From ddc280920282ff3e2801e9a79f9dfa8a6c6f5699 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 17 Sep 2015 11:30:13 +0100 Subject: boost->std Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f --- uui/inc/pch/precompiled_uui.hxx | 1 - uui/source/iahndl-authentication.cxx | 10 +++++----- uui/source/iahndl-errorhandler.cxx | 4 ++-- uui/source/iahndl-filter.cxx | 1 - uui/source/iahndl-locking.cxx | 8 ++++---- uui/source/iahndl-ssl.cxx | 6 +++--- uui/source/iahndl.cxx | 10 +++++----- 7 files changed, 19 insertions(+), 21 deletions(-) (limited to 'uui') diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx index 9d02068cdeb2..19826a34ff23 100644 --- a/uui/inc/pch/precompiled_uui.hxx +++ b/uui/inc/pch/precompiled_uui.hxx @@ -15,7 +15,6 @@ */ #include -#include #include #include #include diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 3249e9db67bf..a58a0be5978f 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -52,7 +52,7 @@ #include "iahndl.hxx" -#include +#include using namespace com::sun::star; @@ -100,7 +100,7 @@ executeLoginDialog( if (bSavePassword) { - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); xDialog->SetSavePasswordText( ResId(rInfo.GetIsRememberPersistent() ? RID_SAVE_PASSWORD @@ -413,7 +413,7 @@ executeMasterPasswordDialog( { SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if( nMode == task::PasswordRequestMode_PASSWORD_CREATE ) { ScopedVclPtrInstance< MasterPasswordCreateDialog > xDialog( @@ -511,7 +511,7 @@ executePasswordDialog( { SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if( nMode == task::PasswordRequestMode_PASSWORD_CREATE ) { if (bIsSimplePasswordRequest) @@ -530,7 +530,7 @@ executePasswordDialog( VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create(); AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify ); - boost::scoped_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp ); + std::unique_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp ); rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL ); rInfo.SetPassword( pDialog->GetPasswordToOpen() ); diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 481ed0e58579..4b57e264a772 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -33,7 +33,7 @@ #include "getcontinuations.hxx" #include "iahndl.hxx" -#include +#include using namespace com::sun::star; @@ -169,7 +169,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( SOURCE_UUI; SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager; + std::unique_ptr< ResMgr > xManager; xManager.reset(ResMgr::CreateResMgr(aManager[eSource])); if (!xManager.get()) return; diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 710cd8ae545c..7f959196653a 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -38,7 +38,6 @@ #include "fltdlg.hxx" #include "iahndl.hxx" -#include using namespace com::sun::star; diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index db43be750488..f3793819471a 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -43,7 +43,7 @@ #include "iahndl.hxx" -#include +#include #define UUI_DOC_LOAD_LOCK 0 #define UUI_DOC_OWN_LOAD_LOCK 1 @@ -74,7 +74,7 @@ handleLockedDocumentRequest_( try { SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if (!xManager.get()) return; @@ -156,7 +156,7 @@ handleChangedByOthersRequest_( try { SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if (!xManager.get()) return; @@ -190,7 +190,7 @@ handleLockFileIgnoreRequest_( try { SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if (!xManager.get()) return; diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index e42ed909b5b2..cb25f7c7a095 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -41,7 +41,7 @@ #include "iahndl.hxx" -#include +#include #define DESCRIPTION_1 1 #define TITLE 3 @@ -153,7 +153,7 @@ executeUnknownAuthDialog( std::vector< OUString > aArguments; aArguments.push_back( getContentPart( rXCert->getSubjectName()) ); - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if (xManager.get()) { ResId aResId(RID_UUI_ERRHDL, *xManager.get()); @@ -214,7 +214,7 @@ executeSSLWarnDialog( break; } - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if (xManager.get()) { diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 8f58d8520c90..b607502f9ebc 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -86,7 +86,7 @@ #include "iahndl.hxx" #include "nameclashdlg.hxx" -#include +#include using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; @@ -1036,7 +1036,7 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *p OUString & rProposedNewName, bool bAllowOverwrite ) { - boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr( "uui" ) ); + std::unique_ptr< ResMgr > xManager( ResMgr::CreateResMgr( "uui" ) ); if ( !xManager.get() ) return ABORT; @@ -1142,7 +1142,7 @@ UUIInteractionHelper::handleGenericErrorRequest( OUString aErrorString; ErrorHandler::GetErrorString( nErrorCode, aErrorString ); - boost::scoped_ptr< ResMgr > xManager( + std::unique_ptr< ResMgr > xManager( ResMgr::CreateResMgr( "uui" ) ); OUString aTitle( utl::ConfigManager::getProductName() ); @@ -1184,7 +1184,7 @@ UUIInteractionHelper::handleMacroConfirmRequest( bool bApprove = false; - boost::scoped_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( "uui" ) ); + std::unique_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( "uui" ) ); if ( pResMgr.get() ) { bool bShowSignatures = aSignInfo.getLength() > 0; @@ -1246,7 +1246,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( OUString aMessage; { SolarMutexGuard aGuard; - boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); + std::unique_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui")); if (!xManager.get()) return; -- cgit