diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-26 10:21:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-26 11:26:52 +0100 |
| commit | a860df25dd7bf62ecb6b3d3ed38803b981f56d52 (patch) | |
| tree | 591e39d4fc9b3da4d3b84882e69baf88baa05507 /extensions/source | |
| parent | 87e2b0142a1724b9075f31acfc44011082ce8e12 (diff) | |
masses of MessBoxes not being disposed promptly
since...
commit ba81e5c6bd420b41a84ade6ccd774011a8089f7f
Date: Thu May 28 21:35:43 2015 +0100
tdf#91702 - fix stack-based MessBox allocation.
There is no special ScopedVclPtr<X>::Create or
ScopedVclPtrInstance<X>::Create just
VclPtr<X>::Create and a raw VclPtr<X>::Create()->foo
doesn't call dispose on the owned X
Change-Id: Ifacc8d5e742820701307c3c37b9b86487667d84f
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index def9876347f8..a7b6c79df019 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -262,7 +262,7 @@ namespace abp if ( aTables.empty() ) { - if (RET_YES != ScopedVclPtrInstance<MessageDialog>::Create(this, ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute()) + if (RET_YES != ScopedVclPtrInstance<MessageDialog>(this, ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VCL_BUTTONS_YES_NO)->Execute()) { // cannot ask the user, or the user chose to use this data source, though there are no tables bAllow = false; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index a9aa624770ad..eda77ceda855 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1397,7 +1397,7 @@ namespace pcr } catch(const PropertyVetoException& eVetoException) { - ScopedVclPtr<InfoBox>::Create(m_pView, eVetoException.Message)->Execute(); + ScopedVclPtrInstance<InfoBox>(m_pView, eVetoException.Message)->Execute(); PropertyHandlerRef handler = impl_getHandlerForProperty_throw( rName ); Any aNormalizedValue = handler->getPropertyValue( rName ); getPropertyBox().SetPropertyValue( rName, aNormalizedValue, false ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 25f56553dd0c..b28c11e76b0a 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -586,7 +586,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg mrJob->execute( aEmpty ); } catch(const uno::Exception&) { - ScopedVclPtrInstance<MessageDialog>::Create( nullptr, ResId( STR_NO_WEBBROWSER_FOUND, *mpSfxResMgr ))->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, ResId( STR_NO_WEBBROWSER_FOUND, *mpSfxResMgr))->Execute(); } } |