diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-24 22:20:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-30 12:03:25 +0000 |
| commit | 4ae7ec8c8d22e751b868459e1f51fcecc37dd6b1 (patch) | |
| tree | 42ce743ed34d5b36e35768095daa90875dd7c5a3 /vcl/inc | |
| parent | 0be4633755e1e2d3639866e074a456e1de0de3a8 (diff) | |
vcl: tdf#98812: acquire reference count of WinFontInstances
... when they are inserted in WinSalGraphics::mpWinFontEntry.
Not sure why one of these drops to 0 but is not removed from the
WinSalGraphics when formatting this particular bugdoc.
Acquiring the instances when retaining pointers to them should make
the life cycle a little less insane.
(cherry picked from commit 99207a26df0083851ba8e23be72d5c6974f98a3b)
Change-Id: If1404f46a13736b2a226e198bdf0c3ca8e09bb38
Reviewed-on: https://gerrit.libreoffice.org/23504
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 3d0046ed9d4f..085f77eed706 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -220,6 +220,8 @@ private: sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font int mnPenWidth; // Linienbreite + ImplFontEntry* GetWinFontEntry(int nFallbackLevel); + public: HDC getHDC() const { return mhLocalDC; } void setHDC(HDC aNew) { mhLocalDC = aNew; } |