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 /testtools | |
| 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 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 6 | ||||
| -rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.cxx | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index 3c14cd77b0e5..3933fecffdf2 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -20,7 +20,6 @@ #include "sal/config.h" -#include "boost/noncopyable.hpp" #include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/uno/Any.hxx" @@ -50,11 +49,12 @@ namespace { namespace ttb = ::test::testtools::bridgetest; class Impl: - public cppu::WeakImplHelper<css::lang::XInitialization>, - private boost::noncopyable + public cppu::WeakImplHelper<css::lang::XInitialization> { public: Impl() {} + Impl(const Impl&) = delete; + Impl& operator=(const Impl&) = delete; private: virtual ~Impl() {} diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index a3d03b501a74..e28316351ac5 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -22,7 +22,6 @@ #include "currentcontextchecker.hxx" -#include "boost/noncopyable.hpp" #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" @@ -44,14 +43,16 @@ static char const VALUE[] = "good"; class CurrentContext: public ::osl::DebugBase< CurrentContext >, - public ::cppu::WeakImplHelper< css::uno::XCurrentContext >, - private boost::noncopyable + public ::cppu::WeakImplHelper< css::uno::XCurrentContext > { public: CurrentContext(); virtual ~CurrentContext(); + CurrentContext(const CurrentContext&) = delete; + CurrentContext& operator=(const CurrentContext&) = delete; + virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name) throw (css::uno::RuntimeException, std::exception) override; }; |