summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-10 21:41:44 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-11 07:15:35 +0000
commitc210bf4510585b554e0e9a371f27fa27e2874762 (patch)
tree62f8c45ab415da97af398508e3ea64329268e7a3 /sd
parentcf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (diff)
tdf#94306 replace boost::noncopyable r.. to sdext
... in modules reportdesign to sdext Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes. Make some overloaded ctors explicit (most in sd slidesorter). Add deleted copy-assignment in sc/inc/chart2uno.hxx. Change-Id: I21d4209f0ddb00063ca827474516a05ab4bb2f9a Reviewed-on: https://gerrit.libreoffice.org/23970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/Outliner.hxx7
-rw-r--r--sd/source/core/annotations/Annotation.cxx6
-rw-r--r--sd/source/core/annotations/AnnotationEnumeration.cxx5
-rw-r--r--sd/source/core/undoanim.cxx5
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx6
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx6
-rw-r--r--sd/source/ui/inc/framework/ConfigurationController.hxx4
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.hxx8
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx6
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterTextView.hxx6
-rw-r--r--sd/source/ui/presenter/SlideRenderer.hxx6
-rw-r--r--sd/source/ui/remotecontrol/IBluetoothSocket.hxx6
-rw-r--r--sd/source/ui/sidebar/PanelFactory.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx5
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx7
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx9
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx6
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx6
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.hxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx1
28 files changed, 87 insertions, 76 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 89ba020182f0..73434a74ed4d 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -26,7 +26,6 @@
#include "OutlinerIterator.hxx"
#include <editeng/SpellPortions.hxx>
#include <memory>
-#include <boost/noncopyable.hpp>
class Dialog;
class SdrObject;
@@ -106,8 +105,7 @@ struct SearchSelection
</p>
*/
class Outliner
- : public SdrOutliner,
- public ::boost::noncopyable
+ : public SdrOutliner
{
public:
friend class ::sd::outliner::OutlinerContainer;
@@ -125,6 +123,9 @@ public:
*/
Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode );
virtual ~Outliner();
+ /// Forbid copy construction and copy assignment
+ Outliner(const Outliner&) = delete;
+ Outliner& operator=(const Outliner&) = delete;
/** Despite the name this method is called prior to spell checking *and*
searching and replacing. The position of current view
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index da351ff5f68d..3a2b0616e913 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -19,7 +19,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "osl/time.h"
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -51,11 +50,12 @@ namespace sd {
class Annotation : private ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper< XAnnotation>,
- public ::cppu::PropertySetMixin< XAnnotation >,
- private boost::noncopyable
+ public ::cppu::PropertySetMixin< XAnnotation >
{
public:
explicit Annotation( const Reference< XComponentContext >& context, SdPage* pPage );
+ Annotation(const Annotation&) = delete;
+ Annotation& operator=(const Annotation&) = delete;
SdPage* GetPage() const { return mpPage; }
SdrModel* GetModel() { return (mpPage != nullptr) ? mpPage->GetModel() : nullptr; }
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 25bb921a5013..07d7ad660461 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -19,7 +19,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include <cppuhelper/implbase.hxx>
#include "com/sun/star/uno/XComponentContext.hpp"
@@ -35,10 +34,12 @@ using namespace ::com::sun::star::lang;
namespace sd {
-class AnnotationEnumeration: public ::cppu::WeakImplHelper< css::office::XAnnotationEnumeration >, private boost::noncopyable
+class AnnotationEnumeration: public ::cppu::WeakImplHelper< css::office::XAnnotationEnumeration >
{
public:
explicit AnnotationEnumeration( const AnnotationVector& rAnnotations );
+ AnnotationEnumeration(const AnnotationEnumeration&) = delete;
+ AnnotationEnumeration& operator=(const AnnotationEnumeration&) = delete;
// css::office::XAnnotationEnumeration:
virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index f0fac60c7c13..3a953dbdaac1 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/animations/XAnimationNode.hpp>
#include "CustomAnimationCloner.hxx"
@@ -111,7 +110,7 @@ OUString UndoAnimation::GetComment() const
return SdResId(STR_UNDO_ANIMATION).toString();
}
-struct UndoAnimationPathImpl: private boost::noncopyable
+struct UndoAnimationPathImpl
{
SdPage* mpPage;
sal_Int32 mnEffectOffset;
@@ -136,6 +135,8 @@ struct UndoAnimationPathImpl: private boost::noncopyable
}
}
}
+ UndoAnimationPathImpl(const UndoAnimationPathImpl&) = delete;
+ UndoAnimationPathImpl& operator=(const UndoAnimationPathImpl&) = delete;
CustomAnimationEffectPtr getEffect() const
{
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index 4917321123d3..55744ed2b089 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
#include <osl/mutex.hxx>
-#include <boost/noncopyable.hpp>
#include <map>
#include <memory>
#include <vector>
@@ -38,7 +37,6 @@ class ResourceFactoryManager;
/** Manage the set of active resources. Activate and deactivate resources.
*/
class ConfigurationControllerResourceManager
- : private ::boost::noncopyable
{
public:
/** For every active resource both the resource itself as well as its
@@ -63,6 +61,10 @@ public:
~ConfigurationControllerResourceManager();
+ /// Forbid copy construction and copy assignment
+ ConfigurationControllerResourceManager(const ConfigurationControllerResourceManager&) = delete;
+ ConfigurationControllerResourceManager& operator=(const ConfigurationControllerResourceManager&) = delete;
+
/** Activate all the resources that are specified by resource ids in
rResources. The resource ids of activated resources are added to
the given configuration. Activated resources are notified to all
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 8fac4564fe31..cd44236eefed 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/weakref.hxx>
#include <sfx2/viewfrm.hxx>
-#include <boost/noncopyable.hpp>
#include <vcl/scrbar.hxx>
#include "sddllapi.h"
#include <memory>
@@ -66,12 +65,15 @@ namespace sd { namespace slidesorter {
Note that this class is not in its final state.
*/
class SlideSorter
- : private ::boost::noncopyable
{
friend class controller::SlotManager;
public:
virtual ~SlideSorter();
+ /// Forbid copy construction and copy assignment
+ SlideSorter(const SlideSorter&) = delete;
+ SlideSorter& operator=(const SlideSorter&) = delete;
+
/** Return whether the called SlideSorter object is valid and calling
its Get(Model,View,Controller) methods is safe. When <FALSE/> is
called then no other methods should be called.
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index c6e78c74ff6e..dbb9cc945be4 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -35,7 +35,6 @@
#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace {
@@ -59,12 +58,13 @@ namespace sd { namespace framework {
*/
class ConfigurationController
: private sd::MutexOwner,
- private boost::noncopyable,
public ConfigurationControllerInterfaceBase
{
public:
ConfigurationController() throw();
virtual ~ConfigurationController() throw();
+ ConfigurationController(const ConfigurationController&) = delete;
+ ConfigurationController& operator=(const ConfigurationController&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index b04281921d3f..c9662b7d2a14 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SD_SOURCE_UI_PRESENTER_CANVASUPDATEREQUESTER_HXX
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <boost/noncopyable.hpp>
#include <sal/types.h>
#include <tools/solar.h>
#include <tools/link.hxx>
@@ -37,9 +36,12 @@ namespace sd { namespace presenter {
more PresenterCanvas wrappers). Multiple calls are collected and lead
to a single call to updateScreen.
*/
-class CanvasUpdateRequester : private ::boost::noncopyable
+class CanvasUpdateRequester
{
public:
+ CanvasUpdateRequester(const CanvasUpdateRequester&) = delete;
+ CanvasUpdateRequester& operator=(const CanvasUpdateRequester&) = delete;
+
/** @return the Canvas UpdateRequester object for the given shared canvas.
A new object is created when it does not already exist.
*/
@@ -49,7 +51,7 @@ public:
void RequestUpdate (const bool bUpdateAll);
private:
- CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas);
+ explicit CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas);
~CanvasUpdateRequester();
class Deleter; friend class Deleter;
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 2df5cda400c8..0c197429e22a 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -32,7 +32,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#include <boost/noncopyable.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -49,8 +48,7 @@ namespace {
> PresenterCustomSpriteInterfaceBase;
}
class PresenterCustomSprite
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public PresenterCustomSpriteInterfaceBase
{
public:
@@ -60,6 +58,8 @@ public:
const Reference<awt::XWindow>& rxBaseWindow,
const css::geometry::RealSize2D& rSpriteSize);
virtual ~PresenterCustomSprite();
+ PresenterCustomSprite(const PresenterCustomSprite&) = delete;
+ PresenterCustomSprite& operator=(const PresenterCustomSprite&) = delete;
virtual void SAL_CALL disposing()
throw (RuntimeException) override;
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 2484ea933fa5..8e0937006179 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -34,7 +34,6 @@
#include <com/sun/star/rendering/VolatileContentDestroyedException.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sd { namespace presenter {
@@ -60,8 +59,7 @@ namespace {
construction. This allows the shared canvas to be a canvas of sprite itself.
*/
class PresenterCanvas
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterCanvasInterfaceBase
{
public:
@@ -99,6 +97,8 @@ public:
const css::uno::Reference<css::awt::XWindow>& rxSharedWindow,
const css::uno::Reference<css::awt::XWindow>& rxWindow);
virtual ~PresenterCanvas();
+ PresenterCanvas(const PresenterCanvas&) = delete;
+ PresenterCanvas& operator=(const PresenterCanvas&) = delete;
virtual void SAL_CALL disposing()
throw (css::uno::RuntimeException) override;
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index 0abe0861b537..785cd179135f 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
namespace sd { namespace presenter {
@@ -40,13 +39,14 @@ namespace {
not be implemented in an extension.
*/
class PresenterHelper
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterHelperInterfaceBase
{
public:
explicit PresenterHelper (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PresenterHelper();
+ PresenterHelper(const PresenterHelper&) = delete;
+ PresenterHelper& operator=(const PresenterHelper&) = delete;
// XInitialize
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 3080700e1aa6..af8985a54ac2 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -26,7 +26,6 @@
#include "cache/SlsPageCache.hxx"
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sd { namespace presenter {
@@ -41,13 +40,14 @@ namespace {
/** Uno API wrapper around the slide preview cache.
*/
class PresenterPreviewCache
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterPreviewCacheInterfaceBase
{
public:
explicit PresenterPreviewCache (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PresenterPreviewCache();
+ PresenterPreviewCache(const PresenterPreviewCache&) = delete;
+ PresenterPreviewCache& operator=(const PresenterPreviewCache&) = delete;
// XInitialize
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 30c4a9ed34c2..7570ab728dd3 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace com { namespace sun { namespace star { namespace uno {
@@ -45,12 +44,13 @@ namespace {
This service is used by the presenter screen to render the notes view.
*/
class PresenterTextView
- : private ::boost::noncopyable,
- public PresenterTextViewInterfaceBase
+ : public PresenterTextViewInterfaceBase
{
public:
explicit PresenterTextView (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PresenterTextView();
+ PresenterTextView(const PresenterTextView&) = delete;
+ PresenterTextView& operator=(const PresenterTextView&) = delete;
// XInitialization
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index 15ed3cf33ee6..3f053d918a5e 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -30,7 +30,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
namespace sd { namespace presenter {
@@ -45,13 +44,14 @@ namespace {
/** Render single slides into bitmaps.
*/
class SlideRenderer
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public SlideRendererInterfaceBase
{
public:
explicit SlideRenderer (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~SlideRenderer();
+ SlideRenderer(const SlideRenderer&) = delete;
+ SlideRenderer& operator=(const SlideRenderer&) = delete;
virtual void SAL_CALL disposing() override;
// XInitialization
diff --git a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx
index c229f9248637..a1f542db4d1f 100644
--- a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx
+++ b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx
@@ -11,15 +11,17 @@
#define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_IBLUETOOTHSOCKET_HXX
#include <rtl/string.hxx>
-#include <boost/noncopyable.hpp>
namespace sd
{
/** Interface for bluetooth data io
*/
- struct IBluetoothSocket : private boost::noncopyable
+ struct IBluetoothSocket
{
+ IBluetoothSocket() = default;
virtual ~IBluetoothSocket() {}
+ IBluetoothSocket(const IBluetoothSocket&) = delete;
+ IBluetoothSocket& operator=(const IBluetoothSocket&) = delete;
/** Blocks until a line is read.
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index d1ecf7080905..a60b3c79d66c 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <boost/noncopyable.hpp>
#include <map>
#include <memory>
@@ -46,8 +45,7 @@ namespace
}
class PanelFactory
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PanelFactoryInterfaceBase
{
public:
@@ -56,6 +54,8 @@ public:
explicit PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PanelFactory();
+ PanelFactory(const PanelFactory&) = delete;
+ PanelFactory& operator=(const PanelFactory&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
index 8de015ffac4c..59509a7a23dc 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx
@@ -23,8 +23,6 @@
#include "model/SlsSharedPageDescriptor.hxx"
#include <basegfx/point/b2dpoint.hxx>
-#include <boost/noncopyable.hpp>
-
#include <functional>
#include <vector>
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 9b90f36fba3a..5296db12a3d2 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -37,7 +37,6 @@ namespace sd { namespace slidesorter { namespace controller {
/** Experimental class for simple eye candy animations.
*/
class Animator
- : private ::boost::noncopyable
{
public:
/** In some circumstances we have to avoid animation and jump to the
@@ -46,8 +45,10 @@ public:
*/
enum AnimationMode { AM_Animated, AM_Immediate };
- Animator (SlideSorter& rSlideSorter);
+ explicit Animator (SlideSorter& rSlideSorter);
~Animator();
+ Animator(const Animator&) = delete;
+ Animator& operator=(const Animator&) = delete;
/** When disposed the animator will stop its work immediately and not
process any timer events anymore.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 596fda670207..835e45b097b4 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <vector>
#include <memory>
-#include <boost/noncopyable.hpp>
#include "sddllapi.h"
@@ -52,10 +51,12 @@ class SlideSorterController;
Indices of pages relate always to the number of all pages in the model
(as returned by GetPageCount()) not just the selected pages.
*/
-class PageSelector : private ::boost::noncopyable
+class PageSelector
{
public:
- PageSelector (SlideSorter& rSlideSorter);
+ explicit PageSelector(SlideSorter& rSlideSorter);
+ PageSelector(const PageSelector&) = delete;
+ PageSelector& operator=(const PageSelector&) = delete;
// Exported for unit test
SD_DLLPUBLIC void SelectAllPages();
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 9b7af9b6d1a3..935b4a6c2743 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -25,7 +25,6 @@
#include "controller/SlsInsertionIndicatorHandler.hxx"
#include "fupoor.hxx"
#include <svtools/transfer.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sd { namespace slidesorter {
@@ -37,10 +36,11 @@ namespace sd { namespace slidesorter { namespace controller {
class SlideSorterController;
class SelectionFunction
- : public FuPoor,
- private ::boost::noncopyable
+ : public FuPoor
{
public:
+ SelectionFunction(const SelectionFunction&) = delete;
+ SelectionFunction& operator=(const SelectionFunction&) = delete;
static rtl::Reference<FuPoor> Create( SlideSorter& rSlideSorter, SfxRequest& rRequest );
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
index 56e21137732d..7e227b578970 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx
@@ -22,7 +22,6 @@
#include "controller/SlsAnimator.hxx"
#include "model/SlsSharedPageDescriptor.hxx"
-#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
namespace sd { namespace slidesorter { namespace controller {
@@ -30,11 +29,12 @@ namespace sd { namespace slidesorter { namespace controller {
/** Manage requests for scrolling page objects into view.
*/
class VisibleAreaManager
- : public ::boost::noncopyable
{
public:
- VisibleAreaManager (SlideSorter& rSlideSorter);
+ explicit VisibleAreaManager (SlideSorter& rSlideSorter);
~VisibleAreaManager();
+ VisibleAreaManager(const VisibleAreaManager&) = delete;
+ VisibleAreaManager& operator=(const VisibleAreaManager&) = delete;
void ActivateCurrentSlideTracking();
void DeactivateCurrentSlideTracking();
@@ -58,7 +58,7 @@ public:
class TemporaryDisabler
{
public:
- TemporaryDisabler (SlideSorter& rSlideSorter);
+ explicit TemporaryDisabler (SlideSorter& rSlideSorter);
~TemporaryDisabler();
private:
VisibleAreaManager& mrVisibleAreaManager;
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index fc535c3b848f..d8cbb7c147f9 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -35,7 +35,6 @@
#include <vcl/outdev.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <memory>
-#include <boost/noncopyable.hpp>
class Point;
@@ -60,8 +59,7 @@ class SelectionPainter;
class ToolTip;
class SlideSorterView
- : public sd::View,
- public ::boost::noncopyable
+ : public sd::View
{
public:
@@ -71,12 +69,15 @@ public:
by this class.
*/
- SlideSorterView (SlideSorter& rSlideSorter);
+ explicit SlideSorterView (SlideSorter& rSlideSorter);
void Init();
virtual ~SlideSorterView();
void Dispose();
+ SlideSorterView(const SlideSorterView&) = delete;
+ SlideSorterView& operator=(const SlideSorterView&) = delete;
+
/** Set the general way of layouting the page objects. Note that this
method does not trigger any repaints or layouts.
*/
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
index 2e3753f49adf..ad822cf4021b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
@@ -22,7 +22,6 @@
#include "controller/SlsAnimator.hxx"
#include <memory>
-#include <boost/noncopyable.hpp>
namespace sd { namespace slidesorter { namespace view {
@@ -32,10 +31,11 @@ class InsertPosition;
position while a move or copy operation takes place.
*/
class InsertAnimator
- : private ::boost::noncopyable
{
public:
- InsertAnimator (SlideSorter& rSlideSorter);
+ explicit InsertAnimator (SlideSorter& rSlideSorter);
+ InsertAnimator(const InsertAnimator&) = delete;
+ InsertAnimator& operator=(const InsertAnimator&) = delete;
/** Set the position at which we have to make room for the display of an
icon.
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index ff6a398a531e..a7f9031dbca7 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -21,8 +21,6 @@
#include <utility>
-#include <boost/noncopyable.hpp>
-
#include "model/SlideSorterModel.hxx"
#include "model/SlsPageDescriptor.hxx"
@@ -32,13 +30,15 @@ using namespace ::sd::slidesorter::model;
namespace {
class PageEnumerationImpl
- : public Enumeration<SharedPageDescriptor>, private boost::noncopyable
+ : public Enumeration<SharedPageDescriptor>
{
public:
inline PageEnumerationImpl (
const SlideSorterModel& rModel,
const PageEnumeration::PagePredicate& rPredicate);
virtual ~PageEnumerationImpl();
+ PageEnumerationImpl(const PageEnumerationImpl&) = delete;
+ PageEnumerationImpl& operator=(const PageEnumerationImpl&) = delete;
/** Create a copy of the called enumeration object.
*/
virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() override;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index 9f7e09c34c22..b7ebe225dc87 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -31,7 +31,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propshlp.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sd { namespace slidesorter {
@@ -47,14 +46,15 @@ namespace {
/** Implementation of the com.sun.star.drawing.SlideSorter service.
*/
class SlideSorterService
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public SlideSorterServiceInterfaceBase
{
public:
explicit SlideSorterService (
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~SlideSorterService();
+ SlideSorterService(const SlideSorterService&) = delete;
+ SlideSorterService& operator=(const SlideSorterService&) = delete;
virtual void SAL_CALL disposing() override;
// XInitialization
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 2f57b1f5264e..c361dd3a713a 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -66,7 +66,6 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <canvas/elapsedtime.hxx>
-#include <boost/noncopyable.hpp>
//#define DEBUG_TIMING
#ifdef DEBUG_TIMING
@@ -104,12 +103,13 @@ namespace {
}
class BackgroundPainter
- : public ILayerPainter,
- public ::boost::noncopyable
+ : public ILayerPainter
{
public:
explicit BackgroundPainter (const Color& rBackgroundColor) : maBackgroundColor(rBackgroundColor) {}
virtual ~BackgroundPainter() {}
+ BackgroundPainter(const BackgroundPainter&) = delete;
+ BackgroundPainter& operator=(const BackgroundPainter&) = delete;
virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) override
{
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 84de2c96506b..67dfc709a4e0 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -25,8 +25,6 @@
#include <tools/gen.hxx>
#include <tools/fract.hxx>
-#include <boost/noncopyable.hpp>
-
#include <functional>
namespace sd { namespace slidesorter { namespace view {
@@ -102,11 +100,13 @@ void ForAllRectangles (const vcl::Region& rRegion, ::std::function<void (const R
}
}
-class Layer : private ::boost::noncopyable
+class Layer
{
public:
Layer();
~Layer();
+ Layer(const Layer&) = delete;
+ Layer& operator=(const Layer&) = delete;
void Initialize (sd::Window *pTargetWindow);
void InvalidateRectangle (const Rectangle& rInvalidationBox);
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index 0a6ac661cb9d..b6d34433bc5b 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -26,7 +26,6 @@
#include <vcl/region.hxx>
#include <vcl/virdev.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>