6 files changed, 14 insertions, 18 deletions
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 40ad99712a03..e3484a2995c7 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -59,7 +59,7 @@ namespace sw {
             virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE;
 
             // deleters
-            virtual ::boost::shared_ptr<ILazyDeleter>
+            virtual std::shared_ptr<ILazyDeleter>
                 deleteMark(const const_iterator_t& ppMark) SAL_OVERRIDE;
             virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE;
             virtual void clearAllMarks() SAL_OVERRIDE;
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index 087d81eb4219..f025789ff36b 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
 
 #include <IDocumentUndoRedo.hxx>
-#include <boost/shared_ptr.hpp>
 #include <svx/sdrundomanager.hxx>
 #include <ndarr.hxx>
+#include <memory>
 
 class IDocumentDrawModelAccess;
 class IDocumentRedlineAccess;
@@ -36,7 +36,7 @@ class UndoManager
     , public SdrUndoManager
 {
 public:
-    UndoManager(boost::shared_ptr<SwNodes> pUndoNodes,
+    UndoManager(std::shared_ptr<SwNodes> pUndoNodes,
         IDocumentDrawModelAccess & rDrawModelAccess,
         IDocumentRedlineAccess & rRedlineAccess,
         IDocumentState & rState);
@@ -92,7 +92,7 @@ private:
     IDocumentState & m_rState;
 
     /// Undo nodes array: content not currently in document
-    boost::shared_ptr<SwNodes> m_xUndoNodes;
+    std::shared_ptr<SwNodes> m_xUndoNodes;
 
     bool m_bGroupUndo       : 1;    // TRUE: Undo grouping enabled
     bool m_bDrawUndo        : 1;    // TRUE: Draw Undo enabled
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 8406fd47c896..eb2a48341426 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <undobj.hxx>
-#include <boost/shared_ptr.hpp>
 #include <rtl/ustring.hxx>
 #include <numrule.hxx>
 
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 45dccf97e9e1..1f41868696ed 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -22,10 +22,9 @@
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
 #include <osl/interlck.h>
-
-#include <boost/weak_ptr.hpp>
 #include <salhelper/simplereferenceobject.hxx>
 #include <ifinishedthreadlistener.hxx>
+#include <memory>
 
 /** class for an observable thread
 
@@ -44,7 +43,7 @@ class ObservableThread : public osl::Thread,
 
         virtual ~ObservableThread();
 
-        void SetListener( boost::weak_ptr< IFinishedThreadListener > pThreadListener,
+        void SetListener( std::weak_ptr< IFinishedThreadListener > pThreadListener,
                           const oslInterlockedCount nThreadID );
 
         static inline void * operator new(std::size_t size)
@@ -82,7 +81,7 @@ class ObservableThread : public osl::Thread,
 
         oslInterlockedCount mnThreadID;
 
-        boost::weak_ptr< IFinishedThreadListener > mpThreadListener;
+        std::weak_ptr< IFinishedThreadListener > mpThreadListener;
 
 };
 #endif
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index 831df4ee563a..111e2a3247d9 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -27,8 +27,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 
 #include <map>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 class SwAsyncRetrieveInputStreamThreadConsumer;
 
@@ -49,7 +48,7 @@ class SwRetrievedInputStreamDataManager
 
         struct tData
         {
-            boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
+            std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
             com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
             bool mbIsStreamReadOnly;
 
@@ -58,7 +57,7 @@ class SwRetrievedInputStreamDataManager
                   mbIsStreamReadOnly( false )
             {};
 
-            tData( boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
+            tData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
                 : mpThreadConsumer( pThreadConsumer ),
                   mbIsStreamReadOnly( false )
             {};
@@ -66,7 +65,7 @@ class SwRetrievedInputStreamDataManager
 
         static SwRetrievedInputStreamDataManager& GetManager();
 
-        tDataKey ReserveData( boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer );
+        tDataKey ReserveData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer );
 
         void PushData( const tDataKey nDataKey,
                        com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 006190ec04b6..67e4dc4441b5 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -33,8 +33,7 @@
 #include <cancellablejob.hxx>
 #include <threadlistener.hxx>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
 #include <ifinishedthreadlistener.hxx>
 
 
@@ -52,7 +51,7 @@ class ThreadManager
         explicit ThreadManager( ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& rThreadJoiner );
         virtual ~ThreadManager();
 
-        boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
+        std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
         void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID );
 
         /** initialization
@@ -117,7 +116,7 @@ class ThreadManager
 
         ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XJobManager > mrThreadJoiner;
 
-        boost::shared_ptr< ThreadListener > mpThreadListener;
+        std::shared_ptr< ThreadListener > mpThreadListener;
 
         oslInterlockedCount mnThreadIDCounter;