git-svn-id:...

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

ASCOfficePDFWriter/AVSOfficePDFWriter.cpp → ASCOfficePDFWriter/ASCOfficePDFWriter.cpp

-// AVSOfficePDFWriter.cpp : Implementation of DLL Exports.
+// ASCOfficePDFWriter.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
@@ -7,10 +7,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{E0DC00B5-13BE-451C-92B5-078A5B44BEEA}", 
-		 name = "AVSOfficePDFWriter", 
-		 helpstring = "AVSOfficePDFWriter 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICEPDFWRITER") ]
-class CAVSOfficePDFWriterModule
+		 name = "ASCOfficePDFWriter", 
+		 resource_name = "IDR_ASCOFFICEPDFWRITER") ]
+class CASCOfficePDFWriterModule
 {
 public:
 // Override CAtlDllModuleT members

ASCOfficePDFWriter/AVSOfficePDFWriter.rc → ASCOfficePDFWriter/ASCOfficePDFWriter.rc

@@ -86,10 +86,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSOfficePDFWriter"
+	IDS_PROJNAME					"ASCOfficePDFWriter"
 END
 
-IDR_AVSOFFICEPDFWRITER REGISTRY "AVSOfficePDFWriter.rgs"
+IDR_ASCOFFICEPDFWRITER REGISTRY "ASCOfficePDFWriter.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 

ASCOfficePDFWriter/AVSOfficePDFWriter.rgs → ASCOfficePDFWriter/ASCOfficePDFWriter.rgs

@@ -2,8 +2,8 @@ HKCR
 {
 	NoRemove AppID
 	{
-		'%APPID%' = s 'AVSOfficePDFWriter'
-		'AVSOfficePDFWriter.DLL'
+		'%APPID%' = s 'ASCOfficePDFWriter'
+		'ASCOfficePDFWriter.DLL'
 		{
 			val AppID = s '%APPID%'
 		}

ASCOfficePDFWriter/AVSOfficePDFWriter_vs2005.sln → ASCOfficePDFWriter/ASCOfficePDFWriter_vs2005.sln

 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePDFWriter", "AVSOfficePDFWriter_vs2005.vcproj", "{FD508B11-154E-491B-BA4A-EA81978955EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficePDFWriter", "ASCOfficePDFWriter_vs2005.vcproj", "{FD508B11-154E-491B-BA4A-EA81978955EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ASCOfficePDFWriter/AVSOfficePDFWriter.vcproj → ASCOfficePDFWriter/ASCOfficePDFWriter_vs2005.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
-	Name="AVSOfficePDFWriter"
+	Version="8,00"
+	Name="ASCOfficePDFWriter"
 	ProjectGUID="{FD508B11-154E-491B-BA4A-EA81978955EF}"
-	RootNamespace="AVSOfficePDFWriter"
+	RootNamespace="ASCOfficePDFWriter"
 	Keyword="AtlProj"
-	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -43,16 +42,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePDFWriter.tlb"
-				HeaderFileName="AVSOfficePDFWriter.h"
+				TypeLibraryName="$(IntDir)/ASCOfficePDFWriter.tlb"
+				HeaderFileName="ASCOfficePDFWriter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePDFWriter_i.c"
-				ProxyFileName="AVSOfficePDFWriter_p.c"
+				InterfaceIdentifierFileName="ASCOfficePDFWriter_i.c"
+				ProxyFileName="ASCOfficePDFWriter_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="X:\AVS\Sources\AVSOfficeStudio\AVSOfficePDFWriter\Zlib;x:\AVS\Sources\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType\"
+				AdditionalIncludeDirectories="../OfficeCore/Fonts/FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -77,12 +76,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSOfficePDFWriter.dll"
+				OutputFile="$(OutDir)/ASCOfficePDFWriter.dll"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSOfficePDFWriter.idl"
+				MergedIDLBaseFileName="_ASCOfficePDFWriter.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficePDFWriter.lib"
+				ImportLibrary="$(OutDir)/ASCOfficePDFWriter.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -103,6 +102,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
@@ -120,7 +122,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="X:\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -137,15 +139,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePDFWriter.tlb"
-				HeaderFileName="AVSOfficePDFWriter.h"
+				TypeLibraryName="$(IntDir)/ASCOfficePDFWriter.tlb"
+				HeaderFileName="ASCOfficePDFWriter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePDFWriter_i.c"
-				ProxyFileName="AVSOfficePDFWriter_p.c"
+				InterfaceIdentifierFileName="ASCOfficePDFWriter_i.c"
+				ProxyFileName="ASCOfficePDFWriter_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="X:\AVS\Sources\AVSOfficeStudio\AVSOfficePDFWriter\Zlib;x:\AVS\Sources\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType\"
+				AdditionalIncludeDirectories="../OfficeCore/Fonts/FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -168,15 +170,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="../Redist/AVSOfficePDFWriter.dll"
+				OutputFile="$(OutDir)/ASCOfficePDFWriter.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSOfficePDFWriter.idl"
+				MergedIDLBaseFileName="_ASCOfficePDFWriter.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficePDFWriter.lib"
+				ImportLibrary="$(OutDir)/ASCOfficePDFWriter.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -197,10 +199,13 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
+				CommandLine="&#x0D;&#x0A;copy $(TargetPath) ..\Redist\ASCOfficePDFWriter.dll"
 			/>
 		</Configuration>
 	</Configurations>
@@ -213,7 +218,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficePDFWriter.cpp"
+				RelativePath=".\ASCOfficePDFWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\OnlineOfficeBinToPdf.cpp"
 				>
 			</File>
 			<File
@@ -239,6 +248,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseASC|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -282,10 +299,18 @@
 				RelativePath=".\Image.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ImageExt.h"
+				>
+			</File>
 			<File
 				RelativePath=".\List.h"
 				>
 			</File>
+			<File
+				RelativePath=".\LZWEncoder.h"
+				>
+			</File>
 			<File
 				RelativePath=".\MemoryManager.h"
 				>
@@ -298,6 +323,10 @@
 				RelativePath=".\Objects.h"
 				>
 			</File>
+			<File
+				RelativePath=".\OnlineOfficeBinToPdf.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Outline.h"
 				>
@@ -361,6 +390,10 @@
 					RelativePath=".\EncoderConstants.h"
 					>
 				</File>
+				<File
+					RelativePath=".\ToUnicode.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Font"
@@ -369,6 +402,10 @@
 					RelativePath=".\Font.h"
 					>
 				</File>
+				<File
+					RelativePath=".\FontBase.h"
+					>
+				</File>
 				<File
 					RelativePath=".\FontBase14.h"
 					>
@@ -381,6 +418,10 @@
 					RelativePath=".\FontTrueType.h"
 					>
 				</File>
+				<File
+					RelativePath=".\FontTrueTypeWriter.h"
+					>
+				</File>
 				<File
 					RelativePath=".\FontType1.h"
 					>
@@ -409,11 +450,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficePDFWriter.rc"
+				RelativePath=".\ASCOfficePDFWriter.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficePDFWriter.rgs"
+				RelativePath=".\ASCOfficePDFWriter.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficePDFWriter/AVSOfficePDFWriter.sln

-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePDFWriter", "AVSOfficePDFWriter.vcproj", "{FD508B11-154E-491B-BA4A-EA81978955EF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Win32.Build.0 = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Win32.ActiveCfg = Release|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

ASCOfficePDFWriter/AVSOfficePDFWriter.vcxproj

-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FD508B11-154E-491B-BA4A-EA81978955EF}</ProjectGuid>
-    <RootNamespace>AVSOfficePDFWriter</RootNamespace>
-    <Keyword>AtlProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Debug\</OutDir>
-    <IntDir>Debug\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Release\</OutDir>
-    <IntDir>Release\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)AVSOfficePDFWriter.tlb</TypeLibraryName>
-      <HeaderFileName>AVSOfficePDFWriter.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>AVSOfficePDFWriter_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>AVSOfficePDFWriter_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>X:\AVS\Sources\AVSOfficeStudio\AVSOfficePDFWriter\Zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)AVSOfficePDFWriter.dll</OutputFile>
-      <MergedIDLBaseFileName>_AVSOfficePDFWriter.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)AVSOfficePDFWriter.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>X:\AVS\Redist\VersionControl.exe "$(SolutionDir)\version.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)AVSOfficePDFWriter.tlb</TypeLibraryName>
-      <HeaderFileName>AVSOfficePDFWriter.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>AVSOfficePDFWriter_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>AVSOfficePDFWriter_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>X:\AVS\Sources\AVSOfficeStudio\AVSOfficePDFWriter\Zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../Redist/AVSOfficePDFWriter.dll</OutputFile>
-      <MergedIDLBaseFileName>_AVSOfficePDFWriter.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)AVSOfficePDFWriter.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="AVSOfficePDFWriter.cpp" />
-    <ClCompile Include="PDFWriter.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Annotation.h" />
-    <ClInclude Include="Catalog.h" />
-    <ClInclude Include="Consts.h" />
-    <ClInclude Include="Destination.h" />
-    <ClInclude Include="Document.h" />
-    <ClInclude Include="Errors.h" />
-    <ClInclude Include="GraphicState.h" />
-    <ClInclude Include="Image.h" />
-    <ClInclude Include="List.h" />
-    <ClInclude Include="MemoryManager.h" />
-    <ClInclude Include="MetaData.h" />
-    <ClInclude Include="Objects.h" />
-    <ClInclude Include="Outline.h" />
-    <ClInclude Include="PageLabel.h" />
-    <ClInclude Include="PageOperations.h" />
-    <ClInclude Include="Pages.h" />
-    <ClInclude Include="PDF.h" />
-    <ClInclude Include="PDFWriter.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="Streams.h" />
-    <ClInclude Include="Types.h" />
-    <ClInclude Include="Utils.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="Encoder.h" />
-    <ClInclude Include="EncoderConstants.h" />
-    <ClInclude Include="Font.h" />
-    <ClInclude Include="FontBase14.h" />
-    <ClInclude Include="FontCID.h" />
-    <ClInclude Include="FontTrueType.h" />
-    <ClInclude Include="FontType1.h" />
-    <ClInclude Include="FontTypes.h" />
-    <ClInclude Include="Encrypt.h" />
-    <ClInclude Include="EncryptDictionary.h" />
-    <ClInclude Include="..\Common\OfficeFileErrorDescription.h" />
-    <ClInclude Include="..\..\..\..\Common\OfficeRendererTemplate.h" />
-    <ClInclude Include="..\..\..\..\Common\PaintStruct.h" />
-    <ClInclude Include="Registration.h" />
-    <ClInclude Include="..\..\..\..\Common\xmlutils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="AVSOfficePDFWriter.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="AVSOfficePDFWriter.rgs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

ASCOfficePDFWriter/AVSOfficePDFWriter_2012.sln

-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePDFWriter", "AVSOfficePDFWriter_2012.vcxproj", "{FD508B11-154E-491B-BA4A-EA81978955EF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGradient", "Tests\TestSvgToPDF\TestGradient.csproj", "{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FD508B11-154E-491B-BA4A-EA81978955EF} = {FD508B11-154E-491B-BA4A-EA81978955EF}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Debug|Win32.Build.0 = Debug|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Any CPU.ActiveCfg = Release|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Win32.ActiveCfg = Release|Win32
-		{FD508B11-154E-491B-BA4A-EA81978955EF}.Release|Win32.Build.0 = Release|Win32
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.Release|Win32.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

ASCOfficePDFWriter/ImageExt.h

@@ -308,9 +308,9 @@ namespace NSImageExt
 			return 0;
 		}
 
-		BOOL DrawOnRenderer(IASCRenderer* pRenderer, BSTR strFile, double dX, double dY, double dW, double dH)
+#ifdef BUILD_CONFIG_FULL_VERSION
+		BOOL DrawOnRenderer(AVSGraphics::IASCRenderer* pRenderer, BSTR strFile, double dX, double dY, double dW, double dH)
 		{
-#if BUILD_CONFIG_FULL_VERSION
 			if (NULL == pRenderer)
 				return FALSE;
 
@@ -379,9 +379,9 @@ namespace NSImageExt
 
 				return TRUE;
 			}
-#endif
-			
+		
 			return FALSE;
 		}
+#endif
 	};
 }
\ No newline at end of file

ASCOfficePDFWriter/PDFWriter.cpp

@@ -9,11 +9,11 @@ HRESULT CPDFWriter::OnlineWordToPdf (BSTR sPathXml, BSTR sDstFile, BSTR sHtmlPla
 	NOnlineOfficeBinToPdf::CommandType eCommand = NOnlineOfficeBinToPdf::ctError;
 	CString sTempLogo;
 
-	AVSGraphics::IAVSWinFonts *piWinFonts = NULL;
+	AVSGraphics::IASCWinFonts *piWinFonts = NULL;
 
 	try
 	{
-		hRes = CoCreateInstance (AVSGraphics::CLSID_CAVSWinFonts, NULL, CLSCTX_ALL, AVSGraphics::IID_IAVSWinFonts, (void **) &piWinFonts);
+		hRes = CoCreateInstance (AVSGraphics::CLSID_CASCWinFonts, NULL, CLSCTX_ALL, AVSGraphics::IID_IASCWinFonts, (void **) &piWinFonts);
 
 #ifdef BUILD_CONFIG_OPENSOURCE_VERSION
 		piWinFonts->Init(L"", TRUE, TRUE);

ASCOfficePDFWriter/PDFWriter.h

 // PDFWriter.h : Declaration of the CPDFWriter

ASCOfficePDFWriter/Resource.h

@@ -4,7 +4,7 @@
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSOFFICEPDFWRITER	101
+#define IDR_ASCOFFICEPDFWRITER			101
 
 // Next default values for new objects
 // 

ASCOfficePDFWriter/Utils.h

@@ -1069,7 +1069,7 @@ BOOL GetFontFile2(NSStructures::CFont *pFont, LPCTSTR lpszFontName, LPTSTR lpszD
 	}
 }
 #else
-BOOL GetFontFile2(NSStructures::CFont *pFont, LPCTSTR lpszFontName, LPTSTR lpszDisplayName, int nDisplayNameSize, LPTSTR lpszFontFile, int nFontFileSize, BOOL *bBold, BOOL *bItalic, AVSGraphics::IAVSFontManager *pFontManager = NULL)
+BOOL GetFontFile2(NSStructures::CFont *pFont, LPCTSTR lpszFontName, LPTSTR lpszDisplayName, int nDisplayNameSize, LPTSTR lpszFontFile, int nFontFileSize, BOOL *bBold, BOOL *bItalic, AVSGraphics::IASCFontManager *pFontManager = NULL)
 {
 	if ( pFontManager )
 	{

ASCOfficePDFWriter/stdafx.h

@@ -50,13 +50,13 @@
 
 #include "../Common/Config.h"
 
-#ifdef BUILD_CONFIG_OPENSOURCE_VERSION
-
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
 #pragma comment (lib, "../OfficeCore/Fonts/FreeType/freetype242_vs2005.lib")
 
+#ifdef BUILD_CONFIG_OPENSOURCE_VERSION
+
 #import "../Redist/OfficeCore.dll"								named_guids rename_namespace("OfficeCore")
 
 namespace MediaCore
@@ -68,27 +68,22 @@ namespace MediaCore
 
 namespace AVSGraphics
 {
-	typedef OfficeCore::IWinFonts IAVSWinFonts;
+	typedef OfficeCore::IWinFonts IASCWinFonts;
 
-	const GUID CLSID_CAVSWinFonts = OfficeCore::CLSID_CWinFonts;
-	const GUID IID_IAVSWinFonts = OfficeCore::IID_IWinFonts;
+	const GUID CLSID_CASCWinFonts = OfficeCore::CLSID_CWinFonts;
+	const GUID IID_IASCWinFonts = OfficeCore::IID_IWinFonts;
 }
 
 #else
 
-// FreeType
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#pragma comment (lib, "..\\..\\AVSImageStudio3\\AVSGraphics\\Objects\\Font\\FreeType\\freetype242_vs2005.lib")
+#import "../../../../../Redist/AVSMediaCore3.dll"				named_guids rename_namespace("MediaCore"), exclude("tagRECT")
+#import "../../../../../Redist/AVSMediaFormatSettings3.dll"		named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
+#import "../../../../../Redist/AVSImageStudio3.dll"				named_guids rename_namespace("ImageStudio")
+#import "../../../../../Redist/AVSImageJbig2.dll"				named_guids rename_namespace("JBig2")
+#import "../../../../../Redist/AVSImageJpeg2000.dll"			named_guids rename_namespace("Jpx")
+#import "../../../../../Redist/AVSImageFile3.dll"				named_guids rename_namespace("ImageFile")
 
-#import "../../../../AVS/Redist/AVSMediaCore3.dll"				named_guids rename_namespace("MediaCore"), exclude("tagRECT")
-#import "../../../../AVS/Redist/AVSMediaFormatSettings3.dll"	named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
-#import "../../../../AVS/Redist/AVSImageStudio3.dll"            named_guids rename_namespace("ImageStudio")
-#import "../../../../AVS/Redist/AVSImageJbig2.dll"              named_guids rename_namespace("JBig2")
-#import "../../../../AVS/Redist/AVSImageJpeg2000.dll"           named_guids rename_namespace("Jpx")
-#import "../../../../AVS/Redist/AVSImageFile3.dll"              named_guids rename_namespace("ImageFile")
-#import "../../../../AVS/Redist/AVSGraphics.dll"                named_guids rename_namespace("AVSGraphics")
+#import "../Redist/ASCGraphics.dll"								named_guids rename_namespace("AVSGraphics")
 #endif
 
 using namespace ATL;
\ No newline at end of file