linux build

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

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BulletColor.h

@@ -88,28 +88,28 @@ namespace PPTX
 			template<class T> AVSINLINE T&			as()		{ return m_Color.as<T>(); }
 			template<class T> AVSINLINE const T&	as() const 	{ return m_Color.as<T>(); }
 
-			virtual DWORD BulletColor::GetRGBA()const
+            virtual DWORD GetRGBA()const
 			{
 				if(has_spec_color())
 					return as<BuClr>().GetRGBA();
 				return 0;
 			}
 
-			virtual DWORD BulletColor::GetARGB()const
+            virtual DWORD GetARGB()const
 			{
 				if(has_spec_color())
 					return as<BuClr>().GetARGB();
 				return 0;
 			}
 
-			virtual DWORD BulletColor::GetBGRA()const
+            virtual DWORD GetBGRA()const
 			{
 				if(has_spec_color())
 					return as<BuClr>().GetBGRA();
 				return 0;
 			}
 
-			virtual DWORD BulletColor::GetABGR()const
+            virtual DWORD GetABGR()const
 			{
 				if(has_spec_color())
 					return as<BuClr>().GetABGR();

ASCOfficePPTXFile/PPTXFormat/WrapperWritingElement.h

@@ -11,11 +11,17 @@
 	Class()	{}														\
 	virtual ~Class() {}												\
 	explicit Class(XmlUtils::CXmlNode& node)	{ fromXML(node); }	\
+    explicit Class(const XmlUtils::CXmlNode& node)	{ fromXML(const_cast<XmlUtils::CXmlNode&> (node)); }	\
     const Class& operator =(XmlUtils::CXmlNode& node)				\
 	{																\
 		fromXML(node);												\
 		return *this;												\
 	}																\
+    const Class& operator =(const XmlUtils::CXmlNode& node)				\
+    {																\
+        fromXML(const_cast<XmlUtils::CXmlNode&> (node));												\
+        return *this;												\
+    }																\
 	Class(const Class& oSrc) { *this = oSrc; }						\
 
 namespace PPTX

ASCPresentationEditor/OfficeDrawing/Attributes.h

@@ -220,6 +220,12 @@ namespace NSPresentationEditor
 		return str;
 	}
 	static inline CString ToString(DWORD val)
+	{
+		CString str = _T("");
+		str.Format(_T("%d"), val);
+		return str;
+	}
+    static inline CString ToString(long val)
     {
         CString str = _T("");
         str.Format(_T("%d"), val);
@@ -924,13 +930,9 @@ namespace NSPresentationEditor
 		}
 		void SetToRenderer(IRenderer *pRenderer)
 		{		
-			BSTR bstrName = Name.AllocSysString();			
-			pRenderer->put_FontName(bstrName);			
-			SysFreeString(bstrName);
+            pRenderer->put_FontName(Name);
+            pRenderer->put_FontPath(Path);
 
-			BSTR bstrPath = Path.AllocSysString();
-			pRenderer->put_FontPath(bstrPath);
-			SysFreeString(bstrPath);
 
 			pRenderer->put_FontSize(Size);
 			pRenderer->put_FontStyle(GetStyle());
@@ -1121,10 +1123,18 @@ namespace NSPresentationEditor
 		virtual CString ToString()
 		{
 			CString strEdge = _T("");
-			strEdge += (_T("edge-visible='") + NSPresentationEditor::ToString(Visible) + _T("' "));
-			strEdge += (_T("edge-dist='") + NSPresentationEditor::ToString(Dist) + _T("' "));
-			strEdge += (_T("edge-color='") + Color.ToString() + _T("' "));
-			strEdge += (_T("edge-alpha='") + NSPresentationEditor::ToString((int)Alpha) + _T("' "));
+            strEdge += _T("edge-visible='");
+            strEdge += NSPresentationEditor::ToString(Visible);
+            strEdge += _T("' ");
+            strEdge += _T("edge-dist='");
+            strEdge += NSPresentationEditor::ToString(Dist);
+            strEdge += _T("' ");
+            strEdge += _T("edge-color='");
+            strEdge += Color.ToString();
+            strEdge += _T("' ");
+            strEdge += _T("edge-alpha='");
+            strEdge += NSPresentationEditor::ToString((int)Alpha);
+            strEdge += _T("' ");
 			return strEdge;
 		}
 	};