boost->std

Change-Id: Ifa87783f68b0fab98f8a0f7cd6ed867202b4532f

5 files changed, 17 insertions, 23 deletions

diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index 35b45d25c642..4ce1309a9fea 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -26,17 +26,11 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
-
-#include <boost/noncopyable.hpp>
-
-#include <memory>
 #include <connectivity/dbtoolsdllapi.hxx>
-
+#include <memory>
 
 namespace dbtools
 {
-
-
     struct FormattedColumnValue_Data;
 
     //= FormattedColumnValue
@@ -44,7 +38,7 @@ namespace dbtools
     /** a class which helps retrieving and setting the value of a database column
         as formatted string.
     */
-    class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue : public ::boost::noncopyable
+    class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue
     {
     public:
         /** constructs an instance
@@ -97,7 +91,9 @@ namespace dbtools
         OUString    getFormattedValue() const;
 
     private:
-        ::std::unique_ptr< FormattedColumnValue_Data >    m_pData;
+        FormattedColumnValue(const FormattedColumnValue&) SAL_DELETED_FUNCTION;
+        FormattedColumnValue& operator=(const FormattedColumnValue&) SAL_DELETED_FUNCTION;
+        std::unique_ptr< FormattedColumnValue_Data >    m_pData;
     };
 
 
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index f135a77b2cde..6801deda6c5b 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -31,7 +31,7 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace connectivity
 {
@@ -56,7 +56,7 @@ namespace connectivity
             {}
             KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){}
         };
-        typedef ::boost::shared_ptr< KeyProperties > TKeyProperties;
+        typedef std::shared_ptr< KeyProperties > TKeyProperties;
         typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OKey_BASE;
         class OCollection;
 
diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx
index f381cc7e0c21..0c45fff8882f 100644
--- a/include/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
@@ -22,11 +22,9 @@
 
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 #include <connectivity/dbtoolsdllapi.hxx>
-
+#include <boost/optional.hpp>
+#include <memory>
 
 namespace connectivity
 {
@@ -305,7 +303,7 @@ namespace connectivity
                         ) const;
 
     private:
-        ::boost::shared_ptr< SQLError_Impl > m_pImpl;
+        std::shared_ptr< SQLError_Impl > m_pImpl;
     };
 
 
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index b6c6234a7c62..4efd2ffdbf41 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -24,10 +24,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <vector>
 #include <functional>
+#include <memory>
 #include <set>
-#include <boost/shared_ptr.hpp>
+#include <vector>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
@@ -80,7 +80,7 @@ namespace connectivity
         const ::com::sun::star::lang::Locale&   rLocale;
         ::dbtools::DatabaseMetaData             aMetaData;
         OSQLParser*                             pParser;
-        ::boost::shared_ptr< QueryNameSet >     pSubQueryHistory;
+        std::shared_ptr< QueryNameSet >         pSubQueryHistory;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    xFormatter;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       xField;
         OUString                                                                        sPredicateTableAlias;
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index d53f3903b94d..c3f5464fa501 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -23,8 +23,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 #include <connectivity/dbtoolsdllapi.hxx>
 
@@ -39,7 +37,7 @@ namespace dbtools
     struct StatementComposer_Data;
     /** a class which is able to compose queries (SELECT statements) from a command and a command type
     */
-    class OOO_DLLPUBLIC_DBTOOLS StatementComposer : public ::boost::noncopyable
+    class OOO_DLLPUBLIC_DBTOOLS StatementComposer
     {
         ::std::unique_ptr< StatementComposer_Data >   m_pData;
 
@@ -90,7 +88,9 @@ namespace dbtools
                 getQuery();
 
     private:
-        StatementComposer();    // not implemented
+        StatementComposer(const StatementComposer&) SAL_DELETED_FUNCTION;
+        StatementComposer& operator=(const StatementComposer&) SAL_DELETED_FUNCTION;
+        StatementComposer() SAL_DELETED_FUNCTION;
     };