[Libreoffice-commits] core.git: dbaccess/source desktop/source desktop/test drawinglayer/source

Jochen Nitschke j.nitschke+logerrit at ok.de
Fri Apr 8 17:43:21 UTC 2016


 dbaccess/source/core/dataaccess/ComponentDefinition.cxx      |    6 ++--
 dbaccess/source/core/dataaccess/databasedocument.hxx         |    7 ++--
 dbaccess/source/core/dataaccess/documentevents.cxx           |    5 ++-
 dbaccess/source/core/dataaccess/documentevents.hxx           |    5 ++-
 dbaccess/source/filter/xml/xmlfilter.cxx                     |    1 
 dbaccess/source/sdbtools/connection/objectnames.cxx          |    5 ++-
 dbaccess/source/ui/app/AppController.cxx                     |   12 +++++---
 dbaccess/source/ui/inc/defaultobjectnamecheck.hxx            |   13 +++++---
 desktop/source/app/cmdlineargs.hxx                           |    6 ++--
 desktop/source/deployment/gui/dp_gui_service.cxx             |    6 ++--
 desktop/source/deployment/misc/dp_descriptioninfoset.cxx     |    7 ++--
 desktop/source/migration/services/jvmfwk.cxx                 |    5 ++-
 desktop/test/deployment/active/active_native.cxx             |   13 +++++---
 desktop/test/deployment/passive/passive_native.cxx           |   13 +++++---
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |    7 ++--
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx   |   16 ++++++++---
 16 files changed, 79 insertions(+), 48 deletions(-)

New commits:
commit 922ee9a9da62febfe38a7780b11cf0d7ea0d5685
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Fri Apr 8 14:58:51 2016 +0200

    tdf#94306 replace boost::noncopyable in d...
    
    dbaccess, desktop and drawinglayer.
    
    Replace with C++11 delete copy-constructur
    and copy-assignment.
    Nothing special, only one unused include in
    dbaccess/source/filter/xml/xmlfilter.cxx.
    
    Change-Id: Iebabbc658215162450d4caf08d4fb2f116c456d9
    Reviewed-on: https://gerrit.libreoffice.org/23918
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index b6f0230..e86b957 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -21,7 +21,6 @@
 #include "apitools.hxx"
 #include "dbastrings.hrc"
 
-#include <boost/noncopyable.hpp>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
@@ -41,14 +40,15 @@ namespace dbaccess
 
 /// helper class for column property change events which holds the OComponentDefinition weak
 class OColumnPropertyListener:
-    public ::cppu::WeakImplHelper< XPropertyChangeListener >,
-    private boost::noncopyable
+    public ::cppu::WeakImplHelper< XPropertyChangeListener >
 {
     OComponentDefinition* m_pComponent;
 protected:
     virtual ~OColumnPropertyListener(){}
 public:
     explicit OColumnPropertyListener(OComponentDefinition* _pComponent) : m_pComponent(_pComponent){}
+    OColumnPropertyListener(const OColumnPropertyListener&) = delete;
+    const OColumnPropertyListener& operator=(const OColumnPropertyListener&) = delete;
     // XPropertyChangeListener
     virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) override
     {
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 06f2c6a..61bdeed 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -59,8 +59,6 @@
 #include <cppuhelper/implbase3.hxx>
 #include <rtl/ref.hxx>
 
-#include <boost/noncopyable.hpp>
-
 namespace comphelper {
     class NamedValueCollection;
 }
@@ -78,7 +76,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XController > >   Contro
 /** helper class monitoring the views of a document, and firing appropriate events
     when views are attached / detached
 */
-class ViewMonitor : public boost::noncopyable
+class ViewMonitor
 {
 public:
     explicit ViewMonitor( DocumentEventNotifier& _rEventNotifier )
@@ -90,6 +88,9 @@ public:
     {
     }
 
+    ViewMonitor(const ViewMonitor&) = delete;
+    const ViewMonitor& operator=(const ViewMonitor&) = delete;
+
     void    reset()
     {
         m_bEverHadController = false;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 08728a6..db67d23 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <functional>
-#include <boost/noncopyable.hpp>
 #include <o3tl/functional.hxx>
 
 namespace dbaccess
@@ -46,7 +45,7 @@ namespace dbaccess
     using ::com::sun::star::uno::Type;
 
     // DocumentEvents_Data
-    struct DocumentEvents_Data : public ::boost::noncopyable
+    struct DocumentEvents_Data
     {
         ::cppu::OWeakObject&    rParent;
         ::osl::Mutex&           rMutex;
@@ -58,6 +57,8 @@ namespace dbaccess
             ,rEventsData( _rEventsData )
         {
         }
+        DocumentEvents_Data(const DocumentEvents_Data&) = delete;
+        const DocumentEvents_Data& operator=(const DocumentEvents_Data&) = delete;
     };
 
     // helper
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 5c304b6..8279682 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -27,7 +27,6 @@
 
 #include <memory>
 #include <map>
-#include <boost/noncopyable.hpp>
 
 namespace dbaccess
 {
@@ -42,12 +41,14 @@ namespace dbaccess
                                   >   DocumentEvents_Base;
 
     class DocumentEvents    :public DocumentEvents_Base
-                            ,public ::boost::noncopyable
     {
     public:
         DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData );
         virtual ~DocumentEvents();
 
+        DocumentEvents(const DocumentEvents&) = delete;
+        const DocumentEvents& operator=(const DocumentEvents&) = delete;
+
         static bool needsSynchronousNotification( const OUString& _rEventName );
 
         // XInterface
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 340360e..a9ebf6c 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index f243ab4..e6a5b44 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 namespace sdbtools
@@ -233,9 +232,11 @@ namespace sdbtools
     };
 
     // NameCheckFactory
-    class NameCheckFactory: private boost::noncopyable
+    class NameCheckFactory
     {
     public:
+        NameCheckFactory(const NameCheckFactory&) = delete;
+        const NameCheckFactory& operator=(const NameCheckFactory&) = delete;
         /** creates an INameValidation instance which can be used to check the existence of query or table names
 
             @param _rContext
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 1f7bc25..f5800c8 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -123,8 +123,6 @@
 
 #include <functional>
 
-#include <boost/noncopyable.hpp>
-
 extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
@@ -184,7 +182,7 @@ Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<
 }
 
 // OApplicationController
-class SelectionNotifier : public ::boost::noncopyable
+class SelectionNotifier
 {
 private:
     ::comphelper::OInterfaceContainerHelper2   m_aSelectionListeners;
@@ -199,6 +197,9 @@ public:
     {
     }
 
+    SelectionNotifier(const SelectionNotifier&) = delete;
+    const SelectionNotifier& operator=(const SelectionNotifier&) = delete;
+
     void addListener( const Reference< XSelectionChangeListener >& _Listener )
     {
         m_aSelectionListeners.addInterface( _Listener );
@@ -248,7 +249,7 @@ public:
     }
 };
 
-class SelectionGuard : public ::boost::noncopyable
+class SelectionGuard
 {
 public:
     explicit SelectionGuard( SelectionNotifier& _rNotifier )
@@ -262,6 +263,9 @@ public:
         m_rNotifier.leaveSelection( SelectionNotifier::SelectionGuardAccess() );
     }
 
+    SelectionGuard(const SelectionGuard&) = delete;
+    const SelectionGuard& operator=(const SelectionGuard&) = delete;
+
 private:
     SelectionNotifier&  m_rNotifier;
 };
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index b0e2fdf..7087d7f 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 namespace dbaui
 {
@@ -37,8 +36,7 @@ namespace dbaui
     /** class implementing the IObjectNameCheck interface, and checking given object names
         against a hierarchical name container
     */
-    class HierarchicalNameCheck :public ::boost::noncopyable
-                                ,public IObjectNameCheck
+    class HierarchicalNameCheck :public IObjectNameCheck
     {
     private:
         std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl;
@@ -60,6 +58,9 @@ namespace dbaui
 
         virtual ~HierarchicalNameCheck();
 
+        HierarchicalNameCheck(const HierarchicalNameCheck&) = delete;
+        const HierarchicalNameCheck& operator=(const HierarchicalNameCheck&) = delete;
+
         // IObjectNameCheck overridables
         virtual bool    isNameValid(
             const OUString& _rObjectName,
@@ -85,8 +86,7 @@ namespace dbaui
         @seealso dbtools::DatabaseMetaData::supportsSubqueriesInFrom
         @seealso css::sdb::tools::XObjectNames::checkNameForCreate
     */
-    class DynamicTableOrQueryNameCheck  :public ::boost::noncopyable
-                                        ,public IObjectNameCheck
+    class DynamicTableOrQueryNameCheck  :public IObjectNameCheck
     {
     private:
         std::unique_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl;
@@ -110,6 +110,9 @@ namespace dbaui
 
         virtual ~DynamicTableOrQueryNameCheck();
 
+        DynamicTableOrQueryNameCheck(const DynamicTableOrQueryNameCheck&) = delete;
+        const DynamicTableOrQueryNameCheck& operator=(const DynamicTableOrQueryNameCheck&) = delete;
+
         // IObjectNameCheck overridables
         virtual bool    isNameValid(
             const OUString& _rObjectName,
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index e0c3726..f110567 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -25,13 +25,12 @@
 #include <vector>
 
 #include <rtl/ustring.hxx>
-#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 
 namespace desktop
 {
 
-class CommandLineArgs: private boost::noncopyable
+class CommandLineArgs
 {
     public:
         struct Supplier
@@ -53,6 +52,9 @@ class CommandLineArgs: private boost::noncopyable
         CommandLineArgs();
         explicit CommandLineArgs( Supplier& supplier );
 
+        CommandLineArgs(const CommandLineArgs&) = delete;
+        const CommandLineArgs& operator=(const CommandLineArgs&) = delete;
+
         boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; }
 
         // Access to bool parameters
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 60686a6..a62c076 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 
 #include <boost/optional.hpp>
-#include <boost/noncopyable.hpp>
 #include "license_dialog.hxx"
 #include "dp_gui_dialog2.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
@@ -50,12 +49,15 @@ namespace sdecl = comphelper::service_decl;
 namespace dp_gui {
 
 
-class MyApp : public Application, private boost::noncopyable
+class MyApp : public Application
 {
 public:
     MyApp();
     virtual ~MyApp();
 
+    MyApp(const MyApp&) = delete;
+    const MyApp& operator=(const MyApp&) = delete;
+
     // Application
     virtual int Main() override;
     virtual void DeInit() override;
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 021de7a..1e05633 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -25,7 +25,6 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/processfactory.hxx>
-#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -58,14 +57,16 @@ namespace {
 using css::uno::Reference;
 
 class EmptyNodeList:
-    public cppu::WeakImplHelper<css::xml::dom::XNodeList>,
-    private boost::noncopyable
+    public cppu::WeakImplHelper<css::xml::dom::XNodeList>
 {
 public:
     EmptyNodeList();
 
     virtual ~EmptyNodeList();
 
+    EmptyNodeList(const EmptyNodeList&) = delete;
+    const EmptyNodeList& operator=(const EmptyNodeList&) = delete;
+
     virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 8be315f..02d26b3 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -27,7 +27,6 @@
 #include <rtl/bootstrap.hxx>
 #include <sal/types.h>
 #include <sal/config.h>
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
@@ -58,12 +57,14 @@ using namespace com::sun::star::configuration::backend;
 namespace migration
 {
 
-class CJavaInfo: private boost::noncopyable
+class CJavaInfo
 {
 public:
     JavaInfo* pData;
     CJavaInfo();
     ~CJavaInfo();
+    CJavaInfo(const CJavaInfo&) = delete;
+    const CJavaInfo& operator=(const CJavaInfo&) = delete;
     operator JavaInfo* () const { return pData;}
 };
 
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 5baf91c..82325ec 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/awt/MessageBoxButtons.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Toolkit.hpp>
@@ -60,10 +59,12 @@ namespace {
 
 class Provider:
     public cppu::WeakImplHelper2<
-        css::lang::XServiceInfo, css::frame::XDispatchProvider >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::frame::XDispatchProvider >
 {
 public:
+    Provider(const Provider&) = delete;
+    const Provider& operator=(const Provider&) = delete;
+
     static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
@@ -151,10 +152,12 @@ Provider::queryDispatches(
 
 class Dispatch:
     public cppu::WeakImplHelper2<
-        css::lang::XServiceInfo, css::frame::XDispatch >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::frame::XDispatch >
 {
 public:
+    Dispatch(const Dispatch&) = delete;
+    const Dispatch& operator=(const Dispatch&) = delete;
+
     static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 4197054..fac8c7b 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/awt/MessageBoxButtons.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Toolkit.hpp>
@@ -57,10 +56,12 @@ namespace {
 
 class Provider:
     public cppu::WeakImplHelper2<
-        css::lang::XServiceInfo, css::frame::XDispatchProvider >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::frame::XDispatchProvider >
 {
 public:
+    Provider(const Provider&) = delete;
+    const Provider& operator=(const Provider&) = delete;
+
     static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
@@ -148,10 +149,12 @@ Provider::queryDispatches(
 
 class Dispatch:
     public cppu::WeakImplHelper2<
-        css::lang::XServiceInfo, css::frame::XDispatch >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::frame::XDispatch >
 {
 public:
+    Dispatch(const Dispatch&) = delete;
+    const Dispatch& operator=(const Dispatch&) = delete;
+
     static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index fca73e1..2d7be59 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/graphic/XPrimitive2DRenderer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -49,13 +48,15 @@ namespace drawinglayer
     {
         class XPrimitive2DRenderer:
             public cppu::WeakAggImplHelper2<
-                css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>,
-            private boost::noncopyable
+                css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>
         {
         public:
             XPrimitive2DRenderer();
             virtual ~XPrimitive2DRenderer();
 
+            XPrimitive2DRenderer(const XPrimitive2DRenderer&) = delete;
+            const XPrimitive2DRenderer& operator=(const XPrimitive2DRenderer&) = delete;
+
             // XPrimitive2DRenderer
             virtual uno::Reference< rendering::XBitmap > SAL_CALL rasterize(
                 const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& Primitive2DSequence,
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 8d411b2..2db0aa8 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/noncopyable.hpp>
 #include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
 #include <drawinglayer/attribute/materialattribute3d.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
@@ -35,7 +34,7 @@ namespace drawinglayer
     {
         namespace // anonymous namespace
         {
-            class TubeBuffer : private boost::noncopyable
+            class TubeBuffer
             {
             private:
                 // data for buffered tube primitives
@@ -49,6 +48,9 @@ namespace drawinglayer
                 {
                 }
 
+                TubeBuffer(const TubeBuffer&) = delete;
+                const TubeBuffer& operator=(const TubeBuffer&) = delete;
+
                 Primitive3DContainer getLineTubeSegments(
                     sal_uInt32 nSegments,
                     const attribute::MaterialAttribute3D& rMaterial)
@@ -117,7 +119,7 @@ namespace drawinglayer
                 return rTheBuffer.getLineTubeSegments(nSegments, rMaterial);
             }
 
-            class CapBuffer : private boost::noncopyable
+            class CapBuffer
             {
             private:
                 // data for buffered cap primitives
@@ -130,6 +132,9 @@ namespace drawinglayer
                     : m_nLineCapSegments(0)
                 {
                 }
+                CapBuffer(const CapBuffer&) = delete;
+                const CapBuffer& operator=(const CapBuffer&) = delete;
+
                 Primitive3DContainer getLineCapSegments(
                     sal_uInt32 nSegments,
                     const attribute::MaterialAttribute3D& rMaterial)
@@ -192,7 +197,7 @@ namespace drawinglayer
                 return rTheBuffer.getLineCapSegments(nSegments, rMaterial);
             }
 
-            class CapRoundBuffer : private boost::noncopyable
+            class CapRoundBuffer
             {
             private:
                 // data for buffered capround primitives
@@ -205,6 +210,9 @@ namespace drawinglayer
                     : m_nLineCapRoundSegments(0)
                 {
                 }
+                CapRoundBuffer(const CapRoundBuffer&) = delete;
+                const CapRoundBuffer& operator=(const CapRoundBuffer&) = delete;
+
                 Primitive3DContainer getLineCapRoundSegments(
                     sal_uInt32 nSegments,
                     const attribute::MaterialAttribute3D& rMaterial)


More information about the Libreoffice-commits mailing list