Use boost::noncopyable

Change-Id: I9cba1299c54f196a5a7b35384f4c15bbbea273bb

9 files changed, 43 insertions, 52 deletions

diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index 9c0cb8431460..3c5dc90d3be2 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_libraries,stocservices,\
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_external,stocservices,boost_headers))
+
 $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices))
 
 $(eval $(call gb_Library_add_exception_objects,stocservices,\
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 8a53877eb40b..3174547fe2d2 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <list>
 
+#include <boost/noncopyable.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase3.hxx>
@@ -64,7 +65,7 @@ using namespace osl;
 
 namespace {
 
-struct StringPool
+struct StringPool: private boost::noncopyable
 {
     OUString slash_UNO_slash_REGISTRY_LINKS;
     OUString slash_IMPLEMENTATIONS;
@@ -90,8 +91,6 @@ struct StringPool
         , com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" )
         , Registry( "Registry" )
         {}
-private:
-    StringPool( const StringPool & );
 };
 
 const StringPool &spool()
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;
 };
 
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 976a38635a03..a8a0f5a950e0 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -20,6 +20,7 @@
 
 #include "stocservices.hxx"
 
+#include "boost/noncopyable.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -42,8 +43,10 @@
 
 namespace {
 
-class Translator: public cppu::WeakImplHelper2<
-    css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator >
+class Translator:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
+    private boost::noncopyable
 {
 public:
     explicit Translator(
@@ -68,9 +71,6 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    Translator(Translator &); // not implemented
-    void operator =(Translator); // not implemented
-
     virtual ~Translator() {}
 
     css::uno::Reference< css::uno::XComponentContext > m_context;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 2e3b35b7a62b..a3a7946e4592 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -25,6 +25,7 @@
 #include <exception>
 #include <vector>
 
+#include "boost/noncopyable.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
@@ -93,7 +94,10 @@ sal_Int32 parseScheme(OUString const & uriReference) {
     return -1;
 }
 
-class UriReference: public cppu::WeakImplHelper1< css::uri::XUriReference > {
+class UriReference:
+    public cppu::WeakImplHelper1<css::uri::XUriReference>,
+    private boost::noncopyable
+{
 public:
     UriReference(
         OUString const & scheme, bool bIsHierarchical, bool bHasAuthority,
@@ -173,9 +177,6 @@ public:
     { m_base.clearFragment(); }
 
 private:
-    UriReference(UriReference &); // not implemented
-    void operator =(UriReference); // not implemented
-
     virtual ~UriReference() {}
 
     stoc::uriproc::UriReference m_base;
@@ -257,8 +258,10 @@ void processSegments(
     }
 }
 
-class Factory: public cppu::WeakImplHelper2<
-    css::lang::XServiceInfo, css::uri::XUriReferenceFactory >
+class Factory:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
+    private boost::noncopyable
 {
 public:
     explicit Factory(
@@ -296,9 +299,6 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    Factory(Factory &); // not implemented
-    void operator =(Factory); // not implemented
-
     virtual ~Factory() {}
 
     css::uno::Reference< css::uri::XUriReference > clone(
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index fb37a0410373..514342841a03 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -23,6 +23,7 @@
 
 #include <exception>
 
+#include "boost/noncopyable.hpp"
 #include "com/sun/star/lang/IllegalArgumentException.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -56,7 +57,8 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public ::cppu::WeakImplHelper1< css::uri::XVndSunStarExpandUrlReference >
+    public ::cppu::WeakImplHelper1<css::uri::XVndSunStarExpandUrlReference>,
+    private boost::noncopyable
 {
 public:
     UrlReference(OUString const & scheme, OUString const & path):
@@ -134,9 +136,6 @@ public:
         throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    UrlReference(UrlReference &); // not defined
-    void operator =(UrlReference); // not defined
-
     virtual ~UrlReference() {}
 
     stoc::uriproc::UriReference base_;
@@ -152,8 +151,10 @@ OUString UrlReference::expand(
             getPath(), ::rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8));
 }
 
-class Parser: public ::cppu::WeakImplHelper2<
-    css::lang::XServiceInfo, css::uri::XUriSchemeParser >
+class Parser:
+    public ::cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
+    private boost::noncopyable
 {
 public:
     Parser() {}
@@ -175,9 +176,6 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    Parser(Parser &); // not defined
-    void operator =(Parser); // not defined
-
     virtual ~Parser() {}
 };
 
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 1bade014b80d..77cfff77f6e0 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -22,6 +22,7 @@
 
 #include "UriReference.hxx"
 
+#include "boost/noncopyable.hpp"
 #include "com/sun/star/lang/IllegalArgumentException.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -190,7 +191,8 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public cppu::WeakImplHelper1< css::uri::XVndSunStarScriptUrlReference >
+    public cppu::WeakImplHelper1<css::uri::XVndSunStarScriptUrlReference>,
+    private boost::noncopyable
 {
 public:
     UrlReference(OUString const & scheme, OUString const & path):
@@ -281,9 +283,6 @@ public:
         throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
 
 private:
-    UrlReference(UrlReference &); // not implemented
-    void operator =(UrlReference); // not implemented
-
     virtual ~UrlReference() {}
 
     sal_Int32 findParameter(OUString const & key);
@@ -376,8 +375,10 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
     }
 }
 
-class Parser: public cppu::WeakImplHelper2<
-    css::lang::XServiceInfo, css::uri::XUriSchemeParser >
+class Parser:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
+    private boost::noncopyable
 {
 public:
     Parser() {}
@@ -397,9 +398,6 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    Parser(Parser &); // not implemented
-    void operator =(Parser); // not implemented
-
     virtual ~Parser() {}
 };
 
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index f83ccbf5d1ff..8c9ea5b9d01a 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -20,6 +20,7 @@
 
 #include "stocservices.hxx"
 
+#include "boost/noncopyable.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -44,8 +45,10 @@
 
 namespace {
 
-class Factory: public cppu::WeakImplHelper2<
-    css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory >
+class Factory:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
+    private boost::noncopyable
 {
 public:
     explicit Factory(
@@ -67,9 +70,6 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    Factory(Factory &); // not implemented
-    void operator =(Factory); // not implemented
-
     virtual ~Factory() {}
 
     css::uno::Reference< css::uno::XComponentContext > m_context;