diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-18 11:21:44 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:03 -0400 |
commit | 46429c9920650c722f541445f186a34a752388a1 (patch) | |
tree | 3bf9ba06cc47a45936c50eebbc035b1b03b2d50f | |
parent | d4b38602c6ae1f0ae45d3f52e15795bfaabd523c (diff) |
tdf#99352 - Some VclPtrs leak past DeInitVCL
Change-Id: I74b27b1d8b662a644df580ae128643b8495355f8
Reviewed-on: https://gerrit.libreoffice.org/24204
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 67d333c608a662621c1069aacdec75e45e33a183)
-rw-r--r-- | sdext/source/pdfimport/wrapper/wrapper.cxx | 11 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 5 | ||||
-rw-r--r-- | sw/source/core/inc/fntcache.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 1 |
6 files changed, 16 insertions, 13 deletions
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 74e17f87c118..7702b41775ee 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -59,6 +59,7 @@ #include <vcl/metric.hxx> #include <vcl/font.hxx> #include <vcl/virdev.hxx> +#include <vcl/lazydelete.hxx> #include <memory> #include <unordered_map> @@ -655,13 +656,13 @@ void Parser::readFont() } - static VclPtr<VirtualDevice> vDev; - if (!vDev) - vDev = VclPtr<VirtualDevice>::Create(); + static vcl::DeleteOnDeinit< VclPtr<VirtualDevice> > vDev( new VclPtr<VirtualDevice> ); + if (!vDev.get()->get()) + (*vDev.get()) = VclPtr<VirtualDevice>::Create(); vcl::Font font(aResult.familyName, Size(0, 1000)); - vDev->SetFont(font); - FontMetric metric(vDev->GetFontMetric()); + (*vDev.get())->SetFont(font); + FontMetric metric((*vDev.get())->GetFontMetric()); aResult.ascent = metric.GetAscent() / 1000.0; m_aFontMap[nFontID] = aResult; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index fca7c57b3cca..dbc593b60ac4 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -30,6 +30,7 @@ #include <vcl/mapmod.hxx> #include <vcl/print.hxx> #include <vcl/vclptr.hxx> +#include <vcl/lazydelete.hxx> #include <LibreOfficeKit/LibreOfficeKitTypes.h> @@ -180,7 +181,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell> protected: static ShellResource* mpShellRes; ///< Resources for the Shell. - static VclPtr<vcl::Window> mpCareWindow; ///< Avoid this window. + static vcl::DeleteOnDeinit< VclPtr<vcl::Window> > mpCareWindow; ///< Avoid this window. SwRect maVisArea; ///< The modern version of VisArea. SwDoc *mpDoc; ///< The document; never 0. @@ -438,7 +439,7 @@ public: static void SetCareWin( vcl::Window* pNew ); static vcl::Window* GetCareWin(SwViewShell& rVSh) - { return mpCareWindow ? mpCareWindow.get() : CareChildWin(rVSh); } + { return (*mpCareWindow.get()) ? mpCareWindow.get()->get() : CareChildWin(rVSh); } static vcl::Window* CareChildWin(SwViewShell& rVSh); inline SfxViewShell *GetSfxViewShell() const { return mpSfxViewShell; } diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index ed634e5d43b7..600218ce1bdb 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -78,7 +78,6 @@ class SwFntObj : public SwCacheObj static long nPixWidth; static MapMode *pPixMap; - static VclPtr<OutputDevice> pPixOut; public: DECL_FIXEDMEMPOOL_NEWDEL(SwFntObj) diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index c8ba8f64ac16..ded4ce15a886 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -28,6 +28,7 @@ #include <vcl/metric.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> +#include <vcl/lazydelete.hxx> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <breakit.hxx> @@ -68,7 +69,7 @@ Color *pWaveCol = nullptr; long SwFntObj::nPixWidth; MapMode* SwFntObj::pPixMap = nullptr; -VclPtr<OutputDevice> SwFntObj::pPixOut; +static vcl::DeleteOnDeinit< VclPtr<OutputDevice> > s_pFntObjPixOut( new VclPtr<OutputDevice> ); namespace { @@ -889,10 +890,10 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) Point aTextOriginPos( rInf.GetPos() ); if( !bPrt ) { - if( rInf.GetpOut() != pPixOut || rInf.GetOut().GetMapMode() != *pPixMap ) + if( rInf.GetpOut() != *s_pFntObjPixOut.get() || rInf.GetOut().GetMapMode() != *pPixMap ) { *pPixMap = rInf.GetOut().GetMapMode(); - pPixOut = rInf.GetpOut(); + (*s_pFntObjPixOut.get()) = rInf.GetpOut(); Size aTmp( 1, 1 ); nPixWidth = rInf.GetOut().PixelToLogic( aTmp ).Width(); } diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index ad0ef20751be..3bf8485ad30c 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -88,7 +88,7 @@ bool SwViewShell::mbLstAct = false; ShellResource *SwViewShell::mpShellRes = nullptr; -VclPtr<vcl::Window> SwViewShell::mpCareWindow = nullptr; +vcl::DeleteOnDeinit< VclPtr<vcl::Window> > SwViewShell::mpCareWindow(new VclPtr<vcl::Window>); bool bInSizeNotify = false; @@ -2425,7 +2425,7 @@ ShellResource* SwViewShell::GetShellRes() void SwViewShell::SetCareWin( vcl::Window* pNew ) { - mpCareWindow = pNew; + (*mpCareWindow.get()) = pNew; } sal_uInt16 SwViewShell::GetPageCount() const diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 4cbf6fdcc514..599bd9fcd4db 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -36,6 +36,7 @@ #include <vcl/dockwin.hxx> #include <vcl/menu.hxx> #include <vcl/virdev.hxx> +#include <vcl/lazydelete.hxx> #include <touch/touch.h> #include <svdata.hxx> |