diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-13 15:39:37 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-13 15:49:24 +0100 |
| commit | 5245021a806ccdd0d569d5cee7b95167892e9aab (patch) | |
| tree | 5739b3098ea35361d0e50650d5ee493c9de9303c /sw | |
| parent | c9f2abed2e8a618bdf1237c162cb2073bb7022e0 (diff) | |
Explicit disposeOnce instead of transient wrappers.
Change-Id: I578aa360c9923abd3fc516865896a004f377375b
audit: "vclwidget: check for calling delete on subclasses of vcl::Window"
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index a99333ea85e4..33363a03ecf0 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -411,8 +411,7 @@ IMPL_STATIC_LINK( SwSendMailDialog, RemoveThis, Timer*, pTimer ) (!pThis->m_pImpl->xMailDispatcher.is() || !pThis->m_pImpl->xMailDispatcher->isRunning())) { - VclPtr<vcl::Window> a(pThis); - a.disposeAndClear(); + pThis->disposeOnce(); } else { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index fb057fc7067c..f5f788f8e7b1 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -859,8 +859,7 @@ void SwNavigationPI::dispose() SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD()); pImgMan->ReleaseToolBox(aContentToolBox.get()); pImgMan->ReleaseToolBox(aGlobalToolBox.get()); - VclPtr<vcl::Window> a(aContentToolBox->GetItemWindow(FN_PAGENUMBER)); - a.disposeAndClear(); + aContentToolBox->GetItemWindow(FN_PAGENUMBER)->disposeOnce(); aContentToolBox->Clear(); if(pxObjectShell) { |