git-svn-id:...

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

OfficeCore/Fonts/WinFonts.h

@@ -642,10 +642,32 @@ private:
 
 			CString _s((char*)pOutput, nOutputLen);
 
+			RELEASEARRAYOBJECTS(pData);
+			RELEASEARRAYOBJECTS(pOutput);
+
 			oWriterJS.WriteStringC(_T("window[\"g_standart_fonts_thumbnail\"] = \"data:image/png;base64,"));
 			oWriterJS.WriteStringC(_s);
 			oWriterJS.WriteStringC(_T("\";\n"));
 
+			if (TRUE)
+			{
+				// dump fontselection.bin
+				CheckBinaryData();
+
+				nInputLen = (int)m_pBinaryFonts->rgsabound[0].cElements;
+				nOutputLen = Base64EncodeGetRequiredLength(nInputLen, ATL_BASE64_FLAG_NOCRLF);
+				pOutput = new BYTE[nOutputLen];
+				Base64Encode((BYTE*)m_pBinaryFonts->pvData, nInputLen, (LPSTR)pOutput, &nOutputLen, ATL_BASE64_FLAG_NOCRLF);
+
+				CString _ss((char*)pOutput, nOutputLen);
+
+				oWriterJS.WriteStringC(_T("window[\"g_fonts_selection_bin\"] = \""));
+				oWriterJS.WriteStringC(_ss);
+				oWriterJS.WriteStringC(_T("\";\n"));
+
+				RELEASEARRAYOBJECTS(pOutput);				
+			}
+
 			CStringA strA = (CStringA)oWriterJS.GetCString();
 			CFile oFileFontsJS;
 			oFileFontsJS.CreateFile(strFile);

OfficeCore/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//9
-#define INTVER 1,0,0,9
-#define STRVER "1,0,0,9\0"
+//10
+#define INTVER 1,0,0,10
+#define STRVER "1,0,0,10\0"