git-svn-id:...

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

ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj

@@ -53,7 +53,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects";"$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType";"$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat""
+				AdditionalIncludeDirectories=""$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include";"$(SolutionDir)";"$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects";"$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType";"$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat""
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_ATL_CSTRING;USE_AVSOFFICESTUDIO_XMLUTILS;SOLUTION_ASCOFFICEDOCXFILE2"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -81,7 +81,7 @@
 				AdditionalDependencies="comsvcs.lib comsuppw.lib gdiplus.lib DocxFormat.lib"
 				OutputFile="$(OutDir)/ASCOfficeDocxFile2.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(SolutionDir)/../Common/DocxFormat/Lib/Debug"
+				AdditionalLibraryDirectories=""$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release";"$(SolutionDir)/../Common/DocxFormat/Lib/Debug""
 				IgnoreDefaultLibraryNames="LIBC.lib"
 				MergedIDLBaseFileName="_ASCOfficeDocxFile2.idl"
 				GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_ATL_CSTRING;USE_AVSOFFICESTUDIO_XMLUTILS;SOLUTION_ASCOFFICEDOCXFILE2"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -179,7 +179,7 @@
 				AdditionalDependencies="comsvcs.lib comsuppw.lib gdiplus.lib DocxFormat.lib"
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)/../Common/DocxFormat/Lib/Release"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Lib/Release&quot;"
 				IgnoreDefaultLibraryNames="LIBC.lib"
 				MergedIDLBaseFileName="_ASCOfficeDocxFile2.idl"
 				GenerateDebugInformation="true"

ASCOfficeDocxFile2/stdafx.h

@@ -75,7 +75,7 @@ namespace ASCGraphics
 
 #endif
 
-#import "../Redist/ASCOfficePPTXFile.dll"	named_guids raw_interfaces_only rename_namespace("PPTXFile"), exclude("_IAVSOfficeFileTemplateEvents"), exclude("_IAVSOfficeFileTemplateEvents2")
+#import "../Redist/ASCOfficePPTXFile.dll"	named_guids raw_interfaces_only rename_namespace("PPTXFile"), exclude("_IAVSOfficeFileTemplateEvents"), exclude("_IAVSOfficeFileTemplateEvents2"), exclude("IASCRenderer")
 
 #include "../Common/DocxFormat/Source/DocxFormat/Docx.h"
 #include "../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"