7 files changed, 28 insertions, 23 deletions
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index e1e5842c751e..bd3f89d7e21b 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <algorithm>
-#include <boost/noncopyable.hpp>
 
 #include <basegfx/tools/canvastools.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
@@ -44,10 +43,12 @@ namespace vclcanvas
 {
     namespace
     {
-        class OutDevHolder : public OutDevProvider,
-            private ::boost::noncopyable
+        class OutDevHolder : public OutDevProvider
         {
         public:
+            OutDevHolder(const OutDevHolder&) = delete;
+            const OutDevHolder& operator=(const OutDevHolder&) = delete;
+
             explicit OutDevHolder( OutputDevice& rOutDev ) :
                 mrOutDev(rOutDev)
             {}
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index f65e895fdfab..2057b0bb32d2 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -36,8 +36,6 @@
 #include "spritecanvas.hxx"
 #include "impltools.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 /* Definition of CanvasFont class */
 
@@ -47,12 +45,15 @@ namespace vclcanvas
                                              css::lang::XServiceInfo > CanvasFont_Base;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
-                       public CanvasFont_Base,
-                       private ::boost::noncopyable
+                       public CanvasFont_Base
     {
     public:
         typedef rtl::Reference<CanvasFont> Reference;
 
+        /// make noncopyable
+        CanvasFont(const CanvasFont&) = delete;
+        const CanvasFont& operator=(const CanvasFont&) = delete;
+
         CanvasFont( const css::rendering::FontRequest&                                     fontRequest,
                     const css::uno::Sequence< css::beans::PropertyValue >&                 extraFontProperties,
                     const css::geometry::Matrix2D&                                         rFontMatrix,
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 332203c82f20..11c06c5afcdf 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -31,8 +31,6 @@
 #include "cachedbitmap.hxx"
 #include "outdevprovider.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 namespace vclcanvas
 {
@@ -42,13 +40,17 @@ namespace vclcanvas
         optional backbuffer painting, when providing it with a second
         OutputDevice to render into.
      */
-    class CanvasHelper : private ::boost::noncopyable
+    class CanvasHelper
     {
     public:
         /** Create canvas helper
          */
         CanvasHelper();
 
+        /// make noncopyable
+        CanvasHelper(const CanvasHelper&) = delete;
+        const CanvasHelper& operator=(const CanvasHelper&) = delete;
+
         /// Release all references
         void disposing();
 
diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index 9d6c88c6ca5c..359f2b887c13 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.hxx
@@ -30,18 +30,20 @@
 
 #include "outdevprovider.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 /* Definition of DeviceHelper class */
 
 namespace vclcanvas
 {
-    class DeviceHelper : private ::boost::noncopyable
+    class DeviceHelper
     {
     public:
         DeviceHelper();
 
+        /// make noncopyable
+        DeviceHelper(const DeviceHelper&) = delete;
+        const DeviceHelper& operator=(const DeviceHelper&) = delete;
+
         void init( const OutDevProviderSharedPtr& rOutDev );
 
         /// Dispose all internal references
diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index fefbdfbed188..fc7e6ba51a60 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.hxx
@@ -31,8 +31,6 @@
 #include "backbuffer.hxx"
 #include "devicehelper.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 /* Definition of DeviceHelper class */
 
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 2ff79de782a8..706338fdf6a8 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -32,8 +32,6 @@
 #include "canvasfont.hxx"
 #include "impltools.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 /* Definition of TextLayout class */
 
@@ -43,10 +41,13 @@ namespace vclcanvas
                                              css::lang::XServiceInfo > TextLayout_Base;
 
     class TextLayout : public ::comphelper::OBaseMutex,
-                       public TextLayout_Base,
-                       private ::boost::noncopyable
+                       public TextLayout_Base
     {
     public:
+        /// make noncopyable
+        TextLayout(const TextLayout&) = delete;
+        const TextLayout& operator=(const TextLayout&) = delete;
+
         TextLayout( const css::rendering::StringContext&                aText,
                     sal_Int8                                            nDirection,
                     sal_Int64                                           nRandomSeed,
diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx
index 6e2bc1c1e499..9c51ed1a33ce 100644
--- a/canvas/source/vcl/windowoutdevholder.hxx
+++ b/canvas/source/vcl/windowoutdevholder.hxx
@@ -26,14 +26,14 @@
 
 #include "outdevprovider.hxx"
 
-#include <boost/noncopyable.hpp>
-
 namespace vclcanvas
 {
-    class WindowOutDevHolder : public OutDevProvider,
-                               private ::boost::noncopyable
+    class WindowOutDevHolder : public OutDevProvider
     {
     public:
+        WindowOutDevHolder(const WindowOutDevHolder&) = delete;
+        const WindowOutDevHolder operator=(const WindowOutDevHolder&) = delete;
+
         explicit WindowOutDevHolder( const css::uno::Reference< css::awt::XWindow>& xWin );
 
     private: