boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

4 files changed, 18 insertions, 17 deletions

diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx
index cf324e76924e..82e6d240274c 100644
--- a/include/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
@@ -25,8 +25,8 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 #include <vector>
 
 #include <com/sun/star/table/XTableColumns.hpp>
@@ -49,7 +49,7 @@
 class SvXMLExport;
 class SvXMLExportPropertyMapper;
 
-typedef ::std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap;
+typedef std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap;
 
 struct XMLTableInfo
 {
@@ -59,7 +59,7 @@ struct XMLTableInfo
     std::vector< OUString > maDefaultRowCellStyles;
 };
 
-typedef ::std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, boost::shared_ptr< XMLTableInfo > > TableInfoMap;
+typedef std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, std::shared_ptr< XMLTableInfo > > TableInfoMap;
 
 class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject
 {
@@ -96,8 +96,8 @@ private:
 
     SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell );
 
-    void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle  );
-    void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const boost::shared_ptr< XMLTableInfo >& pTableInfo );
+    void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const std::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle  );
+    void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const std::shared_ptr< XMLTableInfo >& pTableInfo );
 
 };
 
diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx
index 4de0822b3bb3..8e6bb2659627 100644
--- a/include/xmloff/table/XMLTableImport.hxx
+++ b/include/xmloff/table/XMLTableImport.hxx
@@ -30,13 +30,13 @@
 
 #include <rtl/ref.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 
 class SvXMLStyleContext;
 
 typedef std::map< OUString, OUString > XMLTableTemplate;
-typedef std::map < OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap;
+typedef std::map < OUString, std::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap;
 
 class XMLTableImport : public salhelper::SimpleReferenceObject
 {
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 43b9315bef54..03b2319ce069 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -26,8 +26,6 @@
 
 #include <map>
 #include <memory>
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <xmloff/xmltkmap.hxx>
 #include <rtl/ref.hxx>
@@ -366,16 +364,18 @@ enum XMLTextType
 #define XML_TEXT_RENAME_TYPE_FRAME 10
 #define XML_TEXT_RENAME_TYPE_TABLE 20
 
-class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject,
-    private boost::noncopyable
+class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject
 {
 private:
+    XMLTextImportHelper(const XMLTextImportHelper&) SAL_DELETED_FUNCTION;
+    XMLTextImportHelper& operator=(const XMLTextImportHelper&) SAL_DELETED_FUNCTION;
+
     struct Impl;
     std::unique_ptr<Impl> m_xImpl;
     /// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx
     struct BackpatcherImpl;
-    ::boost::shared_ptr<BackpatcherImpl> m_pBackpatcherImpl;
-    ::boost::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
+    std::shared_ptr<BackpatcherImpl> m_xBackpatcherImpl;
+    std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl();
 
 protected:
     virtual SvXMLImportContext *CreateTableChildContext(
@@ -567,7 +567,7 @@ public:
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::text::XTextRange> & rRange,
         OUString const& i_rXmlId,
-        ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
+        std::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
             i_rpRDFaAttributes);
 
     /// process the start of a range reference
@@ -576,7 +576,7 @@ public:
         ::com::sun::star::uno::Reference<
                 ::com::sun::star::text::XTextRange> & o_rRange,
         OUString & o_rXmlId,
-        ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
+        std::shared_ptr< ::xmloff::ParsedRDFaAttributes > &
             o_rpRDFaAttributes);
 
     OUString FindActiveBookmarkName();
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index b43a63b5a7a3..00d8a34521aa 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -26,7 +26,6 @@
 
 #include <memory>
 #include <limits.h>
-#include <boost/utility.hpp>
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -80,9 +79,11 @@ public:
 */
 
 class XMLOFF_DLLPUBLIC SvXMLUnitConverter
-    : private ::boost::noncopyable
 {
 private:
+    SvXMLUnitConverter(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION;
+    SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION;
+
     struct Impl;
     ::std::unique_ptr<Impl> m_pImpl;