diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-20 11:27:10 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:37:44 +0100 |
| commit | 61b224f392eb856bf4cfa0c04c68202a463cbdbf (patch) | |
| tree | 77a28e38763bc5f9d95e2c278601d31dc6fbf65d /uui/source/iahndl.cxx | |
| parent | f1d9eef4163e88a3cb6360178b52ce441e65d8ae (diff) | |
vclwidget: fixup locally allocated vcl::Window objects
They need to be wrapped in ScopedVclPtr in order to be disposed properly.
Change-Id: Ib64dba353774f54711e4de7f5d15d859c6a4dc7e
Diffstat (limited to 'uui/source/iahndl.cxx')
| -rw-r--r-- | uui/source/iahndl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 64e18d87fd71..ba0608021c35 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1024,7 +1024,7 @@ executeMessageBox( { SolarMutexGuard aGuard; - VclPtr<MessBox> xBox(new MessBox(pParent, nButtonMask, rTitle, rMessage)); + ScopedVclPtr<MessBox> xBox(new MessBox(pParent, nButtonMask, rTitle, rMessage)); sal_uInt16 aResult = xBox->Execute(); switch( aResult ) @@ -1059,7 +1059,7 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *p if ( !xManager.get() ) return ABORT; - VclPtr<NameClashDialog> aDialog(new NameClashDialog(pParent, xManager.get(), rTargetFolderURL, + ScopedVclPtr<NameClashDialog> aDialog(new NameClashDialog(pParent, xManager.get(), rTargetFolderURL, rClashingName, rProposedNewName, bAllowOverwrite) ); NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog->Execute(); @@ -1207,7 +1207,7 @@ UUIInteractionHelper::handleMacroConfirmRequest( if ( pResMgr.get() ) { bool bShowSignatures = aSignInfo.getLength() > 0; - VclPtr<MacroWarning> aWarning(new MacroWarning( + ScopedVclPtr<MacroWarning> aWarning(new MacroWarning( getParentProperty(), bShowSignatures, *pResMgr.get()) ); aWarning->SetDocumentURL( aDocumentURL ); |