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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 98094429a9bb..b3c17934906e 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -214,7 +214,7 @@ namespace svt m_pHelp.disposeAndClear(); for (WizardState i=0; i<m_pImpl->nFirstUnknownPage; ++i) - VclPtr<vcl::Window>(GetPage(i)).disposeAndClear(); + GetPage(i)->disposeOnce(); delete m_pImpl; WizardDialog::dispose(); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 7bcd32bc8d21..82f61e3b9e49 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -126,7 +126,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclSimpleEvent*, pEve IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window*, pWindow ) { (void)*pThis; - VclPtr<vcl::Window>(pWindow).disposeAndClear(); + pWindow->disposeOnce(); return 0; } |