boost->std

Change-Id: I412137e7e7b9b2b87f401bc140a9499d1fc012c6

5 files changed, 24 insertions, 24 deletions

diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 45af1314a6ee..57f908963ed0 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -24,7 +24,7 @@
 #include "sal/types.h"
 #include "swdllapi.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 class SfxItemSet;
@@ -57,7 +57,7 @@ class ToxTabStopTokenHandler;
 class ToxTextGenerator
 {
 public:
-    ToxTextGenerator(const SwForm& toxForm, boost::shared_ptr<ToxTabStopTokenHandler> tabStopHandler);
+    ToxTextGenerator(const SwForm& toxForm, std::shared_ptr<ToxTabStopTokenHandler> tabStopHandler);
 
     virtual ~ToxTextGenerator();
 
@@ -72,8 +72,8 @@ public:
 
 private:
     const SwForm& mToxForm;
-    boost::shared_ptr<ToxLinkProcessor> mLinkProcessor;
-    boost::shared_ptr<ToxTabStopTokenHandler> mTabStopTokenHandler;
+    std::shared_ptr<ToxLinkProcessor> mLinkProcessor;
+    std::shared_ptr<ToxTabStopTokenHandler> mTabStopTokenHandler;
 
     /** A handled text token.
      * It contains the information which should be added to the target text node.
@@ -116,7 +116,7 @@ private:
      * @param hint The hint from which the attributes are taken
      * @param pool The attribute pool for the new items
      */
-    static boost::shared_ptr<SfxItemSet>
+    static std::shared_ptr<SfxItemSet>
     CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool);
 
     /** This method will call GetNumStringOfFirstNode() of the first node in the provided SwTOXSortTabBase.
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 6a8381d14940..dea9fc043b51 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -21,11 +21,11 @@
 
 #include <svl/poolitem.hxx>
 #include <format.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class SwFmtAutoFmt: public SfxPoolItem
 {
-    boost::shared_ptr<SfxItemSet> mpHandle;
+    std::shared_ptr<SfxItemSet> mpHandle;
 
 public:
     SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
@@ -54,9 +54,9 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
-    const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
-          boost::shared_ptr<SfxItemSet> GetStyleHandle() { return mpHandle; }
+    void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
+    const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
+          std::shared_ptr<SfxItemSet> GetStyleHandle() { return mpHandle; }
 };
 
 #endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index c54fb05f8c13..ec7ae44572a2 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -24,7 +24,7 @@
 #include <swatrset.hxx>
 #include <calbck.hxx>
 #include <hintids.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class IDocumentSettingAccess;
 class IDocumentDrawModelAccess;
@@ -37,7 +37,7 @@ class SfxGrabBagItem;
 
 namespace drawinglayer { namespace attribute {
     class SdrAllFillAttributesHelper;
-    typedef boost::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
+    typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
 }}
 
 /// Base class for various Writer styles.
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwFmt : public SwModify
     bool   bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
                                        at format (UI-side!). */
     bool bHidden : 1;
-    boost::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
+    std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
 
 protected:
     SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index c6e1731a6556..03dc719b8c25 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -20,11 +20,6 @@
 #ifndef INCLUDED_SW_INC_NODE_HXX
 #define INCLUDED_SW_INC_NODE_HXX
 
-#include <vector>
-
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
-
 #include <sal/types.h>
 #include <tools/mempool.hxx>
 
@@ -34,6 +29,9 @@
 #include <index.hxx>
 #include <fmtcol.hxx>
 
+#include <memory>
+#include <vector>
+
 // forward declarations
 
 class SwCntntFrm;
@@ -77,7 +75,7 @@ typedef std::vector<SwOLENode*> SwOLENodes; // docary.hxx
 //UUUU
 namespace drawinglayer { namespace attribute {
     class SdrAllFillAttributesHelper;
-    typedef boost::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
+    typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr;
 }}
 
 /// Base class of the Writer document model elements.
@@ -363,7 +361,7 @@ protected:
 
     /**  Attribute-set for all auto attributes of a CntntNode.
       (e.g. TxtNode or NoTxtNode). */
-    boost::shared_ptr<const SfxItemSet> mpAttrSet;
+    std::shared_ptr<const SfxItemSet> mpAttrSet;
 
     /// Make respective nodes create the specific AttrSets.
     virtual void NewAttrSet( SwAttrPool& ) = 0;
@@ -525,12 +523,14 @@ private:
 
 class SwSectionNode
     : public SwStartNode
-    , private ::boost::noncopyable
 {
     friend class SwNodes;
 
 private:
-    ::std::unique_ptr<SwSection> const m_pSection;
+    SwSectionNode(const SwSectionNode&) SAL_DELETED_FUNCTION;
+    SwSectionNode& operator=(const SwSectionNode&) SAL_DELETED_FUNCTION;
+
+    std::unique_ptr<SwSection> const m_pSection;
 
 protected:
     virtual ~SwSectionNode();
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 7d210402e5d9..be8c04b8f2d1 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_UNOSTYLE_HXX
 #define INCLUDED_SW_INC_UNOSTYLE_HXX
 
-#include <boost/shared_ptr.hpp>
 #include <svl/style.hxx>
 #include <svl/lstner.hxx>
 #include <unocoll.hxx>
@@ -41,6 +40,7 @@
 #include <com/sun/star/style/XAutoStyle.hpp>
 
 #include <istyleaccess.hxx>
+#include <memory>
 
 class SwDocShell;
 class SfxItemPropertySet;
@@ -49,7 +49,7 @@ class SwStyleProperties_Impl;
 class SwAutoStylesEnumImpl;
 class IStyleAccess;
 class SfxItemSet;
-typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
+typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
 
 class SwXStyleFamilies :  public cppu::WeakImplHelper4
 <