(1.0.0.13) не пишется base64 картинка в AllFonts.js + уточнение подбора по словарю

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

OfficeCore/Fonts/WinFont.h

@@ -1136,7 +1136,7 @@ public:
 			{
 				ULONG arrReqRanges[6]  = { ulRange1, ulRange2, ulRange3, ulRange4, ulCodeRange1, ulCodeRange2 };
 
-				nCurPenalty += GetSigPenalty( arrCandRanges, arrReqRanges );
+				nCurPenalty += GetSigPenalty( arrCandRanges, arrReqRanges, 1000, true );
 			}
 
 			if ( bIsFixed )

OfficeCore/Fonts/WinFonts.h

@@ -574,7 +574,7 @@ private:
 				pImFile->SaveFile(bsThPath, 4);
 				SysFreeString(bsThPath);
 
-				if (TRUE)
+				if (FALSE)
 				{
 					if (iX == 1)
 					{
@@ -674,7 +674,7 @@ private:
 			}
 			oWriterJS.WriteStringC(_T("];\n\n"));
 
-			if (TRUE)
+			if (strWriteJS_thumbnail != _T(""))
 			{
 				oWriterJS.WriteStringC(_T("window[\"g_standart_fonts_thumbnail\"] = \"data:image/png;base64,"));
 				oWriterJS.WriteStringC(strWriteJS_thumbnail);

OfficeCore/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//12
-#define INTVER 1,0,0,12
-#define STRVER "1,0,0,12\0"
+//13
+#define INTVER 1,0,0,13
+#define STRVER "1,0,0,13\0"