Use boost::noncopyable

Change-Id: I9cba1299c54f196a5a7b35384f4c15bbbea273bb

2 files changed, 6 insertions, 12 deletions

diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 3edc3ffca683..78f393aba5b7 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -20,6 +20,7 @@
 
 #include "interact.hxx"
 
+#include "boost/noncopyable.hpp"
 #include "com/sun/star/java/JavaDisabledException.hpp"
 #include "com/sun/star/java/JavaVMCreationFailureException.hpp"
 #include "com/sun/star/task/XInteractionAbort.hpp"
@@ -33,7 +34,8 @@ using stoc_javavm::InteractionRequest;
 namespace {
 
 class AbortContinuation:
-    public cppu::WeakImplHelper1< css::task::XInteractionAbort >
+    public cppu::WeakImplHelper1<css::task::XInteractionAbort>,
+    private boost::noncopyable
 {
 public:
     inline AbortContinuation() {}
@@ -41,9 +43,6 @@ public:
     virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
 
 private:
-    AbortContinuation(AbortContinuation &); // not implemented
-    void operator =(AbortContinuation); // not implemented
-
     virtual inline ~AbortContinuation() {}
 };
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 36fd069f60b2..e38367c98858 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -119,16 +119,14 @@ class NoJavaIniException: public css::uno::Exception
 };
 
 class SingletonFactory:
-    private cppu::WeakImplHelper1< css::lang::XEventListener >
+    private cppu::WeakImplHelper1< css::lang::XEventListener >,
+    private boost::noncopyable
 {
 public:
     static css::uno::Reference< css::uno::XInterface > getSingleton(
         css::uno::Reference< css::uno::XComponentContext > const & rContext);
 
 private:
-    SingletonFactory(SingletonFactory &); // not implemented
-    void operator =(SingletonFactory); // not implemented
-
     inline SingletonFactory() {}
 
     virtual inline ~SingletonFactory() {}
@@ -545,7 +543,7 @@ void initVMConfiguration(
 
 }
 
-class DetachCurrentThread {
+class DetachCurrentThread: private boost::noncopyable {
 public:
     explicit DetachCurrentThread(JavaVM * jvm): m_jvm(jvm) {}
 
@@ -556,9 +554,6 @@ public:
     }
 
 private:
-    DetachCurrentThread(DetachCurrentThread &); // not defined
-    void operator =(DetachCurrentThread &); // not defined
-
     JavaVM * m_jvm;
 };