печать (рабочая версия, пока без тестового примера)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62339 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/fontengine/ApplicationFonts.cpp

@@ -154,6 +154,39 @@ void CFontSelectFormat::Destroy()
 	RELEASEOBJECT(shCapHeight);
 }
 
+void CFontSelectFormat::Destroy2()
+{
+    RELEASEOBJECT(wsName);
+    RELEASEOBJECT(wsAltName);
+
+    RELEASEOBJECT(wsFamilyClass);
+    RELEASEOBJECT(sFamilyClass);
+
+    RELEASEOBJECT(bFixedWidth);
+
+    RELEASEARRAYOBJECTS(pPanose);
+
+    RELEASEOBJECT(ulRange1);
+    RELEASEOBJECT(ulRange2);
+    RELEASEOBJECT(ulRange3);
+    RELEASEOBJECT(ulRange4);
+    RELEASEOBJECT(ulCodeRange1);
+    RELEASEOBJECT(ulCodeRange2);
+
+    RELEASEOBJECT(usWeight);
+    RELEASEOBJECT(usWidth);
+
+    RELEASEOBJECT(nFontFormat);
+    RELEASEOBJECT(unCharset);
+
+    RELEASEOBJECT(shAvgCharWidth);
+    RELEASEOBJECT(shAscent);
+    RELEASEOBJECT(shDescent);
+    RELEASEOBJECT(shLineGap);
+    RELEASEOBJECT(shXHeight);
+    RELEASEOBJECT(shCapHeight);
+}
+
 ///////////////////////////////////////////////////////////////////////////////////
 CFontInfo::CFontInfo(const std::wstring& wsFontName, 
 	const std::wstring& wsStyle, 

DesktopEditor/fontengine/ApplicationFonts.h

@@ -47,6 +47,7 @@ public:
 	~CFontSelectFormat();
 	void CreateDuplicate(CFontSelectFormat& oFormat);
 	void Destroy();
+    void Destroy2();
 };
 
 //-------------------------------------------------------------------------------------------------------------------------------

DesktopEditor/fontengine/fontdictionaryworker.h

@@ -236,7 +236,7 @@ namespace NSFontDictionary
 			return false;
 
 		// name - делаем ascii, чтобы сработал подбор
-		oFormat.Destroy();
+		oFormat.Destroy2();
 
 		LONG nLen = (LONG)strlen(pFont->m_name);