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 /svl | |
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 'svl')
-rw-r--r-- | svl/source/config/asiancfg.cxx | 6 | ||||
-rw-r--r-- | svl/source/items/aeitem.cxx | 1 | ||||
-rw-r--r-- | svl/source/misc/getstringresource.cxx | 6 | ||||
-rw-r--r-- | svl/source/misc/inethist.cxx | 5 | ||||
-rw-r--r-- | svl/source/svdde/ddeimp.hxx | 5 |
5 files changed, 14 insertions, 9 deletions
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index 3386689987f7..209771a15720 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -21,7 +21,6 @@ #include <cassert> -#include <boost/noncopyable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> @@ -55,12 +54,15 @@ OUString toString(css::lang::Locale const & locale) { } -struct SvxAsianConfig::Impl: private boost::noncopyable { +struct SvxAsianConfig::Impl { Impl(): context(comphelper::getProcessComponentContext()), batch(comphelper::ConfigurationChanges::create(context)) {} + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; + css::uno::Reference< css::uno::XComponentContext > context; std::shared_ptr< comphelper::ConfigurationChanges > batch; diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 89fdad770c3a..730aa1718ad6 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -19,7 +19,6 @@ #include <rtl/ustring.hxx> #include <svl/aeitem.hxx> -#include <boost/noncopyable.hpp> #include <vector> diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx index 6f0de30bc450..fe18e9635c35 100644 --- a/svl/source/misc/getstringresource.cxx +++ b/svl/source/misc/getstringresource.cxx @@ -21,7 +21,6 @@ #include <map> #include <memory> -#include <boost/noncopyable.hpp> #include <i18nlangtag/languagetag.hxx> #include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> @@ -34,9 +33,12 @@ namespace { -class ResMgrMap: private boost::noncopyable { +class ResMgrMap { public: + ResMgrMap() = default; ~ResMgrMap(); + ResMgrMap(const ResMgrMap&) = delete; + ResMgrMap& operator=(const ResMgrMap&) = delete; SimpleResMgr * get(LanguageTag const & locale); diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 09fec7d6a65c..8db4ac91144f 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -22,7 +22,6 @@ #include <algorithm> #include <string.h> -#include <boost/noncopyable.hpp> #include <rtl/instance.hxx> #include <rtl/crc.h> #include <osl/diagnose.h> @@ -41,7 +40,7 @@ #define INETHIST_SIZE_LIMIT 1024 #define INETHIST_MAGIC_HEAD 0x484D4849UL -class INetURLHistory_Impl: private boost::noncopyable +class INetURLHistory_Impl { struct head_entry { @@ -156,6 +155,8 @@ class INetURLHistory_Impl: private boost::noncopyable public: INetURLHistory_Impl(); ~INetURLHistory_Impl(); + INetURLHistory_Impl(const INetURLHistory_Impl&) = delete; + INetURLHistory_Impl& operator=(const INetURLHistory_Impl&) = delete; /** putUrl/queryUrl. */ diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 52df93687439..6c7b3d3a9506 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -23,7 +23,6 @@ #include <windows.h> #include <ddeml.h> -#include <boost/noncopyable.hpp> #include <rtl/ustring.hxx> #include <svl/svdde.hxx> #include <vector> @@ -82,7 +81,7 @@ struct DdeDataImp class DdeConnection; -class DdeInstData : private boost::noncopyable +class DdeInstData { public: sal_uInt16 nRefCount; @@ -106,6 +105,8 @@ public: , nInstanceCli(0) { } + DdeInstData(const DdeInstData&) = delete; + DdeInstData& operator=(const DdeInstData&) = delete; }; DdeInstData* ImpGetInstData(); |