git-svn-id:...

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

ASCPresentationEditor/OfficeDrawing/Attributes.h

@@ -4,12 +4,12 @@
 #include "Metric.h"
 #include "Effects.h"
 #include "../../Common/DocxFormat/Source/XML/XmlUtils.h"
-#include "AVSUtils.h"
+#include "../../Common/ASCUtils.h"
 #include "XmlWriter.h"
 
 #include "Gdiplus.h"
 
-#include "..\..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h"
+#include "../../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
 
 namespace NSPresentationEditor
 {
@@ -528,7 +528,7 @@ namespace NSPresentationEditor
 				(DashStyle == pPen->DashStyle) && (LineStartCap == pPen->LineStartCap) &&
 				(LineEndCap == pPen->LineEndCap) && (LineJoin == pPen->LineJoin));
 		}
-		void SetToRenderer(IAVSRenderer *pRenderer)
+		void SetToRenderer(IASCRenderer *pRenderer)
 		{
 			if (-1 == Color.m_lSchemeIndex)
 				pRenderer->put_PenColor(Color.GetLONG());
@@ -844,7 +844,7 @@ namespace NSPresentationEditor
 					(c_BrushTypeHatch1 <= Type && c_BrushTypeHatch53 >= Type));
 		}
 
-		void SetToRenderer(IAVSRenderer *pRenderer)
+		void SetToRenderer(IASCRenderer *pRenderer)
 		{
 			Type = ConstantCompatible(Type);
 			pRenderer->put_BrushType(Type);
@@ -976,7 +976,7 @@ namespace NSPresentationEditor
 			Underline = (byte)(0x7C & lStyle) >> 2;
 			Strikeout = (byte)(0x0180 & lStyle) >> 7;
 		}
-		void SetToRenderer(IAVSRenderer *pRenderer)
+		void SetToRenderer(IASCRenderer *pRenderer)
 		{
 			BSTR bstrName = Name.AllocSysString();			
 			pRenderer->put_FontName(bstrName);			

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/BaseShape.h

@@ -78,7 +78,7 @@ namespace NSPresentationEditor
 		virtual void ReCalculate()								= 0;
 
 		virtual CString ToXML(CGeomShapeInfo& GeomInfo, CMetricInfo& MetricInfo, double StartTime, double EndTime, CBrush& Brush, CPen& Pen) = 0;
-		virtual void ToRenderer(IAVSRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo)
+		virtual void ToRenderer(IASCRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo)
 		{
 			m_oPath.ToRenderer(pRenderer, pGeomInfo, dStartTime, dEndTime, pPen, pFore, pInfo, GetClassType());
 		}

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Common.h

@@ -384,15 +384,15 @@ namespace NSStringUtils
 
 #ifdef AVS_USE_CONVERT_PPTX_TOCUSTOM_VML
 
-#include "../../../../../AVSImageStudio3/AVSGraphics/Interfaces/AVSRenderer.h"
+#include "../../../../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
 
 #if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
 #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
 #endif
 
 // CAVSOOXToVMLGeometry
-[ coclass, default(IAVSRenderer), threading(apartment), vi_progid("AVSPPTX.VMLShape"), progid("AVSPPTX.VMLShape.1"), version(1.0), uuid("3266F3E4-B6AB-4440-BC58-F38E78BBCCBD") ]
-class ATL_NO_VTABLE CAVSOOXToVMLGeometry : public IAVSRenderer
+[ coclass, default(IASCRenderer), threading(apartment), vi_progid("AVSPPTX.VMLShape"), progid("AVSPPTX.VMLShape.1"), version(1.0), uuid("3266F3E4-B6AB-4440-BC58-F38E78BBCCBD") ]
+class ATL_NO_VTABLE CAVSOOXToVMLGeometry : public IASCRenderer
 {
 private:
 	class _CStringWriter
@@ -812,8 +812,8 @@ public:
 		m_dScaleY = 1.0;
 
 		m_pSimpleGraphicsConverter = NULL;
-		CoCreateInstance(AVSGraphics::CLSID_CAVSGraphicSimpleComverter, NULL, CLSCTX_ALL, 
-			AVSGraphics::IID_IAVSGraphicSimpleComverter, (void**)&m_pSimpleGraphicsConverter);
+		CoCreateInstance(ASCGraphics::CLSID_CASCGraphicSimpleComverter, NULL, CLSCTX_ALL, 
+			ASCGraphics::IID_IASCGraphicSimpleComverter, (void**)&m_pSimpleGraphicsConverter);
 
 		IUnknown* punkRenderer = NULL;
 		this->QueryInterface(IID_IUnknown, (void**)&punkRenderer);
@@ -832,7 +832,7 @@ public:
 
 private:
 	
-	AVSGraphics::IAVSGraphicSimpleComverter*	m_pSimpleGraphicsConverter;
+	ASCGraphics::IASCGraphicSimpleComverter*	m_pSimpleGraphicsConverter;
 	BOOL m_bIsFillPart;
 	BOOL m_bIsStrokePart;
 

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/GraphicsPath.h

 #pragma once
-#include "..\..\..\..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h"
+#include "../../../../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
 
 #include "..\..\Metric.h"
 #include "..\..\Attributes.h"
@@ -142,7 +142,7 @@ namespace NSPresentationEditor
 			InternalClear();
 		}
 
-		virtual void Draw(IAVSRenderer* pRenderer)
+		virtual void Draw(IASCRenderer* pRenderer)
 		{
 			if (NULL == pRenderer)
 				return;
@@ -180,7 +180,7 @@ namespace NSPresentationEditor
 			pRenderer->PathCommandEnd();
 			pRenderer->EndCommand(c_nPathType);
 		}
-		void ConvertVector(IAVSRenderer* pRenderer)
+		void ConvertVector(IASCRenderer* pRenderer)
 		{
 			pRenderer->SetCommandParams(m_dAngle, m_oBounds.left, m_oBounds.top, m_oBounds.GetWidth(), m_oBounds.GetHeight(), m_lFlags);
 
@@ -300,7 +300,7 @@ namespace NSPresentationEditor
 				};
 			}
 
-			void CheckLastPoint(IAVSRenderer* pRenderer, CDoublePoint& pointCur)
+			void CheckLastPoint(IASCRenderer* pRenderer, CDoublePoint& pointCur)
 			{
 				if (NULL == pRenderer)
 					return;
@@ -445,7 +445,7 @@ namespace NSPresentationEditor
 			}
 
 
-			void GetSafearrayPoints(IAVSRenderer* pRenderer, SAFEARRAY** ppArray, CDoublePoint& pointCur, BOOL bR = FALSE)
+			void GetSafearrayPoints(IASCRenderer* pRenderer, SAFEARRAY** ppArray, CDoublePoint& pointCur, BOOL bR = FALSE)
 			{
 				if (NULL == ppArray)
 					return;
@@ -497,7 +497,7 @@ namespace NSPresentationEditor
 				*ppArray = pArray;
 			}
 
-			void Draw(IAVSRenderer* pRenderer, CDoublePoint& pointCur)
+			void Draw(IASCRenderer* pRenderer, CDoublePoint& pointCur)
 			{
 				switch (m_eType)
 				{
@@ -791,7 +791,7 @@ namespace NSPresentationEditor
 				};
 			}
 
-			inline void AddEllipticalQuadr(IAVSRenderer*& pRenderer, bool& bIsX, double& x1, double& y1, double& x2, double& y2, double& dRadX, double& dRadY)
+			inline void AddEllipticalQuadr(IASCRenderer*& pRenderer, bool& bIsX, double& x1, double& y1, double& x2, double& y2, double& dRadX, double& dRadY)
 			{
 				if (bIsX)
 				{

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

@@ -1718,7 +1718,7 @@ namespace NSGuidesVML
 
 #else
 
-#include "../../../../../AVSOfficePPTXFile/Editor/XmlWriter.h"
+#include "../../../../../ASCOfficePPTXFile/Editor/XmlWriter.h"
 
 namespace NSGuidesVML
 {

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

@@ -500,7 +500,7 @@ public:
 
 		return m_oPath.ToXml(GeomInfo, StartTime, EndTime, Pen, Brush, MetricInfo, NSBaseShape::pptx);
 	}
-	virtual void ToRenderer(IAVSRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo)
+	virtual void ToRenderer(IASCRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo)
 	{
 		FManager.SetWidthHeight(pGeomInfo.m_dWidth, pGeomInfo.m_dHeight);
 		ReCalculate();

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

@@ -85,7 +85,7 @@ namespace NSGuidesVML
 			void Convert ( CPPTXShape* pPPTXShape )
 			{
 				ConvertAdjastments ( pPPTXShape->m_arAdjustments, pPPTXShape->FManager.mapAdjustments );
-				AddSizeGuides (pPPTXShape->FManager.GetWidth(), pPPTXShape->FManager.GetHeight());
+				AddSizeGuides ((LONG)pPPTXShape->FManager.GetWidth(), (LONG)pPPTXShape->FManager.GetHeight());
 				ConvertGuides ( pPPTXShape->FManager.strGuides, pPPTXShape->FManager.mapGuides);
 				ConvertPath( pPPTXShape->m_strPath, pPPTXShape->FManager.strGuides, pPPTXShape->FManager.mapGuides);
 

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Path.h

@@ -1946,7 +1946,7 @@ namespace NSPresentationEditor
 			return strResult;
 		}
 
-		void ToRenderer(IAVSRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, 
+		void ToRenderer(IASCRenderer* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, 
 			double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo, NSBaseShape::ClassType ClassType)
 		{
 			CGraphicPath oPath;

ASCPresentationEditor/OfficeDrawing/Shapes/Shape.h

@@ -352,7 +352,7 @@ public:
 		return strImageTransform;
 	}
 
-	void ToRenderer(IAVSRenderer* pRenderer, CGeomShapeInfo& oGeomInfo, CMetricInfo& pInfo, double dStartTime, double dEndTime)
+	void ToRenderer(IASCRenderer* pRenderer, CGeomShapeInfo& oGeomInfo, CMetricInfo& pInfo, double dStartTime, double dEndTime)
 	{
 		oGeomInfo.m_dLimoX = m_lLimoX;
 		oGeomInfo.m_dLimoY = m_lLimoY;

ASCPresentationEditor/PPTXWriter/CSS.h

 #pragma once
-#include "AvsUtils.h"
+#include "../../Common/ASCUtils.h"
 #include "../OfficeDrawing/TextAttributesEx.h"
 
 #define _USE_XMLLITE_READER_

ASCPresentationEditor/PPTXWriter/FileDownloader.h

 #pragma once
 
-#include "BaseThread.h"
+#include "../../Common/BaseThread.h"
 
 #include <wininet.h>
 #pragma comment(lib, "Wininet")