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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/dialogs/restartdialog.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/filter/SvFilterOptionsDialog.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 7bef79758c47..828188f7e034 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -83,7 +83,7 @@ void svtools::executeRestartDialog( css::uno::Reference< css::uno::XComponentContext > const & context, vcl::Window * parent, RestartReason reason) { - if (RestartDialog(parent, reason).Execute()) { + if (ScopedVclPtrInstance<RestartDialog>::Create(parent, reason)->Execute()) { css::task::OfficeRestartManager::get(context)->requestRestart( css::uno::Reference< css::task::XInteractionHandler >()); } diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 46fe1a8c4868..e2734837a793 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -255,7 +255,7 @@ sal_Int16 SvFilterOptionsDialog::execute() aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat ); bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) ); - if ( ExportDialog( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK ) + if ( ScopedVclPtrInstance<ExportDialog>::Create( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat )->Execute() == RET_OK ) nRet = ui::dialogs::ExecutableDialogResults::OK; pResMgr.reset(); |