[Libreoffice-commits] core.git: sfx2/source shell/source slideshow/source smoketest/smoketest.cxx sot/source

Jochen Nitschke j.nitschke+logerrit at ok.de
Wed Apr 13 11:34:55 UTC 2016


 sfx2/source/control/itemdel.cxx                                        |    5 ++-
 sfx2/source/control/querystatus.cxx                                    |    6 ++--
 sfx2/source/dialog/templdlg.cxx                                        |    6 +++-
 sfx2/source/dialog/versdlg.cxx                                         |    5 ++-
 sfx2/source/doc/SfxDocumentMetaData.cxx                                |    6 ++--
 sfx2/source/doc/docfile.cxx                                            |    5 ++-
 sfx2/source/doc/docundomanager.cxx                                     |    5 ++-
 sfx2/source/explorer/nochaos.cxx                                       |    5 ++-
 sfx2/source/inc/docundomanager.hxx                                     |    4 +--
 shell/source/backends/desktopbe/desktopbackend.cxx                     |    6 ++--
 shell/source/backends/kde4be/kde4backend.cxx                           |    6 ++--
 shell/source/backends/kdebe/kdebackend.cxx                             |    6 ++--
 shell/source/unix/sysshell/recently_used_file_handler.cxx              |    6 +++-
 slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx        |    6 ++--
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx   |   11 +++++---
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    6 ++--
 slideshow/source/engine/animationnodes/basenode.cxx                    |    6 +++-
 slideshow/source/engine/animationnodes/basenode.hxx                    |    6 ++--
 slideshow/source/engine/pointersymbol.hxx                              |    4 ---
 slideshow/source/engine/rehearsetimingsactivity.hxx                    |    6 ++--
 slideshow/source/engine/shapes/drawinglayeranimation.cxx               |   13 ++++++----
 slideshow/source/engine/shapes/drawshapesubsetting.hxx                 |   10 +++++--
 slideshow/source/engine/shapes/externalshapebase.cxx                   |    8 ++----
 slideshow/source/engine/shapes/intrinsicanimationactivity.cxx          |   11 ++++----
 slideshow/source/engine/shapes/viewappletshape.hxx                     |    8 ++++--
 slideshow/source/engine/shapes/viewbackgroundshape.hxx                 |    7 +++--
 slideshow/source/engine/shapes/viewmediashape.hxx                      |    8 ++++--
 slideshow/source/engine/shapes/viewshape.hxx                           |    9 ++++--
 slideshow/source/engine/slide/layer.hxx                                |   12 +++++----
 slideshow/source/engine/slide/layermanager.hxx                         |   10 +++++--
 slideshow/source/engine/slide/shapemanagerimpl.hxx                     |   10 +++++--
 slideshow/source/engine/slide/userpaintoverlay.cxx                     |    1 
 slideshow/source/engine/slide/userpaintoverlay.hxx                     |    5 ++-
 slideshow/source/engine/slideview.cxx                                  |    8 +++---
 slideshow/source/engine/transitions/slidechangebase.hxx                |    7 +++--
 slideshow/source/engine/waitsymbol.hxx                                 |    7 +++--
 slideshow/source/inc/activitiesfactory.hxx                             |    1 
 slideshow/source/inc/activitiesqueue.hxx                               |    7 +++--
 slideshow/source/inc/animatedsprite.hxx                                |    5 ++-
 slideshow/source/inc/delayevent.hxx                                    |    6 ++--
 slideshow/source/inc/eventmultiplexer.hxx                              |    5 ++-
 slideshow/source/inc/eventqueue.hxx                                    |    6 +++-
 slideshow/source/inc/screenupdater.hxx                                 |    5 ++-
 slideshow/source/inc/shape.hxx                                         |    6 +++-
 slideshow/source/inc/shapeattributelayerholder.hxx                     |    7 +++--
 slideshow/source/inc/slidebitmap.hxx                                   |    7 +++--
 slideshow/source/inc/smilfunctionparser.hxx                            |   12 +++------
 slideshow/source/inc/unoviewcontainer.hxx                              |    6 ++--
 slideshow/source/inc/usereventqueue.hxx                                |    6 ++--
 slideshow/source/inc/wakeupevent.hxx                                   |    7 ++---
 smoketest/smoketest.cxx                                                |    6 +++-
 sot/source/sdstor/stgcache.hxx                                         |    5 ++-
 52 files changed, 200 insertions(+), 147 deletions(-)

New commits:
commit 0de868cd0f430efc6256926c2865530818d7b7dd
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Apr 13 10:07:19 2016 +0200

    tdf#94306 replace boost::noncopyable in sfx2 to sot
    
    Replace with C++11 delete copy-constructur
    and copy-assignment.
    Remove boost/noncopyable.hpp includes.
    Add missing default ctors.
    Make some overloaded ctors explicit,
    seems cppcheck doesn't flag: T(const template<X>& rx).
    
    Change-Id: I63c5a3ac84a33ea6d49868e2d9aa281ada79958e
    Reviewed-on: https://gerrit.libreoffice.org/24050
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx
index 8c92433..d29f5fd 100644
--- a/sfx2/source/control/itemdel.cxx
+++ b/sfx2/source/control/itemdel.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include "itemdel.hxx"
 #include <vcl/svapp.hxx>
 #include <tools/errcode.hxx>
@@ -28,7 +27,7 @@
 
 #include <svl/itempool.hxx>
 
-class SfxItemDisruptor_Impl: private boost::noncopyable
+class SfxItemDisruptor_Impl
 {
     SfxPoolItem *           pItem;
     Link<Application*,void> aLink;
@@ -40,6 +39,8 @@ public:
     explicit SfxItemDisruptor_Impl(SfxPoolItem *pItemToDesrupt);
     void LaunchDeleteOnIdle();
     ~SfxItemDisruptor_Impl();
+    SfxItemDisruptor_Impl(const SfxItemDisruptor_Impl&) = delete;
+    SfxItemDisruptor_Impl& operator=(const SfxItemDisruptor_Impl&) = delete;
 };
 
 SfxItemDisruptor_Impl::SfxItemDisruptor_Impl( SfxPoolItem *pItemToDesrupt ):
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 2e6fa98..3e10e9e 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <sfx2/querystatus.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
@@ -46,13 +45,14 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
 class SfxQueryStatus_Impl:
-    public cppu::WeakImplHelper<css::frame::XStatusListener>,
-    private boost::noncopyable
+    public cppu::WeakImplHelper<css::frame::XStatusListener>
 {
     public:
 
         SfxQueryStatus_Impl( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
         virtual ~SfxQueryStatus_Impl();
+        SfxQueryStatus_Impl(const SfxQueryStatus_Impl&) = delete;
+        SfxQueryStatus_Impl& operator=(const SfxQueryStatus_Impl&) = delete;
 
         // Query method
         SfxItemState QueryState( SfxPoolItem*& pPoolItem );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index edbdcac..8827712 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 #include <vcl/menu.hxx>
@@ -178,7 +177,7 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
 #define MAX_FILTER_ENTRIES          14
 
 
-class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
+class SfxCommonTemplateDialog_Impl::DeletionWatcher
 {
     typedef void (DeletionWatcher::* bool_type)();
 
@@ -195,6 +194,9 @@ public:
             m_pDialog->impl_setDeletionWatcher(m_pPrevious);
     }
 
+    DeletionWatcher(const DeletionWatcher&) = delete;
+    DeletionWatcher& operator=(const DeletionWatcher&) = delete;
+
     // Signal that the dialog was deleted
     void signal()
     {
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index ab2572c..e0a2cb8 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svl/eitem.hxx>
@@ -63,7 +62,7 @@ struct SfxVersionInfo
                             SfxVersionInfo();
 };
 
-class SfxVersionTableDtor: private boost::noncopyable
+class SfxVersionTableDtor
 {
 private:
     std::vector< SfxVersionInfo* >  aTableList;
@@ -72,6 +71,8 @@ public:
     explicit                SfxVersionTableDtor( const uno::Sequence < document::CmisVersion > & rInfo );
                             ~SfxVersionTableDtor()
                             { DelDtor(); }
+                            SfxVersionTableDtor(const SfxVersionTableDtor&) = delete;
+    SfxVersionTableDtor&    operator=(const SfxVersionTableDtor&) = delete;
 
     void                    DelDtor();
 
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 22f0f27..e2ceb4d 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
@@ -126,12 +125,13 @@ typedef ::cppu::WeakComponentImplHelper<
 
 class SfxDocumentMetaData:
     private ::cppu::BaseMutex,
-    public SfxDocumentMetaData_Base,
-    private boost::noncopyable
+    public SfxDocumentMetaData_Base
 {
 public:
     explicit SfxDocumentMetaData(
         css::uno::Reference< css::uno::XComponentContext > const & context);
+    SfxDocumentMetaData(const SfxDocumentMetaData&) = delete;
+    SfxDocumentMetaData& operator=(const SfxDocumentMetaData&) = delete;
 
     // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName()
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4362ddb..28e12bef 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -121,7 +121,6 @@
 #include "sfxacldetect.hxx"
 #include <officecfg/Office/Common.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 using namespace ::com::sun::star;
@@ -166,7 +165,7 @@ bool IsLockingUsed()
 
 } // anonymous namespace
 
-class SfxMedium_Impl : private boost::noncopyable
+class SfxMedium_Impl
 {
 public:
     StreamMode m_nStorOpenMode;
@@ -240,6 +239,8 @@ public:
 
     explicit SfxMedium_Impl();
     ~SfxMedium_Impl();
+    SfxMedium_Impl(const SfxMedium_Impl&) = delete;
+    SfxMedium_Impl& operator=(const SfxMedium_Impl&) = delete;
 
     OUString getFilterMimeType()
         { return !m_pFilter ? OUString() : m_pFilter->GetMimeType(); }
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index 9c00fa4..40ee06e 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -32,7 +32,6 @@
 #include <tools/diagnose_ex.h>
 #include <framework/undomanagerhelper.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <stack>
 
 
@@ -181,7 +180,6 @@ namespace sfx2
     //= UndoManagerGuard
 
     class UndoManagerGuard  :public ::framework::IMutexGuard
-                            ,public ::boost::noncopyable
     {
     public:
         explicit UndoManagerGuard( DocumentUndoManager& i_undoManager )
@@ -194,6 +192,9 @@ namespace sfx2
         {
         }
 
+        UndoManagerGuard(const UndoManagerGuard&) = delete;
+        UndoManagerGuard& operator=(const UndoManagerGuard&) = delete;
+
         virtual void clear() override
         {
             m_guard.clear();
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index ba13039..b99d7fb 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <svl/itempool.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/stritem.hxx>
@@ -34,7 +33,7 @@
 
 class CntItemPool;
 
-class CntStaticPoolDefaults_Impl: private boost::noncopyable
+class CntStaticPoolDefaults_Impl
 {
     sal_uInt32        m_nItems;
     SfxPoolItem** m_ppDefaults;
@@ -46,6 +45,8 @@ private:
 public:
     explicit CntStaticPoolDefaults_Impl( CntItemPool* pPool );
     ~CntStaticPoolDefaults_Impl();
+    CntStaticPoolDefaults_Impl(const CntStaticPoolDefaults_Impl&) = delete;
+    CntStaticPoolDefaults_Impl& operator=(const CntStaticPoolDefaults_Impl&) = delete;
 
     SfxPoolItem**      GetDefaults() const  { return m_ppDefaults; }
     const SfxItemInfo* GetItemInfos() const { return m_pItemInfos; }
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 084e091..81e90ea 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 /** base class for sub components of an SfxBaseModel, which share their ref count and lifetime with the SfxBaseModel
 */
@@ -104,13 +103,14 @@ namespace sfx2
     struct DocumentUndoManager_Impl;
     class DocumentUndoManager   :public DocumentUndoManager_Base
                                 ,public SfxModelSubComponent
-                                ,public ::boost::noncopyable
     {
         friend struct DocumentUndoManager_Impl;
 
     public:
         DocumentUndoManager( SfxBaseModel& i_document );
         virtual ~DocumentUndoManager();
+        DocumentUndoManager(const DocumentUndoManager&) = delete;
+        DocumentUndoManager& operator=(const DocumentUndoManager&) = delete;
 
         // SfxModelSubComponent overridables
         virtual void    disposing() override;
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index dc98f45..745d96d 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -19,7 +19,6 @@
 
 #include "sal/config.h"
 
-#include "boost/noncopyable.hpp"
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/beans/PropertyVetoException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
@@ -65,11 +64,12 @@ css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() {
 
 class Default:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::beans::XPropertySet >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::beans::XPropertySet >
 {
 public:
     Default() {}
+    Default(const Default&) = delete;
+    Default& operator=(const Default&) = delete;
 
 private:
     virtual ~Default() {}
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index d15f2d2..013e532 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -21,7 +21,6 @@
 
 #include <kapplication.h>
 
-#include "boost/noncopyable.hpp"
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/beans/PropertyVetoException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
@@ -66,11 +65,12 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
 
 class Service:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::beans::XPropertySet >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::beans::XPropertySet >
 {
 public:
     Service();
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
 private:
     virtual ~Service() {}
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index d13c0d1..7381131 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -19,7 +19,6 @@
 
 #include "sal/config.h"
 
-#include "boost/noncopyable.hpp"
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/beans/PropertyVetoException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
@@ -66,11 +65,12 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
 
 class Service:
     public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::beans::XPropertySet >,
-    private boost::noncopyable
+        css::lang::XServiceInfo, css::beans::XPropertySet >
 {
 public:
     Service();
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
 private:
     virtual ~Service() {}
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 0d5ded1..ee9e697 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include "boost/noncopyable.hpp"
 #include "osl/process.h"
 #include "rtl/ustring.hxx"
 #include "rtl/string.hxx"
@@ -212,7 +211,7 @@ namespace /* private */ {
     class unknown_xml_format_exception {};
 
     class recently_used_file_filter:
-        public i_xml_parser_event_handler, private boost::noncopyable
+        public i_xml_parser_event_handler
     {
     public:
         explicit recently_used_file_filter(recently_used_item_list_t& item_list) :
@@ -229,6 +228,9 @@ namespace /* private */ {
             named_command_map_[TAG_GROUP]        = &recently_used_item::set_groups;
         }
 
+        recently_used_file_filter(const recently_used_file_filter&) = delete;
+        recently_used_file_filter& operator=(const recently_used_file_filter&) = delete;
+
         virtual void start_element(
             const string_t& /*raw_name*/,
             const string_t& local_name,
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
index ad03f23..edc8a51 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
@@ -31,16 +31,16 @@
 #include <config_lgpl.h>
 #include <glm/gtc/type_ptr.hpp>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 
 /** This class is to be derived to make any operation (transform) you may need in order to construct your transitions
 */
-class Operation : private boost::noncopyable
+class Operation
 {
 public:
     virtual ~Operation(){}
+    Operation(const Operation&) = delete;
+    Operation& operator=(const Operation&) = delete;
 
 protected:
     /** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to mnT0 to being completely transformed from t = mnT1 to 1. If FALSE, the transform will be ineffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index 449a72f..bf2f1c1 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -31,8 +31,6 @@
 #include <config_lgpl.h>
 #include <glm/gtc/type_ptr.hpp>
 
-#include <boost/noncopyable.hpp>
-
 #include <GL/glew.h>
 
 #include <memory>
@@ -133,11 +131,14 @@ private:
 
     It holds Primitives and Operations on those primitives.
 */
-class OGLTransitionImpl : private boost::noncopyable
+class OGLTransitionImpl
 {
 public:
     virtual ~OGLTransitionImpl();
 
+    OGLTransitionImpl(const OGLTransitionImpl&) = delete;
+    OGLTransitionImpl& operator=(const OGLTransitionImpl&) = delete;
+
     /** Prepare transition.
       */
     bool prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex );
@@ -273,11 +274,13 @@ std::shared_ptr<OGLTransitionImpl> makeDiamond();
 std::shared_ptr<OGLTransitionImpl> makeFadeSmoothly();
 std::shared_ptr<OGLTransitionImpl> makeFadeThroughBlack();
 
-class SceneObject : private boost::noncopyable
+class SceneObject
 {
 public:
     SceneObject();
     virtual ~SceneObject();
+    SceneObject(const SceneObject&) = delete;
+    SceneObject& operator=(const SceneObject&) = delete;
 
     virtual void prepare(GLuint /* program */) {}
     virtual void display(GLint sceneTransformLocation, GLint primitiveTransformLocation, double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) const;
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 17e501a..c864f87 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -65,8 +65,6 @@
 #include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/window.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include "OGLTrans_TransitionImpl.hxx"
 
 #if defined( UNX ) && !defined( MACOSX )
@@ -171,10 +169,12 @@ int oglErrorHandler( Display* /*dpy*/, XErrorEvent* /*evnt*/ )
  * slideshow. This class is implicitly
  * constructed from XTransitionFactory.
 */
-class OGLTransitionerImpl : private cppu::BaseMutex, private boost::noncopyable, public OGLTransitionerImplBase
+class OGLTransitionerImpl : private cppu::BaseMutex, public OGLTransitionerImplBase
 {
 public:
     OGLTransitionerImpl();
+    OGLTransitionerImpl(const OGLTransitionerImpl&) = delete;
+    OGLTransitionerImpl& operator=(const OGLTransitionerImpl&) = delete;
     bool setTransition( std::shared_ptr<OGLTransitionImpl> pOGLTransition );
     bool initialize( const Reference< presentation::XSlideShowView >& xView,
             const Reference< rendering::XBitmap >& xLeavingSlide,
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index fd6c750..f8881f4 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -37,7 +37,6 @@
 #include <vector>
 #include <algorithm>
 #include <iterator>
-#include <boost/noncopyable.hpp>
 
 using namespace ::com::sun::star;
 
@@ -259,7 +258,7 @@ bool isMainSequenceRootNode_(
 
 /** state transition handling
  */
-class BaseNode::StateTransition : private boost::noncopyable
+class BaseNode::StateTransition
 {
 public:
     enum Options { NONE, FORCE };
@@ -271,6 +270,9 @@ public:
         clear();
     }
 
+    StateTransition(const StateTransition&) = delete;
+    StateTransition& operator=(const StateTransition&) = delete;
+
     bool enter( NodeState eToState, int options = NONE )
     {
         OSL_ENSURE( meToState == INVALID,
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index 77862c5..f91ee21 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -27,7 +27,6 @@
 #include "slideshowcontext.hxx"
 #include "shapesubset.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <vector>
 
 namespace slideshow {
@@ -74,13 +73,14 @@ class BaseContainerNode;
     file-private accessor methods.
 */
 class BaseNode : public AnimationNode,
-                 public  ::osl::DebugBase<BaseNode>,
-                 private ::boost::noncopyable
+                 public  ::osl::DebugBase<BaseNode>
 {
 public:
     BaseNode( css::uno::Reference<css::animations::XAnimationNode> const& xNode,
               ::std::shared_ptr<BaseContainerNode> const&        pParent,
               NodeContext const&                                   rContext );
+    BaseNode(const BaseNode&) = delete;
+    BaseNode& operator=(const BaseNode&) = delete;
 
     /** Provide the node with a shared_ptr to itself.
 
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index 9bae614..a9f7850 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -21,7 +21,6 @@
 #include "eventmultiplexer.hxx"
 #include "unoview.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <vector>
 
 using namespace com::sun::star;
@@ -33,8 +32,7 @@ class EventMultiplexer;
 typedef std::shared_ptr<class PointerSymbol> PointerSymbolSharedPtr;
 
 /// On-screen 'laser pointer' from the Impress remote control
-class PointerSymbol : public ViewEventHandler,
-                      private ::boost::noncopyable
+class PointerSymbol : public ViewEventHandler
 {
 public:
     static PointerSymbolSharedPtr create( const css::uno::Reference<css::rendering::XBitmap>& xBitmap,
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index b800f75..802e539 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -23,7 +23,6 @@
 #include "activity.hxx"
 
 #include <basegfx/range/b2drange.hxx>
-#include <boost/noncopyable.hpp>
 
 #include <vector>
 #include <utility>
@@ -45,8 +44,7 @@ struct SlideShowContext;
 class EventMultiplexer;
 class ScreenUpdater;
 class RehearseTimingsActivity : public Activity,
-                                public ViewEventHandler,
-                                private ::boost::noncopyable
+                                public ViewEventHandler
 {
 public:
     /** Creates the activity.
@@ -55,6 +53,8 @@ public:
         const SlideShowContext& rContext );
 
     virtual ~RehearseTimingsActivity();
+    RehearseTimingsActivity(const RehearseTimingsActivity&) = delete;
+    RehearseTimingsActivity& operator=(const RehearseTimingsActivity&) = delete;
 
     /** Starts and shows the timer; adds to activity queue.
      */
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 08b53ce..4b1f03b 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -53,7 +53,6 @@
 #include "intrinsicanimationactivity.hxx"
 #include "intrinsicanimationeventhandler.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <vector>
 #include <memory>
 
@@ -129,8 +128,7 @@ double ScrollTextAnimNode::GetStateAtRelativeTime(
     }
 }
 
-class ActivityImpl : public Activity,
-                     private boost::noncopyable
+class ActivityImpl : public Activity
 {
 public:
     virtual ~ActivityImpl();
@@ -140,6 +138,9 @@ public:
         std::shared_ptr<WakeupEvent> const& pWakeupEvent,
         std::shared_ptr<DrawShape> const& pDrawShape );
 
+    ActivityImpl(const ActivityImpl&) = delete;
+    ActivityImpl& operator=(const ActivityImpl&) = delete;
+
     bool enableAnimations();
 
     // Disposable:
@@ -241,14 +242,16 @@ private:
 };
 
 
-class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler,
-                                   private boost::noncopyable
+class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler
 {
 public:
     explicit IntrinsicAnimationListener( ActivityImpl& rActivity ) :
         mrActivity( rActivity )
     {}
 
+    IntrinsicAnimationListener(const IntrinsicAnimationListener&) = delete;
+    IntrinsicAnimationListener& operator=(const IntrinsicAnimationListener&) = delete;
+
 private:
 
     virtual bool enableAnimations() override { return mrActivity.enableAnimations(); }
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
index 71457e3..48dca8e 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPESUBSETTING_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWSHAPESUBSETTING_HXX
 
-#include <boost/noncopyable.hpp>
-
 #include "doctreenode.hxx"
 #include "attributableshape.hxx"
 
@@ -35,7 +33,7 @@ namespace slideshow
         /** This class encapsulates the subsetting aspects of a
             DrawShape.
          */
-        class DrawShapeSubsetting : private boost::noncopyable
+        class DrawShapeSubsetting
         {
         public:
             /** Create empty shape subset handling.
@@ -63,6 +61,12 @@ namespace slideshow
             DrawShapeSubsetting( const DocTreeNode&                         rShapeSubset,
                                  const ::std::shared_ptr< GDIMetaFile >&  rMtf );
 
+            /// Forbid copy copstruction
+            DrawShapeSubsetting(const DrawShapeSubsetting&) = delete;
+
+            /// Forbid copy assignment
+            DrawShapeSubsetting& operator=(const DrawShapeSubsetting&) = delete;
+
             /** Reset metafile.
 
                 Use this method to completely reset the
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index d181ab8..40c0d99 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -30,8 +30,6 @@
 #include "intrinsicanimationeventhandler.hxx"
 #include "tools.hxx"
 
-#include <boost/noncopyable.hpp>
-
 
 using namespace ::com::sun::star;
 
@@ -41,14 +39,14 @@ namespace slideshow
     namespace internal
     {
         class ExternalShapeBase::ExternalShapeBaseListener : public ViewEventHandler,
-                                                             public IntrinsicAnimationEventHandler,
-                                                             private boost::noncopyable
+                                                             public IntrinsicAnimationEventHandler
         {
         public:
             explicit ExternalShapeBaseListener( ExternalShapeBase& rBase ) :
                 mrBase( rBase )
             {}
-
+            ExternalShapeBaseListener(const ExternalShapeBaseListener&) = delete;
+            ExternalShapeBaseListener& operator=(const ExternalShapeBaseListener&) = delete;
 
         private:
             // ViewEventHandler
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index dfefa44..ba1d481 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -27,7 +27,6 @@
 #include "intrinsicanimationactivity.hxx"
 #include "intrinsicanimationeventhandler.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 namespace slideshow
@@ -41,8 +40,7 @@ namespace slideshow
             animations directly within a shape, e.g. drawing layer
             animations, or GIF animations.
          */
-        class IntrinsicAnimationActivity : public Activity,
-                                           private boost::noncopyable
+        class IntrinsicAnimationActivity : public Activity
         {
         public:
             /** Create an IntrinsicAnimationActivity.
@@ -69,6 +67,8 @@ namespace slideshow
                                         const ::std::vector<double>&    rTimeouts,
                                         ::std::size_t                   nNumLoops,
                                         CycleMode                       eCycleMode );
+            IntrinsicAnimationActivity(const IntrinsicAnimationActivity&) = delete;
+            IntrinsicAnimationActivity& operator=(const IntrinsicAnimationActivity&) = delete;
 
             virtual void dispose() override;
             virtual double calcTimeLag() const override;
@@ -93,13 +93,14 @@ namespace slideshow
         };
 
 
-        class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler,
-                                           private boost::noncopyable
+        class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler
         {
         public:
             explicit IntrinsicAnimationListener( IntrinsicAnimationActivity& rActivity ) :
                 mrActivity( rActivity )
             {}
+            IntrinsicAnimationListener(const IntrinsicAnimationListener&) = delete;
+            IntrinsicAnimationListener& operator=(const IntrinsicAnimationListener&) = delete;
 
         private:
 
diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx
index 5a3ccc0..dfef6ab 100644
--- a/slideshow/source/engine/shapes/viewappletshape.hxx
+++ b/slideshow/source/engine/shapes/viewappletshape.hxx
@@ -23,7 +23,6 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <com/sun/star/awt/Point.hpp>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 #include "viewlayer.hxx"
@@ -50,7 +49,7 @@ namespace slideshow
             The class is able to render the associated applet on View
             implementations.
          */
-        class ViewAppletShape : private boost::noncopyable
+        class ViewAppletShape
         {
         public:
             /** Create a ViewAppletShape for the given View
@@ -83,6 +82,11 @@ namespace slideshow
              */
             virtual ~ViewAppletShape();
 
+            /// Forbid copy construction
+            ViewAppletShape(const ViewAppletShape&) = delete;
+            /// Forbid copy assignment
+            ViewAppletShape& operator=(const ViewAppletShape&) = delete;
+
             /** Query the associated view layer of this shape
              */
             ViewLayerSharedPtr getViewLayer() const;
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
index e2a57e2..1985b82 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
@@ -28,7 +28,6 @@
 #include <cppcanvas/spritecanvas.hxx>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 #include "gdimtftools.hxx"
 #include "viewlayer.hxx"
@@ -44,7 +43,7 @@ namespace slideshow
             The class is able to render the associated background on
             View implementations.
          */
-        class ViewBackgroundShape : private boost::noncopyable
+        class ViewBackgroundShape
         {
         public:
             /** Create a ViewBackgroundShape for the given View
@@ -58,6 +57,10 @@ namespace slideshow
              */
             ViewBackgroundShape( const ViewLayerSharedPtr&      rViewLayer,
                                  const ::basegfx::B2DRectangle& rShapeBounds );
+            /// Forbid copy construction
+            ViewBackgroundShape(const ViewBackgroundShape&) = delete;
+            /// Forbid copy assignment
+            ViewBackgroundShape& operator=(const ViewBackgroundShape&) = delete;
 
             /** Query the associated view layer of this shape
              */
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index 1b60a77..e935f0a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/Point.hpp>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include <vcl/vclptr.hxx>
 
 #include "viewlayer.hxx"
@@ -56,7 +55,7 @@ namespace slideshow
             The class is able to render the associated media shape on
             View implementations.
          */
-        class ViewMediaShape : private boost::noncopyable
+        class ViewMediaShape
         {
         public:
             /** Create a ViewMediaShape for the given View
@@ -72,6 +71,11 @@ namespace slideshow
              */
             virtual ~ViewMediaShape();
 
+            /// Forbid copy construction
+            ViewMediaShape(const ViewMediaShape&) = delete;
+            /// Forbid copy assignment
+            ViewMediaShape& operator=(const ViewMediaShape&) = delete;
+
             /** Query the associated view layer of this shape
              */
             ViewLayerSharedPtr getViewLayer() const;
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index ccefbda..88b3f7a 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -26,8 +26,6 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include "tools.hxx"
 #include "shapeattributelayer.hxx"
 #include "animatedsprite.hxx"
@@ -48,7 +46,7 @@ namespace slideshow
             The class is able to render the associated XShape on
             View implementations.
          */
-        class ViewShape : private boost::noncopyable
+        class ViewShape
         {
         public:
             /** Create a ViewShape for the given View
@@ -58,6 +56,11 @@ namespace slideshow
              */
             explicit ViewShape( const ViewLayerSharedPtr& rViewLayer );
 
+            ///Forbid copy construction
+            ViewShape(const ViewShape&) = delete;
+            /// Forbid copy assignment
+            ViewShape& operator=(const ViewShape&) = delete;
+
             /** Query the associated view layer of this shape
              */
             ViewLayerSharedPtr getViewLayer() const;
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 3dc6a88..645c249 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -26,8 +26,6 @@
 #include "view.hxx"
 #include "animatableshape.hxx"
 
-#include <boost/noncopyable.hpp>
-
 #include <vector>
 #include <memory>
 
@@ -58,12 +56,16 @@ namespace slideshow
             be called from the LayerManager. Normally, it shouldn't be
             possible to get hold of an instance of this class at all.
          */
-        class Layer : public std::enable_shared_from_this<Layer>,
-                      private boost::noncopyable
+        class Layer : public std::enable_shared_from_this<Layer>
         {
         public:
             typedef std::shared_ptr<LayerEndUpdate> EndUpdater;
 
+            /// Forbid copy construction
+            Layer(const Layer&) = delete;
+            /// Forbid copy assignment
+            Layer& operator=(const Layer&) = delete;
+
             /** Create background layer
 
                 This method will create a layer without a ViewLayer,
@@ -213,7 +215,7 @@ namespace slideshow
                 Dummy parameter, to disambiguate from normal layer
                 constructor
              */
-            Layer( Dummy                    eFlag );
+            explicit Layer( Dummy                    eFlag );
 
             /** Create non-background layer
 
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index f15c5fe..61ccede 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYERMANAGER_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYERMANAGER_HXX
 
-#include <boost/noncopyable.hpp>
-
 #include <cppcanvas/spritecanvas.hxx>
 
 #include "unoview.hxx"
@@ -59,7 +57,7 @@ namespace slideshow
             @see Layer
             @see Shape
          */
-        class LayerManager : private boost::noncopyable
+        class LayerManager
         {
         public:
             /** Create a new layer manager for the given page bounds
@@ -79,6 +77,12 @@ namespace slideshow
                           const ::basegfx::B2DRange& rPageBounds,
                           bool                       bDisableAnimationZOrder );
 
+            /// Forbid copy construction
+            LayerManager(const LayerManager&) = delete;
+
+            /// Forbid copy assignment
+            LayerManager& operator=(const LayerManager&) = delete;
+
             /** Activate the LayerManager
 
                 This method activates the LayerManager. Prior to
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 63dc1c7..9d8cd51 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -35,7 +35,6 @@
 #include "shapelistenereventhandler.hxx"
 #include "mouseeventhandler.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <set>
 #include <map>
 #include <memory>
@@ -53,8 +52,7 @@ class ShapeManagerImpl : public SubsettableShapeManager,
                          public ShapeListenerEventHandler,
                          public MouseEventHandler,
                          public ViewUpdate,
-                         public std::enable_shared_from_this<ShapeManagerImpl>,
-                         private boost::noncopyable
+                         public std::enable_shared_from_this<ShapeManagerImpl>
 {
 public:
     /** Create a shape event broadcaster
@@ -69,6 +67,12 @@ public:
                       const ShapeEventListenerMap& rGlobalListenersMap,
                       const ShapeCursorMap&        rGlobalCursorMap );
 
+    /// Forbid copy construction
+    ShapeManagerImpl(const ShapeManagerImpl&) = delete;
+
+    /// Forbid copy assignment
+    ShapeManagerImpl& operator=(const ShapeManagerImpl&) = delete;
+
     /** Enables event listening.
 
         The initial slide content on the background layer
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 1e3aab9..1a3ad4d 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -36,7 +36,6 @@
 #include "screenupdater.hxx"
 #include "vieweventhandler.hxx"
 
-#include <boost/noncopyable.hpp>
 #include "slide.hxx"
 #include "cursormanager.hxx"
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx
index 8c57ba2..eb37554 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.hxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.hxx
@@ -25,7 +25,6 @@
 #include "unoview.hxx"
 #include "rgbcolor.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 #include <vector>
 
@@ -47,7 +46,7 @@ namespace slideshow
             listening for mouse clicks and moves. When the mouse is
             dragged, a hand sketching in the selected color is shown.
         */
-        class UserPaintOverlay : private boost::noncopyable
+        class UserPaintOverlay
         {
         public:
             /** Create a UserPaintOverlay
@@ -64,6 +63,8 @@ namespace slideshow
                                                      const PolyPolygonVector& rPolygons,
                                                      bool                     bActive);
             ~UserPaintOverlay();
+            UserPaintOverlay(const UserPaintOverlay&) = delete;
+            UserPaintOverlay& operator=(const UserPaintOverlay&) = delete;
             PolyPolygonVector getPolygons();
             void drawPolygons();
 
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 053dfea..bc6fee9 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -51,8 +51,6 @@
 
 #include <com/sun/star/presentation/XSlideShow.hpp>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 #include <vector>
 #include <iterator>
@@ -377,8 +375,7 @@ public:
     the layer priority changes, the sprites change z order together
     with their parent.
  */
-class SlideViewLayer : public ViewLayer,
-                       private boost::noncopyable
+class SlideViewLayer : public ViewLayer
 {
     /// Smart container for all sprites issued by this layer
     mutable LayerSpriteContainer             maSpriteContainer;
@@ -442,6 +439,9 @@ public:
     {
     }
 
+    SlideViewLayer(const SlideViewLayer&) = delete;
+    SlideViewLayer& operator=(const SlideViewLayer&) = delete;
+
     void updateView( const basegfx::B2DHomMatrix& rMatrix,
                      const basegfx::B2DSize&      rUserSize )
     {
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 192e959..fbb3d6d 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -30,7 +30,6 @@
 #include "soundplayer.hxx"
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 
 namespace cppcanvas
@@ -49,10 +48,12 @@ namespace internal {
     implement the perform() method.
 */
 class SlideChangeBase : public ViewEventHandler,
-                        public NumberAnimation,
-                        private ::boost::noncopyable
+                        public NumberAnimation
 {
 public:
+    SlideChangeBase(const SlideChangeBase&) = delete;
+    SlideChangeBase& operator=(const SlideChangeBase&) = delete;
+
     // NumberAnimation
     virtual bool operator()( double x ) override;
     virtual double getUnderlyingValue() const override;
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index 7c58c61..8da60e66 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -29,7 +29,6 @@
 #include "unoview.hxx"
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include <vector>
 
 namespace slideshow {
@@ -39,10 +38,12 @@ class EventMultiplexer;
 typedef std::shared_ptr<class WaitSymbol> WaitSymbolSharedPtr;
 
 /// On-screen 'hour glass' for when slideshow is unresponsive
-class WaitSymbol : public ViewEventHandler,
-                   private ::boost::noncopyable
+class WaitSymbol : public ViewEventHandler
 {
 public:
+    WaitSymbol(const WaitSymbol&) = delete;
+    WaitSymbol& operator=(const WaitSymbol&) = delete;
+
     static WaitSymbolSharedPtr create( const css::uno::Reference<css::rendering::XBitmap>& xBitmap,
                                        ScreenUpdater&                               rScreenUpdater,
                                        EventMultiplexer&                            rEventMultiplexer,
diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx
index 57c8541..fb122f8 100644
--- a/slideshow/source/inc/activitiesfactory.hxx
+++ b/slideshow/source/inc/activitiesfactory.hxx
@@ -37,7 +37,6 @@
 #include "pairanimation.hxx"
 
 #include <boost/optional.hpp>
-#include <boost/noncopyable.hpp>
 
 /* Definition of ActivitiesFactory class */
 
diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx
index 2b03b9f..5dd2f8e 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -28,7 +28,6 @@
 #include <canvas/elapsedtime.hxx>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 
 /* Definition of ActivitiesQueue class */
@@ -42,7 +41,7 @@ namespace slideshow
             activity objects to this class, which are called in a
             round-robin fashion.
         */
-        class ActivitiesQueue : private ::boost::noncopyable
+        class ActivitiesQueue
         {
         public:
             /** Create an ActivitiesQueue.
@@ -51,9 +50,11 @@ namespace slideshow
                 Pointer to global presentation timer. Used for
                 adjusting and holding global presentation time.
              */
-            ActivitiesQueue(
+            explicit ActivitiesQueue(
                 const std::shared_ptr< ::canvas::tools::ElapsedTime >&  pPresTimer );
             ~ActivitiesQueue();
+            ActivitiesQueue(const ActivitiesQueue&) = delete;
+            ActivitiesQueue& operator=(const ActivitiesQueue&) = delete;
 
             /** Add the given activity to the queue.
              */
diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx
index a5980da..8a49f83 100644
--- a/slideshow/source/inc/animatedsprite.hxx
+++ b/slideshow/source/inc/animatedsprite.hxx
@@ -31,7 +31,6 @@
 
 #include <boost/optional.hpp>
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 
 /* Definition of AnimatedSprite class */
@@ -47,7 +46,7 @@ namespace slideshow
             and all the gory details of offset calculations and
             rounding prevention.
          */
-        class AnimatedSprite : private boost::noncopyable
+        class AnimatedSprite
         {
         public:
             /** Create a new AnimatedSprite, for the given metafile
@@ -68,6 +67,8 @@ namespace slideshow
             AnimatedSprite( const ViewLayerSharedPtr&   rViewLayer,
                             const ::basegfx::B2DSize&   rSpriteSizePixel,
                             double                      nSpritePrio );
+            AnimatedSprite(const AnimatedSprite&) = delete;
+            AnimatedSprite& operator=(const AnimatedSprite&) = delete;
 
             /** Resize the sprite.
 
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index fd43d29..1389b80 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -21,8 +21,6 @@
 
 #include "event.hxx"
 
-#include <boost/noncopyable.hpp>
-
 #include <functional>
 
 namespace slideshow {
@@ -30,7 +28,7 @@ namespace internal {
 
 /** Event, which delays the functor call the given amount of time
  */
-class Delay : public Event, private ::boost::noncopyable
+class Delay : public Event
 {
 public:
     typedef ::std::function<void ()> FunctorT;
@@ -49,6 +47,8 @@ public:
         mnTimeout(nTimeout),
         maFunc(func),
         mbWasFired(false) {}
+    Delay(const Delay&) = delete;
+    Delay& operator=(const Delay&) = delete;
 
     // Event:
     virtual bool fire() override;
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index e39c79e..b1a4a00 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -26,7 +26,6 @@
 #include "shapelistenereventhandler.hxx"
 #include "vieweventhandler.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -133,7 +132,7 @@ typedef ::std::shared_ptr< UserPaintEventHandler > UserPaintEventHandlerSharedPt
     after the user action occurred, but only after the given
     timeout. Which is actually a feature.
 */
-class EventMultiplexer : private ::boost::noncopyable
+class EventMultiplexer
 {
 public:
     /** Create an event multiplexer
@@ -158,6 +157,8 @@ public:
     EventMultiplexer( EventQueue&             rEventQueue,
                       UnoViewContainer const& rViewContainer );
     ~EventMultiplexer();
+    EventMultiplexer(const EventMultiplexer&) = delete;
+    EventMultiplexer& operator=(const EventMultiplexer&) = delete;
 
     // Management methods
 
diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx
index c67e5d7..613135b 100644
--- a/slideshow/source/inc/eventqueue.hxx
+++ b/slideshow/source/inc/eventqueue.hxx
@@ -25,7 +25,6 @@
 
 #include "event.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <functional>
 #include <queue>
 #include <vector>
@@ -40,7 +39,7 @@ namespace slideshow
         /** This class handles events in a presentation. Events are
             time instants where e.g. effects start.
          */
-        class EventQueue : private ::boost::noncopyable
+        class EventQueue
         {
         public:
             EventQueue(
@@ -49,6 +48,9 @@ namespace slideshow
 
             ~EventQueue();
 
+            EventQueue(const EventQueue&) = delete;
+            EventQueue& operator=(const EventQueue&) = delete;
+
             /** Add the given event to the queue. The event is fired
                 at, or shortly after, its Event::getActivationTime instant.
              */
diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx
index e975f3a..4140ed4 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -22,7 +22,6 @@
 
 #include "viewupdate.hxx"
 #include "unoviewcontainer.hxx"
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 /* Definition of ScreenUpdater class */
@@ -42,11 +41,13 @@ namespace slideshow
             objects report any pending update, commitUpdates() does
             nothing.
          */
-        class ScreenUpdater : private boost::noncopyable
+        class ScreenUpdater
         {
         public:
             explicit ScreenUpdater( UnoViewContainer const& rViewContainer );
             ~ScreenUpdater();
+            ScreenUpdater(const ScreenUpdater&) = delete;
+            ScreenUpdater& operator=(const ScreenUpdater&) = delete;
 
             /** Notify screen update
 
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index 59bbd99..d3cf3b8 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -28,7 +28,6 @@
 
 #include "viewlayer.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 #include <set>
 #include <vector>
@@ -52,10 +51,13 @@ namespace slideshow
             slide's shape, providing bound rect, underlying XShape and
             basic paint methods.
          */
-        class Shape : private boost::noncopyable
+        class Shape
         {
         public:
+            Shape() = default;
             virtual ~Shape() {}
+            Shape(const Shape&) = delete;
+            Shape& operator=(const Shape&) = delete;
 
             /** Get the associated XShape of this shape.
 
diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx
index ef187ba..12044e5 100644
--- a/slideshow/source/inc/shapeattributelayerholder.hxx
+++ b/slideshow/source/inc/shapeattributelayerholder.hxx
@@ -23,8 +23,6 @@
 #include "attributableshape.hxx"
 #include "shapeattributelayer.hxx"
 
-#include <boost/noncopyable.hpp>
-
 namespace slideshow
 {
     namespace internal
@@ -39,7 +37,7 @@ namespace slideshow
             process that is required for shape and attribute layer
             interaction).
          */
-        class ShapeAttributeLayerHolder : private boost::noncopyable
+        class ShapeAttributeLayerHolder
         {
         public:
             /** Create a ShapeAttributeLayerHolder instance.
@@ -60,6 +58,9 @@ namespace slideshow
                          // correctly deregistered from the shape.
             }
 
+            ShapeAttributeLayerHolder(const ShapeAttributeLayerHolder&) = delete;
+            ShapeAttributeLayerHolder& operator=(const ShapeAttributeLayerHolder&) = delete;
+
             void reset()
             {
                 if( mpShape && mpAttributeLayer )
diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx
index 6d3d0b9..d0e1692 100644
--- a/slideshow/source/inc/slidebitmap.hxx
+++ b/slideshow/source/inc/slidebitmap.hxx
@@ -28,7 +28,6 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 namespace com { namespace sun { namespace star { namespace rendering
 {
@@ -57,10 +56,12 @@ namespace slideshow
             Slide::getFinalSlideBitmap must also be adapted (they no
             longer need a Canvas ptr, which is actually a hack now).
          */
-        class SlideBitmap : private boost::noncopyable
+        class SlideBitmap
         {
         public:
-            SlideBitmap( const ::cppcanvas::BitmapSharedPtr& rBitmap );
+            explicit SlideBitmap( const ::cppcanvas::BitmapSharedPtr& rBitmap );
+            SlideBitmap(const SlideBitmap&) = delete;
+            SlideBitmap& operator=(const SlideBitmap&) = delete;
 
             bool                draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const;
             ::basegfx::B2ISize  getSize() const;
diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx
index 5a2147d..42a07be 100644
--- a/slideshow/source/inc/smilfunctionparser.hxx
+++ b/slideshow/source/inc/smilfunctionparser.hxx
@@ -25,8 +25,6 @@
 
 #include <basegfx/range/b2drectangle.hxx>
 
-#include <boost/noncopyable.hpp>
-
 
 /* Definition of SmilFunctionParser class */
 
@@ -34,9 +32,13 @@ namespace slideshow
 {
     namespace internal
     {
-        class SmilFunctionParser : private boost::noncopyable
+        class SmilFunctionParser
         {
         public:
+            SmilFunctionParser() = delete;
+            SmilFunctionParser(const SmilFunctionParser&) = delete;
+            SmilFunctionParser& operator=(const SmilFunctionParser&) = delete;
+
             /** Parse a string containing a SMIL value.
 
                 This method parses a string representing
@@ -144,10 +146,6 @@ namespace slideshow
             static ExpressionNodeSharedPtr parseSmilFunction( const OUString&            rSmilFunction,
                                                               const ::basegfx::B2DRectangle&    rRelativeShapeBounds ); // throw ParseError
 
-        private:
-            // disabled constructor/destructor, since this is
-            // supposed to be a singleton
-            SmilFunctionParser();
         };
     }
 }
diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx
index c1f013e..9d47c8f 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -22,8 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include <vector>
 #include <memory>
 
@@ -43,10 +41,12 @@ namespace slideshow
     {
         /** Contains UnoViews
          */
-        class UnoViewContainer : private boost::noncopyable
+        class UnoViewContainer
         {
         public:
             UnoViewContainer();
+            UnoViewContainer(const UnoViewContainer&) = delete;
+            UnoViewContainer& operator=(const UnoViewContainer&) = delete;
 
             /** Add a view to this container
 
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index 2522526..d110b7b 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -26,8 +26,6 @@
 #include "eventqueue.hxx"
 #include "shape.hxx"
 
-#include <boost/noncopyable.hpp>
-
 /* Definition of UserEventQueue class */
 
 namespace slideshow {
@@ -57,7 +55,7 @@ class MouseLeaveHandler;
     this object are fired and then all references to them are
     removed.
 */
-class UserEventQueue : private ::boost::noncopyable
+class UserEventQueue
 {
 public:
     /** Create a user event queue
@@ -82,6 +80,8 @@ public:
                     EventQueue&         rEventQueue,
                     CursorManager&      rCursorManager );
     ~UserEventQueue();
+    UserEventQueue(const UserEventQueue&) = delete;
+    UserEventQueue& operator=(const UserEventQueue&) = delete;
 
     /** Clear all registered events.
 
diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx
index 441579c..6992be9 100644
--- a/slideshow/source/inc/wakeupevent.hxx
+++ b/slideshow/source/inc/wakeupevent.hxx
@@ -24,8 +24,6 @@
 #include "event.hxx"
 #include "activitiesqueue.hxx"
 
-#include <boost/noncopyable.hpp>
-
 namespace slideshow {
 namespace internal {
 
@@ -36,13 +34,14 @@ namespace internal {
     the EventQueue, to avoid busy-waiting for the next
     discrete time instant.
 */
-class WakeupEvent : public Event,
-                    private ::boost::noncopyable
+class WakeupEvent : public Event
 {
 public:
     WakeupEvent(
         std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
         ActivitiesQueue & rActivityQueue );
+    WakeupEvent(const WakeupEvent&) = delete;
+    WakeupEvent& operator=(const WakeupEvent&) = delete;
 
     virtual void dispose() override;
     virtual bool fire() override;
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index 6bc2a9c..fa301f7 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/types.h>
 #include <chrono>
-#include "boost/noncopyable.hpp"
 #include "com/sun/star/awt/AsyncCallback.hpp"
 #include "com/sun/star/awt/XCallback.hpp"
 #include "com/sun/star/beans/PropertyState.hpp"
@@ -56,10 +55,13 @@
 
 namespace {
 
-struct Result: private boost::noncopyable {
+struct Result {
     osl::Condition condition;
     bool success;
     OUString result;
+    Result() = default;
+    Result(const Result&) = delete;
+    Result& operator=(const Result&) = delete;
 };
 
 class Listener:
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index d0ac5c8..bc8511b 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -25,7 +25,6 @@
 #include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <stgelem.hxx>
-#include <boost/noncopyable.hpp>
 #include <salhelper/simplereferenceobject.hxx>
 #include <unordered_map>
 #include <functional>
@@ -95,7 +94,7 @@ public:
     void Clear();                           // clear the cache
 };
 
-class StgPage : public salhelper::SimpleReferenceObject, private boost::noncopyable
+class StgPage : public salhelper::SimpleReferenceObject
 {
     const sal_Int32 mnPage;                // page index
     sal_uInt8*      mpData;                // nSize bytes
@@ -103,6 +102,8 @@ class StgPage : public salhelper::SimpleReferenceObject, private boost::noncopya
              StgPage( short nData, sal_Int32 nPage );
     virtual ~StgPage();
 public:
+             StgPage(const StgPage&) = delete;
+    StgPage& operator=(const StgPage&) = delete;
     static rtl::Reference< StgPage > Create( short nData, sal_Int32 nPage );
 
     sal_Int32 GetPage()  { return mnPage; }


More information about the Libreoffice-commits mailing list