[Libreoffice-commits] core.git: basic/inc basic/source

[Steven Guo]

 basic/inc/sbxbase.hxx               |    5 ++---
 basic/source/classes/sbxmod.cxx     |    9 ++++++---
 basic/source/runtime/dllmgr-x64.cxx |   13 ++++++++++---
 basic/source/runtime/dllmgr-x86.cxx |   13 ++++++++++---
 4 files changed, 28 insertions(+), 12 deletions(-)

New commits:
commit 5819268ad709f52417b59421260e86e9c7e90f75
Author: Steven Guo <steventimothyguo at gmail.com>
Date:   Sun Mar 6 21:19:25 2016 -0800

    tdf#94306 Replace boost::noncopyable with plain C++11 deleted copy ctors
    
    Replaced boost::noncopyable with plain C++11 deleted copy ctors
    in /basic/* files.
    
    Change-Id: I9c0eb0a51ec5cb25c88c72b55f42864e73006e6b
    Reviewed-on: https://gerrit.libreoffice.org/22969
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
index ad10d61..39d0227 100644
--- a/basic/inc/sbxbase.hxx
+++ b/basic/inc/sbxbase.hxx
@@ -24,8 +24,6 @@
 #include <basic/sbxdef.hxx>
 #include <basic/basicdllapi.h>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 #include <vector>
 
@@ -35,7 +33,6 @@ class SbxBasicFormater;
 
 // AppData structure for SBX:
 struct SbxAppData
-    : private ::boost::noncopyable
 {
     SbxError            eSbxError;  // Error code
     std::vector<std::unique_ptr<SbxFactory>>
@@ -46,6 +43,8 @@ struct SbxAppData
     // It might be useful to store this class 'global' because some string resources are saved here
 
     SbxAppData();
+    SbxAppData(const SbxAppData&) = delete;
+    const SbxAppData& operator=(const SbxAppData&) = delete;
     ~SbxAppData();
 };
 
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 033dd04..82aedf5 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -71,7 +71,6 @@
 #include <ooo/vba/VbQueryClose.hpp>
 #include <list>
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include "sbxmod.hxx"
 #include "parser.hxx"
 
@@ -446,11 +445,13 @@ bool getDefaultVBAMode( StarBASIC* pb )
     return xVBACompat.is() && xVBACompat->getVBACompatibilityMode();
 }
 
-class AsyncQuitHandler: private boost::noncopyable
+class AsyncQuitHandler
 {
     AsyncQuitHandler() {}
 
 public:
+    AsyncQuitHandler(const AsyncQuitHandler&) = delete;
+    const AsyncQuitHandler& operator=(const AsyncQuitHandler&) = delete;
     static AsyncQuitHandler& instance()
     {
         static AsyncQuitHandler dInst;
@@ -2242,7 +2243,7 @@ typedef ::cppu::WeakImplHelper<
     document::XDocumentEventListener > FormObjEventListener_BASE;
 
 class FormObjEventListenerImpl:
-    public FormObjEventListener_BASE, private boost::noncopyable
+    public FormObjEventListener_BASE
 {
     SbUserFormModule* mpUserForm;
     uno::Reference< lang::XComponent > mxComponent;
@@ -2253,6 +2254,8 @@ class FormObjEventListenerImpl:
     bool mbShowing;
 
 public:
+    FormObjEventListenerImpl(const FormObjEventListenerImpl&) = delete;
+    const FormObjEventListenerImpl& operator=(const FormObjEventListenerImpl&) = delete;
     FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent, const uno::Reference< frame::XModel >& xModel ) :
         mpUserForm( pUserForm ), mxComponent( xComponent), mxModel( xModel ),
         mbDisposed( false ), mbOpened( false ), mbActivated( false ), mbShowing( false )
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 48e5cc7..11a514b 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -38,7 +38,6 @@
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <boost/noncopyable.hpp>
 
 #undef max
 
@@ -102,8 +101,12 @@ struct StringData: public UnmarshalData {
     bool special;
 };
 
-class MarshalData: private boost::noncopyable {
+class MarshalData {
 public:
+    MarshalData() = default;
+    MarshalData(const MarshalData&) = delete;
+    const MarshalData& operator=(const MarshalData&) = delete;
+
     std::vector< char > * newBlob() {
         blobs_.push_front(std::vector< char >());
         return &blobs_.front();
@@ -714,11 +717,15 @@ OUString fullDllName(OUString const & name) {
 
 }
 
-struct SbiDllMgr::Impl: private boost::noncopyable {
+struct SbiDllMgr::Impl{
 private:
     typedef std::map< OUString, ::rtl::Reference< Dll > > Dlls;
 
 public:
+    Impl() = default;
+    Impl(const Impl&) = delete;
+    const Impl& operator=(const Impl&) = delete;
+    
     Dll * getDll(OUString const & name);
 
     Dlls dlls;
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 2bb2993..bd8c5be 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -38,7 +38,6 @@
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <boost/noncopyable.hpp>
 
 #undef max
 
@@ -110,8 +109,12 @@ struct StringData: public UnmarshalData {
     bool special;
 };
 
-class MarshalData: private boost::noncopyable {
+class MarshalData {
 public:
+    MarshalData() = default;
+    MarshalData(const MarshalData&) = delete;
+    const MarshalData& operator=(const MarshalData&) = delete;
+    
     std::vector< char > * newBlob() {
         blobs_.push_front(std::vector< char >());
         return &blobs_.front();
@@ -668,11 +671,15 @@ OUString fullDllName(OUString const & name) {
 
 }
 
-struct SbiDllMgr::Impl: private boost::noncopyable {
+struct SbiDllMgr::Impl {
 private:
     typedef std::map< OUString, rtl::Reference< Dll > > Dlls;
 
 public:
+    Impl() = default;
+    Impl(const Impl&) = delete;
+    const Impl& operator=(const Impl&) = delete;
+    
     Dll * getDll(OUString const & name);
 
     Dlls dlls;