diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-13 10:11:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 11:19:04 +0000 |
| commit | 97abbec95665b43a9a09e10a0fb31854cdbd5c0d (patch) | |
| tree | b6917d80775c411a5480febd77b89fb256203b6a /svgio/inc | |
| parent | 9a2ff36b51f86ca3ade8093d7698314c0d3db6a6 (diff) | |
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>
Diffstat (limited to 'svgio/inc')
| -rw-r--r-- | svgio/inc/svgio/svgreader/svgdocument.hxx | 8 | ||||
| -rw-r--r-- | svgio/inc/svgio/svgreader/svgnode.hxx | 5 |
2 files changed, 8 insertions, 5 deletions
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); |