boost->std

Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

34 files changed, 76 insertions, 119 deletions

diff --git a/include/basebmp/debug.hxx b/include/basebmp/debug.hxx
index 688daf41c834..c99f764946ce 100644
--- a/include/basebmp/debug.hxx
+++ b/include/basebmp/debug.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASEBMP_DEBUG_HXX
 
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <basebmp/basebmpdllapi.h>
 
 namespace basebmp
@@ -48,7 +48,7 @@ namespace basebmp
         debugDump( pMyDevice, output );
 </pre>
     */
-    void BASEBMP_DLLPUBLIC debugDump( const boost::shared_ptr< BitmapDevice >& rDevice,
+    void BASEBMP_DLLPUBLIC debugDump( const std::shared_ptr< BitmapDevice >& rDevice,
                                       ::std::ostream&                          rOutputStream );
 }
 
diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx
index 275fc45d1279..308026a0e188 100644
--- a/include/canvas/debug.hxx
+++ b/include/canvas/debug.hxx
@@ -26,7 +26,7 @@
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 
 # include <sal/config.h>
-# include <boost/shared_ptr.hpp>
+# include <memory>
 
 ::std::size_t find_unreachable_objects( bool );
 
diff --git a/include/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx
index f942749c8a6a..f1d68ba8527f 100644
--- a/include/canvas/elapsedtime.hxx
+++ b/include/canvas/elapsedtime.hxx
@@ -21,9 +21,8 @@
 #define INCLUDED_CANVAS_ELAPSEDTIME_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
 #include <canvas/canvastoolsdllapi.h>
+#include <memory>
 
 namespace canvas
 {
@@ -57,7 +56,7 @@ namespace canvas
                 are not taken from the system's time base, but from
                 the provided timer.
              */
-            ElapsedTime( ::boost::shared_ptr<ElapsedTime> const & pTimeBase );
+            ElapsedTime( std::shared_ptr<ElapsedTime> const & pTimeBase );
 
             /** Reset the time
 
@@ -147,7 +146,7 @@ namespace canvas
             double getCurrentTime() const;
             double getElapsedTimeImpl() const; // does not set m_fLastQueriedTime
 
-            const ::boost::shared_ptr<ElapsedTime>  m_pTimeBase;
+            const std::shared_ptr<ElapsedTime>  m_pTimeBase;
 
             /// To validate adjustTimer() calls with bLimitToLastQueriedTime=true
             mutable double                          m_fLastQueriedTime;
diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
index 9fc1070f243a..d8061889d6bd 100644
--- a/include/canvas/rendering/bitmap.hxx
+++ b/include/canvas/rendering/bitmap.hxx
@@ -29,7 +29,6 @@
 #include <canvas/rendering/icachedprimitive.hxx>
 #include <canvas/rendering/isurfaceproxymanager.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <memory>
 #include <vector>
 
@@ -214,7 +213,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations,
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
         /** See XCanvas interface
 
@@ -231,7 +230,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations,
             const ::com::sun::star::uno::Reference<
                   ::com::sun::star::geometry::XMapping2D >&         xMapping,
             const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes );
@@ -256,7 +255,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations );
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations );
         /** See XCanvas interface
 
             @param textureAnnotations
@@ -272,7 +271,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&         renderState,
             const ::com::sun::star::uno::Sequence<
                   ::com::sun::star::rendering::Texture >&           textures,
-            const ::std::vector< ::boost::shared_ptr<Bitmap> >&     textureAnnotations,
+            const ::std::vector< std::shared_ptr<Bitmap> >&     textureAnnotations,
             const ::com::sun::star::uno::Reference<
                   ::com::sun::star::geometry::XMapping2D >&         xMapping );
 
@@ -284,7 +283,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState& renderState );
         /// See XCanvas interface
         ICachedPrimitiveSharedPtr drawBitmap(
-            const ::boost::shared_ptr<Bitmap>&              rImage,
+            const std::shared_ptr<Bitmap>&              rImage,
             const ::com::sun::star::rendering::ViewState&   viewState,
             const ::com::sun::star::rendering::RenderState& renderState );
 
@@ -296,7 +295,7 @@ namespace canvas
             const ::com::sun::star::rendering::RenderState&     renderState );
         /// See XCanvas interface
         ICachedPrimitiveSharedPtr drawBitmapModulated(
-            const ::boost::shared_ptr<Bitmap>&                  rImage,
+            const std::shared_ptr<Bitmap>&                  rImage,
             const ::com::sun::star::rendering::ViewState&       viewState,
             const ::com::sun::star::rendering::RenderState&     renderState );
 
@@ -306,7 +305,7 @@ namespace canvas
         const std::unique_ptr< ImplBitmap > mxImpl;
     };
 
-    typedef ::boost::shared_ptr< Bitmap > BitmapSharedPtr;
+    typedef std::shared_ptr< Bitmap > BitmapSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX
diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
index 8df4cc94a136..ecf5843ae4c3 100644
--- a/include/canvas/rendering/icachedprimitive.hxx
+++ b/include/canvas/rendering/icachedprimitive.hxx
@@ -22,8 +22,7 @@
 
 #include <sal/types.h>
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -52,7 +51,7 @@ namespace canvas
         virtual sal_Int8 redraw( const ::com::sun::star::rendering::ViewState& aState ) const = 0;
     };
 
-    typedef ::boost::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
+    typedef std::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index a9922bead33e..6b8c8c0ee1ef 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace canvas
 {
@@ -80,7 +78,7 @@ namespace canvas
         virtual Format getFormat() const = 0;
     };
 
-    typedef ::boost::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
+    typedef std::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index cbde9e67cb97..2e78d1ee2f19 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -85,7 +83,7 @@ namespace canvas
             @return a pointer to a surface, which is an abstraction of
             a piece of (possibly hardware-accelerated) texture memory.
          */
-        virtual ::boost::shared_ptr<ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) = 0;
+        virtual std::shared_ptr<ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) = 0;
 
         /** Begin rendering the given primitive.
 
@@ -116,7 +114,7 @@ namespace canvas
         virtual bool      isError() = 0;
     };
 
-    typedef ::boost::shared_ptr< IRenderModule > IRenderModuleSharedPtr;
+    typedef std::shared_ptr< IRenderModule > IRenderModuleSharedPtr;
 
     /// Little RAII wrapper for guarding access to IRenderModule interface
     class RenderModuleGuard : private ::boost::noncopyable
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index 1e8e47a5578b..896a4396324f 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -74,7 +72,7 @@ namespace canvas
         virtual ::basegfx::B2IVector getSize() = 0;
     };
 
-    typedef ::boost::shared_ptr< ISurface > ISurfaceSharedPtr;
+    typedef std::shared_ptr< ISurface > ISurfaceSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx
index 47a2e98b3d94..9523ffa40a30 100644
--- a/include/canvas/rendering/isurfaceproxy.hxx
+++ b/include/canvas/rendering/isurfaceproxy.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
 #include <canvas/rendering/irendermodule.hxx>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace basegfx
 {
@@ -99,7 +98,7 @@ namespace canvas
                            const ::basegfx::B2DHomMatrix&   rTransform ) = 0;
     };
 
-    typedef ::boost::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr;
+    typedef std::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index 7172748f8531..c2ba559d4c48 100644
--- a/include/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
@@ -22,10 +22,8 @@
 
 #include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
-
-#include <boost/shared_ptr.hpp>
-
 #include <canvas/canvastoolsdllapi.h>
+#include <memory>
 
 namespace canvas
 {
@@ -57,11 +55,11 @@ namespace canvas
             Internally this texture may even be distributed to several
             real hardware surfaces.
         */
-        virtual ::boost::shared_ptr< ISurfaceProxy > createSurfaceProxy(
+        virtual std::shared_ptr< ISurfaceProxy > createSurfaceProxy(
             const IColorBufferSharedPtr& pBuffer ) const = 0;
     };
 
-    typedef ::boost::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr;
+    typedef std::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr;
 
 
     /** Create a surface proxy for the given render module.
diff --git a/include/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx
index 03bc03c6036c..17496eeb4aa4 100644
--- a/include/comphelper/make_shared_from_uno.hxx
+++ b/include/comphelper/make_shared_from_uno.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
 #define INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
 
-#include <boost/shared_ptr.hpp>
 #include <functional>
+#include <memory>
 
 namespace comphelper {
 
@@ -32,12 +32,12 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> {
 };
 } // namespace detail
 
-/** Makes a boost::shared_ptr from a ref-counted UNO object pointer.
+/** Makes a std::shared_ptr from a ref-counted UNO object pointer.
     This makes sense if the object is used via UNO (implementing some X
     interface) and also internally using its implementation class, e.g.
 
     <pre>
-        boost::shared_ptr<MyUnoImpl> const ptr(
+        std::shared_ptr<MyUnoImpl> const ptr(
             comphelper::make_shared_from_UNO( new MyUnoImpl ) );
         ...
         xUno->callingUno( uno::Reference<XSomeInterface>( ptr.get() ) );
@@ -47,7 +47,7 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> {
     </pre>
 
     @attention The shared_ptr operates on a separate reference counter, so
-               weak pointers (boost::weak_ptr) are invalidated when the last
+               weak pointers (std::weak_ptr) are invalidated when the last
                shared_ptr is destroyed, although the UNO object may still be
                alive.
 
@@ -55,10 +55,10 @@ template <typename T> struct ReleaseFunc : ::std::unary_function<T *, void> {
     @return shared_ptr to object
 */
 template <typename T>
-inline ::boost::shared_ptr<T> make_shared_from_UNO( T * p )
+inline std::shared_ptr<T> make_shared_from_UNO( T * p )
 {
     p->acquire();
-    return ::boost::shared_ptr<T>( p, detail::ReleaseFunc<T>() );
+    return std::shared_ptr<T>( p, detail::ReleaseFunc<T>() );
 }
 
 } // namespace comphelper
diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index 12eed6e30e8d..eed0607ecd5e 100644
--- a/include/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
@@ -21,10 +21,9 @@
 #define INCLUDED_CPPCANVAS_BITMAP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
 #include <cppcanvas/canvasgraphic.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
@@ -66,7 +65,7 @@ namespace cppcanvas
             ::com::sun::star::rendering::XBitmap >  getUNOBitmap() const = 0;
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_BITMAP_HXX
diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx
index b47d438151e5..1d4775ccd0aa 100644
--- a/include/cppcanvas/bitmapcanvas.hxx
+++ b/include/cppcanvas/bitmapcanvas.hxx
@@ -22,10 +22,9 @@
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
-
-#include <boost/shared_ptr.hpp>
 #include <basegfx/vector/b2isize.hxx>
 #include <cppcanvas/canvas.hxx>
+#include <memory>
 
 
 /* Definition of BitmapCanvas */
@@ -35,7 +34,7 @@ namespace cppcanvas
     class BitmapCanvas;
 
     // forward declaration, since cloneBitmapCanvas() also references BitmapCanvas
-    typedef ::boost::shared_ptr< BitmapCanvas > BitmapCanvasSharedPtr;
+    typedef std::shared_ptr< BitmapCanvas > BitmapCanvasSharedPtr;
 
     /** BitmapCanvas interface
      */
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index 3538ffd619f3..caba56da59f3 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_CPPCANVAS_CANVAS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
 #include <cppcanvas/font.hxx>
 #include <cppcanvas/color.hxx>
-
+#include <memory>
 
 namespace basegfx
 {
@@ -48,10 +46,10 @@ namespace cppcanvas
     class Canvas;
 
     // forward declaration, since tools::PolyPolygon also references Canvas
-    typedef ::boost::shared_ptr< PolyPolygon > PolyPolygonSharedPtr;
+    typedef std::shared_ptr< PolyPolygon > PolyPolygonSharedPtr;
 
     // forward declaration, since cloneCanvas() also references Canvas
-    typedef ::boost::shared_ptr< Canvas > CanvasSharedPtr;
+    typedef std::shared_ptr< Canvas > CanvasSharedPtr;
 
     /** Canvas interface
      */
diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index 173ee466cef2..8792b6c4982e 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -21,10 +21,9 @@
 #define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
 #include <cppcanvas/color.hxx>
 #include <cppcanvas/canvas.hxx>
+#include <memory>
 
 namespace basegfx
 {
@@ -38,7 +37,7 @@ namespace basegfx
 namespace cppcanvas
 {
     // forward declaration, since tools::PolyPolygon also derives from CanvasGraphic
-    typedef ::boost::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr;
+    typedef std::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr;
 
 
     /** This interface defines basic properties of
@@ -138,7 +137,7 @@ namespace cppcanvas
 
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx
index b6ed71d823bf..e216203024c5 100644
--- a/include/cppcanvas/color.hxx
+++ b/include/cppcanvas/color.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CPPCANVAS_COLOR_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 /* Definition of Color class */
 
@@ -44,7 +42,7 @@ namespace cppcanvas
         virtual ::com::sun::star::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const = 0;
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
 
     inline sal_uInt8 getRed( Color::IntSRGBA nCol )
     {
diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx
index 2b810ebfdaa7..f65943100df5 100644
--- a/include/cppcanvas/customsprite.hxx
+++ b/include/cppcanvas/customsprite.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
 
 #include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
 #include <cppcanvas/sprite.hxx>
 #include <cppcanvas/canvas.hxx>
-
+#include <memory>
 
 /* Definition of CustomSprite class */
 
@@ -39,7 +37,7 @@ namespace cppcanvas
         virtual CanvasSharedPtr getContentCanvas() const = 0;
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
diff --git a/include/cppcanvas/font.hxx b/include/cppcanvas/font.hxx
index cbe30123f924..4aa786c33702 100644
--- a/include/cppcanvas/font.hxx
+++ b/include/cppcanvas/font.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CPPCANVAS_FONT_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
@@ -41,7 +39,7 @@ namespace cppcanvas
         virtual ~Font() {}
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::Font > FontSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::Font > FontSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_FONT_HXX
diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index d8a2876522dd..e902a1fd952d 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -21,9 +21,8 @@
 #define INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
 #include <cppcanvas/canvasgraphic.hxx>
+#include <memory>
 
 namespace basegfx
 {
@@ -74,7 +73,7 @@ namespace cppcanvas
             ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0;
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx
index 8d51071ba116..908c3d278d28 100644
--- a/include/cppcanvas/renderer.hxx
+++ b/include/cppcanvas/renderer.hxx
@@ -22,12 +22,11 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <cppcanvas/canvasgraphic.hxx>
 #include <cppcanvas/color.hxx>
+#include <memory>
 
 namespace basegfx
 {
@@ -136,7 +135,7 @@ namespace cppcanvas
         };
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_RENDERER_HXX
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 3074ab515cce..867d13e75fb6 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_CPPCANVAS_SPRITE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace basegfx
 {
@@ -102,7 +101,7 @@ namespace cppcanvas
             ::com::sun::star::rendering::XSprite > getUNOSprite() const = 0;
     };
 
-    typedef ::boost::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
 }
 
 #endif // INCLUDED_CPPCANVAS_SPRITE_HXX
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index 1ac219e7a86f..c4152fbe498a 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -23,14 +23,11 @@
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <basegfx/vector/b2dsize.hxx>
-
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-
-
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/sprite.hxx>
 #include <cppcanvas/customsprite.hxx>
+#include <boost/noncopyable.hpp>
+#include <memory>
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
@@ -45,7 +42,7 @@ namespace cppcanvas
     class SpriteCanvas;
 
     // forward declaration, since cloneSpriteCanvas() also references SpriteCanvas
-    typedef ::boost::shared_ptr< ::cppcanvas::SpriteCanvas > SpriteCanvasSharedPtr;
+    typedef std::shared_ptr< ::cppcanvas::SpriteCanvas > SpriteCanvasSharedPtr;
 
     /** SpriteCanvas interface
      */
diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx
index 8b9773d26863..6ccc3224c78a 100644
--- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx
@@ -27,8 +27,6 @@
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
-#include <boost/shared_ptr.hpp>
-
 
 // predefines
 
@@ -88,10 +86,10 @@ namespace drawinglayer
             basegfx::BColorModifierStack                        maBColorModifierStack;
 
             /// the current active texture
-            boost::shared_ptr< texture::GeoTexSvx >             mpGeoTexSvx;
+            std::shared_ptr< texture::GeoTexSvx >             mpGeoTexSvx;
 
             /// the current active transparence texture
-            boost::shared_ptr< texture::GeoTexSvx >             mpTransparenceGeoTexSvx;
+            std::shared_ptr< texture::GeoTexSvx >             mpTransparenceGeoTexSvx;
 
             /// SvtOptionsDrawinglayer incarnation to react on diverse settings
             const SvtOptionsDrawinglayer                        maDrawinglayerOpt;
@@ -138,8 +136,8 @@ namespace drawinglayer
 
             /// data read access renderer stuff
             const basegfx::BColorModifierStack& getBColorModifierStack() const { return maBColorModifierStack; }
-            const boost::shared_ptr< texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; }
-            const boost::shared_ptr< texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; }
+            const std::shared_ptr< texture::GeoTexSvx >& getGeoTexSvx() const { return mpGeoTexSvx; }
+            const std::shared_ptr< texture::GeoTexSvx >& getTransparenceGeoTexSvx() const { return mpTransparenceGeoTexSvx; }
             sal_uInt32 getTransparenceCounter() const { return mnTransparenceCounter; }
             bool getModulate() const { return mbModulate; }
             bool getFilter() const { return mbFilter; }
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 75ecbc85a606..04fe1e3725e7 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -15,7 +15,6 @@
 #include <cassert>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 #include <clew/clew.h>
 
 #include <sal/detail/log.h>
diff --git a/include/sfx2/sidebar/DeckDescriptor.hxx b/include/sfx2/sidebar/DeckDescriptor.hxx
index a0980c6bde78..f3e7cd6c41d2 100644
--- a/include/sfx2/sidebar/DeckDescriptor.hxx
+++ b/include/sfx2/sidebar/DeckDescriptor.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/sidebar/EnumContext.hxx>
 #include "ContextList.hxx"
-#include <boost/shared_ptr.hpp>
 
 #include <sfx2/sidebar/Deck.hxx>
 
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index b42dbc9779f0..a73edd598cb4 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/ui/XSidebarPanel.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/PanelDescriptor.hxx b/include/sfx2/sidebar/PanelDescriptor.hxx
index fa490b9ec0f0..1578bfd245cf 100644
--- a/include/sfx2/sidebar/PanelDescriptor.hxx
+++ b/include/sfx2/sidebar/PanelDescriptor.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/sidebar/EnumContext.hxx>
 #include <sfx2/sidebar/ContextList.hxx>
-#include <boost/shared_ptr.hpp>
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index 8708707b7c01..275737dd531e 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -25,7 +25,6 @@
 #include <unotools/confignode.hxx>
 #include <com/sun/star/frame/XController.hpp>
 #include <set>
-#include <boost/shared_ptr.hpp>
 #include <svtools/miscopt.hxx>
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index bf363edf415e..450190382b08 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -229,7 +229,7 @@ private:
     void ShowPopupMenu (
         const Rectangle& rButtonBox,
         const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
-    ::boost::shared_ptr<PopupMenu> CreatePopupMenu (
+    std::shared_ptr<PopupMenu> CreatePopupMenu (
         const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
     DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
     void BroadcastPropertyChange();
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 036f149d8637..1620f5da3a35 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -28,7 +28,6 @@
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <boost/scoped_ptr.hpp>
 
 #include <functional>
 
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index 9cb75241032a..3ebbfec6d9f4 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -28,8 +28,6 @@
 #include <tools/wintypes.hxx>
 #include <vcl/window.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
 class ExtMultiLineEdit;
 class SvtDocInfoTable_Impl;
 
@@ -58,7 +56,7 @@ public:
 
 private:
     VclPtr<ExtMultiLineEdit> m_pEditWin;
-    boost::scoped_ptr< SvtDocInfoTable_Impl > m_xInfoTable;
+    std::unique_ptr< SvtDocInfoTable_Impl > m_xInfoTable;
     LanguageTag m_aLanguageTag;
 
     void insertEntry(OUString const & title, OUString const & value);
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index c57cf37ea8ff..61ec8120a342 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -23,7 +23,6 @@
 #include <vcl/metric.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/vclptr.hxx>
-#include <boost/shared_ptr.hpp>
 #include <map>
 #include <memory>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index b14099897111..7ba3b025350b 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -24,7 +24,6 @@
 #include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <boost/scoped_ptr.hpp>
 
 class XFillStyleItem;
 class XFillColorItem;
@@ -45,11 +44,11 @@ class ListBox;
 class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFillToolBoxControl : public SfxToolBoxControl
 {
 private:
-    boost::scoped_ptr< XFillStyleItem >    mpStyleItem;
-    boost::scoped_ptr< XFillColorItem >    mpColorItem;
-    boost::scoped_ptr< XFillGradientItem > mpFillGradientItem;
-    boost::scoped_ptr< XFillHatchItem >    mpHatchItem;
-    boost::scoped_ptr< XFillBitmapItem >   mpBitmapItem;
+    std::unique_ptr< XFillStyleItem >    mpStyleItem;
+    std::unique_ptr< XFillColorItem >    mpColorItem;
+    std::unique_ptr< XFillGradientItem > mpFillGradientItem;
+    std::unique_ptr< XFillHatchItem >    mpHatchItem;
+    std::unique_ptr< XFillBitmapItem >   mpBitmapItem;
 
     VclPtr<FillControl>        mpFillControl;
     VclPtr<SvxFillTypeBox>     mpLbFillType;
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 47fd4b4b9efd..0d1faf0cb632 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -41,7 +41,6 @@
 #include <vcl/vclptr.hxx>
 #include <svl/intitem.hxx>
 #include <com/sun/star/ui/XUIElement.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <svx/svxdllapi.h>
 
 class XFillFloatTransparenceItem;
@@ -138,11 +137,11 @@ protected:
     VclPtr<MetricField>                                        mpMTRAngle;
     VclPtr<ListBox>                                            mpGradientStyle;
 
-    ::boost::scoped_ptr< XFillStyleItem >               mpStyleItem;
-    ::boost::scoped_ptr< XFillColorItem >               mpColorItem;
-    ::boost::scoped_ptr< XFillGradientItem >            mpFillGradientItem;
-    ::boost::scoped_ptr< XFillHatchItem >               mpHatchItem;
-    ::boost::scoped_ptr< XFillBitmapItem >              mpBitmapItem;
+    std::unique_ptr< XFillStyleItem >               mpStyleItem;
+    std::unique_ptr< XFillColorItem >               mpColorItem;
+    std::unique_ptr< XFillGradientItem >            mpFillGradientItem;
+    std::unique_ptr< XFillHatchItem >               mpHatchItem;
+    std::unique_ptr< XFillBitmapItem >              mpBitmapItem;
 
     Image                                               maImgAxial;
     Image                                               maImgElli;
@@ -153,8 +152,8 @@ protected:
 
     AreaTransparencyGradientPopup maTrGrPopup;
 
-    ::boost::scoped_ptr< XFillFloatTransparenceItem >   mpFloatTransparenceItem;
-    ::boost::scoped_ptr< SfxUInt16Item >                mpTransparanceItem;
+    std::unique_ptr< XFillFloatTransparenceItem >   mpFloatTransparenceItem;
+    std::unique_ptr< SfxUInt16Item >                mpTransparanceItem;
 
     css::uno::Reference<css::frame::XFrame>                 mxFrame;