desktop: std::auto_ptr -> std::unique_ptr

Change-Id: I450ee7134454321365d9d153522b8942a3d7d811

13 files changed, 20 insertions, 23 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index da0d92730423..b2c3433dc4cf 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1332,8 +1332,8 @@ struct ExecuteGlobals
     Reference < css::document::XDocumentEventListener > xGlobalBroadcaster;
     bool bRestartRequested;
     bool bUseSystemFileDialog;
-    std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
-    std::auto_ptr<SvtPathOptions> pPathOptions;
+    std::unique_ptr<SvtLanguageOptions> pLanguageOptions;
+    std::unique_ptr<SvtPathOptions> pPathOptions;
 
     ExecuteGlobals()
     : bRestartRequested( false )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e40c2910d468..dd93edbd3132 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -92,7 +92,7 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
 {
     const OUString operator () () {
         const SolarMutexGuard guard;
-        ::std::auto_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) );
+        ::std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) );
         OSL_ASSERT( resmgr.get() != 0 );
         return ResId(STR_FILTERNAME_ALL, *resmgr.get()).toString();
     }
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index e4185bbe7fdf..84bf5b7d7318 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -211,7 +211,7 @@ void ServiceImpl::startExecuteModal(
     throw (RuntimeException, std::exception)
 {
     bool bCloseDialog = true;  // only used if m_bShowUpdateOnly is true
-    ::std::auto_ptr<Application> app;
+    ::std::unique_ptr<Application> app;
     //ToDo: synchronize access to s_dialog !!!
     if (! dp_gui::TheExtensionManager::s_ExtMgr.is())
     {
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index ff375208630d..c9aab531d127 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -307,7 +307,7 @@ sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception)
 
 sal_Int16 LicenseDialog::solar_execute()
 {
-    std::auto_ptr<LicenseDialogImpl> dlg(
+    std::unique_ptr<LicenseDialogImpl> dlg(
         new LicenseDialogImpl(
             VCLUnoHelper::GetWindow(m_parent),
             m_xComponentContext, m_sExtensionName, m_sLicenseText));
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 91e7257fe4a7..f342eda53721 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -50,7 +50,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
 
     OUString m_activePackages;
     OUString m_activePackages_expanded;
-    ::std::auto_ptr< ActivePackages > m_activePackagesDB;
+    ::std::unique_ptr< ActivePackages > m_activePackagesDB;
     //This mutex is only used for synchronization in addPackage
     ::osl::Mutex m_addMutex;
     css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 636d2ad786f1..fe30080f46fd 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -292,7 +292,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     OUString m_commonRDB_orig;
     OUString m_nativeRDB_orig;
 
-    std::auto_ptr<ComponentBackendDb> m_backendDb;
+    std::unique_ptr<ComponentBackendDb> m_backendDb;
 
     void addDataToDb(OUString const & url, ComponentBackendDb::Data const & data);
     ComponentBackendDb::Data readDataFromDb(OUString const & url);
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 0408442a0b7e..4af0fe373d02 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -46,6 +46,7 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <list>
 #include <memory>
+#include <utility>
 
 #include "dp_configurationbackenddb.hxx"
 
@@ -103,7 +104,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 
     bool m_configmgrini_inited;
     bool m_configmgrini_modified;
-    std::auto_ptr<ConfigurationBackendDb> m_backendDb;
+    std::unique_ptr<ConfigurationBackendDb> m_backendDb;
 
     // PackageRegistryBackend
     virtual Reference<deployment::XPackage> bindPackage_(
@@ -113,7 +114,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 
 #if HAVE_FEATURE_EXTENSIONS
     // for backwards compatibility - nil if no (compatible) back-compat db present
-    ::std::auto_ptr<PersistentMap> m_registeredPackages;
+    ::std::unique_ptr<PersistentMap> m_registeredPackages;
 #endif
 
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -218,9 +219,7 @@ BackendImpl::BackendImpl(
         configmgrini_verify_init( xCmdEnv );
 
 #if HAVE_FEATURE_EXTENSIONS
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<PersistentMap> pMap;
-        SAL_WNODEPRECATED_DECLARATIONS_POP
+        ::std::unique_ptr<PersistentMap> pMap;
         OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) );
 
         // Don't create it if it doesn't exist already
@@ -228,9 +227,7 @@ BackendImpl::BackendImpl(
         {
             try
             {
-                SAL_WNODEPRECATED_DECLARATIONS_PUSH
-                pMap = ::std::auto_ptr<PersistentMap>( new PersistentMap( aCompatURL, false ) );
-                SAL_WNODEPRECATED_DECLARATIONS_POP
+                pMap.reset( new PersistentMap( aCompatURL, false ) );
             }
             catch (const Exception &e)
             {
@@ -240,7 +237,7 @@ BackendImpl::BackendImpl(
                 dp_misc::writeConsole( aStr.getStr() );
             }
         }
-        m_registeredPackages = pMap;
+        m_registeredPackages = std::move(pMap);
 #endif
      }
 }
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 5df3919ff035..034ccb2bb3e8 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -86,7 +86,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     void revokeEntryFromDb(OUString const & url);
 
     Reference<deployment::XPackageTypeInfo> m_xExecutableTypeInfo;
-    std::auto_ptr<ExecutableBackendDb> m_backendDb;
+    std::unique_ptr<ExecutableBackendDb> m_backendDb;
 public:
     BackendImpl( Sequence<Any> const & args,
                  Reference<XComponentContext> const & xComponentContext );
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 41a429b77214..51feccca2ebf 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -111,7 +111,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 
     const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
-    std::auto_ptr<HelpBackendDb> m_backendDb;
+    std::unique_ptr<HelpBackendDb> m_backendDb;
 
 public:
     BackendImpl( Sequence<Any> const & args,
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index de7968a5a510..5e4f96d072ee 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -240,7 +240,7 @@ class BackendImpl : public ImplBaseT
     const Reference<deployment::XPackageTypeInfo> m_xLegacyBundleTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
 
-    std::auto_ptr<ExtensionBackendDb> m_backendDb;
+    std::unique_ptr<ExtensionBackendDb> m_backendDb;
 
     void addDataToDb(OUString const & url, ExtensionBackendDb::Data const & data);
     ExtensionBackendDb::Data readDataFromDb(OUString const & url);
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index c5ef149fbc52..cf1bc1f1683b 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -93,7 +93,7 @@ class BackendImpl : public t_helper
     const Reference<deployment::XPackageTypeInfo> m_xBasicLibTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xDialogLibTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
-    std::auto_ptr<ScriptBackendDb> m_backendDb;
+    std::unique_ptr<ScriptBackendDb> m_backendDb;
 public:
     BackendImpl( Sequence<Any> const & args,
                  Reference<XComponentContext> const & xComponentContext );
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 5f8e345fb0a0..4bb99e431e19 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -51,7 +51,7 @@ struct install_info
 };
 
 typedef std::vector< OUString > strings_v;
-typedef std::auto_ptr< strings_v > strings_vr;
+typedef std::unique_ptr< strings_v > strings_vr;
 
 struct migration_step
 {
@@ -73,7 +73,7 @@ struct supported_migration
 };
 
 typedef std::vector< migration_step > migrations_v;
-typedef std::auto_ptr< migrations_v > migrations_vr;
+typedef std::unique_ptr< migrations_v > migrations_vr;
 typedef std::vector< supported_migration > migrations_available;
 
 
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index 13013bbd6ce1..f6018ed022f1 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -31,7 +31,7 @@ namespace migration
 
 
     typedef ::std::vector< OUString > TStringVector;
-    typedef ::std::auto_ptr< TStringVector > TStringVectorPtr;
+    typedef ::std::unique_ptr< TStringVector > TStringVectorPtr;
 
 
 }   // namespace migration