linux build, undefined symbols error (cximage) are present

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

ASCOfficePPTXFile/PPTXFormat/Logic/CxnSp.h

@@ -7,6 +7,7 @@
 #include "SpPr.h"
 #include "ShapeStyle.h"
 
+
 namespace PPTX
 {
 	namespace Logic

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h

@@ -301,4 +301,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_SHAPE_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_SHAPE_INCLUDE_H

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -88,7 +88,7 @@ SOURCES += pptxformatlib.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/Layout.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp \
     ../../../../XlsxSerializerCom/Reader/CSVReader.cpp \
-    ../../../../DesktopEditor/raster/BgraFrame.cpp \
+    #../../../../DesktopEditor/raster/BgraFrame.cpp \
     ../../../../XlsxSerializerCom/Writer/CSVWriter.cpp \
     ../../../../ASCPresentationEditor/OfficeDrawing/Elements.cpp \
     ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp \

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/BaseShape.h

@@ -48,7 +48,7 @@ namespace NSPresentationEditor
         std::vector<SimpleTypes::CPoint>	m_arConnectors;
 		std::vector<LONG>		m_arConnectorAngles;
 
-		std::vector<RECT>		m_arTextRects;
+        std::vector<Aggplus::RECT>		m_arTextRects;
 		
 		std::vector<CHandle_>	m_arHandles;
 

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/Formula.h

@@ -9,7 +9,8 @@
 
 #include "./../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
 
-#include "./../../../../../DesktopEditor/cximage/CxImage/ximadef.h"
+//#include "./../../../../../DesktopEditor/cximage/CxImage/ximadef.h"
+#include "../../../../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
 
 namespace NSGuidesVML
 {

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTXShape/PPTXShape.h

@@ -459,7 +459,7 @@ public:
 		XmlUtils::CXmlNode rect;
 		if(rect.FromXmlString(xml))
 		{
-			RECT TextRect;
+            Aggplus::RECT TextRect;
 			TextRect.top = (long)FManager.GetValue(rect.GetAttribute(_T("t")));
 			TextRect.left = (long)FManager.GetValue(rect.GetAttribute(_T("l")));
 			TextRect.right = (long)FManager.GetValue(rect.GetAttribute(_T("r")));
@@ -575,4 +575,4 @@ public:
 		dWidth = FManager.GetWidth();
 		dHeight = FManager.GetHeight();
 	}
-};
\ No newline at end of file
+};

ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h

@@ -3,7 +3,8 @@
 #include "TextStructures.h"
 
 #ifndef WIN32
-    #include "./../../DesktopEditor/cximage/CxImage/ximadef.h"
+    //#include "./../../DesktopEditor/cximage/CxImage/ximadef.h"
+    #include "../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
 #endif
 namespace NSPresentationEditor
 {

DesktopEditor/cximage/CxImage/xiofile.h

@@ -3,10 +3,11 @@
 
 #include "xfile.h"
 #ifndef _WIN32
-#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
+//#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
 //#include <TCHAR.h>
 
+/*
 #ifndef WIN32
     #ifdef _UNICODE
         typedef wchar_t TCHAR;
@@ -14,6 +15,7 @@
         typedef char TCHAR;
     #endif
 #endif
+*/
 
 class DLL_EXP CxIOFile : public CxFile
 	{

DesktopEditor/graphics/aggplustypes.h

@@ -278,4 +278,4 @@ public:
 
 } //namespace Aggplus
 
-#endif // _AGGPLUSTYPES_H
\ No newline at end of file
+#endif // _AGGPLUSTYPES_H