[Libreoffice-commits] core.git: canvas/source

Jochen Nitschke j.nitschke+logerrit at ok.de
Thu Apr 7 07:28:59 UTC 2016


 canvas/source/cairo/cairo_canvasfont.hxx         |    7 ++++---
 canvas/source/cairo/cairo_canvashelper.hxx       |    7 +++++--
 canvas/source/cairo/cairo_devicehelper.hxx       |    8 +++++---
 canvas/source/cairo/cairo_spritedevicehelper.hxx |    2 --
 canvas/source/cairo/cairo_textlayout.hxx         |    9 +++++----
 canvas/source/directx/dx_9rm.cxx                 |    8 +++++---
 canvas/source/directx/dx_bitmapcanvashelper.hxx  |    2 --
 canvas/source/directx/dx_canvasfont.hxx          |    7 ++++---
 canvas/source/directx/dx_canvashelper.hxx        |    8 +++++---
 canvas/source/directx/dx_devicehelper.hxx        |    7 +++++--
 canvas/source/directx/dx_graphicsprovider.hxx    |    7 +++++--
 canvas/source/directx/dx_spritedevicehelper.hxx  |    2 --
 canvas/source/directx/dx_textlayout.hxx          |    8 ++++----
 canvas/source/opengl/ogl_canvasfont.hxx          |    9 +++++----
 canvas/source/opengl/ogl_spritedevicehelper.hxx  |    7 +++++--
 canvas/source/opengl/ogl_textlayout.hxx          |    9 +++++----
 canvas/source/vcl/canvas.cxx                     |    7 ++++---
 canvas/source/vcl/canvasfont.hxx                 |    9 +++++----
 canvas/source/vcl/canvashelper.hxx               |    8 +++++---
 canvas/source/vcl/devicehelper.hxx               |    8 +++++---
 canvas/source/vcl/spritedevicehelper.hxx         |    2 --
 canvas/source/vcl/textlayout.hxx                 |    9 +++++----
 canvas/source/vcl/windowoutdevholder.hxx         |    8 ++++----
 23 files changed, 90 insertions(+), 68 deletions(-)

New commits:
commit f9b200ce54cd67ddc04747f9676568a86e14d864
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Apr 6 18:32:13 2016 +0200

    tdf#94306 replace boost::noncopyable in canvas
    
    Replace with C++11 delete copy-constructur
    and copy-assignment.
    Some helper classes had boost/noncopyable.hpp
    included but didn't use it.
    
    Change-Id: I339f2c413a944649d9d63c046e8b7f7ee6e46791
    Reviewed-on: https://gerrit.libreoffice.org/23866
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 276277e..80604b5 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -34,7 +34,6 @@
 
 #include "cairo_spritecanvas.hxx"
 
-#include <boost/noncopyable.hpp>
 
 
 /* Definition of CanvasFont class */
@@ -45,11 +44,13 @@ namespace cairocanvas
                                              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,
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index f03f9d3..f86a27d 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -30,7 +30,6 @@
 
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
-#include <boost/noncopyable.hpp>
 
 #include <vcl/cairo.hxx>
 #include "cairo_surfaceprovider.hxx"
@@ -51,9 +50,13 @@ namespace cairocanvas
         Clip
     };
 
-    class CanvasHelper : private ::boost::noncopyable
+    class CanvasHelper
     {
     public:
+        /// make noncopyable
+        CanvasHelper(const CanvasHelper&) = delete;
+        const CanvasHelper& operator=(const CanvasHelper&) = delete;
+
         CanvasHelper();
 
         /// Release all references
diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index f6264fd..6e6e46f 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.hxx
@@ -24,8 +24,6 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <boost/noncopyable.hpp>
-
 #include <vcl/window.hxx>
 #include <vcl/bitmap.hxx>
 
@@ -35,9 +33,13 @@
 
 namespace cairocanvas
 {
-    class DeviceHelper : private ::boost::noncopyable
+    class DeviceHelper
     {
     public:
+        /// make noncopyable
+        DeviceHelper(const DeviceHelper&) = delete;
+        const DeviceHelper& operator=(const DeviceHelper&) = delete;
+
         DeviceHelper();
 
         /** init helper
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index dcd2b8e..d0f1648 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -24,8 +24,6 @@
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/XBufferController.hpp>
 
-#include <boost/noncopyable.hpp>
-
 #include <vcl/window.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/cairo.hxx>
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 5dc5e9b..ce8a71a 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -30,8 +30,6 @@
 
 #include <vcl/outdev.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include <vcl/cairo.hxx>
 #include "cairo_canvasfont.hxx"
 
@@ -44,10 +42,13 @@ namespace cairocanvas
                                              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/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 81cecde..6beb183 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#include <boost/noncopyable.hpp>
-
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/range/b2irectangle.hxx>
@@ -141,9 +139,13 @@ namespace dxcanvas
 
         private:
             /// Guard local methods against concurrent access to RenderModule
-            class ImplRenderModuleGuard : private ::boost::noncopyable
+            class ImplRenderModuleGuard
             {
             public:
+                /// make noncopyable
+                ImplRenderModuleGuard(const ImplRenderModuleGuard&) = delete;
+                const ImplRenderModuleGuard& operator=(const ImplRenderModuleGuard&) = delete;
+
                 explicit inline ImplRenderModuleGuard( DXRenderModule& rRenderModule );
                 inline ~ImplRenderModuleGuard();
 
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx
index e07cdf7..8a5ecca 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.hxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx
@@ -32,8 +32,6 @@
 #include "dx_impltools.hxx"
 #include "dx_canvashelper.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 namespace dxcanvas
 {
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index fbbdb61..1f96f7c 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -30,7 +30,6 @@
 #include <rtl/ref.hxx>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 #include "dx_winstuff.hxx"
 #include "dx_gdiplususer.hxx"
@@ -47,11 +46,13 @@ namespace dxcanvas
                                              css::lang::XServiceInfo > CanvasFont_Base;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
-                       public CanvasFont_Base,
-                       private ::boost::noncopyable
+                       public CanvasFont_Base
     {
     public:
         typedef rtl::Reference<CanvasFont> ImplRef;
+        /// 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,
diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx
index d518da9..650caa3 100644
--- a/canvas/source/directx/dx_canvashelper.hxx
+++ b/canvas/source/directx/dx_canvashelper.hxx
@@ -31,8 +31,6 @@
 #include "dx_gdiplususer.hxx"
 #include "dx_impltools.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 namespace dxcanvas
 {
@@ -40,11 +38,15 @@ namespace dxcanvas
         optional backbuffer painting, when providing it with a second
         HDC to render into.
      */
-    class CanvasHelper : private ::boost::noncopyable
+    class CanvasHelper
     {
     public:
         CanvasHelper();
 
+        /// make noncopyable
+        CanvasHelper(const CanvasHelper&) = delete;
+        const CanvasHelper& operator=(const CanvasHelper&) = delete;
+
         /// Release all references
         void disposing();
 
diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index 8046f91..51d46f2 100644
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -29,19 +29,22 @@
 
 #include <canvas/rendering/isurfaceproxymanager.hxx>
 #include <vcl/vclptr.hxx>
-#include <boost/noncopyable.hpp>
 
 class OutputDevice;
 /* Definition of DeviceHelper class */
 
 namespace dxcanvas
 {
-    class DeviceHelper : private ::boost::noncopyable
+    class DeviceHelper
     {
     public:
         DeviceHelper();
         ~DeviceHelper();
 
+        /// make noncopyable
+        DeviceHelper(const DeviceHelper&) = delete;
+        const DeviceHelper& operator=(const DeviceHelper&) = delete;
+
         /** Init the device helper
 
             @param hdc
diff --git a/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx
index 4e8e427..22e6577 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 #include "dx_winstuff.hxx"
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 namespace Gdiplus{ class Graphics; }
@@ -30,10 +29,14 @@ namespace dxcanvas
 {
     /** Provider of a Gdiplus::Graphics. Interface
      */
-    class GraphicsProvider : private ::boost::noncopyable
+    class GraphicsProvider
     {
     public:
+        GraphicsProvider() = default;
         virtual ~GraphicsProvider() {}
+        /// make noncopyable
+        GraphicsProvider(const GraphicsProvider&) = delete;
+        const GraphicsProvider operator=(const GraphicsProvider) = delete;
 
         virtual GraphicsSharedPtr getGraphics() = 0;
     };
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index f952096..5716e5c 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -30,8 +30,6 @@
 
 #include <canvas/rendering/isurfaceproxymanager.hxx>
 
-#include <boost/noncopyable.hpp>
-
 
 namespace dxcanvas
 {
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index d3e45be..8aad3a8 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -29,8 +29,6 @@
 
 #include <basegfx/vector/b2isize.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include "dx_canvasfont.hxx"
 #include "dx_ibitmap.hxx"
 #include "dx_winstuff.hxx"
@@ -44,14 +42,16 @@ namespace dxcanvas
                                              css::lang::XServiceInfo > TextLayout_Base;
 
     class TextLayout : public ::comphelper::OBaseMutex,
-                       public TextLayout_Base,
-                       private ::boost::noncopyable
+                       public TextLayout_Base
     {
     public:
         TextLayout( const css::rendering::StringContext& aText,
                     sal_Int8                                                  nDirection,
                     sal_Int64                                                 nRandomSeed,
                     const CanvasFont::ImplRef&                                rFont );
+        /// make noncopyable
+        TextLayout(const TextLayout&) = delete;
+        const TextLayout& operator=(const TextLayout&) = delete;
 
         /// Dispose all internal references
         virtual void SAL_CALL disposing();
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index e63639a..c070973 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -18,8 +18,6 @@
 
 #include <rtl/ref.hxx>
 
-#include <boost/noncopyable.hpp>
-
 
 /* Definition of CanvasFont class */
 
@@ -30,12 +28,15 @@ namespace oglcanvas
     typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont > CanvasFontBaseT;
 
     class CanvasFont : public ::comphelper::OBaseMutex,
-                       public CanvasFontBaseT,
-                       private ::boost::noncopyable
+                       public CanvasFontBaseT
     {
     public:
         typedef rtl::Reference<CanvasFont> ImplRef;
 
+        /// 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&                                         fontMatrix );
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index e7a1076..6b7bdc3 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -15,7 +15,6 @@
 #include <rtl/ref.hxx>
 #include <canvas/elapsedtime.hxx>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
-#include <boost/noncopyable.hpp>
 
 #include "ogl_buffercontext.hxx"
 
@@ -36,12 +35,16 @@ namespace oglcanvas
     class CanvasCustomSprite;
     class CanvasHelper;
 
-    class SpriteDeviceHelper : private ::boost::noncopyable
+    class SpriteDeviceHelper
     {
     public:
         SpriteDeviceHelper();
         ~SpriteDeviceHelper();
 
+        /// make noncopyable
+        SpriteDeviceHelper(const SpriteDeviceHelper&) = delete;
+        const SpriteDeviceHelper& operator=(const SpriteDeviceHelper&) = delete;
+
         void init( vcl::Window&                            rWindow,
                    SpriteCanvas&                           rSpriteCanvas,
                    const css::awt::Rectangle&              rViewArea );
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index 4fc6acb..9b46387 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -17,8 +17,6 @@
 
 #include <basegfx/vector/b2isize.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include "ogl_canvasfont.hxx"
 
 
@@ -29,8 +27,7 @@ namespace oglcanvas
     typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout > TextLayoutBaseT;
 
     class TextLayout : public ::comphelper::OBaseMutex,
-                       public TextLayoutBaseT,
-                       private ::boost::noncopyable
+                       public TextLayoutBaseT
     {
     public:
         TextLayout( const css::rendering::StringContext&              aText,
@@ -38,6 +35,10 @@ namespace oglcanvas
                     sal_Int64                                         nRandomSeed,
                     const CanvasFont::ImplRef&                        rFont );
 
+        /// make noncopyable
+        TextLayout(const TextLayout&) = delete;
+        const TextLayout& operator=(const TextLayout&) = delete;
+
         /// Dispose all internal references
         virtual void SAL_CALL disposing() override;
 
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index e1e5842..bd3f89d 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 f65e895..2057b0b 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 332203c..11c06c5 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 9d6c88c..359f2b8 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 fefbdfb..fc7e6ba 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 2ff79de..706338f 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 6e2bc1c..9c51ed1 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:


More information about the Libreoffice-commits mailing list