just silence the auto_ptr deprecations in isolation

4 files changed, 34 insertions, 26 deletions

diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 8ee1e12a7569..c76414334057 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -57,6 +57,8 @@
 
 #include "iahndl.hxx"
 
+#include <boost/scoped_ptr.hpp>
+
 using namespace com::sun::star;
 
 namespace {
@@ -92,9 +94,9 @@ executeLoginDialog(
         if (!bCanUseSysCreds)
             nFlags |= LF_NO_USESYSCREDS;
 
-        std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
+        boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
         UniString aRealm(rRealm);
-        std::auto_ptr< LoginDialog > xDialog(
+        boost::scoped_ptr< LoginDialog > xDialog(
                 new LoginDialog( pParent, nFlags, rInfo.GetServer(), &aRealm, xManager.get()));
         if (rInfo.GetErrorText().Len() != 0)
             xDialog->SetErrorText(rInfo.GetErrorText());
@@ -423,11 +425,11 @@ executeMasterPasswordDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::auto_ptr< ResMgr > xManager(
+        boost::scoped_ptr< ResMgr > xManager(
             ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
-            std::auto_ptr< MasterPasswordCreateDialog > xDialog(
+            boost::scoped_ptr< MasterPasswordCreateDialog > xDialog(
                 new MasterPasswordCreateDialog(pParent, xManager.get()));
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
@@ -436,7 +438,7 @@ executeMasterPasswordDialog(
         }
         else
         {
-            std::auto_ptr< MasterPasswordDialog > xDialog(
+            boost::scoped_ptr< MasterPasswordDialog > xDialog(
                 new MasterPasswordDialog(pParent, nMode, xManager.get()));
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
@@ -526,13 +528,13 @@ executePasswordDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::auto_ptr< ResMgr > xManager(
+        boost::scoped_ptr< ResMgr > xManager(
             ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
             if (bIsSimplePasswordRequest)
             {
-                std::auto_ptr< PasswordDialog > pDialog(
+                boost::scoped_ptr< PasswordDialog > pDialog(
                     new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
                     bIsPasswordToModify, bIsSimplePasswordRequest ) );
                 pDialog->SetMinLen(0);
@@ -546,7 +548,7 @@ executePasswordDialog(
 
                 VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
                 AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
-                std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
+                boost::scoped_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
 
                 rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
                 rInfo.SetPassword( pDialog->GetPasswordToOpen() );
@@ -556,7 +558,7 @@ executePasswordDialog(
         }
         else // enter password or reenter password
         {
-            std::auto_ptr< PasswordDialog > pDialog(
+            boost::scoped_ptr< PasswordDialog > pDialog(
                 new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
                 bIsPasswordToModify, bIsSimplePasswordRequest ) );
             pDialog->SetMinLen(0);
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();
 
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 7183fe8faa84..c57aa49007cd 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -50,6 +50,8 @@
 
 #include "iahndl.hxx"
 
+#include <boost/scoped_ptr.hpp>
+
 #define DESCRIPTION_1 1
 #define DESCRIPTION_2 2
 #define TITLE 3
@@ -154,9 +156,9 @@ executeUnknownAuthDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::auto_ptr< ResMgr > xManager(
+        boost::scoped_ptr< ResMgr > xManager(
             ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
-        std::auto_ptr< UnknownAuthDialog > xDialog(
+        boost::scoped_ptr< UnknownAuthDialog > xDialog(
             new UnknownAuthDialog( pParent,
                                    rXCert,
                                    xServiceFactory,
@@ -203,9 +205,9 @@ executeSSLWarnDialog(
     {
         SolarMutexGuard aGuard;
 
-        std::auto_ptr< ResMgr > xManager(
+        boost::scoped_ptr< ResMgr > xManager(
            ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
-        std::auto_ptr< SSLWarnDialog > xDialog(
+        boost::scoped_ptr< SSLWarnDialog > xDialog(
            new SSLWarnDialog( pParent,
                               rXCert,
                               xServiceFactory,
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 3cda495e0afa..401228c7ea6e 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -93,6 +93,8 @@
 #include "iahndl.hxx"
 #include "nameclashdlg.hxx"
 
+#include <boost/scoped_ptr.hpp>
+
 /** === begin UNO using === **/
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::UNO_QUERY;
@@ -1210,7 +1212,7 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParen
                                                                   rtl::OUString & rProposedNewName,
                                                                   bool bAllowOverwrite )
 {
-    std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
+    boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
     if ( !xManager.get() )
         return ABORT;
 
@@ -1320,7 +1322,7 @@ UUIInteractionHelper::handleGenericErrorRequest(
             String aErrorString;
             ErrorHandler::GetErrorString( nErrorCode, aErrorString );
 
-            std::auto_ptr< ResMgr > xManager(
+            boost::scoped_ptr< ResMgr > xManager(
                 ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
             ::rtl::OUString aTitle;
 
@@ -1375,7 +1377,7 @@ UUIInteractionHelper::handleMacroConfirmRequest(
 
     bool bApprove = false;
 
-    std::auto_ptr< ResMgr > pResMgr(
+    boost::scoped_ptr< ResMgr > pResMgr(
         ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
     if ( pResMgr.get() )
     {
@@ -1439,7 +1441,7 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest(
 
     if ( !s_bDeferredToNextSession )
     {
-        std::auto_ptr< ResMgr > pResMgr(
+        boost::scoped_ptr< ResMgr > pResMgr(
             ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
         if ( pResMgr.get() )
         {
@@ -1510,7 +1512,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
     ::rtl::OUString aMessage;
     {
         SolarMutexGuard aGuard;
-        std::auto_ptr< ResMgr > xManager(
+        boost::scoped_ptr< ResMgr > xManager(
             ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
         if (!xManager.get())
             return;