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 /sc/source/ui/dbgui | |
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 'sc/source/ui/dbgui')
-rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/sfiltdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index ca24f23fa763..ba3163b9ece4 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -43,7 +43,7 @@ class DBSaveData; static DBSaveData* pSaveObj = NULL; -#define ERRORBOX(s) MessageDialog(this, s).Execute() +#define ERRORBOX(s) ScopedVclPtrInstance<MessageDialog>::Create(this, s)->Execute() // class DBSaveData diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index c6f226689276..5ffac4434adf 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -41,7 +41,7 @@ #include <limits> -#define ERRORBOX(rid) MessageDialog(this, ScGlobal::GetRscString(rid)).Execute() +#define ERRORBOX(rid) ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString(rid))->Execute() #define QUERY_ENTRY_COUNT 4 #define INVALID_HEADER_POS std::numeric_limits<size_t>::max() diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 4cf0a86013d1..9ae4d34a1e85 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -39,7 +39,7 @@ // DEFINE -------------------------------------------------------------------- -#define ERRORBOX(rid) MessageDialog(this, ScGlobal::GetRscString(rid)).Execute() +#define ERRORBOX(rid) ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString(rid))->Execute() // class ScSpecialFilterDialog diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 68fbc944025c..85661d1067a2 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -807,7 +807,7 @@ SfxTabPage::sfxpg ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( !bPosInputOk ) { - MessageDialog(this, ScGlobal::GetRscString( STR_INVALID_TABREF)).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, ScGlobal::GetRscString( STR_INVALID_TABREF))->Execute(); m_pEdOutPos->GrabFocus(); m_pEdOutPos->SetSelection( Selection( 0, SELECTION_MAX ) ); theOutPos.Set(0,0,0); |