boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

21 files changed, 85 insertions, 87 deletions

diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 2625f40510b9..1848639698c2 100644
--- a/include/comphelper/scoped_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -7,11 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX
-#define INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX
+#ifndef INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX
+#define INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX
 
 #include <cppuhelper/implbase1.hxx>
-#include <boost/utility.hpp>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
@@ -22,13 +21,16 @@
 namespace comphelper
 {
 //Similar to std::unique_ptr, except additionally releases the ptr on XComponent::disposing and/or XTerminateListener::notifyTermination if supported
-template<class T> class scoped_disposing_ptr : private boost::noncopyable
+template<class T> class unique_disposing_ptr
 {
 private:
     std::unique_ptr<T> m_xItem;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener;
+
+    unique_disposing_ptr(const unique_disposing_ptr&) SAL_DELETED_FUNCTION;
+    unique_disposing_ptr& operator=(const unique_disposing_ptr&) SAL_DELETED_FUNCTION;
 public:
-    scoped_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 )
+    unique_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 )
         : m_xItem(p)
     {
         m_xTerminateListener = new TerminateListener(rComponent, *this);
@@ -59,7 +61,7 @@ public:
         return static_cast< bool >(m_xItem);
     }
 
-    virtual ~scoped_disposing_ptr()
+    virtual ~unique_disposing_ptr()
     {
         reset();
     }
@@ -68,10 +70,10 @@ private:
     {
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent;
-        scoped_disposing_ptr<T>& m_rItem;
+        unique_disposing_ptr<T>& m_rItem;
     public:
         TerminateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent,
-            scoped_disposing_ptr<T>& rItem) : m_xComponent(rComponent), m_rItem(rItem)
+            unique_disposing_ptr<T>& rItem) : m_xComponent(rComponent), m_rItem(rItem)
         {
             if (m_xComponent.is())
             {
@@ -135,19 +137,19 @@ private:
 //for threadsafety. The user can ensure this, except in the case of its dtor
 //being called from reset due to a terminate on the XComponent being called
 //from an aribitrary thread
-template<class T> class scoped_disposing_solar_mutex_reset_ptr
-    : public scoped_disposing_ptr<T>
+template<class T> class unique_disposing_solar_mutex_reset_ptr
+    : public unique_disposing_ptr<T>
 {
 public:
-    scoped_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 )
-        : scoped_disposing_ptr<T>(rComponent, p)
+    unique_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 )
+        : unique_disposing_ptr<T>(rComponent, p)
     {
     }
 
     virtual void reset(T * p = 0)
     {
         SolarMutexGuard aGuard;
-        scoped_disposing_ptr<T>::reset(p);
+        unique_disposing_ptr<T>::reset(p);
     }
 };
 
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 93f8d35d52fd..884829b3a97e 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1155,9 +1155,7 @@ private:
     bool                mbPicStrmQueried;   /// True = ImplQueryPictureStream() has been called.
 };
 
-typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef;
-
-
+typedef std::shared_ptr< EscherExGlobal > EscherExGlobalRef;
 
 class SdrObject;
 class SdrPage;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index a6fdf663c0d4..b6b6bd7dd011 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -23,10 +23,10 @@
 #include <string.h>
 
 #include <map>
-#include <vector>
+#include <memory>
 #include <set>
+#include <vector>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/ptr_container/ptr_set.hpp>
 
@@ -114,19 +114,19 @@ typedef boost::ptr_vector<SvxMSDffShapeOrder> SvxMSDffShapeOrders;
 
 struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById
 {
-    bool operator()(::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs,
-                    ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const;
+    bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs,
+                    std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const;
 };
 struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoByTxBxComp
 {
-    bool operator()(::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs,
-                    ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const;
+    bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs,
+                    std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const;
 };
 
 // the following will be sorted explicitly:
-typedef ::std::set< ::boost::shared_ptr<SvxMSDffShapeInfo>,
+typedef ::std::set< std::shared_ptr<SvxMSDffShapeInfo>,
             CompareSvxMSDffShapeInfoById > SvxMSDffShapeInfos_ById;
-typedef ::std::multiset< ::boost::shared_ptr<SvxMSDffShapeInfo>,
+typedef ::std::multiset< std::shared_ptr<SvxMSDffShapeInfo>,
             CompareSvxMSDffShapeInfoByTxBxComp> SvxMSDffShapeInfos_ByTxBxComp;
 
 #define SVXMSDFF_SETTINGS_CROP_BITMAPS      1
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 2ad8338e9932..2705df3bc343 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -13,7 +13,6 @@
 #include <ostream>
 #include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
@@ -173,7 +172,7 @@ public:
 class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase
 {
     sal_Int32 tbid;
-    boost::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
+    std::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
 public:
     TBCMenuSpecific();
     virtual ~TBCMenuSpecific(){}
@@ -205,7 +204,7 @@ public:
 
 class TBCComboDropdownSpecific : public TBBase
 {
-    boost::shared_ptr< TBCCDData > data;
+    std::shared_ptr< TBCCDData > data;
 public:
     TBCComboDropdownSpecific( const TBCHeader& header );
     TBCComboDropdownSpecific(){}
@@ -218,10 +217,10 @@ public:
 class TBCBSpecific :  public TBBase
 {
     sal_uInt8 bFlags;
-    boost::shared_ptr< TBCBitMap > icon; // optional
-    boost::shared_ptr< TBCBitMap > iconMask; // optional
-    boost::shared_ptr< sal_uInt16 > iBtnFace; // optional
-    boost::shared_ptr< WString > wstrAcc; // optional
+    std::shared_ptr< TBCBitMap > icon; // optional
+    std::shared_ptr< TBCBitMap > iconMask; // optional
+    std::shared_ptr< sal_uInt16 > iBtnFace; // optional
+    std::shared_ptr< WString > wstrAcc; // optional
 
 public:
     TBCBSpecific();
@@ -266,8 +265,8 @@ class MSFILTER_DLLPUBLIC TBCHeader : public TBBase
     sal_uInt16 tcid;
     sal_uInt32 tbct;
     sal_uInt8 bPriority;
-    boost::shared_ptr< sal_uInt16 > width;  //optional
-    boost::shared_ptr< sal_uInt16 > height; //optional
+    std::shared_ptr< sal_uInt16 > width;  //optional
+    std::shared_ptr< sal_uInt16 > height; //optional
 
 public:
     TBCHeader();
@@ -287,7 +286,7 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase
 {
     TBCHeader rHeader;
     TBCGeneralInfo controlGeneralInfo;
-    boost::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct
+    std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct
     TBCData(const TBCData&) SAL_DELETED_FUNCTION;
     TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION;
 public:
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 90e7cfe669ac..d08baa9ea590 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -34,8 +34,6 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/CmisVersion.hpp>
-#include <boost/shared_ptr.hpp>
-#include <set>
 
 #include <vcl/timer.hxx>
 #include <svl/poolitem.hxx>
@@ -47,6 +45,8 @@
 #include <sfx2/shell.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <com/sun/star/frame/XModel.hpp>
+#include <memory>
+#include <set>
 
 class SbxValue;
 class SvxMacro;
@@ -415,7 +415,7 @@ public:
     virtual Size                GetFirstPageSize();
     bool                        DoClose();
     virtual void                PrepareReload();
-    ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const;
+    std::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const;
     virtual void                CancelTransfers();
 
     bool                        GenerateAndStoreThumbnail(
@@ -597,7 +597,7 @@ public:
     virtual bool    SetProtectionPassword( const OUString &rPassword );
     virtual bool    GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
 
-    SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( bool bFullContent ) const;
+    SAL_DLLPRIVATE std::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( bool bFullContent ) const;
 
     SAL_DLLPRIVATE bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
 
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 871776e1417d..74f06e06f8e4 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -35,7 +35,7 @@
 #include <svx/EnhancedCustomShapeFunctionParser.hxx>
 #include <tools/gen.hxx>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 #define DFF_CUSTOMSHAPE_FLIP_V      1
@@ -102,8 +102,8 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet
             bool bReady;
             double fValue;
         };
-        com::sun::star::uno::Sequence< OUString >                                                  seqEquations;
-        std::vector< ::boost::shared_ptr< EnhancedCustomShape::ExpressionNode > >                       vNodesSharedPtr;
+        com::sun::star::uno::Sequence< OUString >                                                       seqEquations;
+        std::vector< std::shared_ptr< EnhancedCustomShape::ExpressionNode > >                           vNodesSharedPtr;
         std::vector< EquationResult >                                                                   vEquationResults;
 
         com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >            seqSegments;
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 164ca6fd13f5..9f4f464e7133 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX
 
 #include <sal/config.h>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
+#include <memory>
 #include <vector>
 
 #include <svx/svxdllapi.h>
@@ -119,7 +119,7 @@ public:
     virtual com::sun::star::drawing::EnhancedCustomShapeParameter fillNode(
         std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) = 0;
 };
-typedef ::boost::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr;
+typedef std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr;
 
 /** This exception is thrown, when the arithmetic expression
     parser failed to parse a string.
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 7810ddab29b5..d27afb6c9042 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -22,8 +22,8 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/scrbar.hxx>
-#include <boost/shared_ptr.hpp>
 #include <map>
+#include <memory>
 #include <svx/svxdllapi.h>
 
 // define ----------------------------------------------------------------
@@ -95,7 +95,7 @@ protected:
 
 
 private:
-    typedef ::std::map<sal_Int32, boost::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap;
+    typedef std::map<sal_Int32, std::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap;
     ItemsMap        m_aItems;
     Link            aDoubleClkHdl;
     Link            aSelectHdl;
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index 1febdbd53467..bb0bdc39513c 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -23,7 +23,7 @@
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 // Forward declarations
 class Timer;
@@ -50,7 +50,7 @@ private: // Functions
 
 private:
     struct ImplData;
-    ::boost::shared_ptr<ImplData> mpImpl;
+    std::shared_ptr<ImplData> mxImpl;
 };
 
 
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index b6ca6f61cb73..41e679d8389c 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_NBDTMG_HXX
 #define INCLUDED_SVX_NBDTMG_HXX
 #include <svx/svxdllapi.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 #include <editeng/numitem.hxx>
 #include <vcl/font.hxx>
@@ -81,7 +81,7 @@ class  SVX_DLLPUBLIC NumSettings_Impl
 };
 
 typedef NumSettings_Impl* NumSettings_ImplPtr;
-typedef std::vector< boost::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl;
+typedef std::vector< std::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl;
 
 class  SVX_DLLPUBLIC BulletsSettings
 {
@@ -165,7 +165,7 @@ class  SVX_DLLPUBLIC NumberSettings_Impl
 };
 
 typedef NumberSettings_Impl* NumberSettings_ImplPtr;
-typedef std::vector< boost::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_Impl;
+typedef std::vector< std::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_Impl;
 
 class  SVX_DLLPUBLIC OutlineSettings_Impl
 {
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index ca5f024f3134..92d893dfc26b 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -61,7 +61,7 @@ public:
     SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const SAL_OVERRIDE;
     SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) SAL_OVERRIDE;
 
-    SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  ) SAL_OVERRIDE;
+    SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet  ) SAL_OVERRIDE;
     SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) SAL_OVERRIDE;
 
     // slots
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index 98532141ae87..6c15e286eca2 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_SVX_SELECTIONCONTROLLER_HXX
 
 #include <svx/svxdllapi.h>
-
-#include <boost/shared_ptr.hpp>
-
 #include <cppuhelper/weak.hxx>
+#include <memory>
 
 class KeyEvent;
 class MouseEvent;
@@ -63,7 +61,7 @@ public:
     virtual bool PasteObjModel( const SdrModel& rModel );
 
     /** returns a format paint brush set from the current selection */
-    virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  );
+    virtual bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet  );
 
     /** applies a format paint brush set from the current selection.
         if bNoCharacterFormats is true, no character attributes are changed.
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index 5d9f90b56b50..1d2147a93d56 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -26,8 +26,6 @@
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <memory>
 
 namespace cppu
@@ -58,7 +56,7 @@ namespace svx
 
         virtual ~IPropertyValueProvider();
     };
-    typedef ::boost::shared_ptr< IPropertyValueProvider >  PPropertyValueProvider;
+    typedef std::shared_ptr< IPropertyValueProvider >  PPropertyValueProvider;
 
 
     //= PropertyValueProvider
@@ -69,7 +67,6 @@ namespace svx
         and calls the getPropertyValue method.
     */
     class SVX_DLLPUBLIC PropertyValueProvider   :public IPropertyValueProvider
-                                                ,public ::boost::noncopyable
     {
     public:
         PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char* _pAsciiPropertyName )
@@ -83,6 +80,9 @@ namespace svx
 
     protected:
         ::cppu::OWeakObject&    getContext() const { return m_rContext; }
+        PropertyValueProvider(const PropertyValueProvider&) SAL_DELETED_FUNCTION;
+        PropertyValueProvider& operator=(const PropertyValueProvider&) SAL_DELETED_FUNCTION;
+
     private:
         ::cppu::OWeakObject&    m_rContext;
         const OUString   m_sPropertyName;
@@ -97,7 +97,7 @@ namespace svx
 
         The class is intended to be held as member of the class which does the property change broadcasting.
     */
-    class SVX_DLLPUBLIC PropertyChangeNotifier : public ::boost::noncopyable
+    class SVX_DLLPUBLIC PropertyChangeNotifier
     {
     public:
         /** constructs a notifier instance
@@ -129,7 +129,10 @@ namespace svx
         void    disposing();
 
     private:
-        ::std::unique_ptr< PropertyChangeNotifier_Data >  m_pData;
+        PropertyChangeNotifier(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION;
+        PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION;
+
+        std::unique_ptr< PropertyChangeNotifier_Data >  m_xData;
     };
 
 
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index 0b9ed762b933..ed5e9a80ad1e 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -28,10 +28,8 @@
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <boost/function.hpp>
 
-
 class SdrMarkView;
 
 
@@ -45,8 +43,7 @@ namespace {
 
 
 class SVX_DLLPUBLIC SelectionChangeHandler
-    : private ::boost::noncopyable,
-      private ::cppu::BaseMutex,
+    : private ::cppu::BaseMutex,
       public SelectionChangeHandlerInterfaceBase
 {
 public:
@@ -69,6 +66,9 @@ public:
     void Disconnect (void);
 
 private:
+    SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
+    SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
+
     const boost::function<rtl::OUString(void)> maSelectionChangeCallback;
     css::uno::Reference<css::frame::XController> mxController;
     const sfx2::sidebar::EnumContext::Context meDefaultContext;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 66bbe0b8f043..fb30ff7a428e 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -26,7 +26,7 @@
 
 #include <svx/selectioncontroller.hxx>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class SdrOutliner;
 class OutlinerView;
@@ -259,7 +259,7 @@ public:
     bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const;
 
     /** returns a format paint brush set from the current selection */
-    bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  );
+    bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet  );
 
     /** applies a format paint brush set from the current selection.
         if bNoCharacterFormats is true, no character attributes are changed.
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index b3fa3c4b43a0..40063882f1fa 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -38,8 +38,6 @@
 #include <svx/pageitem.hxx>
 #include <vcl/field.hxx>
 
-#include <boost/shared_ptr.hpp>
-
 class OutputDevice;
 #include <svx/svdtypes.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index b1ee25d81f21..864cc83c543e 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -29,7 +29,6 @@
 #include <svx/xtextit0.hxx>
 #include <svx/svdtext.hxx>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <svx/svxdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/svdpagv.hxx>
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;