RECT->Aggplus::RECT

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

ASCOfficePPTXFile/Editor/imagemanager.h

@@ -367,7 +367,7 @@ namespace NSShapeImageGen
 			oInfo.m_eType = GetImageType(oBgraFrame);
 
 			CString strSaveItem = _T("");
-			uint32_t nOutputFormat;
+			unsigned int nOutputFormat;
 			if (itJPG == oInfo.m_eType)
 			{
 				strSaveItem.Format(_T("%s\\image%d.jpg"), m_strDstMedia, oInfo.m_lID);

ASCOfficePPTXFile/PPTXFormat/Logic/CxnSp.cpp

@@ -73,7 +73,7 @@ namespace PPTX
 				style->SetParentPointer(this);
 		}
 
-		void CxnSp::GetRect(RECT& pRect)const
+		void CxnSp::GetRect(Aggplus::RECT& pRect)const
 		{
 			pRect.bottom = 0;
 			pRect.left = 0;

ASCOfficePPTXFile/PPTXFormat/Logic/CxnSp.h

@@ -22,7 +22,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node);
 			virtual CString toXML() const;
-			virtual void GetRect(RECT& pRect)const;
+			virtual void GetRect(Aggplus::RECT& pRect)const;
 
 			DWORD GetLine(Ln& line)const;
 			DWORD GetFill(UniFill& fill)const;

ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp

@@ -87,7 +87,7 @@ namespace PPTX
 			}
 			else
 			{
-				RECT& txRect = lpShapeElement->m_oShape.m_pShape->m_arTextRects[0];
+				Aggplus::RECT& txRect = lpShapeElement->m_oShape.m_pShape->m_arTextRects[0];
 				//double dkoefX = (double)lCoordSize / max(1, dCoordSizeX);
 				//double dkoefY = (double)lCoordSize / max(1, dCoordSizeY);
 

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -335,7 +335,7 @@ namespace PPTX
 			pReader->Seek(_end_rec);
 		}
 
-		void GraphicFrame::GetRect(RECT& pRect)const
+		void GraphicFrame::GetRect(Aggplus::RECT& pRect)const
 		{
 			pRect.left		= xfrm.offX.get();
 			pRect.top		= xfrm.offY.get();

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.h

@@ -27,7 +27,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node);
 			virtual CString toXML() const;
-			virtual void GetRect(RECT& pRect)const;
+			virtual void GetRect(Aggplus::RECT& pRect)const;
 
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
 	

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -100,7 +100,7 @@ namespace PPTX
 				style->SetParentPointer(this);
 		}
 
-		void Pic::GetRect(RECT& pRect)const
+		void Pic::GetRect(Aggplus::RECT& pRect)const
 		{
 			pRect.bottom	= 0;
 			pRect.left		= 0;

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h

@@ -24,7 +24,7 @@ namespace PPTX
 		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node);
 			virtual CString toXML() const;
-			virtual void GetRect(RECT& pRect)const;
+			virtual void GetRect(Aggplus::RECT& pRect)const;
 			virtual CString GetFullPicName()const;
 			virtual CString GetVideoLink()const;
 			virtual CString GetAudioLink()const;

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -105,7 +105,7 @@ namespace PPTX
 			levelUp = NULL;
 		}
 
-		void Shape::GetRect(RECT& pRect)const
+		void Shape::GetRect(Aggplus::RECT& pRect)const
 		{
 			pRect.bottom = 0;
 			pRect.left = 0;

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h

@@ -34,7 +34,7 @@ namespace PPTX
 			CString GetText()const{if(txBody.IsInit()) return txBody->GetText(); return _T(""); };
 
 			void GetShapeFullDescription(Shape& shape, int level = 0)const;
-			void GetRect(RECT& pRect)const;
+			void GetRect(Aggplus::RECT& pRect)const;
 			DWORD GetFill(UniFill& fill)const;
 			DWORD GetLine(Ln& line)const;
 

ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.h

@@ -12,7 +12,7 @@
 #include "Sp3d.h"
 #include "Geometry.h"
 
-#include "../../../../DesktopEditor/cximage/CxImage/ximadef.h" //for RECT
+#include "../../../DesktopEditor/graphics/aggplustypes.h" //for RECT
 
 namespace PPTX
 {

ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h

@@ -9,7 +9,7 @@
 #include "ShapeProperties.h"
 #include "ShapeTextProperties.h"
 
-#include "../../../../DesktopEditor/cximage/CxImage/ximadef.h" //for RECT
+#include "../../../DesktopEditor/graphics/aggplustypes.h" //for RECT
 
 namespace PPTX
 {
@@ -137,7 +137,7 @@ namespace PPTX
 					pWriter->EndNode(m_name);
 			}
 
-			void NormalizeRect(RECT& rect)const
+			void NormalizeRect(Aggplus::RECT& rect)const
 			{
 				if(grpSpPr.xfrm.IsInit())
 				{