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 /cui/source/dialogs | |
| 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 'cui/source/dialogs')
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 | ||||
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/dialogs/insdlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/dialogs/multipat.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index e0b944498af0..7fcc94334679 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -736,7 +736,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProg sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState) ? RID_STR_SEARCH_GENERAL_ERROR : RID_STR_SEARCH_NORECORD; - ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RES(nErrorId))->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(nErrorId))->Execute(); SAL_FALLTHROUGH; } case FmSearchProgress::STATE_CANCELED: diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ca99ba88756c..9e6c715a106d 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -986,7 +986,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, vo { aLastFilterName = aText; - if( ScopedVclPtrInstance<MessageDialog>::Create( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" )->Execute() == RET_YES ) + if( ScopedVclPtrInstance<MessageDialog>( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" )->Execute() == RET_YES ) SearchFiles(); } } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index c98baa8943cd..9c0b5a596274 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -284,7 +284,7 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); aErr = aErr.replaceFirst( "%", aFileName ); - ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute(); } else { @@ -292,7 +292,7 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) ); aErr = aErr.replaceFirst( "%", aServerName ); - ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute(); } } } @@ -333,7 +333,7 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); aErr = aErr.replaceFirst( "%", aFileName ); - ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); + ScopedVclPtrInstance<MessageDialog>(this, aErr)->Execute(); } } } diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 39624134b669..bd4e9ade7028 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -92,7 +92,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) { OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sInsPath ); - ScopedVclPtr<InfoBox>::Create( this, sMsg )->Execute(); + ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute(); } SelectHdl_Impl( nullptr ); @@ -116,7 +116,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) { OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) ); sMsg = sMsg.replaceFirst( "%1", sInsPath ); - ScopedVclPtr<InfoBox>::Create( this, sMsg )->Execute(); + ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute(); } else { |