summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-08-28 18:37:37 +0200
committerMichael Stahl <mstahl@redhat.com>2015-08-28 20:42:45 +0200
commit34700400247e378e074ce4164ab2809edb092201 (patch)
treeb391b7dde601ccf2efb2e84759301a946bbb9973 /vcl/inc
parentd421ba3b665e6175e3ccfec7397e5f203f3ed54b (diff)
vcl: fix resource management issue in WinSalLayout
Since commit 65a66d41fd0e13d0aad9df935091b731b4af650a the sd_exports_test crashes on Windows in UniscribeLayout because it uses a ImplFontEntry that has been removed from the font cache. Tweak the refcount in WinLayout so it will be valid. Change-Id: Ic4bf984ea9fd70de9fa95ca964ae12d95d47d5bf
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/outfont.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index dd6c45634752..bc5e65c3f01a 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -36,6 +36,7 @@ class PhysicalFontFamily;
class ImplGetDevFontList;
class ImplGetDevSizeList;
class ImplFontEntry;
+class ImplFontCache;
class ImplPreMatchFontSubstitution;
class ImplGlyphFallbackFontSubstitution;
class FontSelectPattern;
@@ -223,6 +224,7 @@ public:
virtual ~ImplFontEntry();
public: // TODO: make data members private
+ ImplFontCache * m_pFontCache;
FontSelectPattern maFontSelData; // FontSelectionData
ImplFontMetricData maMetric; // Font Metric
const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol