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 /sfx2/source/appl/newhelp.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 'sfx2/source/appl/newhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 54330246c40b..321ef7f328de 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -303,7 +303,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeContentListBox(vcl::Wi ContentListBox_Impl::~ContentListBox_Impl() { - dispose(); + disposeOnce(); } void ContentListBox_Impl::dispose() @@ -434,7 +434,7 @@ HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl HelpTabPage_Impl::~HelpTabPage_Impl() { - dispose(); + disposeOnce(); } void HelpTabPage_Impl::dispose() @@ -456,7 +456,7 @@ ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindo ContentTabPage_Impl::~ContentTabPage_Impl() { - dispose(); + disposeOnce(); } void ContentTabPage_Impl::dispose() @@ -573,7 +573,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im IndexTabPage_Impl::~IndexTabPage_Impl() { - dispose(); + disposeOnce(); } void IndexTabPage_Impl::dispose() @@ -982,7 +982,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_ SearchTabPage_Impl::~SearchTabPage_Impl() { - dispose(); + disposeOnce(); } void SearchTabPage_Impl::dispose() @@ -1190,7 +1190,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarksBox(vcl::Wind BookmarksBox_Impl::~BookmarksBox_Impl() { - dispose(); + disposeOnce(); } void BookmarksBox_Impl::dispose() @@ -1328,7 +1328,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexW BookmarksTabPage_Impl::~BookmarksTabPage_Impl() { - dispose(); + disposeOnce(); } void BookmarksTabPage_Impl::dispose() @@ -1482,7 +1482,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent) SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() { - dispose(); + disposeOnce(); } void SfxHelpIndexWindow_Impl::dispose() @@ -1968,7 +1968,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() { - dispose(); + disposeOnce(); } void SfxHelpTextWindow_Impl::dispose() @@ -3074,7 +3074,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( SfxHelpWindow_Impl::~SfxHelpWindow_Impl() { - dispose(); + disposeOnce(); } void SfxHelpWindow_Impl::dispose() @@ -3293,7 +3293,7 @@ SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParen SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl() { - dispose(); + disposeOnce(); } void SfxAddHelpBookmarkDialog_Impl::dispose() |