boost->std

Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f

14 files changed, 32 insertions, 41 deletions

diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index 6f985f6bc4f0..7ed3dfafb279 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
 #define INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <unordered_map>
 
 namespace sw
@@ -39,7 +39,7 @@ public:
     virtual ~ExternalData() {}
 };
 
-typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer;
+typedef std::shared_ptr<ExternalData> tExternalDataPointer;
 }
 
 class IDocumentExternalData
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 7de0f2ffd5ae..4d8f984eff54 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/types.h>
 #include <IMark.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class SwPaM;
 struct SwPosition;
@@ -50,7 +50,7 @@ class IDocumentMarkAccess
             NAVIGATOR_REMINDER
         };
 
-        typedef ::boost::shared_ptr< ::sw::mark::IMark> pMark_t;
+        typedef std::shared_ptr< ::sw::mark::IMark> pMark_t;
         typedef ::std::vector< pMark_t > container_t;
         typedef container_t::iterator iterator_t;
         typedef container_t::const_iterator const_iterator_t;
@@ -179,7 +179,7 @@ class IDocumentMarkAccess
             @param ppMark
             [in] an iterator pointing to the Mark to be deleted.
         */
-        virtual ::boost::shared_ptr<ILazyDeleter>
+        virtual std::shared_ptr<ILazyDeleter>
             deleteMark(const IDocumentMarkAccess::const_iterator_t& ppMark) =0;
 
         /** Deletes a mark.
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 56850f8601c8..b72ec6c365ea 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -23,8 +23,8 @@
 #include <calbck.hxx>
 #include <pam.hxx>
 #include <boost/operators.hpp>
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 #include <swdllapi.h>
 
 struct SwPosition;
@@ -133,18 +133,18 @@ namespace sw { namespace mark
     struct CompareIMarkStartsAfter
     {
         bool operator()(SwPosition const& rPos,
-                        boost::shared_ptr<sw::mark::IMark> const& pMark)
+                        std::shared_ptr<sw::mark::IMark> const& pMark)
         {
             return pMark->StartsAfter(rPos);
         }
 #ifdef DBG_UTIL
-        bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark,
+        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
                         SwPosition const& rPos)
         {
             return pMark->StartsBefore(rPos);
         }
-        bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark1,
-                        boost::shared_ptr<sw::mark::IMark> const& pMark2)
+        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
+                        std::shared_ptr<sw::mark::IMark> const& pMark2)
         {
             return (*pMark1) < (*pMark2);
         }
@@ -155,19 +155,19 @@ namespace sw { namespace mark
     // so it needs 3 overloads...
     struct CompareIMarkStartsBefore
     {
-        bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark,
+        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
                         SwPosition const& rPos)
         {
             return pMark->StartsBefore(rPos);
         }
 #ifdef DBG_UTIL
         bool operator()(SwPosition const& rPos,
-                        boost::shared_ptr<sw::mark::IMark> const& pMark)
+                        std::shared_ptr<sw::mark::IMark> const& pMark)
         {
             return pMark->StartsAfter(rPos);
         }
-        bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark1,
-                        boost::shared_ptr<sw::mark::IMark> const& pMark2)
+        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
+                        std::shared_ptr<sw::mark::IMark> const& pMark2)
         {
             return (*pMark1) < (*pMark2);
         }
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 0a912d06ce2f..a92552445691 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_INC_FLYPOS_HXX
 
 #include <swdllapi.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <set>
 
 class SwFrameFormat;
@@ -45,10 +45,10 @@ public:
 // SwPosFlyFrms can be handled by value (as return value), only refcounts to
 // contained SwPosFlyFrm* will be copied. When releasing the last SwPosFlyFrmPtr
 // instance the allocated instance will be freed. The array is sorted by
-// GetNdIndex by using a ::std::set container.
-typedef ::boost::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
+// GetNdIndex by using a std::set container.
+typedef std::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
 struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; };
-typedef ::std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
+typedef std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
 
 #endif // INCLUDED_SW_INC_FLYPOS_HXX
 
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index ac4747a7b5ff..1ce349367e5c 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -26,9 +26,8 @@
 #include <sfx2/Metadatable.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 
+#include <memory>
 #include <vector>
 
 namespace com { namespace sun { namespace star {
@@ -91,7 +90,7 @@ private:
     friend class SwTextMeta; ///< needs SetTextAttr, DoCopy
     friend class ::sw::Meta; ///< needs m_pTextAttr
 
-    ::boost::shared_ptr< ::sw::Meta > m_pMeta;
+    std::shared_ptr< ::sw::Meta > m_pMeta;
     SwTextMeta * m_pTextAttr;
 
     SwTextMeta * GetTextAttr() { return m_pTextAttr; }
@@ -105,7 +104,7 @@ private:
 
 public:
     /// takes ownership
-    explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+    explicit SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta,
                         const sal_uInt16 i_nWhich );
     virtual ~SwFormatMeta();
 
@@ -198,12 +197,12 @@ class MetaFieldManager
     : private ::boost::noncopyable
 {
 private:
-    typedef ::std::vector< ::boost::weak_ptr<MetaField> > MetaFieldList_t;
+    typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t;
     MetaFieldList_t m_MetaFields;
 
 public:
     MetaFieldManager();
-    ::boost::shared_ptr<MetaField> makeMetaField(
+    std::shared_ptr<MetaField> makeMetaField(
                 SwFormatMeta * const i_pFormat = 0,
                 const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
                 const bool bIsFixedLanguage = false );
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 65da31e73a87..bef476592e34 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -23,8 +23,7 @@
 #include <svtools/grfmgr.hxx>
 #include <ndnotxt.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
 class SwAsyncRetrieveInputStreamThreadConsumer;
 
 class SwGrfFormatColl;
@@ -49,7 +48,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
     bool bFrameInPaint          :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
     bool bScaleImageMap         :1; ///< Scale image map in SetTwipSize.
 
-    boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
+    std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
     bool mbLinkedInputStreamReady;
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
     bool mbIsStreamReadOnly;
@@ -193,7 +192,7 @@ public:
     /// Returns the with our graphic attributes filled Graphic-Attr-Structure.
     GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
 
-    boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
+    std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
     bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;}
     void TriggerAsyncRetrieveInputStream();
     void ApplyInputStream(
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 79aa6fe3711f..ad2283d08aa6 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -141,7 +141,7 @@ private:
 
     const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode;
     OUString msDefaultListId;
-    boost::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
+    std::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
 
 public:
     /// add parameter <eDefaultNumberFormatPositionAndSpaceMode>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 935cb971dd3b..861b4b214692 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -20,7 +20,6 @@
 #include <basic/basmgr.hxx>
 #include <boost/noncopyable.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 0ace20ad75fb..245458c34aec 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -48,8 +48,6 @@
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/optional.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <cassert>
 #include <cctype>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 8ee8cc4820ea..b16d1ef82243 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -18,7 +18,6 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index fbdfc6f31e42..15c2d2c98f42 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -15,7 +15,6 @@
 */
 
 #include <basic/sbuno.hxx>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index d4189ed6f8cd..92a6d7cb2b39 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class SwPaM;
 class SwTextNode;
@@ -70,7 +70,7 @@ public:
 
     // return text selection for the given field
     static void GetPamForTextField( const SwTextField& rTextField,
-                                 boost::shared_ptr< SwPaM >& rPamForTextField );
+                                 std::shared_ptr< SwPaM >& rPamForTextField );
 
 };
 
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 34cea59ecfc0..400d1d7a6040 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -22,8 +22,6 @@
 #include <vector>
 #include <memory>
 
-#include <boost/shared_ptr.hpp>
-
 #include <svl/undo.hxx>
 
 #include <SwRewriter.hxx>
@@ -223,7 +221,7 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
 {
     SwTextFormatColl *pTextFormatColl, *pLastNdColl;
     std::vector<SwFrameFormat*>* pFrameFormats;
-    ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
+    ::std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
     SwRedlineData* pRedlData;
     bool bSttWasTextNd;
 protected:
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 2ae2a2b19a94..1c4d944ff193 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -26,7 +26,7 @@
 #include <swtypes.hxx>
 #include <ring.hxx>
 #include <swrect.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <stack>
 #include <vcl/mapmod.hxx>
 #include <vcl/print.hxx>
@@ -90,7 +90,7 @@ namespace vcl
 // Currently the Preview flag is needed for DrawPage.
 #define VSHELLFLAG_ISPREVIEW            ((long)0x1)
 #define VSHELLFLAG_SHARELAYOUT          ((long)0x2)
-typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr;
+typedef std::shared_ptr<SwRootFrm> SwRootFrmPtr;
 
 class SwViewShell;
 class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>