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>

29 files changed, 55 insertions, 81 deletions

diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx
index 90ebd05cbd7b..b17c7f5364a1 100644
--- a/canvas/source/directx/dx_bitmap.hxx
+++ b/canvas/source/directx/dx_bitmap.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <boost/shared_ptr.hpp>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <memory>
 #include "dx_winstuff.hxx"
 #include "dx_ibitmap.hxx"
 #include "dx_graphicsprovider.hxx"
@@ -79,7 +79,7 @@ namespace dxcanvas
         bool                 mbAlpha;
     };
 
-    typedef ::boost::shared_ptr< DXBitmap > DXBitmapSharedPtr;
+    typedef std::shared_ptr< DXBitmap > DXBitmapSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx
index 1c9ae8f839c6..f363f91b694e 100644
--- a/canvas/source/directx/dx_bitmapprovider.hxx
+++ b/canvas/source/directx/dx_bitmapprovider.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
 
 #include "dx_ibitmap.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace dxcanvas
 {
@@ -31,7 +31,7 @@ namespace dxcanvas
         virtual IBitmapSharedPtr getBitmap() const = 0;
     };
 
-    typedef boost::shared_ptr<BitmapProvider> BitmapProviderSharedPtr;
+    typedef std::shared_ptr<BitmapProvider> BitmapProviderSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 0ed123d6ec53..d23325bc1fa8 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -24,11 +24,7 @@
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
-
 #include <basegfx/vector/b2isize.hxx>
-
-#include <boost/shared_ptr.hpp>
-
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <canvas/base/basemutexhelper.hxx>
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index d6a788046f89..fbbdb61bfea5 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -29,7 +29,7 @@
 
 #include <rtl/ref.hxx>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/noncopyable.hpp>
 
 #include "dx_winstuff.hxx"
@@ -40,8 +40,8 @@
 
 namespace dxcanvas
 {
-    typedef ::boost::shared_ptr< Gdiplus::Font >        FontSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::FontFamily >  FontFamilySharedPtr;
+    typedef std::shared_ptr< Gdiplus::Font >        FontSharedPtr;
+    typedef std::shared_ptr< Gdiplus::FontFamily >  FontFamilySharedPtr;
 
     typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
                                              css::lang::XServiceInfo > CanvasFont_Base;
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index f776ec73c9db..c2e0c96ecc45 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -50,7 +49,7 @@ namespace dxcanvas
 {
     namespace
     {
-        typedef ::boost::shared_ptr< Gdiplus::PathGradientBrush >   PathGradientBrushSharedPtr;
+        typedef std::shared_ptr< Gdiplus::PathGradientBrush >   PathGradientBrushSharedPtr;
 
         bool fillLinearGradient( GraphicsSharedPtr&                             rGraphics,
                                  const ::canvas::ParametricPolyPolygon::Values& /*rValues*/,
diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx
index 2f11574b63fb..a050d24fb389 100644
--- a/canvas/source/directx/dx_gdiplususer.hxx
+++ b/canvas/source/directx/dx_gdiplususer.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
 
 #include <sal/config.h>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 /* Definition of GDIPlusUser class */
 
@@ -31,7 +30,7 @@ namespace dxcanvas
     class GDIPlusUser
     {
     public:
-        typedef ::boost::shared_ptr< GDIPlusUser > GDIPlusUserSharedPtr;
+        typedef std::shared_ptr< GDIPlusUser > GDIPlusUserSharedPtr;
 
         static GDIPlusUserSharedPtr createInstance();
         ~GDIPlusUser();
diff --git a/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx
index 1b7ec65035ae..4e8e4272d4a0 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.hxx
@@ -21,9 +21,8 @@
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 #include "dx_winstuff.hxx"
-
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
+#include <memory>
 
 namespace Gdiplus{ class Graphics; }
 
@@ -39,7 +38,7 @@ namespace dxcanvas
         virtual GraphicsSharedPtr getGraphics() = 0;
     };
 
-    typedef ::boost::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
+    typedef std::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
diff --git a/canvas/source/directx/dx_ibitmap.hxx b/canvas/source/directx/dx_ibitmap.hxx
index 28d6ee1ad74c..c16faaf5f60b 100644
--- a/canvas/source/directx/dx_ibitmap.hxx
+++ b/canvas/source/directx/dx_ibitmap.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <boost/shared_ptr.hpp>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <memory>
 #include "dx_graphicsprovider.hxx"
 
 namespace dxcanvas
@@ -56,7 +56,7 @@ namespace dxcanvas
             const css::geometry::IntegerPoint2D&       pos ) = 0;
     };
 
-    typedef boost::shared_ptr<IBitmap> IBitmapSharedPtr;
+    typedef std::shared_ptr<IBitmap> IBitmapSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 62be92b8b045..5601e21d5f45 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -28,7 +28,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/numeric/ftools.hxx>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include "dx_canvasfont.hxx"
 
 namespace basegfx
@@ -106,11 +106,11 @@ namespace dxcanvas
 
         bool drawGdiPlusBitmap( const GraphicsSharedPtr& rGraphics,
                                 const BitmapSharedPtr&   rBitmap );
-        bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+        bool drawDIBits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                          const BITMAPINFO&                               rBI,
                          const void*                                     pBits );
 
-        bool drawRGBABits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+        bool drawRGBABits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                            const RawRGBABitmap&                            rRawRGBAData );
 
         BitmapSharedPtr bitmapFromXBitmap( const css::uno::Reference< css::rendering::XBitmap >&  xBitmap );
diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
index 6a61a64b09dc..b4863953a4c3 100644
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.hxx
@@ -23,7 +23,7 @@
 #include <basegfx/vector/b2ivector.hxx>
 #include <basegfx/range/b2irectangle.hxx>
 #include <canvas/rendering/irendermodule.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include "dx_winstuff.hxx"
 
 namespace vcl { class Window; }
@@ -69,7 +69,7 @@ namespace dxcanvas
         virtual HWND getHWND() const = 0;
     };
 
-    typedef ::boost::shared_ptr< IDXRenderModule > IDXRenderModuleSharedPtr;
+    typedef std::shared_ptr< IDXRenderModule > IDXRenderModuleSharedPtr;
 
 
     /** Factory method, to create an IRenderModule instance for the
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index 6d1744efda73..85b2c6105749 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -130,7 +130,7 @@ namespace dxcanvas
         bool mbAlpha;
     };
 
-    typedef ::boost::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr;
+    typedef std::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index fbbe023a2cb0..b524254127c9 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/rendering/StringContext.hpp>
@@ -46,7 +46,7 @@ namespace dxcanvas
         ~TextLayoutDrawHelper();
 
         // draw text
-        void drawText( const boost::shared_ptr<Gdiplus::Graphics>&          rGraphics,
+        void drawText( const std::shared_ptr<Gdiplus::Graphics>&          rGraphics,
                        const css::rendering::ViewState&        rViewState,
                        const css::rendering::RenderState&      rRenderState,
                        const ::basegfx::B2ISize&               rOutputOffset,
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 336dc0bd205c..38462b4690cd 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -64,7 +64,7 @@ namespace dxcanvas
             }
 
             /// Draw DI bits to given Graphics
-            bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+            bool drawDIBits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                              const void*                                     hDIB )
             {
                 bool            bRet( false );
@@ -94,7 +94,7 @@ namespace dxcanvas
                 Reference to bitmap. Might get modified, in such a way
                 that it will hold a DIB after a successful function call.
              */
-            bool drawVCLBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+            bool drawVCLBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                                 ::Bitmap&                                       rBmp )
             {
                 BitmapSystemData aBmpSysData;
@@ -467,7 +467,7 @@ namespace dxcanvas
                 return aBmpData;
             }
 
-            bool drawVCLBitmapEx( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+            bool drawVCLBitmapEx( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                                   const ::BitmapEx&                               rBmpEx )
             {
                 if( !rBmpEx.IsTransparent() )
@@ -483,7 +483,7 @@ namespace dxcanvas
             }
         }
 
-        bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+        bool drawVCLBitmapFromXBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                                        const uno::Reference< rendering::XBitmap >&     xBitmap )
         {
             // TODO(F2): add support for floating point bitmap formats
diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
index 422252766947..e3fb62269cac 100644
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/TriState.hpp>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace Gdiplus { class Graphics; }
 
@@ -39,10 +37,10 @@ namespace dxcanvas
         {
             sal_Int32                           mnWidth;
             sal_Int32                           mnHeight;
-            ::boost::shared_ptr< sal_uInt8 >    mpBitmapData;
+            std::shared_ptr< sal_uInt8 >    mpBitmapData;
         };
 
-        bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr< Gdiplus::Graphics >& rGraphics,
+        bool drawVCLBitmapFromXBitmap( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
                                        const css::uno::Reference<
                                              css::rendering::XBitmap >&   xBitmap );
     }
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 5ffd3abb6771..478acaf61435 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
 #include <algorithm>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <basegfx/numeric/ftools.hxx>
 
@@ -72,13 +71,13 @@ typedef IDirect3DSurface9 surface_type;
 namespace dxcanvas
 {
     // some shared pointer typedefs to Gdiplus objects
-    typedef ::boost::shared_ptr< Gdiplus::Graphics >        GraphicsSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::GraphicsPath >    GraphicsPathSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::Bitmap >          BitmapSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::CachedBitmap >    CachedBitmapSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::Font >            FontSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::Brush >           BrushSharedPtr;
-    typedef ::boost::shared_ptr< Gdiplus::TextureBrush >    TextureBrushSharedPtr;
+    typedef std::shared_ptr< Gdiplus::Graphics >        GraphicsSharedPtr;
+    typedef std::shared_ptr< Gdiplus::GraphicsPath >    GraphicsPathSharedPtr;
+    typedef std::shared_ptr< Gdiplus::Bitmap >          BitmapSharedPtr;
+    typedef std::shared_ptr< Gdiplus::CachedBitmap >    CachedBitmapSharedPtr;
+    typedef std::shared_ptr< Gdiplus::Font >            FontSharedPtr;
+    typedef std::shared_ptr< Gdiplus::Brush >           BrushSharedPtr;
+    typedef std::shared_ptr< Gdiplus::TextureBrush >    TextureBrushSharedPtr;
 
     /** COM object RAII wrapper
 
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index c820d307e695..cfb8ff8163b2 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -15,14 +15,8 @@
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/vector/b2dsize.hxx>
-
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
 #include "ogl_canvashelper.hxx"
 
-
 namespace oglcanvas
 {
     /** Helper class for basic canvas functionality. */
diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx
index a99446b7ad2c..202e0634dbad 100644
--- a/canvas/source/opengl/ogl_buffercontext.hxx
+++ b/canvas/source/opengl/ogl_buffercontext.hxx
@@ -13,8 +13,7 @@
 #include <GL/glew.h>
 
 #include <sal/config.h>
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace oglcanvas
 {
@@ -31,7 +30,7 @@ namespace oglcanvas
         virtual GLuint getTextureId() = 0;
     };
 
-    typedef ::boost::shared_ptr<IBufferContext> IBufferContextSharedPtr;
+    typedef std::shared_ptr<IBufferContext> IBufferContextSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx
index ba2d0a6dd8be..99cc42548053 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -19,8 +19,6 @@
 #include <canvas/base/basemutexhelper.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
-#include <boost/shared_ptr.hpp>
-
 #include "ogl_bitmapcanvashelper.hxx"
 #include "ogl_spritecanvas.hxx"
 
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 12f66171b0ac..3a87a1c3e907 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -18,7 +18,6 @@
 
 #include <rtl/ref.hxx>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 2a9914506aeb..e7a10764a91e 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -16,7 +16,6 @@
 #include <canvas/elapsedtime.hxx>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include "ogl_buffercontext.hxx"
 
@@ -131,7 +130,7 @@ namespace oglcanvas
         /// For the frame counter timings
         ::canvas::tools::ElapsedTime                       maLastUpdate;
 
-        boost::shared_ptr<TextureCache>                    mpTextureCache;
+        std::shared_ptr<TextureCache>                    mpTextureCache;
 
         unsigned int                                       mnLinearTwoColorGradientProgram;
         unsigned int                                       mnLinearMultiColorGradientProgram;
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 4fa647732bdd..8922f5ca055d 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -123,7 +123,7 @@ ElapsedTime::ElapsedTime()
 }
 
 ElapsedTime::ElapsedTime(
-    boost::shared_ptr<ElapsedTime> const & pTimeBase )
+    std::shared_ptr<ElapsedTime> const & pTimeBase )
     : m_pTimeBase( pTimeBase ),
       m_fLastQueriedTime( 0.0 ),
       m_fStartTime( getCurrentTime() ),
diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index 75ef54402be1..c456a2983570 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.hxx
@@ -27,15 +27,15 @@
 #include <canvas/rendering/isurface.hxx>
 
 #include <list>
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include "surfacerect.hxx"
 
 namespace canvas
 {
     class PageFragment;
 
-    typedef ::boost::shared_ptr< PageFragment > FragmentSharedPtr;
+    typedef std::shared_ptr< PageFragment > FragmentSharedPtr;
 
     /** One page of IRenderModule-provided texture space
      */
@@ -62,7 +62,7 @@ namespace canvas
         bool isValidLocation( const SurfaceRect& r ) const;
     };
 
-    typedef ::boost::shared_ptr< Page > PageSharedPtr;
+    typedef std::shared_ptr< Page > PageSharedPtr;
 
 
     /** A part of a page, which gets allocated to a surface
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index 632d4d6bae6c..9161fe438406 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -72,7 +72,7 @@ namespace canvas
     // PageManagerSharedPtr
 
 
-    typedef ::boost::shared_ptr< PageManager > PageManagerSharedPtr;
+    typedef std::shared_ptr< PageManager > PageManagerSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index 33186c11ce17..d6b8d90995e0 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -142,7 +142,7 @@ namespace canvas
                                            const ::basegfx::B2ISize&  rSize ) const;
     };
 
-    typedef ::boost::shared_ptr< Surface > SurfaceSharedPtr;
+    typedef std::shared_ptr< Surface > SurfaceSharedPtr;
 }
 
 #endif
diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx
index 3eb7019e0f27..56f4ac7a926b 100644
--- a/canvas/source/tools/surfaceproxy.hxx
+++ b/canvas/source/tools/surfaceproxy.hxx
@@ -115,7 +115,7 @@ namespace canvas
         canvas::IColorBufferSharedPtr mpBuffer;
     };
 
-    typedef ::boost::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr;
+    typedef std::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr;
 }
 
 #endif
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 0beeda2e0467..babdf935874d 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -25,8 +25,7 @@
 #include <canvas/vclwrapper.hxx>
 #include "outdevprovider.hxx"
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace vclcanvas
 {
@@ -54,7 +53,7 @@ namespace vclcanvas
         VclPtr< VirtualDevice > maVDev;
     };
 
-    typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
+    typedef std::shared_ptr< BackBuffer > BackBufferSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX
diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx
index b51867994a68..1207369074da 100644
--- a/canvas/source/vcl/bitmapbackbuffer.hxx
+++ b/canvas/source/vcl/bitmapbackbuffer.hxx
@@ -26,8 +26,7 @@
 #include <canvas/vclwrapper.hxx>
 #include "outdevprovider.hxx"
 
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 namespace vclcanvas
 {
@@ -88,7 +87,7 @@ namespace vclcanvas
         mutable bool                            mbVDevContentIsCurrent;
     };
 
-    typedef ::boost::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr;
+    typedef std::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr;
 
 }
 
diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx
index ffb9d571a367..acf8391933d8 100644
--- a/canvas/source/vcl/cachedbitmap.hxx
+++ b/canvas/source/vcl/cachedbitmap.hxx
@@ -21,17 +21,15 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
-
 #include <svtools/grfmgr.hxx>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 
 /* Definition of CachedBitmap class */
 
 namespace vclcanvas
 {
-    typedef ::boost::shared_ptr< GraphicObject > GraphicObjectSharedPtr;
+    typedef std::shared_ptr< GraphicObject > GraphicObjectSharedPtr;
 
     class CachedBitmap : public ::canvas::CachedPrimitiveBase
     {
diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx
index 37c48c63a36e..c09b580cf4f9 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
 #include <sal/types.h>
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
 
 class OutputDevice;
 
@@ -47,7 +46,7 @@ namespace vclcanvas
         virtual const OutputDevice& getOutDev() const = 0;
     };
 
-    typedef ::boost::shared_ptr< OutDevProvider > OutDevProviderSharedPtr;
+    typedef std::shared_ptr< OutDevProvider > OutDevProviderSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX