connectivity: std::auto_ptr -> std::unique_ptr

Change-Id: I796dc05d1846f140a56b5a6f14a69a239324ae5b

6 files changed, 7 insertions, 9 deletions

diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 1894f354f3e3..39e46dbb02c2 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -90,7 +90,7 @@ namespace connectivity
     private:
         ::osl::Mutex                                            m_aMutex;
         Reference<XComponentContext>                            m_aContext;
-        ::std::auto_ptr< ::comphelper::OfficeResourceBundle >   m_pResources;
+        ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
         bool                                                    m_bAttemptedInit;
     };
 
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 7501e978aa18..6241318578ff 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -103,7 +103,7 @@ namespace connectivity
                                                         //  an operation
             MozabDriver*                            m_pDriver;      //  Pointer to the owning
                                                                     //  driver object
-            ::std::auto_ptr< ConnectionImplData >   m_pImplData;
+            ::std::unique_ptr< ConnectionImplData > m_pImplData;
                 // This is to be able to hold a boost::shared_ptr. If we would hold it as member, it would
                 // not compile the mozillasrc directory, since this directory is compiled without RTTI support
                 // and boost seems to require RTTI on some platforms.
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index 7e66763b2a38..ab020ed9f40f 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
@@ -58,7 +58,7 @@ namespace connectivity { namespace mozab {
         virtual ~MLdapAttributeMap();
 
     private:
-        ::std::auto_ptr< AttributeMap_Data >    m_pData;
+        ::std::unique_ptr< AttributeMap_Data >    m_pData;
     };
 
 
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index ea28d4801668..c3c0896a1f89 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -46,7 +46,7 @@ namespace connectivity
         static  oslInterlockedCount     s_nClients;
 
     private:
-        ::std::auto_ptr< ::comphelper::OfficeResourceBundle >
+        ::std::unique_ptr< ::comphelper::OfficeResourceBundle >
                                         m_pResourceBundle;
 
     public:
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index dfd553574b4e..cead9fab7fe8 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -73,15 +73,13 @@ namespace connectivity
     }
 
 
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue(
+    ::std::unique_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
         const Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn )
     {
-        ::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) );
+        ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) );
         return pValue;
     }
-    SAL_WNODEPRECATED_DECLARATIONS_POP
 
 
     ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext) const
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index 4ba0fe5fc4ee..7631606a4892 100644
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
@@ -52,7 +52,7 @@ namespace connectivity
 
         virtual ::rtl::Reference< simple::IDataAccessTools > getDataAccessTools() SAL_OVERRIDE;
 
-        virtual ::std::auto_ptr< ::dbtools::FormattedColumnValue >  createFormattedColumnValue(
+        virtual ::std::unique_ptr< ::dbtools::FormattedColumnValue >  createFormattedColumnValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn