diff options
| author | Armin Le Grand (Allotropia) <armin.le.grand@me.com> | 2021-02-23 14:24:24 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2021-02-23 20:42:34 +0100 |
| commit | 3d33e4ce3987ea17e73a72e84f7f0df7af8101a6 (patch) | |
| tree | 32f1f556d21d63c02a746813e2b2e993e2a3f764 /vcl/inc | |
| parent | ed796e0fcd47edcc1df2766a08aaf0cb85622bab (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>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/impfont.hxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 14a2189d3921..35150abc87c0 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -64,14 +64,12 @@ public: void SetCharSet( const rtl_TextEncoding eCharSet ) { meCharSet = eCharSet; } void SetFontSize( const Size& rSize ) { -#ifndef _WIN32 if(rSize.Height() != maAverageFontSize.Height()) { // reset evtl. buffered calculated AverageFontSize, it depends // on Font::Height mnCalculatedAverageFontWidth = 0; } -#endif maAverageFontSize = rSize; } @@ -91,10 +89,8 @@ public: void IncreaseQualityBy( int nQualityAmount ) { mnQuality += nQualityAmount; } void DecreaseQualityBy( int nQualityAmount ) { mnQuality -= nQualityAmount; } -#ifndef _WIN32 tools::Long GetCalculatedAverageFontWidth() const { return mnCalculatedAverageFontWidth; } void SetCalculatedAverageFontWidth(tools::Long nNew) { mnCalculatedAverageFontWidth = nNew; } -#endif bool operator==( const ImplFont& ) const; @@ -146,9 +142,7 @@ private: int mnQuality; -#ifndef _WIN32 tools::Long mnCalculatedAverageFontWidth; -#endif }; #endif // INCLUDED_VCL_INC_IMPFONT_HXX |