diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-26 10:21:41 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-03 09:47:42 +0000 |
| commit | 0b21f434b45c350cd9cc5b820226245d6824bf86 (patch) | |
| tree | 2db24f59783e6a91bee55fb2cd75421836f6dd60 /svtools | |
| parent | c4c30cfac570aeb0f8ac91b36b986e438e2811bc (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
(cherry picked from commit a860df25dd7bf62ecb6b3d3ed38803b981f56d52)
Change-Id: Ifacc8d5e742820701307c3c37b9b86487667d84f
Reviewed-on: https://gerrit.libreoffice.org/27537
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 bc6c3f7309ac..b46de7618948 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -98,7 +98,7 @@ void svtools::executeRestartDialog( css::uno::Reference< css::uno::XComponentContext > const & context, vcl::Window * parent, RestartReason reason) { - if (ScopedVclPtrInstance<RestartDialog>::Create(parent, reason)->Execute()) { + if (ScopedVclPtrInstance<RestartDialog>(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 31bf45cc34a4..165f13dd215f 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -250,7 +250,7 @@ sal_Int16 SvFilterOptionsDialog::execute() aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat ); bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) ); - if ( ScopedVclPtrInstance<ExportDialog>::Create( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat )->Execute() == RET_OK ) + if ( ScopedVclPtrInstance<ExportDialog>( aFltCallDlgPara, mxContext, mxSourceDocument, mbExportSelection, bIsPixelFormat )->Execute() == RET_OK ) nRet = ui::dialogs::ExecutableDialogResults::OK; pResMgr.reset(); |