linux build

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

ASCPresentationEditor/OfficeDrawing/Attributes.h

@@ -4,7 +4,7 @@
 	#include <atlcoll.h>
 	#include <gdiplus.h>
 #else
-	#include "../../ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h"
+    #include "../../../ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h"
 #endif
 
 #include "Metric.h"

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/BaseShape.h

 #pragma once
 #include "Path.h"
-
+#include "../../../Common/DocxFormat/Source/Common/SimpleTypes_Base.h"
 namespace NSPresentationEditor
 {
 	using namespace NSBaseShape;
@@ -35,7 +35,7 @@ namespace NSPresentationEditor
 			return (*this);
 		}
 	};
-
+//
 	class CBaseShape
 	{
 	public:
@@ -45,7 +45,7 @@ namespace NSPresentationEditor
 		LONG					m_eJoin;
 		bool					m_bConcentricFill;
 
-		std::vector<CPoint>	m_arConnectors;
+        std::vector<SimpleTypes::CPoint>	m_arConnectors;
 		std::vector<LONG>		m_arConnectorAngles;
 
 		std::vector<RECT>		m_arTextRects;

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

@@ -2,8 +2,8 @@
 #include "Formula.h"
 #include "../Path.h"
 #include "../PPTShape/Formula.h"
+#include "../PPTXShape/PPTXShape.h"
 #include "../PPTShape/PPTShape.h"
-
 namespace NSGuidesVML
 {
 #ifndef ENABLE_PPT_TO_PPTX_CONVERT