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>

8 files changed, 49 insertions, 32 deletions

diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 45d699f59131..438ee792e1e9 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <list>
 
-#include <boost/noncopyable.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -66,7 +65,7 @@ using namespace osl;
 
 namespace {
 
-struct StringPool: private boost::noncopyable
+struct StringPool
 {
     OUString slash_UNO_slash_REGISTRY_LINKS;
     OUString slash_IMPLEMENTATIONS;
@@ -92,6 +91,8 @@ struct StringPool: private boost::noncopyable
         , com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" )
         , Registry( "Registry" )
         {}
+    StringPool(const StringPool&) = delete;
+    StringPool& operator=(const StringPool&) = delete;
 };
 
 const StringPool &spool()
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index cb3f08018402..c2962d021e46 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -20,7 +20,6 @@
 
 #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>
@@ -34,11 +33,12 @@ using stoc_javavm::InteractionRequest;
 namespace {
 
 class AbortContinuation:
-    public cppu::WeakImplHelper<css::task::XInteractionAbort>,
-    private boost::noncopyable
+    public cppu::WeakImplHelper<css::task::XInteractionAbort>
 {
 public:
     inline AbortContinuation() {}
+    AbortContinuation(const AbortContinuation&) = delete;
+    AbortContinuation& operator=(const AbortContinuation&)= delete;
 
     virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {}
 
@@ -49,11 +49,12 @@ private:
 }
 
 class InteractionRequest::RetryContinuation:
-    public cppu::WeakImplHelper<css::task::XInteractionRetry>,
-    private boost::noncopyable
+    public cppu::WeakImplHelper<css::task::XInteractionRetry>
 {
 public:
     inline RetryContinuation(): m_bSelected(false) {}
+    RetryContinuation(const RetryContinuation&) = delete;
+    RetryContinuation& operator=(const RetryContinuation&) = delete;
 
     virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 7a1e08c27f16..683e6ef9b00f 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -78,7 +78,6 @@
 #include <time.h>
 #include <memory>
 #include <vector>
-#include <boost/noncopyable.hpp>
 
 // Properties of the javavm can be put
 // as a komma separated list in this
@@ -117,8 +116,7 @@ class NoJavaIniException: public css::uno::Exception
 };
 
 class SingletonFactory:
-    private cppu::WeakImplHelper< css::lang::XEventListener >,
-    private boost::noncopyable
+    private cppu::WeakImplHelper< css::lang::XEventListener >
 {
 public:
     static css::uno::Reference< css::uno::XInterface > getSingleton(
@@ -129,6 +127,9 @@ private:
 
     virtual inline ~SingletonFactory() {}
 
+    SingletonFactory(const SingletonFactory&) = delete;
+    SingletonFactory& operator=(const SingletonFactory&) = delete;
+
     virtual void SAL_CALL disposing(css::lang::EventObject const &)
         throw (css::uno::RuntimeException, std::exception) override;
 
@@ -530,7 +531,7 @@ void initVMConfiguration(
     setTimeZone(pjvm);
 }
 
-class DetachCurrentThread: private boost::noncopyable {
+class DetachCurrentThread {
 public:
     explicit DetachCurrentThread(JavaVM * jvm): m_jvm(jvm) {}
 
@@ -540,6 +541,9 @@ public:
         }
     }
 
+    DetachCurrentThread(const DetachCurrentThread&) = delete;
+    DetachCurrentThread& operator=(const DetachCurrentThread&) = delete;
+
 private:
     JavaVM * m_jvm;
 };
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 7c81651d87d1..cc08209ecf27 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#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,12 +41,14 @@ namespace {
 
 class Translator:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>
 {
 public:
     Translator() {}
 
+    Translator(const Translator&) = delete;
+    Translator& operator=(const Translator&) = delete;
+
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index e8d3c6acb86f..88310c5cd340 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -25,7 +25,6 @@
 #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,8 +92,7 @@ sal_Int32 parseScheme(OUString const & uriReference) {
 }
 
 class UriReference:
-    public cppu::WeakImplHelper<css::uri::XUriReference>,
-    private boost::noncopyable
+    public cppu::WeakImplHelper<css::uri::XUriReference>
 {
 public:
     UriReference(
@@ -106,6 +104,9 @@ public:
             query)
     {}
 
+    UriReference(const UriReference&) = delete;
+    UriReference& operator=(const UriReference&) = delete;
+
     virtual OUString SAL_CALL getUriReference()
         throw (css::uno::RuntimeException, std::exception) override
     { return m_base.getUriReference(); }
@@ -258,14 +259,16 @@ void processSegments(
 
 class Factory:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::uri::XUriReferenceFactory>
 {
 public:
     explicit Factory(
         css::uno::Reference< css::uno::XComponentContext > const & context):
         m_context(context) {}
 
+    Factory(const Factory&) = delete;
+    Factory& operator=(const Factory&) = delete;
+
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 263795825bc5..cd6eef41f788 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -21,7 +21,6 @@
 
 #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,8 +55,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>,
-    private boost::noncopyable
+    public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>
 {
 public:
     UrlReference(OUString const & scheme, OUString const & path):
@@ -66,6 +64,9 @@ public:
             OUString())
     {}
 
+    UrlReference(const UrlReference&) = delete;
+    UrlReference& operator=(const UrlReference&) = delete;
+
     virtual OUString SAL_CALL getUriReference()
         throw (css::uno::RuntimeException, std::exception) override
     { return base_.getUriReference(); }
@@ -152,12 +153,14 @@ OUString UrlReference::expand(
 
 class Parser:
     public ::cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::uri::XUriSchemeParser>
 {
 public:
     Parser() {}
 
+    Parser(const Parser&) = delete;
+    Parser& operator=(const Parser&) = delete;
+
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 3092c8d3284a..2f1297913d67 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -19,7 +19,6 @@
 
 #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>
@@ -188,8 +187,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>,
-    private boost::noncopyable
+    public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>
 {
 public:
     UrlReference(OUString const & scheme, OUString const & path):
@@ -197,6 +195,9 @@ public:
             scheme, false, false, OUString(), path, false, OUString())
     {}
 
+    UrlReference(const UrlReference&) = delete;
+    UrlReference& operator=(const UrlReference&) = delete;
+
     virtual OUString SAL_CALL getUriReference()
         throw (css::uno::RuntimeException, std::exception) override
     { return m_base.getUriReference(); }
@@ -374,12 +375,14 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
 
 class Parser:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::uri::XUriSchemeParser>
 {
 public:
     Parser() {}
 
+    Parser(const Parser&) = delete;
+    Parser& operator=(const Parser&) = delete;
+
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 5bb9fb09b868..c96b081b2982 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#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>
@@ -45,14 +44,16 @@ namespace {
 
 class Factory:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>
 {
 public:
     explicit Factory(
         css::uno::Reference< css::uno::XComponentContext > const & context):
         m_context(context) {}
 
+    Factory(const Factory&) = delete;
+    Factory& operator=(const Factory&) = delete;
+
     virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException, std::exception) override;