diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-28 09:11:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-28 09:12:27 +0200 |
| commit | 09cb92096919e5a7bf4cf5fe66689e312ebc7f9c (patch) | |
| tree | 91af4abe382007a45f6e18c88eba11fc0fe5795f /sfx2 | |
| parent | 89687d651eabcf64816c1b25defe38c7b68dd468 (diff) | |
convert std::unique_ptr<VclAbstractDialog> to VclPtr
Change-Id: Ifdd2a0599efd701def02b4a4d2a1c489cb1b27fa
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b7da7a4af5e8..e9750b4d3dbb 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -606,7 +606,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) { - std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, RID_DEFAULTABOUT )); + ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, RID_DEFAULTABOUT )); pDlg->Execute(); bDone = true; } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 473176c20ef1..f750d1ee74dd 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1477,14 +1477,15 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon if ( bCaughtException && bRaiseError ) { - std::unique_ptr< VclAbstractDialog > pScriptErrDlg; SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) - pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( aException ) ); - OSL_ENSURE( pScriptErrDlg.get(), "SfxObjectShell::CallXScript: no script error dialog!" ); + { + ScopedVclPtr<VclAbstractDialog> pScriptErrDlg( pFact->CreateScriptErrorDialog( aException ) ); + OSL_ENSURE( pScriptErrDlg.get(), "SfxObjectShell::CallXScript: no script error dialog!" ); - if ( pScriptErrDlg.get() ) - pScriptErrDlg->Execute(); + if ( pScriptErrDlg.get() ) + pScriptErrDlg->Execute(); + } } OSL_TRACE( "leaving CallXScript" ); |