From f8e1f8652255cadd80a991aa3e059ee631b333b8 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Mon, 18 Nov 2019 16:04:24 +0000 Subject: 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 --- vcl/quartz/salgdi.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'vcl/quartz') 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; -- cgit