tdf#94306 replace boost::noncopyable in ..

.. accessibility, avmedia, basctl, basic and bridges
remove boost from module if not needed anymore

Change-Id: I6177f8276766a0a7df1703e81bf1b448912df6e2
Reviewed-on: https://gerrit.libreoffice.org/23744Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx

@@ -23,7 +23,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
@@ -349,7 +348,6 @@ typedef ::cppu::ImplHelper1 <   css::accessibility::XAccessible
 class BrowseBoxAccessibleElement
             :public AccessibleBrowseBoxBase
             ,public BrowseBoxAccessibleElement_Base
-            ,private boost::noncopyable
 {
 protected:
     /** Constructor sets specified name and description. If the constant of a
@@ -387,6 +385,9 @@ protected:
         const OUString& rDescription );
 
 public:
+    // noncopyable
+    BrowseBoxAccessibleElement(const BrowseBoxAccessibleElement&) = delete;
+    const BrowseBoxAccessibleElement& operator=(const BrowseBoxAccessibleElement&) = delete;
     // XInterface
     DECLARE_XINTERFACE( )
     // XTypeProvider

avmedia/source/gstreamer/gstframegrabber.hxx

@@ -23,7 +23,6 @@
 #include "gstplayer.hxx"
 #include <com/sun/star/media/XFrameGrabber.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <boost/noncopyable.hpp>
 
 namespace avmedia { namespace gstreamer {
 
@@ -31,11 +30,15 @@ typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
                                 css::lang::XServiceInfo > FrameGrabber_BASE;
 
 
-class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
+class FrameGrabber : public FrameGrabber_BASE
 {
     GstElement *mpPipeline;
     void disposePipeline();
 public:
+    // noncopyable
+    FrameGrabber(const FrameGrabber&) = delete;
+    const FrameGrabber& operator=(const FrameGrabber&) =delete;
+
     // static create method instead of public Ctor
     static FrameGrabber* create( const OUString &rURL );
 

avmedia/source/vlc/wrapper/EventHandler.hxx

@@ -11,7 +11,6 @@
 #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
 
 #include <functional>
-#include <boost/noncopyable.hpp>
 #include <salhelper/thread.hxx>
 #include "ThreadsafeQueue.hxx"
 
@@ -21,9 +20,12 @@ namespace vlc
 {
 namespace wrapper
 {
-    class EventHandler : public ::osl::Thread, private boost::noncopyable
+    class EventHandler : public ::osl::Thread
     {
     public:
+        EventHandler(const EventHandler&) = delete;
+        const EventHandler& operator=(const EventHandler&) = delete;
+
         EventHandler();
         void stop();
 

avmedia/source/vlc/wrapper/EventManager.hxx

@@ -11,7 +11,6 @@
 #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
 
 #include <functional>
-#include <boost/noncopyable.hpp>
 #include "Player.hxx"
 
 struct libvlc_event_manager_t;
@@ -24,10 +23,13 @@ namespace vlc
 namespace wrapper
 {
     class EventHandler;
-    class EventManager : private boost::noncopyable
+    class EventManager
     {
 
     public:
+        EventManager(const EventManager&) = delete;
+        const EventManager& operator=(const EventManager&) = delete;
+
         static bool LoadSymbols();
         typedef std::function<void()> Callback;
 

avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx

@@ -22,7 +22,6 @@
 #include <iostream>
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
-#include <boost/noncopyable.hpp>
 
 namespace avmedia
 {
@@ -31,9 +30,12 @@ namespace vlc
 namespace wrapper
 {
 template<class T>
-class ThreadsafeQueue : private boost::noncopyable
+class ThreadsafeQueue
 {
 public:
+    ThreadsafeQueue(const ThreadsafeQueue&) = delete;
+    const ThreadsafeQueue& operator=(const ThreadsafeQueue&) = delete;
+
     ThreadsafeQueue();
 
     void push( const T& data );

basctl/inc/pch/precompiled_basctl.hxx

@@ -55,7 +55,6 @@
 #include <utility>
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/noncopyable.hpp>
 #include <osl/conditn.h>
 #include <osl/conditn.hxx>
 #include <osl/diagnose.h>

basctl/source/basicide/doceventnotifier.cxx

@@ -27,7 +27,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <comphelper/processfactory.hxx>
-#include <boost/noncopyable.hpp>
 
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -62,11 +61,14 @@ namespace basctl
 
     /** impl class for DocumentEventNotifier
     */
-    class DocumentEventNotifier::Impl   :public ::boost::noncopyable
-                                        ,public ::cppu::BaseMutex
+    class DocumentEventNotifier::Impl   :public ::cppu::BaseMutex
                                         ,public DocumentEventNotifier_Impl_Base
     {
     public:
+        // noncopyable
+        Impl(const Impl&) = delete;
+        const Impl& operator=(const Impl) = delete;
+
         Impl (DocumentEventListener&, Reference<XModel> const& rxDocument);
         virtual ~Impl ();
 

basctl/source/inc/doceventnotifier.hxx

@@ -24,8 +24,6 @@
 
 #include <rtl/ref.hxx>
 
-#include <boost/noncopyable.hpp>
-
 
 namespace basctl
 {
@@ -34,9 +32,13 @@ namespace basctl
     class ScriptDocument;
 
 
-    class SAL_NO_VTABLE DocumentEventListener : private ::boost::noncopyable
+    class SAL_NO_VTABLE DocumentEventListener
     {
     public:
+        DocumentEventListener(const DocumentEventListener&) = delete;
+        const DocumentEventListener& operator=(const DocumentEventListener&) = delete;
+        DocumentEventListener() = default;
+
         virtual void onDocumentCreated( const ScriptDocument& _rDocument ) = 0;
         virtual void onDocumentOpened( const ScriptDocument& _rDocument ) = 0;
         virtual void onDocumentSave( const ScriptDocument& _rDocument ) = 0;

basic/source/runtime/dllmgr.hxx

@@ -22,14 +22,16 @@
 
 #include <sal/config.h>
 #include <basic/sberrors.hxx>
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 class SbxArray;
 class SbxVariable;
 
-class SbiDllMgr: private boost::noncopyable {
+class SbiDllMgr {
 public:
+    SbiDllMgr(const SbiDllMgr&) = delete;
+    const SbiDllMgr& operator=(const SbiDllMgr&) = delete;
+
     SbiDllMgr();
 
     ~SbiDllMgr();

bridges/Library_cpp_uno.mk

@@ -184,8 +184,6 @@ endif
 
 endif
 
-$(eval $(call gb_Library_use_external,$(gb_CPPU_ENV)_uno,boost_headers))
-
 $(eval $(call gb_Library_use_internal_comprehensive_api,$(gb_CPPU_ENV)_uno,\
 	udkapi \
 ))

bridges/Library_java_uno.mk

@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,java_uno))
 
-$(eval $(call gb_Library_use_external,java_uno,boost_headers))
-
 ifeq ($(OS)$(COM),WNTGCC)
 ifeq ($(EXCEPTIONS),sjlj)
 $(eval $(call gb_Library_add_defs,java_uno,\

bridges/source/cpp_uno/shared/vtablefactory.cxx

@@ -34,7 +34,6 @@
 #include "sal/types.h"
 #include "typelib/typedescription.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <new>
 #include <unordered_map>
 #include <vector>
@@ -119,9 +118,12 @@ extern "C" void SAL_CALL freeExec(
 }
 
 class VtableFactory::GuardedBlocks:
-    public std::vector<Block>, private boost::noncopyable
+    public std::vector<Block>
 {
 public:
+    GuardedBlocks(const GuardedBlocks&) = delete;
+    const GuardedBlocks& operator=(const GuardedBlocks&) = delete;
+
     explicit GuardedBlocks(VtableFactory const & factory):
         m_factory(factory), m_guarded(true) {}
 

bridges/source/jni_uno/jni_info.h

@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <unordered_map>
 
 #include "jni_base.h"
@@ -61,8 +60,11 @@ inline bool is_XInterface( typelib_TypeDescriptionReference * type )
             OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
 }
 
-struct JNI_type_info: private boost::noncopyable
+struct JNI_type_info
 {
+    JNI_type_info(const JNI_type_info&) = delete;
+    const JNI_type_info& operator=(const JNI_type_info&) = delete;
+
     ::com::sun::star::uno::TypeDescription      m_td;
     jclass                                      m_class;
 
@@ -106,18 +108,20 @@ private:
     virtual ~JNI_compound_type_info() {}
 };
 
-struct JNI_type_info_holder: private boost::noncopyable
+struct JNI_type_info_holder
 {
     JNI_type_info * m_info;
-    inline JNI_type_info_holder()
-        : m_info( NULL )
-        {}
+
+    JNI_type_info_holder(const JNI_type_info_holder&) = delete;
+    const JNI_type_info_holder& operator=(const JNI_type_info_holder&) = delete;
+
+    inline JNI_type_info_holder() : m_info( nullptr ) {}
 };
 
 typedef ::std::unordered_map<
     OUString, JNI_type_info_holder, OUStringHash > t_str2type;
 
-class JNI_info: private boost::noncopyable
+class JNI_info
 {
     mutable ::osl::Mutex        m_mutex;
     mutable t_str2type          m_type_map;
@@ -201,6 +205,10 @@ public:
     ::com::sun::star::uno::Type const & m_void_type;
     JNI_interface_type_info const * m_XInterface_type_info;
 
+    // noncopyable
+    JNI_info(const JNI_info&) = delete;
+    const JNI_info& operator=(const JNI_info&) = delete;
+
     JNI_type_info const * get_type_info(
         JNI_context const & jni,
         typelib_TypeDescription * type ) const;

bridges/source/jni_uno/jniunoenvironmentdata.hxx

@@ -24,7 +24,6 @@
 
 #include <jni.h>
 
-#include <boost/noncopyable.hpp>
 #include <jvmaccess/unovirtualmachine.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
@@ -34,7 +33,10 @@
 namespace jni_uno {
 
 // The pContext payload of a JNI uno_Environment:
-struct JniUnoEnvironmentData: boost::noncopyable {
+struct JniUnoEnvironmentData {
+    JniUnoEnvironmentData(const JniUnoEnvironmentData&) = delete;
+    const JniUnoEnvironmentData& operator=(const JniUnoEnvironmentData&) = delete;
+
     explicit JniUnoEnvironmentData(
         rtl::Reference<jvmaccess::UnoVirtualMachine> const & theMachine):
         machine(theMachine), info(JNI_info::get_jni_info(theMachine)),