Skip to content

O
onlyoffice_core
Commit 38a3083b authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander Trofimov
Browse files
Options

(1.0.0.135) http://bugzserver/show_bug.cgi?id=25923 






git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57801 954022d7-b5bf-4e40-9824-e11837661b57
parent 259b2b7e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 970 additions and 19 deletions
.gitattributes
View file @ 38a3083b
......@@ -269,6 +269,42 @@ ASCOfficePDFReader/Resources/n022004l.crpt svn_mime_002dtype=application%2Foctet
ASCOfficePDFReader/Resources/n022023l.crpt svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFReader/Resources/n022024l.crpt svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFReader/Resources/s050000l.crpt svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/Properties svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/bin svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/bin/AxInterop.AcroPDFLib.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Interop.ASCOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Interop.AVSGraphics.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Interop.AVSMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Interop.AVSOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Interop.AcroPDFLib.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Interop.Acrobat.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/PdfWriter.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/PdfWriter.pdb svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Test.exe svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/Test.pdb svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/bin/files svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/bin/files/PDF.pdf svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/AxInterop.AcroPDFLib.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/DesignTimeResolveAssemblyReferences.cache svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Interop.ASCOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Interop.AVSGraphics.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Interop.AVSMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Interop.AVSOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Interop.AcroPDFLib.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Interop.Acrobat.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/TempPE svnc_tsvn_003alogminsize=5
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Test.MainForm.resources svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Test.Properties.Resources.resources svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Test.exe svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/Test.pdb svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/TestGradient.csproj.GenerateResource.Cache svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/TestGradient.csproj.ResolveComReference.cache svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestGradient/obj/Debug/TestGradient.csprojResolveAssemblyReference.cache svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestSvgToPDF/bin/AxInterop.AcroPDFLib.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestSvgToPDF/bin/Interop.AVSGraphics.dll svn_mime_002dtype=application%2Foctet-stream
ASCOfficePDFWriter/Tests/TestSvgToPDF/bin/Interop.AVSMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
......
ASCOfficePDFWriter/ASCOfficePDFWriter_vs2005.vcproj
View file @ 38a3083b
......@@ -571,22 +571,6 @@
RelativePath="..\Common\OfficeFileErrorDescription.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\OfficeRendererTemplate.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\PaintStruct.h"
>
</File>
<File
RelativePath=".\Registration.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\xmlutils.h"
>
</File>
</Filter>
<File
RelativePath=".\ReadMe.txt"
......
ASCOfficePDFWriter/ASCOfficePDFWriter_vs2012.sln 0 → 100644
View file @ 38a3083b
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficePDFWriter", "ASCOfficePDFWriter_vs2012.vcxproj", "{FD508B11-154E-491B-BA4A-EA81978955EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGradient", "Tests\TestGradient\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
ReleaseOpenSource|Any CPU = ReleaseOpenSource|Any CPU
ReleaseOpenSource|Mixed Platforms = ReleaseOpenSource|Mixed Platforms
ReleaseOpenSource|Win32 = ReleaseOpenSource|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
{FD508B11-154E-491B-BA4A-EA81978955EF}.ReleaseOpenSource|Any CPU.ActiveCfg = ReleaseOpenSource|Win32
{FD508B11-154E-491B-BA4A-EA81978955EF}.ReleaseOpenSource|Mixed Platforms.ActiveCfg = ReleaseOpenSource|Win32
{FD508B11-154E-491B-BA4A-EA81978955EF}.ReleaseOpenSource|Mixed Platforms.Build.0 = ReleaseOpenSource|Win32
{FD508B11-154E-491B-BA4A-EA81978955EF}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32
{FD508B11-154E-491B-BA4A-EA81978955EF}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|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
{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseOpenSource|Any CPU.ActiveCfg = Release|Any CPU
{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseOpenSource|Any CPU.Build.0 = Release|Any CPU
{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseOpenSource|Mixed Platforms.ActiveCfg = Release|Any CPU
{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseOpenSource|Mixed Platforms.Build.0 = Release|Any CPU
{026BC4D2-0BB0-4ACE-9693-93DD1D66C38D}.ReleaseOpenSource|Win32.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
ASCOfficePDFWriter/ASCOfficePDFWriter_vs2012.vcproj 0 → 100644
View file @ 38a3083b
This diff is collapsed.
ASCOfficePDFWriter/ASCOfficePDFWriter_vs2012.vcxproj 0 → 100644
View file @ 38a3083b
This diff is collapsed.
ASCOfficePDFWriter/PDFWriter.cpp
View file @ 38a3083b
......@@ -1061,6 +1061,8 @@ BOOL CPDFWriter::ApplyFillGradient()
PDF::Pattern* pattern = m_oPatternState.GetFill();
if (pattern)
{
ATLTRACE2(_T("ApplyFillGradient\n"));
// % fill
// /Pattern cs
......@@ -1193,6 +1195,8 @@ BOOL CPDFWriter::ApplyStrokeGradient()
PDF::Pattern* pattern = m_oPatternState.GetStroke();
if (pattern)
{
ATLTRACE2(_T("ApplyStrokeGradient\n"));
// % stroke
// /Pattern CS
......@@ -1317,6 +1321,8 @@ BOOL CPDFWriter::ApplyTileFill()
IUnknown* pImage = ImageUtils::LoadImage(m_oBrush.TexturePath);
if (pImage)
{
ATLTRACE2(_T("ApplyTileFill\n"));
LONG width = 0;
LONG height = 0;
......@@ -1430,6 +1436,11 @@ BOOL CPDFWriter::ApplyTileFill()
BOOL CPDFWriter::CreateLinearGradientFromSvgXml(const CString& sXml, BOOL fill)
{
ATLTRACE2(_T("CreateLinearGradientFromSvgXml\n"));
m_oBrush.TexturePath = L"";
m_oBrush.Type = 1000;
int FormId = -1;
XrefEntry entry = XrefGetEntry(m_pDocument->pXref, m_pDocument->pXref->pEntries->nCount - 2);
......@@ -1746,6 +1757,11 @@ BOOL CPDFWriter::CreateLinearGradientFromSvgXml(const CString& sXml, BOOL fill)
}
BOOL CPDFWriter::CreateRadialGradientFromSvgXml(const CString& sXml, BOOL fill)
{
ATLTRACE2(_T("CreateRadialGradientFromSvgXml\n"));
m_oBrush.TexturePath = L"";
m_oBrush.Type = 1000;
int FormId = -1;
XrefEntry entry = XrefGetEntry(m_pDocument->pXref, m_pDocument->pXref->pEntries->nCount - 2);
......
ASCOfficePDFWriter/PDFWriter.h
View file @ 38a3083b
B// PDFWriter.h : Declaration of the CPDFWriter
......
ASCOfficePDFWriter/version.h
View file @ 38a3083b
......@@ -2,6 +2,6 @@
//1
//0
//0
//134
#define INTVER 1,0,0,134
#define STRVER "1,0,0,134\0"
//135
#define INTVER 1,0,0,135
#define STRVER "1,0,0,135\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