From 97abbec95665b43a9a09e10a0fb31854cdbd5c0d Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Wed, 13 Apr 2016 10:11:37 +0200
Subject: tdf#94306 replace boost::noncopyable in stoc to xmlsec..

Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.

With this commit there should be no users
of boost::noncopyable left.

Change-Id: I6b1e47824912a6a80cc3f00f34938ebc048d8975
Reviewed-on: https://gerrit.libreoffice.org/24051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
---
 svgio/inc/svgio/svgreader/svgdocument.hxx | 8 +++++---
 svgio/inc/svgio/svgreader/svgnode.hxx     | 5 +++--
 svgio/source/svguno/xsvgparser.cxx        | 5 +++--
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'svgio')

diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index 274360ce7524..5a4b63119d7b 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
 #define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
 
-#include <boost/noncopyable.hpp>
 #include <svgio/svgreader/svgnode.hxx>
 #include <unordered_map>
 
@@ -28,7 +27,7 @@ namespace svgio
 {
     namespace svgreader
     {
-        class SvgDocument : private boost::noncopyable
+        class SvgDocument
         {
         private:
             /// the document hierarchy with all root nodes
@@ -49,9 +48,12 @@ namespace svgio
             IdStyleTokenMapper      maIdStyleTokenMapperList;
 
         public:
-            SvgDocument(const OUString& rAbsolutePath);
+            explicit SvgDocument(const OUString& rAbsolutePath);
             ~SvgDocument();
 
+            SvgDocument(const SvgDocument&) = delete;
+            SvgDocument& operator=(const SvgDocument&) = delete;
+
             /// append another root node, ownership changes
             void appendNode(SvgNode* pNode);
 
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 0184f29d4136..1b8359dde9b6 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -26,7 +26,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <vector>
-#include <boost/noncopyable.hpp>
 
 // predefines
 namespace svgio
@@ -82,7 +81,7 @@ namespace svgio
         // which members should be initialized
         Display getDisplayFromContent(const OUString& aContent);
 
-        class SvgNode : private boost::noncopyable, public InfoProvider
+        class SvgNode : public InfoProvider
         {
         private:
             /// basic data, Type, document we belong to and parent (if not root)
@@ -135,6 +134,8 @@ namespace svgio
                 SvgDocument& rDocument,
                 SvgNode* pParent);
             virtual ~SvgNode();
+            SvgNode(const SvgNode&) = delete;
+            SvgNode& operator=(const SvgNode&) = delete;
 
             /// scan helper to read and interpret a local CssStyle to mpLocalCssStyle
             void readLocalCssStyle(const OUString& aContent);
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 1484c9f46c62..14f184f87b17 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/graphic/XSvgParser.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -40,7 +39,7 @@ namespace svgio
 {
     namespace svgreader
     {
-        class XSvgParser : public ::cppu::WeakAggImplHelper2< graphic::XSvgParser, lang::XServiceInfo >, private boost::noncopyable
+        class XSvgParser : public ::cppu::WeakAggImplHelper2< graphic::XSvgParser, lang::XServiceInfo >
         {
         private:
             uno::Reference< uno::XComponentContext > context_;
@@ -50,6 +49,8 @@ namespace svgio
             explicit XSvgParser(
                 uno::Reference< uno::XComponentContext > const & context);
             virtual ~XSvgParser();
+            XSvgParser(const XSvgParser&) = delete;
+            XSvgParser& operator=(const XSvgParser&) = delete;
 
             // XSvgParser
             virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition(
-- 
cgit