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 /xmloff | |
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 'xmloff')
-rw-r--r-- | xmloff/inc/txtlists.hxx | 5 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/impastpl.hxx | 7 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 4 |
4 files changed, 13 insertions, 9 deletions
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx index fc8f12d8c16c..d1c2eded4933 100644 --- a/xmloff/inc/txtlists.hxx +++ b/xmloff/inc/txtlists.hxx @@ -25,7 +25,6 @@ #include <stack> #include <tuple> #include <vector> -#include <boost/noncopyable.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <xmloff/xmlictxt.hxx> @@ -34,11 +33,13 @@ class XMLTextListBlockContext; class XMLTextListItemContext; class XMLNumberedParaContext; -class XMLTextListsHelper : private boost::noncopyable +class XMLTextListsHelper { public: XMLTextListsHelper(); ~XMLTextListsHelper(); + XMLTextListsHelper(const XMLTextListsHelper&) = delete; + XMLTextListsHelper& operator=(const XMLTextListsHelper&) = delete; /// list stack for importing: diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 57abb9670b3b..c64ef59e6488 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <sax/tools/converter.hxx> #include <xmloff/xmlprmap.hxx> @@ -118,7 +117,7 @@ using ::std::vector; // class SchXMLExportHelper_Impl -class SchXMLExportHelper_Impl: private boost::noncopyable +class SchXMLExportHelper_Impl { public: // first: data sequence for label, second: data sequence for values. @@ -132,6 +131,9 @@ public: virtual ~SchXMLExportHelper_Impl(); + SchXMLExportHelper_Impl(const SchXMLExportHelper_Impl&) = delete; + SchXMLExportHelper_Impl& operator=(const SchXMLExportHelper_Impl&) = delete; + // auto-styles /// parse chart and collect all auto-styles used in current pool void collectAutoStyles( css::uno::Reference< css::chart::XChartDocument > rChartDoc ); diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 803e93fa4428..dc3b97d01dd8 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -34,8 +34,6 @@ #include <xmloff/maptype.hxx> #include <xmloff/xmlexppr.hxx> -#include <boost/noncopyable.hpp> - class SvXMLAutoStylePoolP; class XMLAutoStylePoolParent; struct XMLAutoStyleFamily; @@ -102,7 +100,7 @@ public: // Implementationclass for stylefamily-information -struct XMLAutoStyleFamily : boost::noncopyable +struct XMLAutoStyleFamily { typedef std::set<std::unique_ptr<XMLAutoStylePoolParent>, comphelper::UniquePtrValueLess<XMLAutoStylePoolParent>> ParentSetType; @@ -126,6 +124,9 @@ struct XMLAutoStyleFamily : boost::noncopyable explicit XMLAutoStyleFamily( sal_Int32 nFamily ); ~XMLAutoStyleFamily(); + XMLAutoStyleFamily(const XMLAutoStyleFamily&) = delete; + XMLAutoStyleFamily& operator=(const XMLAutoStyleFamily&) = delete; + friend bool operator<(const XMLAutoStyleFamily& r1, const XMLAutoStyleFamily& r2); void ClearEntries(); diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 0c4cc551422c..6ad3333280f6 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -61,7 +61,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <txtlists.hxx> #include <xmloff/odffields.hxx> -#include <boost/noncopyable.hpp> using ::com::sun::star::ucb::XAnyCompare; @@ -490,7 +489,6 @@ static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = #define MAX_COMBINED_CHARACTERS 6 struct XMLTextImportHelper::Impl - : private ::boost::noncopyable { std::unique_ptr<SvXMLTokenMap> m_xTextElemTokenMap; std::unique_ptr<SvXMLTokenMap> m_xTextPElemTokenMap; @@ -596,6 +594,8 @@ struct XMLTextImportHelper::Impl , m_bInsideDeleteContext( false ) { } + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; void InitOutlineStylesCandidates() { |