diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-31 21:06:51 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:28:52 +0100 |
| commit | d46e0d9656670dcd7dcca2f32062606400ff6246 (patch) | |
| tree | feec84bb694fe4d107c6aae2d66442ae046be31f /uui | |
| parent | 5d133eb62187ae910772ff5dfeb8f2c3276e8481 (diff) | |
second half of non-scriptable, Instance constructor conversion.
Change-Id: I616c8c28255e0d90ae90033a128bd34d7570530c
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index ba0608021c35..f8ec35ec28f3 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1059,8 +1059,8 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *p if ( !xManager.get() ) return ABORT; - ScopedVclPtr<NameClashDialog> aDialog(new NameClashDialog(pParent, xManager.get(), rTargetFolderURL, - rClashingName, rProposedNewName, bAllowOverwrite) ); + ScopedVclPtrInstance<NameClashDialog> aDialog(pParent, xManager.get(), rTargetFolderURL, + rClashingName, rProposedNewName, bAllowOverwrite); NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog->Execute(); rProposedNewName = aDialog->getNewName(); @@ -1207,8 +1207,8 @@ UUIInteractionHelper::handleMacroConfirmRequest( if ( pResMgr.get() ) { bool bShowSignatures = aSignInfo.getLength() > 0; - ScopedVclPtr<MacroWarning> aWarning(new MacroWarning( - getParentProperty(), bShowSignatures, *pResMgr.get()) ); + ScopedVclPtrInstance<MacroWarning> aWarning( + getParentProperty(), bShowSignatures, *pResMgr.get() ); aWarning->SetDocumentURL( aDocumentURL ); if ( aSignInfo.getLength() > 1 ) |