diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-06 18:32:13 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-07 07:28:35 +0000 |
commit | f9b200ce54cd67ddc04747f9676568a86e14d864 (patch) | |
tree | 1211402d5a9c5737f0d4979d9719ac068e092eba /canvas/source/opengl/ogl_textlayout.hxx | |
parent | 04216006ee038232067bcf74d67b14e8918063f2 (diff) |
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@ok.de>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'canvas/source/opengl/ogl_textlayout.hxx')
-rw-r--r-- | canvas/source/opengl/ogl_textlayout.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index 4fc6acb6d618..9b4638716776 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; |