diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-11-18 16:04:24 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-11-19 12:48:03 +0100 |
| commit | a00bdc999344db34d5926dc77ed5ca895295b0ee (patch) | |
| tree | c1fc41c69e6a62e021467b601423fd5143e5fd28 /vcl/unx/generic | |
| parent | 325005697155853891ce4f23e7349931e748d7e7 (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>
(cherry picked from commit f8e1f8652255cadd80a991aa3e059ee631b333b8)
Reviewed-on: https://gerrit.libreoffice.org/83149
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 3b1c7f24f01a..9610a73bc1d6 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -81,7 +81,12 @@ CairoTextRender::CairoTextRender() rp = nullptr; } -void CairoTextRender::setFont(LogicalFontInstance *pEntry, int nFallbackLevel) +CairoTextRender::~CairoTextRender() +{ + ReleaseFonts(); +} + +void CairoTextRender::SetFont(LogicalFontInstance *pEntry, int nFallbackLevel) { // release all no longer needed font resources for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i ) @@ -380,11 +385,6 @@ bool CairoTextRender::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCap // SalGraphics -void CairoTextRender::SetFont(LogicalFontInstance *pEntry, int nFallbackLevel) -{ - setFont(pEntry, nFallbackLevel); -} - void CairoTextRender::SetTextColor( Color nColor ) { |