summaryrefslogtreecommitdiff
path: root/sdext
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 /sdext
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 'sdext')
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx11
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.hxx4
-rw-r--r--sdext/source/presenter/PresenterButton.hxx6
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.hxx4
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.hxx8
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx5
-rw-r--r--sdext/source/presenter/PresenterPaneBase.hxx4
-rw-r--r--sdext/source/presenter/PresenterPaneBorderManager.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.hxx6
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.hxx7
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx6
-rw-r--r--sdext/source/presenter/PresenterScreen.hxx13
-rw-r--r--sdext/source/presenter/PresenterScrollBar.hxx7
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.hxx6
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx4
-rw-r--r--sdext/source/presenter/PresenterSprite.hxx4
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx11
-rw-r--r--sdext/source/presenter/PresenterToolBar.hxx8
-rw-r--r--sdext/source/presenter/PresenterUIPainter.hxx4
-rw-r--r--sdext/source/presenter/PresenterWindowManager.hxx6
21 files changed, 70 insertions, 66 deletions
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 48c9a7570ddf..ee189ade5bc0 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -23,7 +23,6 @@
#include "pdfihelper.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
@@ -44,8 +43,7 @@ namespace
class PDFPasswordRequest:
public cppu::WeakImplHelper<
- task::XInteractionRequest, task::XInteractionPassword >,
- private boost::noncopyable
+ task::XInteractionRequest, task::XInteractionPassword >
{
private:
mutable osl::Mutex m_aMutex;
@@ -55,6 +53,8 @@ private:
public:
explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName);
+ PDFPasswordRequest(const PDFPasswordRequest&) = delete;
+ PDFPasswordRequest& operator=(const PDFPasswordRequest&) = delete;
// XInteractionRequest
virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception) override;
@@ -120,11 +120,12 @@ void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception)
}
class UnsupportedEncryptionFormatRequest:
- public cppu::WeakImplHelper< task::XInteractionRequest >,
- private boost::noncopyable
+ public cppu::WeakImplHelper< task::XInteractionRequest >
{
public:
UnsupportedEncryptionFormatRequest() {}
+ UnsupportedEncryptionFormatRequest(const UnsupportedEncryptionFormatRequest&) = delete;
+ UnsupportedEncryptionFormatRequest& operator=(const UnsupportedEncryptionFormatRequest&) = delete;
private:
virtual ~UnsupportedEncryptionFormatRequest() {}
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index cad6fff9db59..78c83d8ef21a 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Color.hpp>
-#include <boost/noncopyable.hpp>
#include <map>
#include <memory>
@@ -40,7 +39,6 @@ namespace sdext { namespace presenter {
A bitmap group is defined by some entries in the configuration.
*/
class PresenterBitmapContainer
- : private ::boost::noncopyable
{
public:
/** There is one bitmap for the normal state, one for a mouse over effect and one
@@ -100,6 +98,8 @@ public:
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = nullptr);
~PresenterBitmapContainer();
+ PresenterBitmapContainer(const PresenterBitmapContainer&) = delete;
+ PresenterBitmapContainer& operator=(const PresenterBitmapContainer&) = delete;
void Initialize (
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext);
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 5200e2c3caf6..4421c3739445 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -32,7 +32,6 @@
#include <com/sun/star/rendering/XBitmap.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
#include <rtl/ref.hxx>
namespace sdext { namespace presenter {
@@ -52,8 +51,7 @@ namespace {
frame.
*/
class PresenterButton
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterButtonInterfaceBase
{
public:
@@ -65,6 +63,8 @@ public:
const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas,
const OUString& rsConfigurationName);
virtual ~PresenterButton();
+ PresenterButton(const PresenterButton&) = delete;
+ PresenterButton& operator=(const PresenterButton&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx
index e26e845c2db5..d07978547cee 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.hxx
@@ -28,18 +28,18 @@
#include <com/sun/star/rendering/XCanvasFont.hpp>
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
/** Collection of functions to ease the life of a canvas user.
*/
class PresenterCanvasHelper
- : private ::boost::noncopyable
{
public:
PresenterCanvasHelper();
~PresenterCanvasHelper();
+ PresenterCanvasHelper(const PresenterCanvasHelper&) = delete;
+ PresenterCanvasHelper& operator=(const PresenterCanvasHelper&) = delete;
void Paint (
const SharedBitmapDescriptor& rpBitmap,
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 5ce5bcf39d4a..35258e7e00cc 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -25,8 +25,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
-
#include <functional>
namespace sdext { namespace presenter {
@@ -39,14 +37,16 @@ typedef ::cppu::WeakComponentImplHelper <
change takes place.
*/
class PresenterFrameworkObserver
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterFrameworkObserverInterfaceBase
{
public:
typedef ::std::function<bool ()> Predicate;
typedef ::std::function<void (bool)> Action;
+ PresenterFrameworkObserver(const PresenterFrameworkObserver&) = delete;
+ PresenterFrameworkObserver& operator=(const PresenterFrameworkObserver&) = delete;
+
static void RunOnUpdateEnd (
const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
const Action& rAction);
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index ad1e87398a2e..77ab818bf5bc 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -34,7 +34,6 @@
#include <algorithm>
#include <vector>
#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -96,7 +95,7 @@ namespace {
const sal_Int32 nMaximalWidth);
};
- class Block: private boost::noncopyable
+ class Block
{
public:
Block (
@@ -104,6 +103,8 @@ namespace {
const OUString& rsRightText,
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
const sal_Int32 nMaximalWidth);
+ Block(const Block&) = delete;
+ Block& operator=(const Block&) = delete;
void Update (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
const sal_Int32 nMaximalWidth);
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 18037bfe09a5..0defffeab978 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -36,7 +36,6 @@
#include <com/sun/star/util/Color.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
@@ -60,7 +59,6 @@ namespace {
*/
class PresenterPaneBase
: protected ::cppu::BaseMutex,
- private ::boost::noncopyable,
public PresenterPaneBaseInterfaceBase
{
public:
@@ -68,6 +66,8 @@ public:
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterPaneBase();
+ PresenterPaneBase(const PresenterPaneBase&) = delete;
+ PresenterPaneBase& operator=(const PresenterPaneBase&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index 6d81840ccecb..f5251da5b216 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
@@ -41,7 +41,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
@@ -58,8 +57,7 @@ namespace {
/** Manage the interactive moving and resizing of panes.
*/
class PresenterPaneBorderManager
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public PresenterPaneBorderManagerInterfaceBase
{
public:
@@ -67,6 +65,8 @@ public:
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterPaneBorderManager();
+ PresenterPaneBorderManager(const PresenterPaneBorderManager&) = delete;
+ PresenterPaneBorderManager& operator=(const PresenterPaneBorderManager&) = delete;
virtual void SAL_CALL disposing();
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 324f7e911821..eb3f4ae2eee4 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -29,7 +29,6 @@
#include <com/sun/star/awt/XGraphics.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sdext { namespace presenter {
@@ -47,14 +46,15 @@ namespace {
objects.
*/
class PresenterPaneBorderPainter
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public PresenterPaneBorderPainterInterfaceBase
{
public:
explicit PresenterPaneBorderPainter (
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PresenterPaneBorderPainter();
+ PresenterPaneBorderPainter(const PresenterPaneBorderPainter&) = delete;
+ PresenterPaneBorderPainter& operator=(const PresenterPaneBorderPainter&) = delete;
/** Transform the bounding box of the window content to the outer
bounding box of the border that is painted around it.
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 2cf299de1266..84fb3b5daed6 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -34,8 +34,6 @@
#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
-
#include <functional>
#include <memory>
#include <vector>
@@ -56,14 +54,15 @@ namespace {
screen but stores the views displayed in these panes as well.
*/
class PresenterPaneContainer
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterPaneContainerInterfaceBase
{
public:
explicit PresenterPaneContainer (
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PresenterPaneContainer();
+ PresenterPaneContainer(const PresenterPaneContainer&) = delete;
+ PresenterPaneContainer& operator=(const PresenterPaneContainer&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 5b9d9a4a21fa..0a66ff27ea30 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -61,8 +60,7 @@ namespace {
end.
*/
class PresenterScreenListener
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterScreenListenerInterfaceBase
{
public:
@@ -70,6 +68,8 @@ namespace {
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::frame::XModel2>& rxModel);
virtual ~PresenterScreenListener();
+ PresenterScreenListener(const PresenterScreenListener&) = delete;
+ PresenterScreenListener& operator=(const PresenterScreenListener&) = delete;
void Initialize();
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index d707b4e3045d..6dfc71a6e1a7 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -34,7 +34,6 @@
#include <com/sun/star/presentation/XSlideShowController.hpp>
#include <com/sun/star/presentation/XPresentation2.hpp>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
@@ -55,11 +54,12 @@ namespace {
object.
*/
class PresenterScreenJob
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterScreenJobInterfaceBase
{
public:
+ PresenterScreenJob(const PresenterScreenJob&) = delete;
+ PresenterScreenJob& operator=(const PresenterScreenJob&) = delete;
static OUString getImplementationName_static();
static css::uno::Sequence< OUString > getSupportedServiceNames_static();
static css::uno::Reference<css::uno::XInterface> Create(
@@ -76,7 +76,7 @@ public:
css::uno::RuntimeException, std::exception) override;
private:
- PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
+ explicit PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PresenterScreenJob();
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
@@ -94,8 +94,7 @@ private:
the presenter screen.</p>
*/
class PresenterScreen
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterScreenInterfaceBase
{
public:
@@ -103,6 +102,8 @@ public:
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::frame::XModel2>& rxModel);
virtual ~PresenterScreen();
+ PresenterScreen(const PresenterScreen&) = delete;
+ PresenterScreen& operator=(const PresenterScreen&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 542972374244..73ccbfabc1c4 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -29,8 +29,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
-
#include <functional>
#include <memory>
@@ -51,13 +49,14 @@ namespace {
/** Base class of horizontal and vertical scroll bars.
*/
class PresenterScrollBar
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterScrollBarInterfaceBase
{
public:
typedef ::std::function<void (double)> ThumbMotionListener;
virtual ~PresenterScrollBar();
+ PresenterScrollBar(const PresenterScrollBar&) = delete;
+ PresenterScrollBar& operator=(const PresenterScrollBar&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index ff4208aa2807..a0ec6d1a604e 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -22,7 +22,6 @@
#include "PresenterController.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/awt/XDisplayBitmap.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
@@ -56,8 +55,7 @@ namespace {
uses a derived class that overrides the setCurrentSlide() method.
*/
class PresenterSlidePreview
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PresenterSlidePreviewInterfaceBase
{
public:
@@ -67,6 +65,8 @@ public:
const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterSlidePreview();
+ PresenterSlidePreview(const PresenterSlidePreview&) = delete;
+ PresenterSlidePreview& operator=(const PresenterSlidePreview&) = delete;
virtual void SAL_CALL disposing() override;
// XResourceId
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index 5340bf65824c..e30e2d9df896 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -39,7 +39,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
@@ -58,8 +57,7 @@ namespace {
/** Life view in a secondary window of a full screen slide show.
*/
class PresenterSlideShowView
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public PresenterSlideShowViewInterfaceBase,
public CachablePresenterView
{
@@ -70,6 +68,8 @@ public:
const css::uno::Reference<css::frame::XController>& rxController,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterSlideShowView();
+ PresenterSlideShowView(const PresenterSlideShowView&) = delete;
+ PresenterSlideShowView& operator=(const PresenterSlideShowView&) = delete;
void LateInit();
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index d7ece041198b..d3d5ecf13784 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -45,7 +45,6 @@
#include <algorithm>
#include <math.h>
#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -134,7 +133,6 @@ private:
//==== PresenterSlideSorter::MouseOverManager =================================
class PresenterSlideSorter::MouseOverManager
- : private ::boost::noncopyable
{
public:
MouseOverManager (
@@ -143,6 +141,8 @@ public:
const Reference<awt::XWindow>& rxInvalidateTarget,
const std::shared_ptr<PresenterPaintManager>& rpPaintManager);
~MouseOverManager();
+ MouseOverManager(const MouseOverManager&) = delete;
+ MouseOverManager& operator=(const MouseOverManager&) = delete;
void Paint (
const sal_Int32 nSlideIndex,
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index 594caa6e7757..7043f1896b9f 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/rendering/XCustomSprite.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
@@ -34,11 +33,12 @@ namespace sdext { namespace presenter {
and hiding a sprite before disposing it (results in zombie sprites.)
*/
class PresenterSprite
- : private ::boost::noncopyable
{
public:
PresenterSprite();
virtual ~PresenterSprite();
+ PresenterSprite(const PresenterSprite&) = delete;
+ PresenterSprite& operator=(const PresenterSprite&) = delete;
/** The given sprite canvas is used as factory to create the sprite that
is wrapped by objects of this class.
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 50ad1922530a..220300793c11 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -50,7 +50,6 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <rtl/ustrbuf.hxx>
#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -91,10 +90,11 @@ namespace {
};
class ElementMode
- : private ::boost::noncopyable
{
public:
ElementMode();
+ ElementMode(const ElementMode&) = delete;
+ ElementMode& operator=(const ElementMode&) = delete;
SharedBitmapDescriptor mpIcon;
OUString msAction;
@@ -111,9 +111,11 @@ namespace {
} // end of anonymous namespace
class PresenterToolBar::Context
- : private ::boost::noncopyable
{
public:
+ Context() = default;
+ Context(const Context&) = delete;
+ Context& operator=(const Context&) = delete;
Reference<drawing::XPresenterHelper> mxPresenterHelper;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
};
@@ -128,12 +130,13 @@ namespace {
class Element
: private ::cppu::BaseMutex,
- private ::boost::noncopyable,
public ElementInterfaceBase
{
public:
explicit Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
virtual ~Element();
+ Element(const Element&) = delete;
+ Element& operator=(const Element&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 949a697a4c1d..3348a8d1b36e 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -43,8 +43,6 @@
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/frame/XController.hpp>
-#include <boost/noncopyable.hpp>
-
#include <functional>
namespace {
@@ -72,7 +70,6 @@ namespace sdext { namespace presenter {
*/
class PresenterToolBar
: private ::cppu::BaseMutex,
- private ::boost::noncopyable,
public PresenterToolBarInterfaceBase,
public CachablePresenterView
{
@@ -88,6 +85,8 @@ public:
const ::rtl::Reference<PresenterController>& rpPresenterController,
const Anchor eAnchor);
virtual ~PresenterToolBar();
+ PresenterToolBar(const PresenterToolBar&) = delete;
+ PresenterToolBar& operator=(const PresenterToolBar&) = delete;
void Initialize (
const OUString& rsConfigurationPath);
@@ -221,7 +220,6 @@ private:
*/
class PresenterToolBarView
: private ::cppu::BaseMutex,
- private ::boost::noncopyable,
public PresenterToolBarViewInterfaceBase
{
public:
@@ -231,6 +229,8 @@ public:
const css::uno::Reference<css::frame::XController>& rxController,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterToolBarView();
+ PresenterToolBarView(const PresenterToolBarView&) = delete;
+ PresenterToolBarView& operator=(const PresenterToolBarView&) = delete;
virtual void SAL_CALL disposing() override;
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx
index df1bf1177c3b..ed58fd41b43f 100644
--- a/sdext/source/presenter/PresenterUIPainter.hxx
+++ b/sdext/source/presenter/PresenterUIPainter.hxx
@@ -24,18 +24,18 @@
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
-#include <boost/noncopyable.hpp>
namespace sdext { namespace presenter {
/** Functions for painting UI elements.
*/
class PresenterUIPainter
- : private ::boost::noncopyable
{
public:
PresenterUIPainter();
~PresenterUIPainter();
+ PresenterUIPainter(const PresenterUIPainter&) = delete;
+ PresenterUIPainter& operator=(const PresenterUIPainter&) = delete;
static void PaintHorizontalBitmapComposite (
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 9d61c3c1ffad..e8ecd9fc5819 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -39,7 +39,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sdext { namespace presenter {
@@ -62,8 +61,7 @@ namespace {
to be moved or resized with the mouse.
*/
class PresenterWindowManager
- : private ::boost::noncopyable,
- protected ::cppu::BaseMutex,
+ : protected ::cppu::BaseMutex,
public PresenterWindowManagerInterfaceBase
{
public:
@@ -72,6 +70,8 @@ public:
const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer,
const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterWindowManager();
+ PresenterWindowManager(const PresenterWindowManager&) = delete;
+ PresenterWindowManager& operator=(const PresenterWindowManager&) = delete;
void SAL_CALL disposing() override;