diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /uui/source/iahndl-locking.cxx | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'uui/source/iahndl-locking.cxx')
| -rw-r--r-- | uui/source/iahndl-locking.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index 90c9188792fb..79917dee74e7 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -52,6 +52,8 @@ #include "iahndl.hxx" +#include <boost/scoped_ptr.hpp> + #define UUI_DOC_LOAD_LOCK 0 #define UUI_DOC_OWN_LOAD_LOCK 1 #define UUI_DOC_SAVE_LOCK 2 @@ -82,7 +84,7 @@ handleLockedDocumentRequest_( try { SolarMutexGuard aGuard; - std::auto_ptr< ResMgr > xManager( + boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) return; @@ -103,7 +105,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); - std::auto_ptr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox( + boost::scoped_ptr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox( pParent, xManager.get(), aMessage ) ); nResult = xDialog->Execute(); } @@ -118,7 +120,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); - std::auto_ptr< TryLaterQueryBox > xDialog( + boost::scoped_ptr< TryLaterQueryBox > xDialog( new TryLaterQueryBox( pParent, xManager.get(), aMessage ) ); nResult = xDialog->Execute(); } @@ -133,7 +135,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); - std::auto_ptr< AlreadyOpenQueryBox > xDialog( + boost::scoped_ptr< AlreadyOpenQueryBox > xDialog( new AlreadyOpenQueryBox( pParent, xManager.get(), aMessage, @@ -173,12 +175,12 @@ handleChangedByOthersRequest_( try { SolarMutexGuard aGuard; - std::auto_ptr< ResMgr > xManager( + boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) return; - std::auto_ptr< FileChangedQueryBox > xDialog( + boost::scoped_ptr< FileChangedQueryBox > xDialog( new FileChangedQueryBox( pParent, xManager.get() ) ); sal_Int32 nResult = xDialog->Execute(); @@ -212,12 +214,12 @@ handleLockFileIgnoreRequest_( try { SolarMutexGuard aGuard; - std::auto_ptr< ResMgr > xManager( + boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) return; - std::auto_ptr< LockFailedQueryBox > xDialog( + boost::scoped_ptr< LockFailedQueryBox > xDialog( new LockFailedQueryBox( pParent, xManager.get() ) ); sal_Int32 nResult = xDialog->Execute(); |