(2.0.0.259): ASCOfficeDocxFile2

отключен подбор шрифтов.

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

ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp

@@ -26,12 +26,16 @@ namespace DocWrapper {
 	}
 	void FontProcessor::setFontTable(OOX::CFontTable* fontTable)
 	{
+		//   js
+		return;
 		for (int i = 0; i < fontTable->m_arrFonts.size(); ++i)
 			addToFontMap(*fontTable->m_arrFonts[i]);
 	}
 	
 	CString FontProcessor::getFont(const CString& name)
 	{
+		//   js
+		return name;
 		CString fontName = gc_sDefaultFontName;
 		if (fontMap.find(name) != fontMap.end())
 			fontName = fontMap[name];
@@ -63,6 +67,8 @@ namespace DocWrapper {
 			sFontName = oRFont->ToString2();
 		if(sFontName.IsEmpty())
 			sFontName = CString(gc_sNoNameFont);
+		//   js
+		return  sFontName;
 		oFontSelectFormat.wsName = new std::wstring;
 		*oFontSelectFormat.wsName = string2std_string(sFontName);
 		if(oCharset.IsInit() && oCharset->m_oCharset.IsInit())

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //0
-//258
-#define INTVER 2,0,0,258
-#define STRVER "2,0,0,258\0"
+//259
+#define INTVER 2,0,0,259
+#define STRVER "2,0,0,259\0"

ASCOfficePPTXFile/Editor/FontPicker.h

@@ -67,6 +67,8 @@ namespace NSFontCutter
 			{
 				sFind = _T("Arial");
 			}
+			//   js
+			return sFind;
 
 			std::map<CString, CString>::iterator pPair = m_mapPicks.find(sFind);
 			if (pPair != m_mapPicks.end())