linux build

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

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/Bullet.h

@@ -64,7 +64,7 @@ namespace PPTX
 			template<class T> AVSINLINE T&			as()		{ return m_Bullet.as<T>(); }
 			template<class T> AVSINLINE const T&	as() const 	{ return m_Bullet.as<T>(); }
 
-			virtual CString Bullet::toXML()const
+            virtual CString toXML()const
 			{
 				if (m_Bullet.IsInit())
 					return m_Bullet->toXML();

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/PrstClr.h

@@ -48,14 +48,14 @@ namespace PPTX
 				pWriter->EndNode(_T("a:prstClr"));
 			}
 
-			virtual DWORD PrstClr::GetRGBA(DWORD RGBA) const
+            virtual DWORD GetRGBA(DWORD RGBA) const
 			{
 				PrstClr* pColor = const_cast<PrstClr*>(this);
 				pColor->FillRGBFromVal();
 				return ColorBase::GetRGBA(RGBA);
 			}
 
-			virtual DWORD PrstClr::GetARGB(DWORD ARGB) const
+            virtual DWORD GetARGB(DWORD ARGB) const
 			{
 				PrstClr* pColor = const_cast<PrstClr*>(this);
 				pColor->FillRGBFromVal();

ASCOfficePPTXFile/PPTXFormat/Logic/EffectLst.h

@@ -97,7 +97,7 @@ namespace PPTX
 			nullable<Reflection> reflection;
 			nullable<SoftEdge> softEdge;
 		protected:
-			virtual void EffectLst::FillParentPointersForChilds()
+            virtual void FillParentPointersForChilds()
 			{
 				if(blur.IsInit())
 					blur->SetParentPointer(this);

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/FillOverlay.h

@@ -62,7 +62,7 @@ namespace PPTX
 			UniFill				Fill;
 			Limit::BlendMode	blend;
 		protected:
-			virtual void FillOverlay::FillParentPointersForChilds()
+            virtual void FillParentPointersForChilds()
 			{
 				Fill.SetParentPointer(this);
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/NvCxnSpPr.h

@@ -30,7 +30,7 @@ namespace PPTX
 			}
 
 		public:
-			virtual void NvCxnSpPr::fromXML(XmlUtils::CXmlNode& node)
+            virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				cNvPr		= node.ReadNode(_T("p:cNvPr"));
 				cNvCxnSpPr	= node.ReadNode(_T("p:cNvCxnSpPr"));
@@ -39,7 +39,7 @@ namespace PPTX
 				FillParentPointersForChilds();
 			}
 
-			virtual CString NvCxnSpPr::toXML() const
+            virtual CString toXML() const
 			{
 				XmlUtils::CNodeValue oValue;
 				oValue.Write(cNvPr);

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

@@ -9,8 +9,8 @@ namespace NSGuidesVML
 	{
 	public:
 		RulesType m_eRuler;
-		CSimpleArray<POINT> m_arPoints;
-		CSimpleArray<SPointType> m_arPointsType;
+        std::vector<POINT> m_arPoints;
+        std::vector<SPointType> m_arPointsType;
 
 	private:
 		int m_nCountElementsPoint;
@@ -50,11 +50,11 @@ namespace NSGuidesVML
 	class CConverterPPTXPPT
 	{
 		private:
-			CSimpleArray<CSlice> m_arSlices;
+            std::vector<CSlice> m_arSlices;
 			CPPTShape* pPPTShape;
 			std::map<CString, LONG> m_arMapFormula;	
 			std::map<CString, LONG> m_arMapAdj;
-			CSimpleArray<CSlicePath> m_arSlicesPath;
+            std::vector<CSlicePath> m_arSlicesPath;
 			LONG m_lIndexDst;
 			LONG m_lIndexAdj;
 			SPointType pPointType1;