fix for WIN32

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

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -254,7 +254,10 @@ bool BinDocxRW::CDocxSerializer::getBinaryContent(const CString& bsTxContent, NS
 	long nStartPos = oBufferedStream.GetPosition();
 
 	XmlUtils::CXmlLiteReader oReader;
-	oReader.FromString(bsTxContent);
+	
+	CString bsTxContentTemp = bsTxContent;
+	
+	oReader.FromString(bsTxContentTemp);
 	oReader.ReadNextNode();//v:textbox
 	CString sRootName = oReader.GetName();
 	if(_T("v:textbox") == sRootName)

ASCOfficePPTXFile/ASCOfficePPTXFile.h

@@ -13,8 +13,6 @@
 #include "../Common/DocxFormat/Source/Base/Base.h"
 #include "PPTXFormat/PPTXEvent.h"
 
-#include "../ASCPresentationEditor/ASCPresentationEditorDef.h"
-
 
 typedef void (*load_from_resource)(void*, int, CString&);
 typedef bool (*extract_to_directory)(void*, CString&, CString&);

ASCOfficePPTXFile/ASCOfficePPTXFile.vcproj

@@ -587,59 +587,6 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath="..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTXShape\Formula.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseASC|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ReleaseOpenSource|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTShape\Formula.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"
-						/>
-					</FileConfiguration>
-				</File>
 			</Filter>
 		</Filter>
 		<Filter

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

@@ -13,6 +13,7 @@
 #include "Editor/PPTXWriter.h"
 
 #include "PPTXFormat/PPTXEvent.h"
+#include "../ASCPresentationEditor/ASCPresentationEditorDef.h"
 
 CPPTXFile::CPPTXFile(load_from_resource fCallbackResource, extract_to_directory fCallbackExtract, compress_from_directory fCallbackCompress, progress_operation fCallbackProgress, void* pCallbackArg)
 {

ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj

@@ -190,10 +190,6 @@
 		<Filter
 			Name="EditorSource"
 			>
-			<File
-				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\BaseShape.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\Editor\BinaryFileReaderWriter.cpp"
 				>
@@ -206,26 +202,10 @@
 				RelativePath="..\Editor\FontPicker.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTXShape\Formula.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTShape\Formula.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Layout.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTShape\PPTShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTXShape\PPTXShape.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.cpp"
 				>

Common/DocxFormat/Source/XML/libxml2/XML/libxml.h

@@ -10,12 +10,12 @@
 #define __XML_LIBXML_H__
 
 #ifndef NO_LARGEFILE_SOURCE
-#ifndef _LARGEFILE_SOURCE
-#define _LARGEFILE_SOURCE
-#endif
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
+	#ifndef _LARGEFILE_SOURCE
+		#define _LARGEFILE_SOURCE
+	#endif
+	#ifndef _FILE_OFFSET_BITS
+		#define _FILE_OFFSET_BITS 64
+	#endif
 #endif
 
 #if defined(macintosh)
@@ -34,8 +34,11 @@
  * copy to config.h own "preset" configuration file.
  * As result ifdef HAVE_CONFIG_H is omited here.
  */
-    //#include "config.h"
-    #include <inttypes.h>
+	#ifdef _WIN32
+		#include "config.h"
+	#else
+		#include <inttypes.h>
+	#endif
     #include <libxml/xmlversion.h>
 #endif