[Libreoffice-commits] core.git: testtools/Library_constructors.mk testtools/source

[Stephan Bergmann]

 testtools/Library_constructors.mk                     |    2 ++
 testtools/source/bridgetest/constructors.cxx          |    9 +++++----
 testtools/source/bridgetest/currentcontextchecker.cxx |    8 +++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit c87fa1b51f53f278f06f30305b9e4e4649e43755
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 9 09:53:54 2014 +0200

    Clean up function declarations
    
    Change-Id: Ia4ed1d576cb3bcf46de3225e5569f9cfd15a6f7e

diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
index d1ea87e..516c05d 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_Executable_set_include,testtools_constructors,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,testtools_constructors,boost_headers))
+
 $(eval $(call gb_Library_use_internal_api,testtools_constructors,\
     bridgetest \
 ))
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index a6ab667..6c33803 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -20,6 +20,7 @@
 
 #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"
@@ -49,14 +50,14 @@
 namespace {
 
 namespace ttb = ::test::testtools::bridgetest;
-class Impl: public ::cppu::WeakImplHelper1< css::lang::XInitialization > {
+class Impl:
+    public cppu::WeakImplHelper1<css::lang::XInitialization>,
+    private boost::noncopyable
+{
 public:
     Impl() {}
 
 private:
-    Impl(Impl &); // not defined
-    void operator =(Impl &); // not defined
-
     virtual ~Impl() {}
 
     virtual void SAL_CALL initialize(
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index 7a2d4ae..7924f3f 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -22,6 +22,7 @@
 
 #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"
@@ -43,7 +44,8 @@ static char const VALUE[] = "good";
 
 class CurrentContext:
     public ::osl::DebugBase< CurrentContext >,
-    public ::cppu::WeakImplHelper1< css::uno::XCurrentContext >
+    public ::cppu::WeakImplHelper1< css::uno::XCurrentContext >,
+    private boost::noncopyable
 {
 public:
     CurrentContext();
@@ -52,10 +54,6 @@ public:
 
     virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name)
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-private:
-    CurrentContext(CurrentContext &); // not defined
-    void operator =(CurrentContext &); // not defined
 };
 
 CurrentContext::CurrentContext() {}