diff options
| author | Philippe Jung <phil.jung@free.fr> | 2015-05-26 16:26:35 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-28 09:55:08 +0100 |
| commit | be8a02364c82df5252a1ced49db29f855c85677a (patch) | |
| tree | 71ab14185b350d2a593df55713b6b7f5d4ab5eca /cui/source/dialogs | |
| parent | 71079c49ec377ecca2a4410a41d3de3dcd7e07ff (diff) | |
Rewrite all calls like Dialog(params).Execute()
Replace all calls looking like
ADialog(some params).Execute()
by
ScopedVclPtrInstance<ADialog>::Create(some parms)->Execute()
Change-Id: I0b6f0a9ea5ef0a749ffa30ce131e9dc989604639
Reviewed-on: https://gerrit.libreoffice.org/15915
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
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 | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 76c132ab7305..2a5c31f5c199 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -752,7 +752,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState) ? RID_STR_SEARCH_GENERAL_ERROR : RID_STR_SEARCH_NORECORD; - MessageDialog(this, CUI_RES(nErrorId)).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RES(nErrorId))->Execute(); } // NO break ! case FmSearchProgress::STATE_CANCELED: diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 4eafd4904a23..def7872b7edf 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1024,7 +1024,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl) { aLastFilterName = aText; - if( MessageDialog( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" ).Execute() == RET_YES ) + if( ScopedVclPtrInstance<MessageDialog>::Create( 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 eacfed6d6e9b..a68af459b3f7 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -292,7 +292,7 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); aErr = aErr.replaceFirst( "%", aFileName ); - MessageDialog(this, aErr).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); } else { @@ -300,7 +300,7 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) ); aErr = aErr.replaceFirst( "%", aServerName ); - MessageDialog(this, aErr).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); } } } @@ -341,7 +341,7 @@ short SvInsertOleDlg::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); aErr = aErr.replaceFirst( "%", aFileName ); - MessageDialog(this, aErr).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); } } } @@ -486,7 +486,7 @@ short SvInsertPlugInDialog::Execute() // global Resource from svtools (former so3 resource) OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_PLUGIN ) ); aErr = aErr.replaceFirst( "%", aURL ); - MessageDialog(this, aErr).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, aErr)->Execute(); } } |