linux build (disabled font cutter)

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

ASCOfficePPTXFile/Editor/FontCutter.h

@@ -156,7 +156,7 @@ namespace NSFontCutter
 		template<typename T>
 		void WriteEmbeddedFonts(T* pWriter)
 		{
-#ifdef BUILD_CONFIG_FULL_VERSION
+#if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
 			ULONG nCount = 0;
 
 			for(std::map<CString, CEmbeddedFontInfo>::iterator pPair = m_mapFontsEmbeddded.begin(); pPair != m_mapFontsEmbeddded.end(); ++pPair)
@@ -319,7 +319,7 @@ namespace NSFontCutter
 
             delete [] pArrayUnicodes;
 			RELEASEINTERFACE(pFontConverter);
-#endif
+#endif // #if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
 		}
 
         bool GenerateSafearray(USHORT **ppArray, size_t& nCount)
@@ -354,7 +354,7 @@ namespace NSFontCutter
             return true;
 		}
 
-#ifdef BUILD_CONFIG_FULL_VERSION
+#if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
         void WriteFont(CString& strName, LONG& lFaceIndex, CString& strFontPath, CFile* pFile, USHORT* pArrayUnicodes, size_t pArrayUnicodesLength, Fonts::IFontConverter* pFontConverter)
 		{	
 			LONG lFontConverterFlag = 16; // truetype only
@@ -389,7 +389,7 @@ namespace NSFontCutter
 
 			RELEASEARRAY(pArrayData);			
 		}
-#endif
+#endif // #if defined(BUILD_CONFIG_FULL_VERSION) && !defined(DONT_WRITE_EMBEDDED_FONTS)
 	};
 }
 

ASCOfficePPTXFile/Editor/FontPicker.h

@@ -2,9 +2,9 @@
 
 #include "../../Common/DocxFormat/Source/SystemUtility/File.h"
 #include "BinReaderWriterDefines.h"
-#ifdef _WIN32
+
     #include "FontCutter.h"
-#endif
+
 
 //#include "../../DesktopEditor/fontengine/FontManager.h"
 #include "../../DesktopEditor/fontengine/ApplicationFonts.h"

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -21,7 +21,8 @@ DEFINES += UNICODE \
     NODOCX \
     DISABLE_FILE_DOWNLOADER \
     CXIMAGE_DONT_DECLARE_TCHAR \
-    BUILD_CONFIG_FULL_VERSION
+    BUILD_CONFIG_FULL_VERSION \
+    DONT_WRITE_EMBEDDED_FONTS
 
 INCLUDEPATH += \
     /usr/include/libxml2