...

Common/OfficeFileFormatChecker2.cpp

@@ -33,7 +33,10 @@
 
 #include "../DesktopEditor/common/File.h"
 #include "../OfficeUtils/src/OfficeUtils.h"
-#include "../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
+
+#if defined FILE_FORMAT_CHECKER_WITH_MACRO
+	#include "../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
+#endif
 
 #include "3dParty/pole/pole.h"
 #include <algorithm>
@@ -146,10 +149,12 @@ bool COfficeFileFormatChecker::isDocFormatFile	(POLE::Storage * storage)
 		if (entries.size() > 0)
 			return false;
 
+#if defined FILE_FORMAT_CHECKER_WITH_MACRO
 		if (storage->isDirectory(L"Macros"))
 		{
 			bMacroEnabled = true;
 		}
+#endif
 		return true;
 	}
 
@@ -185,11 +190,12 @@ bool COfficeFileFormatChecker::isXlsFormatFile	(POLE::Storage * storage)
 			}
 		}
 	}
+#if defined FILE_FORMAT_CHECKER_WITH_MACRO
 	if (storage->isDirectory(L"_VBA_PROJECT_CUR"))
 	{
 		bMacroEnabled = true;
 	}
-
+#endif
 	return true;
 }
 
@@ -237,6 +243,7 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & fileName)
         }
         else if ( isPptFormatFile(&storage) )
         {
+#if defined FILE_FORMAT_CHECKER_WITH_MACRO
 			COfficePPTFile pptFile;
 			
 			bMacroEnabled = true;
@@ -246,6 +253,7 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & fileName)
 				return false;
 			}         
 			pptFile.CloseFile();
+#endif
 			nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT;
             return true;
         }

X2tConverter/build/Qt/X2tConverter.pri

@@ -60,6 +60,7 @@ DEFINES += DJVU_USE_DYNAMIC_LIBRARY
 DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
 DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY
 DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
+DEFINES += FILE_FORMAT_CHECKER_WITH_MACRO
 
 core_windows {
     INCLUDEPATH += ../../../OfficeUtils/src/zlib-1.2.3

X2tConverter/test/win32Test/X2tTest.vcproj

@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""../../../DesktopEditor/agg-2.4/include";../../../DesktopEditor/xml/build/vs2005;../../../DesktopEditor/xml/libxml2/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FILE_FORMAT_CHECKER_WITH_MACRO;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"