boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

12 files changed, 30 insertions, 32 deletions

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>