diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-04-28 08:38:17 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-04-28 12:36:23 +0200 |
| commit | 12dcfc191bc258b51f5d00f46ea44a6a1c6fda91 (patch) | |
| tree | 2cb861f63d2b2ec4cc1e6f7138ca659093c55951 /include/vcl | |
| parent | f8d6ec1a516237f0e9f73080b172ecba3e96478d (diff) | |
include LogicalFontInstance font scale in SalLayoutGlyphsCache key
For some reason it may differ even if vcl::Font is the same.
Without this ScExportTest2::testTdf66668 fails.
Change-Id: I728a0848ac0420ce0d746134c7072f6ab59f2761
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133537
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/glyphitemcache.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/vcl/glyphitemcache.hxx b/include/vcl/glyphitemcache.hxx index ab9ad877059a..ea6d9fca7ffb 100644 --- a/include/vcl/glyphitemcache.hxx +++ b/include/vcl/glyphitemcache.hxx @@ -71,6 +71,8 @@ private: tools::Long logicWidth; VclPtr<const OutputDevice> outputDevice; vcl::Font font; + double fontScaleX; + double fontScaleY; MapMode mapMode; bool rtl; vcl::text::ComplexTextLayoutFlags layoutMode; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index bf4985622fad..ea14e3d018b7 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1192,8 +1192,9 @@ public: //If bNewFontLists is true then drop and refetch lists of system fonts SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); -protected: SAL_DLLPRIVATE const LogicalFontInstance* GetFontInstance() const; + +protected: SAL_DLLPRIVATE tools::Long GetEmphasisAscent() const { return mnEmphasisAscent; } SAL_DLLPRIVATE tools::Long GetEmphasisDescent() const { return mnEmphasisDescent; } |