diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-24 17:17:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-24 20:10:21 +0100 |
| commit | 8c04ab5e7b3420de8557ff9ad8e67f601f51211f (patch) | |
| tree | e0499a8db1d22db21c19a43320a43735754368e2 /vcl | |
| parent | 3ceb01afc3e5f47930e24fb0b21e6e85b86f660e (diff) | |
forcepoint #6 release virtual devices before releasing font cache
Change-Id: Iacfbe7da788235c96519ecd106d09ab534c83849
Reviewed-on: https://gerrit.libreoffice.org/50281
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index f44fd566aabc..1e84db1dd9cf 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -577,10 +577,6 @@ void DeInitVCL() } ImplDeletePrnQueueList(); - delete pSVData->maGDIData.mpScreenFontList; - pSVData->maGDIData.mpScreenFontList = nullptr; - delete pSVData->maGDIData.mpScreenFontCache; - pSVData->maGDIData.mpScreenFontCache = nullptr; // destroy all Sal interfaces before destroying the instance // and thereby unloading the plugin @@ -616,6 +612,11 @@ void DeInitVCL() pSVData->maWinData.mpAutoScrollWin = nullptr; pSVData->maWinData.mpLastWheelWindow = nullptr; + delete pSVData->maGDIData.mpScreenFontList; + pSVData->maGDIData.mpScreenFontList = nullptr; + delete pSVData->maGDIData.mpScreenFontCache; + pSVData->maGDIData.mpScreenFontCache = nullptr; + // Deinit Sal if (pSVData->mpDefInst) { |