diff options
author | Armin Le Grand (Allotropia) <armin.le.grand@me.com> | 2021-02-23 14:24:24 +0100 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-02-26 00:26:46 +0100 |
commit | 8b5922443654b8fc7354801c9ada17274f60eb8f (patch) | |
tree | 78818fedea89dba3b51e2547b26ff063bf941117 /emfio/source/reader/emfreader.cxx | |
parent | 75d5db29f2ad2ff4f7944d47efc4ee001be7a1e7 (diff) |
tdf#127471 Detect&Correct EMF/WMF with wrong FontScale
Before correcting our EMF/WMF export to write the Windows-
specific data in the case of FontScaling, we wrote these
files with wrong FontScaling.
This change tries to detect and correct this at import, so
that newer versions of the office on all plattforms can
again load old, from us but not on Windows written EMF/WMF
files.
With this change we can read again all new and old EMF/WMF
files (see table in task, comment 80).
Change-Id: I1a0b0ab5f57c7cd40520401568af05cab4ecb4c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111399
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
(cherry picked from commit 3d33e4ce3987ea17e73a72e84f7f0df7af8101a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111452
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'emfio/source/reader/emfreader.cxx')
-rw-r--r-- | emfio/source/reader/emfreader.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 6a974085d887..d0e7eb31c696 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1825,6 +1825,10 @@ namespace emfio } mpInputStream->Seek( nNextPos ); } + + // tdf#127471 + maScaledFontHelper.applyAlternativeFontScale(); + if( !maBmpSaveList.empty() ) ResolveBitmapActions( maBmpSaveList ); |