summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2022-04-11 12:43:05 +0200
committerLuboš Luňák <l.lunak@collabora.com>2022-04-12 13:31:09 +0200
commit3361db2179dfe4ddb017ac59660c26c2acaaac8d (patch)
treed873f6eb2eb675255389be4f35f90f3180d8999b /include/vcl
parentcbaf1fbaa6e707d939f815eda360fad68a492aca (diff)
include OutputDevice MapMode in SalLayoutGlyphsCache key (tdf#148400)
The mapmode also affects the layout of the glyphs. Change-Id: I9492bc4d3d9e991ef8ab5dc30ce424e44cbc79f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132822 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/glyphitemcache.hxx1
-rw-r--r--include/vcl/mapmod.hxx3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/vcl/glyphitemcache.hxx b/include/vcl/glyphitemcache.hxx
index 34a5b51d6c1b..e0ab8aaf1013 100644
--- a/include/vcl/glyphitemcache.hxx
+++ b/include/vcl/glyphitemcache.hxx
@@ -67,6 +67,7 @@ private:
tools::Long logicWidth;
VclPtr<const OutputDevice> outputDevice;
vcl::Font font;
+ MapMode mapMode;
bool rtl;
vcl::text::ComplexTextLayoutFlags layoutMode;
LanguageType digitLanguage;
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 591db8d8c1c0..f3c937a5f915 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -64,6 +64,9 @@ public:
}
bool IsDefault() const;
+ // Compute value usable as hash.
+ size_t GetHashValue() const;
+
// tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps
// vcl::ScopedBitmapAccess in parallelized 3D renderer
typedef o3tl::cow_wrapper< ImplMapMode, o3tl::ThreadSafeRefCountingPolicy > ImplType;