diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-26 13:26:36 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:05:20 +0100 |
| commit | b3dcb2996b70caabda1939c9e85545c97d78404a (patch) | |
| tree | 0a8c8db9cfe053f61e90c100b7ebad7fe72605b2 /include | |
| parent | ef22212ecb813ce5c822cfbb7b1da7b4860128ef (diff) | |
vcl: some VclPtr fixes found by the new plugin code
Change-Id: Ib4f591aaa88d8710fdb9b672533cfa8bb024160f
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/dialog.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/layout.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 95afb6acdbf4..e5a895fdba6e 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -62,7 +62,6 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - virtual void dispose() SAL_OVERRIDE; public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } @@ -83,6 +82,7 @@ public: explicit Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); + virtual void dispose() SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index fde760953db0..1f8555675f53 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -572,7 +572,7 @@ protected: DECL_LINK(ScrollBarHdl, void *); void InitScrollBars(const Size &rRequest); virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; - void dispose() SAL_OVERRIDE { m_pVScroll.disposeAndClear(); m_pHScroll.disposeAndClear(); VclBin::dispose(); } + void dispose() SAL_OVERRIDE { m_pVScroll.disposeAndClear(); m_pHScroll.disposeAndClear(); m_aScrollBarBox.disposeAndClear(); VclBin::dispose(); } private: bool m_bUserManagedScrolling; VclPtr<ScrollBar> m_pVScroll; |