diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-10 09:07:06 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 10:55:36 +0100 |
commit | d7a84ce8406096b455d81f50cd50ca2e877adc06 (patch) | |
tree | b1dd2b5a4860cf2c9664e2ff3087b8dbb9db7576 /svx/source/svdraw/svdibrow.cxx | |
parent | c0a802b59e1edddeb0b621e15137f5058299efd7 (diff) |
vclwidget: only call dispose() once
by using a new utility method in vcl::Window
This means that we don't have to make all our dispose
methods safe to call more than once.
Change-Id: I2110c7de4a86c70fdc97dd8fd318c86b56865374
Diffstat (limited to 'svx/source/svdraw/svdibrow.cxx')
-rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 42a990477c5c..ad948fa7f079 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -169,7 +169,7 @@ public: : Edit(pParent, nBits), pBrowse(pBrowse_) {} - virtual ~ImpItemEdit() { dispose(); } + virtual ~ImpItemEdit() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE { pBrowse.clear(); Edit::dispose(); } virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; }; @@ -213,7 +213,7 @@ _SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBi _SdrItemBrowserControl::~_SdrItemBrowserControl() { - dispose(); + disposeOnce(); } void _SdrItemBrowserControl::dispose() @@ -1055,7 +1055,7 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits _SdrItemBrowserWindow::~_SdrItemBrowserWindow() { - dispose(); + disposeOnce(); } void _SdrItemBrowserWindow::dispose() |