Skip to content

O
onlyoffice_core
Commit c6ed59a7 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

EmfFile - fix emf from users file xlsx

parent 1d331571
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 753 additions and 9 deletions
DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
View file @ c6ed59a7
...@@ -970,15 +970,15 @@ namespace MetaFile ...@@ -970,15 +970,15 @@ namespace MetaFile
return SetError(); return SetError();
m_oStream >> pPen->PenStyle; m_oStream >> pPen->PenStyle;
m_oStream >> pPen->Width;
unsigned int widthY = 0;
m_oStream >> widthY;
if (widthY && !pPen->Width) unsigned int widthX, widthY;
pPen->Width = widthY; m_oStream >> widthX >> widthY;
if (!pPen->Width) if (!widthX)
pPen->Width = 1; {//emf from Bonetti Martínez. cálculo estructural de pilotes y pilas.xlsx
widthX = 1 / m_pDC->GetPixelWidth();
}
pPen->Width = widthX;
m_oStream >> pPen->Color; m_oStream >> pPen->Color;
m_oPlayer.RegisterObject(ulPenIndex, (CEmfObjectBase*)pPen); m_oPlayer.RegisterObject(ulPenIndex, (CEmfObjectBase*)pPen);
......
DesktopEditor/raster/Metafile/MetaFileTest/MetaFileTest.sln 0 → 100644
View file @ c6ed59a7
This diff is collapsed.
DesktopEditor/raster/Metafile/MetaFileTest/MetaFileTest.vcproj 0 → 100644
View file @ c6ed59a7
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="MetaFileTest"
ProjectGUID="{E31E1A7F-08BF-49BC-BCE8-12006C22685C}"
RootNamespace="MetaFileTest"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\TestMain.cpp"
>
</File>
<File
RelativePath="..\..\..\..\build\lib\win_32\UnicodeConverter.lib"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
DesktopEditor/raster/Metafile/TestMain.cpp
View file @ c6ed59a7
...@@ -109,9 +109,9 @@ void main() ...@@ -109,9 +109,9 @@ void main()
oFonts.Initialize(); oFonts.Initialize();
CMetaFile oMetaFile(&oFonts); CMetaFile oMetaFile(&oFonts);
ConvertFolder(oMetaFile, L"D://test//_svm//1//", c_lMetaSvm); //ConvertFolder(oMetaFile, L"D://test//_svm//1//", c_lMetaSvm);
//ConvertFolder(oMetaFile, L"D://Test Files//Wmf//Test//", c_lMetaWmf); //ConvertFolder(oMetaFile, L"D://Test Files//Wmf//Test//", c_lMetaWmf);
//ConvertFolder(oMetaFile, L"D://Test Files//Emf//Temp//", c_lMetaEmf); ConvertFolder(oMetaFile, L"D://test//_emf", c_lMetaEmf);
//_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
//_CrtDumpMemoryLeaks(); //_CrtDumpMemoryLeaks();
......
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