summaryrefslogtreecommitdiff
path: root/vcl/quartz
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2019-11-18 16:04:24 +0000
committerJan-Marek Glogowski <glogow@fbihome.de>2019-11-19 03:13:33 +0100
commitf8e1f8652255cadd80a991aa3e059ee631b333b8 (patch)
treecbe314f07dea9aff9f444faafa9abbe7eb51db56 /vcl/quartz
parente6aac0b637d583d3cfb893276f813ff5aa1ade17 (diff)
tdf#128434 correctly release fonts in destructors
This adds ReleaseFonts() calls to all destructors of SalGraphics and TextRenderImpl derivated classes, which implement SetFont. During destruction a base class can't call into derivated classes, as these are already destructed, so we have to spread these calls manually. Change-Id: Ia57db04f7df665e5205212ce512119e2f60e3379 Reviewed-on: https://gerrit.libreoffice.org/82967 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/quartz')
-rw-r--r--vcl/quartz/salgdi.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 8884d0bd9f3b..b6df53319e28 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -222,12 +222,7 @@ AquaSalGraphics::~AquaSalGraphics()
CGPathRelease( mxClipPath );
}
- for (int i = 0; i < MAX_FALLBACK; ++i)
- {
- if (!mpTextStyle[i])
- break;
- mpTextStyle[i].clear();
- }
+ ReleaseFonts();
if( mpXorEmulation )
delete mpXorEmulation;