Skip to content

O
onlyoffice_core
Commit 9c419c93 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
Browse files
Options

(1.0.0.74) ASC version full 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52670 954022d7-b5bf-4e40-9824-e11837661b57
parent c3b2f4aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 1110 deletions
ASCOfficePDFReader/AVSOfficePDFReader.cpp → ASCOfficePDFReader/ASCOfficePDFReader.cpp
View file @ 9c419c93
// AVSOfficePDFReader.cpp : Implementation of DLL Exports. // ASCOfficePDFReader.cpp : Implementation of DLL Exports.
#include "stdafx.h" #include "stdafx.h"
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
[ module(dll, uuid = "{2F5F8982-81C9-414D-BAB1-5385B6384FC1}", [ module(dll, uuid = "{2F5F8982-81C9-414D-BAB1-5385B6384FC1}",
name = "AVSOfficePDFReader", name = "ASCOfficePDFReader",
helpstring = "AVSOfficePDFReader 1.0 Type Library", helpstring = "ASCOfficePDFReader 1.0 Type Library",
resource_name = "IDR_AVSOFFICEPDFREADER")] resource_name = "IDR_ASCOFFICEPDFREADER")]
class CAVSOfficePDFReaderModule class CASCOfficePDFReaderModule
{ {
public: public:
// Override CAtlDllModuleT members // Override CAtlDllModuleT members
......
ASCOfficePDFReader/AVSOfficePDFReader.rc → ASCOfficePDFReader/ASCOfficePDFReader.rc
View file @ 9c419c93
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
#include "resource.h" #include "resource.h"
#define COMPONENT_NAME "OfficePDFReader" #define COMPONENT_NAME "OfficePDFReader"
#include "../../../../Common/FileInfo.h" #include "../Common/FileInfo.h"
#include "version.h" #include "version.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
...@@ -172,7 +172,7 @@ END ...@@ -172,7 +172,7 @@ END
// REGISTRY // REGISTRY
// //
IDR_AVSOFFICEPDFREADER REGISTRY "AVSOfficePDFReader.rgs" IDR_ASCOFFICEPDFREADER REGISTRY "ASCOfficePDFReader.rgs"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
...@@ -181,7 +181,7 @@ IDR_AVSOFFICEPDFREADER REGISTRY "AVSOfficePDFReader.rgs" ...@@ -181,7 +181,7 @@ IDR_AVSOFFICEPDFREADER REGISTRY "AVSOfficePDFReader.rgs"
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_PROJNAME "AVSOfficePDFReader" IDS_PROJNAME "ASCOfficePDFReader"
END END
#endif // English (U.S.) resources #endif // English (U.S.) resources
......
ASCOfficePDFReader/AVSOfficePDFReader.rgs → ASCOfficePDFReader/ASCOfficePDFReader.rgs
View file @ 9c419c93
...@@ -2,8 +2,8 @@ HKCR ...@@ -2,8 +2,8 @@ HKCR
{ {
NoRemove AppID NoRemove AppID
{ {
'%APPID%' = s 'AVSOfficePDFReader' '%APPID%' = s 'ASCOfficePDFReader'
'AVSOfficePDFReader.DLL' 'ASCOfficePDFReader.DLL'
{ {
val AppID = s '%APPID%' val AppID = s '%APPID%'
} }
......
ASCOfficePDFReader/AVSOfficePDFReader_vs2005.sln → ASCOfficePDFReader/ASCOfficePDFReader_vs2005.sln
View file @ 9c419c93
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005 # Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePDFReader", "AVSOfficePDFReader_vs2005.vcproj", "{BCE14148-A4AB-4472-B690-E2B31926000F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficePDFReader", "ASCOfficePDFReader_vs2005.vcproj", "{BCE14148-A4AB-4472-B690-E2B31926000F}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
ASCOfficePDFReader/AVSOfficePDFReader.vcproj → ASCOfficePDFReader/ASCOfficePDFReader_vs2005.vcproj
View file @ 9c419c93
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="8,00"
Name="AVSOfficePDFReader" Name="ASCOfficePDFReader"
ProjectGUID="{BCE14148-A4AB-4472-B690-E2B31926000F}" ProjectGUID="{BCE14148-A4AB-4472-B690-E2B31926000F}"
RootNamespace="AVSOfficePDFReader"
Keyword="AtlProj" Keyword="AtlProj"
TargetFrameworkVersion="196613"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -19,7 +17,7 @@ ...@@ -19,7 +17,7 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="Debug" OutputDirectory="Debug"
IntermediateDirectory="Debug" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfATL="1" UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
...@@ -43,17 +41,17 @@ ...@@ -43,17 +41,17 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSOfficePDFReader.tlb" TypeLibraryName="$(IntDir)/ASCOfficePDFReader.tlb"
HeaderFileName="AVSOfficePDFReader.h" HeaderFileName="ASCOfficePDFReader.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSOfficePDFReader_i.c" InterfaceIdentifierFileName="ASCOfficePDFReader_i.c"
ProxyFileName="AVSOfficePDFReader_p.c" ProxyFileName="ASCOfficePDFReader_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="FreeType;x:\Common\\" AdditionalIncludeDirectories="../ASCOfficePDFReader/FreeType;../ASCImageStudio3/ASCGraphics/Interfaces"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_VS_2008" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_VS_2005;_CRTDBG_MAP_ALLOC"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
...@@ -77,12 +75,13 @@ ...@@ -77,12 +75,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="$(OutDir)/AVSOfficePDFReader.dll" OutputFile="$(OutDir)/ASCOfficePDFReader.dll"
LinkIncremental="2" LinkIncremental="1"
MergedIDLBaseFileName="_AVSOfficePDFReader.idl" IgnoreDefaultLibraryNames="msvcrt.lib, libcmt.lib"
MergedIDLBaseFileName="_ASCOfficePDFReader.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/AVSOfficePDFReader.lib" ImportLibrary="$(OutDir)/ASCOfficePDFReader.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -90,6 +89,7 @@ ...@@ -90,6 +89,7 @@
/> />
<Tool <Tool
Name="VCManifestTool" Name="VCManifestTool"
EmbedManifest="true"
/> />
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
...@@ -103,6 +103,9 @@ ...@@ -103,6 +103,9 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Performing registration" Description="Performing registration"
...@@ -120,7 +123,7 @@ ...@@ -120,7 +123,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="X:\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;" CommandLine="..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -137,16 +140,16 @@ ...@@ -137,16 +140,16 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSOfficePDFReader.tlb" TypeLibraryName="$(IntDir)/ASCOfficePDFReader.tlb"
HeaderFileName="AVSOfficePDFReader.h" HeaderFileName="ASCOfficePDFReader.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSOfficePDFReader_i.c" InterfaceIdentifierFileName="ASCOfficePDFReader_i.c"
ProxyFileName="AVSOfficePDFReader_p.c" ProxyFileName="ASCOfficePDFReader_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="X:\AVS\Sources\AVSOfficeStudio\AVSOfficePDFReader\FreeType" AdditionalIncludeDirectories="../ASCOfficePDFReader/FreeType;../ASCImageStudio3/ASCGraphics/Interfaces"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_VS_2008" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_VS_2005"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
...@@ -168,15 +171,15 @@ ...@@ -168,15 +171,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../Redist/AVSOfficePDFReader.dll" OutputFile="../Redist/ASCOfficePDFReader.dll"
LinkIncremental="1" LinkIncremental="1"
MergedIDLBaseFileName="_AVSOfficePDFReader.idl" MergedIDLBaseFileName="_ASCOfficePDFReader.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSOfficePDFReader.lib" ImportLibrary="$(OutDir)/ASCOfficePDFReader.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -197,12 +200,15 @@ ...@@ -197,12 +200,15 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Performing registration" Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;" CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
<References> <References>
</References> </References>
...@@ -213,7 +219,7 @@ ...@@ -213,7 +219,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\AVSOfficePDFReader.cpp" RelativePath=".\ASCOfficePDFReader.cpp"
> >
</File> </File>
<File <File
...@@ -239,6 +245,14 @@ ...@@ -239,6 +245,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="ReleaseASC|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter
...@@ -405,6 +419,22 @@ ...@@ -405,6 +419,22 @@
RelativePath=".\Hash.h" RelativePath=".\Hash.h"
> >
</File> </File>
<File
RelativePath=".\JArithmeticDecoder.cpp"
>
</File>
<File
RelativePath=".\JArithmeticDecoder.h"
>
</File>
<File
RelativePath=".\JBIG2Stream.cpp"
>
</File>
<File
RelativePath=".\JBIG2Stream.h"
>
</File>
<File <File
RelativePath=".\JPXStream.cpp" RelativePath=".\JPXStream.cpp"
> >
...@@ -620,6 +650,10 @@ ...@@ -620,6 +650,10 @@
RelativePath=".\OutputDevice.h" RelativePath=".\OutputDevice.h"
> >
</File> </File>
<File
RelativePath=".\RendererOutputDev.cpp"
>
</File>
<File <File
RelativePath=".\RendererOutputDev.h" RelativePath=".\RendererOutputDev.h"
> >
...@@ -781,11 +815,11 @@ ...@@ -781,11 +815,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\AVSOfficePDFReader.rc" RelativePath=".\ASCOfficePDFReader.rc"
> >
</File> </File>
<File <File
RelativePath=".\AVSOfficePDFReader.rgs" RelativePath=".\ASCOfficePDFReader.rgs"
> >
</File> </File>
<Filter <Filter
...@@ -853,7 +887,7 @@ ...@@ -853,7 +887,7 @@
Name="Common" Name="Common"
> >
<File <File
RelativePath="..\Common\OfficeDefines.h" RelativePath="..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
> >
</File> </File>
<File <File
...@@ -864,10 +898,6 @@ ...@@ -864,10 +898,6 @@
RelativePath="..\..\..\..\Common\OfficeRendererTemplate.h" RelativePath="..\..\..\..\Common\OfficeRendererTemplate.h"
> >
</File> </File>
<File
RelativePath="..\..\..\..\Common\PaintStruct.h"
>
</File>
</Filter> </Filter>
<File <File
RelativePath=".\ReadMe.txt" RelativePath=".\ReadMe.txt"
......
ASCOfficePDFReader/AVSOfficePDFReader.sln deleted 100644 → 0
View file @ c3b2f4aa

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePDFReader", "AVSOfficePDFReader.vcproj", "{BCE14148-A4AB-4472-B690-E2B31926000F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BCE14148-A4AB-4472-B690-E2B31926000F}.Debug|Win32.ActiveCfg = Debug|Win32
{BCE14148-A4AB-4472-B690-E2B31926000F}.Debug|Win32.Build.0 = Debug|Win32
{BCE14148-A4AB-4472-B690-E2B31926000F}.Release|Win32.ActiveCfg = Release|Win32
{BCE14148-A4AB-4472-B690-E2B31926000F}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
ASCOfficePDFReader/AVSOfficePDFReader_vs2005.vcproj deleted 100644 → 0
View file @ c3b2f4aa
This diff is collapsed.
ASCOfficePDFReader/CMap.h
View file @ 9c419c93
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "CharTypes.h" #include "CharTypes.h"
#include "GlobalParams.h" #include "GlobalParams.h"
#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\XmlUtils.h" #include "../Common/XmlUtils.h"
#include "TemporaryCS.h" #include "../Common/TemporaryCS.h"
class StringExt; class StringExt;
struct CMapVectorEntry; struct CMapVectorEntry;
......
ASCOfficePDFReader/CharCodeToUnicode.h
View file @ 9c419c93
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "CharTypes.h" #include "CharTypes.h"
#include "GlobalParams.h" #include "GlobalParams.h"
#include "TemporaryCS.h" #include "../Common/TemporaryCS.h"
struct CharCodeToUnicodeString; struct CharCodeToUnicodeString;
......
ASCOfficePDFReader/GlobalParams.cpp
View file @ 9c419c93
#include "stdafx.h" #include "stdafx.h"
#include "../Common/RSA/XmlDecoder.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <shlobj.h> #include <shlobj.h>
#include "RSA/XmlDecoder.h"
#include "Resource.h" #include "Resource.h"
#include "MemoryUtils.h" #include "MemoryUtils.h"
......
ASCOfficePDFReader/GlobalParams.h
View file @ 9c419c93
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include "CharTypes.h" #include "CharTypes.h"
#include "TemporaryCS.h" #include "../Common/TemporaryCS.h"
class StringExt; class StringExt;
class CList; class CList;
......
ASCOfficePDFReader/PDFReader.h
View file @ 9c419c93
...@@ -93,7 +93,7 @@ private: ...@@ -93,7 +93,7 @@ private:
PDFDoc *m_pPDFDocument; PDFDoc *m_pPDFDocument;
GlobalParams *m_pGlobalParams; GlobalParams *m_pGlobalParams;
AVSGraphics::IAVSRenderer *m_piDocumentRenderer; AVSGraphics::IASCRenderer *m_piDocumentRenderer;
CStringW m_sTempFolder; CStringW m_sTempFolder;
CFontList m_oFontList; CFontList m_oFontList;
...@@ -330,8 +330,8 @@ public: ...@@ -330,8 +330,8 @@ public:
//#ifdef _DEBUG //#ifdef _DEBUG
if ( m_piDocumentRenderer ) if ( m_piDocumentRenderer )
{ {
IAVSRenderer *pRenderer = NULL; IASCRenderer *pRenderer = NULL;
m_piDocumentRenderer->QueryInterface( __uuidof(AVSGraphics::IAVSRenderer), (void**)&pRenderer ); m_piDocumentRenderer->QueryInterface( __uuidof(AVSGraphics::IASCRenderer), (void**)&pRenderer );
RendererOutputDev oRendererOut( m_pGlobalParams, pRenderer, &m_oFontList ); RendererOutputDev oRendererOut( m_pGlobalParams, pRenderer, &m_oFontList );
oRendererOut.NewPDF( m_pPDFDocument->GetXRef() ); oRendererOut.NewPDF( m_pPDFDocument->GetXRef() );
...@@ -427,8 +427,8 @@ public: ...@@ -427,8 +427,8 @@ public:
//#ifdef _DEBUG //#ifdef _DEBUG
if ( punkRenderer ) if ( punkRenderer )
{ {
IAVSRenderer *pRenderer = NULL; IASCRenderer *pRenderer = NULL;
punkRenderer->QueryInterface( __uuidof(AVSGraphics::IAVSRenderer), (void**)&pRenderer ); punkRenderer->QueryInterface( __uuidof(AVSGraphics::IASCRenderer), (void**)&pRenderer );
RendererOutputDev oRendererOut( m_pGlobalParams, pRenderer, &m_oFontList ); RendererOutputDev oRendererOut( m_pGlobalParams, pRenderer, &m_oFontList );
oRendererOut.NewPDF( m_pPDFDocument->GetXRef() ); oRendererOut.NewPDF( m_pPDFDocument->GetXRef() );
...@@ -463,13 +463,13 @@ public: ...@@ -463,13 +463,13 @@ public:
(*ppRenderer) = NULL; (*ppRenderer) = NULL;
if( NULL == m_piDocumentRenderer ) if( NULL == m_piDocumentRenderer )
return S_OK; return S_OK;
return m_piDocumentRenderer->QueryInterface(__uuidof(AVSGraphics::IAVSRenderer), (void**)&ppRenderer); return m_piDocumentRenderer->QueryInterface(__uuidof(AVSGraphics::IASCRenderer), (void**)&ppRenderer);
} }
STDMETHOD(SetCommandRenderer)(IUnknown* pRenderer) STDMETHOD(SetCommandRenderer)(IUnknown* pRenderer)
{ {
RELEASEINTERFACE( m_piDocumentRenderer ); RELEASEINTERFACE( m_piDocumentRenderer );
if( NULL != pRenderer ) if( NULL != pRenderer )
pRenderer->QueryInterface(__uuidof( AVSGraphics::IAVSRenderer), (void**)&m_piDocumentRenderer); pRenderer->QueryInterface(__uuidof( AVSGraphics::IASCRenderer), (void**)&m_piDocumentRenderer);
return S_OK; return S_OK;
} }
......
ASCOfficePDFReader/RendererOutputDev.cpp
View file @ 9c419c93
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include "File.h" #include "File.h"
#include "CMap.h" #include "CMap.h"
#include "..\AVSOfficeHTMLFile\AVSOfficeHTMLFile\prj\Base64.h" #include "../ASCOfficeHtmlFile_SaxHtmlParser/AVSOfficeHtmlFile/prj/Base64.h"
#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\XmlUtils.h" #include "../Common/XmlUtils.h"
#include "FontFileTrueType.h" #include "FontFileTrueType.h"
#include "FontFileType1C.h" #include "FontFileType1C.h"
...@@ -265,7 +265,7 @@ BOOL CFontList::GetFont(Ref *pRef, TFontEntry *pEntry) ...@@ -265,7 +265,7 @@ BOOL CFontList::GetFont(Ref *pRef, TFontEntry *pEntry)
return TRUE; return TRUE;
} }
RendererOutputDev::RendererOutputDev(GlobalParams *pGlobalParams, IAVSRenderer *pRenderer, CFontList *pFontList) RendererOutputDev::RendererOutputDev(GlobalParams *pGlobalParams, IASCRenderer *pRenderer, CFontList *pFontList)
{ {
m_pGlobalParams = pGlobalParams; m_pGlobalParams = pGlobalParams;
m_pFontList = pFontList; m_pFontList = pFontList;
...@@ -310,7 +310,7 @@ RendererOutputDev::RendererOutputDev(GlobalParams *pGlobalParams, IAVSRenderer * ...@@ -310,7 +310,7 @@ RendererOutputDev::RendererOutputDev(GlobalParams *pGlobalParams, IAVSRenderer *
} }
m_pFontManager = NULL; m_pFontManager = NULL;
::CoCreateInstance( __uuidof(AVSGraphics::CAVSFontManager), NULL, CLSCTX_ALL, __uuidof(AVSGraphics::IAVSFontManager), (void **)&m_pFontManager ); ::CoCreateInstance( __uuidof(AVSGraphics::CASCFontManager), NULL, CLSCTX_ALL, __uuidof(AVSGraphics::IASCFontManager), (void **)&m_pFontManager );
if ( NULL != m_pFontManager ) if ( NULL != m_pFontManager )
m_pFontManager->Initialize( _T("<FontManagerOptions><WinList load='0' /></FontManagerOptions>") ); m_pFontManager->Initialize( _T("<FontManagerOptions><WinList load='0' /></FontManagerOptions>") );
......
ASCOfficePDFReader/RendererOutputDev.h
View file @ 9c419c93
#ifndef _RENDERER_OUTPUTDEV_H #ifndef _RENDERER_OUTPUTDEV_H
#define _RENDERER_OUTPUTDEV_H #define _RENDERER_OUTPUTDEV_H
#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h" #include "../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
#include "..\..\AVSImageStudio3\AVSGraphics\Objects\Structures.h" #include "../ASCImageStudio3/ASCGraphics/Objects/Structures.h"
#define _ONLY_PDF_WRITER_INTERFACE #define _ONLY_PDF_WRITER_INTERFACE
#include "..\AVSOfficePdfWriter\PDFWriter.h" #include "../ASCOfficePdfWriter/PDFWriter.h"
#include "OutputDevice.h" #include "OutputDevice.h"
#include "TemporaryCS.h" #include "../Common/TemporaryCS.h"
class Gr8BitFont; class Gr8BitFont;
class OutputDev; class OutputDev;
...@@ -69,7 +69,7 @@ class RendererOutputDev: public OutputDev ...@@ -69,7 +69,7 @@ class RendererOutputDev: public OutputDev
{ {
public: public:
RendererOutputDev(GlobalParams *pGlobalParams, IAVSRenderer *pRenderer, CFontList *pFontList = NULL); RendererOutputDev(GlobalParams *pGlobalParams, IASCRenderer *pRenderer, CFontList *pFontList = NULL);
virtual ~RendererOutputDev(); virtual ~RendererOutputDev();
virtual BOOL UpSideDown() virtual BOOL UpSideDown()
{ {
...@@ -238,7 +238,7 @@ public: ...@@ -238,7 +238,7 @@ public:
virtual void ClearSoftMask(GrState *pGState); virtual void ClearSoftMask(GrState *pGState);
//----- //-----
void NewPDF(XRef *pXref); void NewPDF(XRef *pXref);
void SetAVSRenderer(IAVSRenderer *pRenderer) void SetAVSRenderer(IASCRenderer *pRenderer)
{ {
m_bUseAxialShaded = FALSE; m_bUseAxialShaded = FALSE;
m_bUseRadialShaded = FALSE; m_bUseRadialShaded = FALSE;
...@@ -288,7 +288,7 @@ private: ...@@ -288,7 +288,7 @@ private:
void DoTransform(double *pMatrix, double *pdShiftX, double *pdShiftY, BOOL bText = FALSE); void DoTransform(double *pMatrix, double *pdShiftX, double *pdShiftY, BOOL bText = FALSE);
private: private:
IAVSRenderer *m_pRenderer; IASCRenderer *m_pRenderer;
int m_nRendererType; int m_nRendererType;
double m_arrMatrix[6]; double m_arrMatrix[6];
...@@ -299,7 +299,7 @@ private: ...@@ -299,7 +299,7 @@ private:
XRef *m_pXref; // Xref PDF- XRef *m_pXref; // Xref PDF-
CFontList *m_pFontList; CFontList *m_pFontList;
AVSGraphics::IAVSFontManager *m_pFontManager; AVSGraphics::IASCFontManager *m_pFontManager;
BOOL *m_pbBreak; // BOOL *m_pbBreak; //
......
ASCOfficePDFReader/Resource.h
View file @ 9c419c93
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Used by AVSOfficePDFReader.rc // Used by AVSOfficePDFReader.rc
// //
#define IDS_PROJNAME 100 #define IDS_PROJNAME 100
#define IDR_AVSOFFICEPDFREADER 101 #define IDR_ASCOFFICEPDFREADER 101
#define IDR_Symbol 204 #define IDR_Symbol 204
#define IDR_ZapfDingbats 205 #define IDR_ZapfDingbats 205
#define IDR_Helvetica 206 #define IDR_Helvetica 206
......
ASCOfficePDFReader/SImage.cpp
View file @ 9c419c93
#include "stdafx.h" #include "stdafx.h"
#include "PaintStruct.h" #include "../Common/PaintStruct.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
ASCOfficePDFReader/UnicodeMap.h
View file @ 9c419c93
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _UNICODE_MAP_H #define _UNICODE_MAP_H
#include "CharTypes.h" #include "CharTypes.h"
#include "TemporaryCS.h" #include "../Common/TemporaryCS.h"
class StringExt; class StringExt;
......
ASCOfficePDFReader/XRef.cpp
View file @ 9c419c93
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "Dict.h" #include "Dict.h"
#include "ErrorConstants.h" #include "ErrorConstants.h"
#include "XRef.h" #include "XRef.h"
#include "TemporaryCS.h" #include "../Common/TemporaryCS.h"
//--------------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------------
......
ASCOfficePDFReader/stdafx.h
View file @ 9c419c93
...@@ -37,21 +37,20 @@ ...@@ -37,21 +37,20 @@
#pragma warning(disable: 4005 4996 4244) #pragma warning(disable: 4005 4996 4244)
#include <atlbase.h> #include <atlbase.h>
#include <atldefine.h>
#include <atlcom.h> #include <atlcom.h>
#include <atlwin.h> #include <atlwin.h>
#include <atltypes.h> #include <atltypes.h>
#include <atlctl.h> #include <atlctl.h>
#include <atlhost.h> #include <atlhost.h>
#include "../Common/atldefine.h"
using namespace ATL; using namespace ATL;
#include "AVSUtils.h" #include "../Common/ASCUtils.h"
#import "..\..\..\Redist\AVSOfficeStudio\AVSOfficeEditor.dll" rename_namespace("AVSOfficeEditor") #import "../Redist/ASCMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT")
#import "..\..\..\Redist\AVSMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT") #import "../Redist/ASCImageStudio3.dll" named_guids rename_namespace("AVSImageStudio")
#import "..\..\..\Redist\AVSMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT") #import "../Redist/ASCImageJpeg2000.dll" named_guids rename_namespace("AVSImageJpeg2000")
#import "..\..\..\Redist\AVSImageStudio3.dll" named_guids rename_namespace("AVSImageStudio") #import "../Redist/ASCGraphics.dll" named_guids rename_namespace("AVSGraphics")
#import "..\..\..\Redist\AVSImageJpeg2000.dll" named_guids rename_namespace("AVSImageJpeg2000")
#import "..\..\..\Redist\AVSGraphics.dll" named_guids rename_namespace("AVSGraphics")
ASCOfficePDFReader/version.h
View file @ 9c419c93
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
//1 //1
//0 //0
//0 //0
//73 //74
#define INTVER 1,0,0,73 #define INTVER 1,0,0,74
#define STRVER "1,0,0,73\0" #define STRVER "1,0,0,74\0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7