git-svn-id:...

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

ASCOfficeSVGFile/AVSOfficeSVGFile/ASCOfficeSVGFile.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeSvgFile"
-#include "../Common/FileInfo.h"
+#include "../../Common/FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

ASCOfficeSVGFile/AVSOfficeSVGFile/ASCOfficeSVGFile.vcproj

@@ -52,7 +52,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;agg\;agg\include;Expat\;..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType"
+				AdditionalIncludeDirectories="..\..\Common;agg\;agg\include;Expat\;..\..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType;..\..\ASCImageStudio3\ASCGraphics\agg;..\..\ASCImageStudio3\ASCGraphics\agg\include;..\..\ASCImageStudio3\ASCGraphics"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;__FOR_TESTS__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@
 				IgnoreImportLibrary="true"
 				OutputFile="$(OutDir)/ASCOfficeSVGFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\ASCImageStudio3\ASCGraphics;$(NOINHERIT)"
+				AdditionalLibraryDirectories="..\..\ASCImageStudio3\ASCGraphics;..\..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType;E:\activex\AVS\Sources\TeamlabOffice\trunk\ServerComponents\ASCImageStudio3\ASCGraphics"
 				MergedIDLBaseFileName="_ASCOfficeSVGFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -122,7 +122,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
+				CommandLine="..\..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -147,7 +147,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Common;agg\;agg\include;Expat\;..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType"
+				AdditionalIncludeDirectories="..\..\Common;agg\;agg\include;Expat\;..\..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;__FOR_TESTS__"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -172,7 +172,7 @@
 				IgnoreImportLibrary="true"
 				OutputFile="$(OutDir)/ASCOfficeSVGFile.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType;$(NOINHERIT)"
+				AdditionalLibraryDirectories="..\..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType;$(NOINHERIT)"
 				MergedIDLBaseFileName="_ASCOfficeSVGFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -202,7 +202,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy $(TargetPath) &quot..\Redist\&quot&#x0D;&#x0A;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy $(TargetPath) &quot;..\..\Redist\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -271,31 +271,31 @@
 			Name="Common"
 			>
 			<File
-				RelativePath="..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
+				RelativePath="..\..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\ASCUtils.h"
+				RelativePath="..\..\Common\ASCUtils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\OfficeCommandsRenderer.h"
+				RelativePath="..\..\Common\OfficeCommandsRenderer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\OfficeDefines.h"
+				RelativePath="..\..\Common\OfficeDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\OfficeFileErrorDescription.h"
+				RelativePath="..\..\Common\OfficeFileErrorDescription.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\OfficeFileFormats.h"
+				RelativePath="..\..\Common\OfficeFileFormats.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Common\OfficeFileTemplate.h"
+				RelativePath="..\..\Common\OfficeFileTemplate.h"
 				>
 			</File>
 		</Filter>
@@ -315,11 +315,11 @@
 			Name="SVG Files"
 			>
 			<File
-				RelativePath="..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.cpp"
+				RelativePath="..\..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.h"
+				RelativePath="..\..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.h"
 				>
 			</File>
 		</Filter>

ASCOfficeSVGFile/AVSOfficeSVGFile/SVGTransformer.cpp

@@ -35,7 +35,7 @@ HRESULT SVGTransformer::Draw ( IUnknown* pUnk, double dX, double dY, double dWid
 	if ( NULL == pUnk )
 		return S_FALSE;
 
-	IAVSRenderer* render = NULL;
+	IASCRenderer* render = NULL;
 	pUnk->QueryInterface ( &render );
 	pUnk->Release ();
 

ASCOfficeSVGFile/AVSOfficeSVGFile/SVGTransformer.h

 #pragma once
 #include "resource.h"  
 
-#include "x:\Common\GdiPlusEx.h"
+#include "..\..\Common\GdiPlusEx.h"
 
-#include "x:\AVS\Sources\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h"
-#include "x:\AVS\Sources\AVSOfficeStudio\Common\OfficeFileErrorDescription.h"
-#include "x:\AVS\Sources\AVSImageStudio3\AVSGraphics\Objects\Image\SVG\SVGFramework.h"
+#include "..\..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
+#include "..\..\Common\OfficeFileErrorDescription.h"
+#include "..\..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.h"
 
 // ISVGTransformer
 [
@@ -93,7 +93,7 @@ private:
 
 	SVG::Parser		m_oParser;
 	SVG::Storage	m_oStorage;
-	SVG::Drawer		m_oRender;
+	SVG::Painter	m_oRender;
 
 	CGdiPlusInit	m_oGdiPlusInit;
 };