git-svn-id:...

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

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -27,6 +27,11 @@ DEFINES += UNICODE \
 INCLUDEPATH += \
     ../../DesktopEditor/freetype-2.5.2/include \
     ../../Common/DocxFormat/Source/XML/libxml2/XML/include
+
+INCLUDEPATH += \
+    /usr/include/libxml2
+
+LIBS += -lxml2
 	
 SOURCES += ../DocWrapper/DocxSerializer.cpp \
     ../DocWrapper/FontProcessor.cpp \
@@ -71,3 +76,10 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+
+unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug/ -lDocxFormatLib
+
+INCLUDEPATH += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug
+DEPENDPATH += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug
+
+unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug/libDocxFormatLib.a

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -4,7 +4,9 @@
 #include "BinReaderWriterDefines.h"
 
 #include "../../Common/Base64.h"
-#include "imagemanager.h"
+
+#include "./imagemanager.h"
+
 #include "./XmlWriter.h"
 #include "BinaryFileReaderWriter.h"
 #include "../PPTXFormat/FileContainer.h"

ASCOfficePPTXFile/Editor/imagemanager.h

@@ -23,6 +23,13 @@ using namespace NSFontCutter;
 
 #include <list>
 
+#ifndef min
+#define min(a,b) (((a)<(b))?(a):(b))
+#endif
+#ifndef max
+#define max(a,b) (((a)>(b))?(a):(b))
+#endif
+
 namespace NSShapeImageGen
 {
 	const long c_nMaxImageSize = 2000;
@@ -632,7 +639,8 @@ namespace NSShapeImageGen
 			//if (NULL == punkImage)
 			//	return;
 
-			BYTE* pBuffer	= punkImage.get_Data();
+            BYTE* pBuffer	= punkImage.
+                    get_Data();
 			LONG lWidth		= punkImage.get_Width();
 			LONG lHeight	= punkImage.get_Height();
 			LONG lStride	= punkImage.get_Stride();

ASCOfficePPTXFile/PPTXFormat/Folder.cpp

@@ -36,7 +36,6 @@ namespace PPTX
 		if(m_bCancelled)
 			return;
 
-        //POSITION pos = NULL;
 		smart_ptr<PPTX::Presentation> _presentation = FileContainer::get(PPTX::FileTypes::Presentation).smart_dynamic_cast<PPTX::Presentation>();
 		if (_presentation.is_init())
 		{

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -79,6 +79,7 @@ SOURCES += pptxformatlib.cpp \
     ../../../Editor/BinaryFileReaderWriter.cpp \
     ../../../Editor/FontPicker.cpp \
 ../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp \
+../../../../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/BaseShape.cpp
 #../../../Directory.cpp \
 #../../File.cpp
 

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -271,3 +271,4 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+

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

@@ -27,15 +27,16 @@
  * At least I tested it with WinCE 5.0 for Emulator and WinCE 4.2/SH4 target
  */
 #include <win32config.h>
-#include <libxml/xmlversion.h>
+    #include <libxml/xmlversion.h>
 #else
 /*
  * Currently supported platforms use either autoconf or
  * copy to config.h own "preset" configuration file.
  * As result ifdef HAVE_CONFIG_H is omited here.
  */
-#include "config.h"
-#include <libxml/xmlversion.h>
+    //#include "config.h"
+    #include <inttypes.h>
+    #include <libxml/xmlversion.h>
 #endif
 
 #if defined(__Lynx__)