summaryrefslogtreecommitdiff
path: root/canvas/source/directx
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/directx')
-rw-r--r--canvas/source/directx/dx_9rm.cxx8
-rw-r--r--canvas/source/directx/dx_bitmapcanvashelper.hxx2
-rw-r--r--canvas/source/directx/dx_canvasfont.hxx7
-rw-r--r--canvas/source/directx/dx_canvashelper.hxx8
-rw-r--r--canvas/source/directx/dx_devicehelper.hxx7
-rw-r--r--canvas/source/directx/dx_graphicsprovider.hxx7
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.hxx2
-rw-r--r--canvas/source/directx/dx_textlayout.hxx8
8 files changed, 28 insertions, 21 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 81cecdea7583..6beb18312a8c 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 e07cdf772723..8a5ecca64c27 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 fbbdb61bfea5..1f96f7c2d45b 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 d518da98b9b4..650caa3906f5 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 8046f91f2daf..51d46f29af97 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 4e8e4272d4a0..22e6577d4f15 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 f9520961cee7..5716e5c788ae 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 d3e45be5073d..8aad3a8328f8 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();