diff options
| author | Hossein <hossein@libreoffice.org> | 2021-11-29 14:43:36 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-11-30 11:25:04 +0100 |
| commit | 20d5e320801606856c1d05c4f34d9fa82371aac8 (patch) | |
| tree | 6dd924e1020c7c563b4abedaa1cf30a5100704c1 /emfio/source | |
| parent | cab4a0166a81749ba025be6e1ab39203bdee1e10 (diff) | |
tdf#145873 Fix FILEOPEN: EMF file not displayed #2
The previous patch 149bd802623d6d83ec9aa04514b938494f7f01f6 only
partially fixed the problem, and the size of the graphical objects
was wrongly calculated. This patch fixes this problem.
The fix can be tested with:
make CPPUNIT_TEST_NAME="testTdf145873" -sr \
CppunitTest_vcl_pdfexport
This test exports the PPTX to PDF and checks the size of the objects.
The previous test for this issue which exported to SVG is removed, as
it could not test the current situation.
Change-Id: I97bed99811eaf8236ded84ffe0c1a7d3d1b5bad5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125924
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'emfio/source')
| -rw-r--r-- | emfio/source/reader/wmfreader.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 47513101777d..f84fdcce4cc6 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -1690,12 +1690,17 @@ namespace emfio bRet = false; break; } - else if ( nFunction == W_META_EOF ) + else if ( nRSize == 3 && nFunction == W_META_EOF ) { break; } switch( nFunction ) { + case W_META_EOF: + { + return; + } + case W_META_SETWINDOWORG: { aWinOrg = ReadYX(); |