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 08:44:31 +0000 |
| commit | 1379e2feaad6344999358bbfb271edbaea66ce2a (patch) | |
| tree | f2d15c298b21e8aa83ec4bbc025ca0561896906e /sc/source/ui/miscdlgs | |
| parent | f9e0e3a4eb8a23bfb9fb66055511c53d120e6579 (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/miscdlgs')
| -rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/instbdlg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/tabopdlg.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index d44b489ff2ad..8772dc0b5004 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -26,8 +26,8 @@ #include <vcl/msgbox.hxx> #include <boost/scoped_array.hpp> -#define ERRORBOX(s) MessageDialog(this, s).Execute() -#define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() +#define ERRORBOX(s) ScopedVclPtrInstance<MessageDialog>::Create(this, s)->Execute() +#define QUERYBOX(m) ScopedVclPtrInstance<QueryBox>::Create(this,WinBits(WB_YES_NO|WB_DEF_YES),m)->Execute() const sal_uLong nEntryDataCol = 0; const sal_uLong nEntryDataRow = 1; diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index fd92d08981e9..719f03726188 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -312,7 +312,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) else { OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); - (void)MessageDialog(this, aErrMsg).Execute(); + (void)ScopedVclPtrInstance<MessageDialog>::Create(this, aErrMsg)->Execute(); } return 0; } diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 8072c83a067c..7f960aca2994 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -809,7 +809,7 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit*, pEdit ) void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) { OUString aMessage = bCondition ? maConditionError : maInputError; - MessageDialog(this, aMessage).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, aMessage)->Execute(); if (pFocus) { mpEdActive = pFocus; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index af94aabb8424..e8904376f098 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -35,7 +35,7 @@ namespace { void lclErrorDialog( vcl::Window* pParent, const OUString& aString ) { - MessageDialog(pParent, aString).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(pParent, aString)->Execute(); } } diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index e86b3b42785d..3706a34edced 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -223,7 +223,7 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError ) break; } - MessageDialog(this, *pMsg, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL).Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(this, *pMsg, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL)->Execute(); pEd->GrabFocus(); } |