[Libreoffice-commits] core.git: reportdesign/inc reportdesign/source sal/cppunittester sal/osl sal/qa sal/rtl sal/textenc sc/inc sdext/source sd/inc sd/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Mon Apr 11 07:16:01 UTC 2016
reportdesign/inc/RptObject.hxx | 5 ++-
reportdesign/source/core/api/ReportDefinition.cxx | 5 ++-
reportdesign/source/core/inc/conditionupdater.hxx | 10 ++-----
reportdesign/source/core/sdr/UndoEnv.cxx | 5 ++-
reportdesign/source/core/sdr/formatnormalizer.hxx | 6 ++--
reportdesign/source/filter/xml/xmlFixedContent.cxx | 5 ++-
reportdesign/source/filter/xml/xmlfilter.cxx | 5 ++-
reportdesign/source/ui/dlg/AddField.cxx | 1
reportdesign/source/ui/dlg/Navigator.cxx | 5 ++-
reportdesign/source/ui/inc/CondFormat.hxx | 2 -
reportdesign/source/ui/inc/ReportController.hxx | 6 ++--
reportdesign/source/ui/report/ReportController.cxx | 1
reportdesign/source/ui/report/ReportControllerObserver.cxx | 5 ++-
sal/cppunittester/cppunittester.cxx | 12 +++++---
sal/osl/unx/file.cxx | 5 ++-
sal/osl/unx/file_path_helper.cxx | 6 ++--
sal/qa/osl/setthreadname/test-setthreadname.cxx | 7 +++--
sal/rtl/bootstrap.cxx | 11 +++++--
sal/rtl/rtl_process.cxx | 6 ++--
sal/textenc/textenc.cxx | 11 +++++--
sc/inc/chart2uno.hxx | 14 +++++-----
sc/inc/dptabsrc.hxx | 9 ++++--
sc/inc/table.hxx | 5 ++-
sd/inc/Outliner.hxx | 7 ++---
sd/source/core/annotations/Annotation.cxx | 6 ++--
sd/source/core/annotations/AnnotationEnumeration.cxx | 5 ++-
sd/source/core/undoanim.cxx | 5 ++-
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx | 6 ++--
sd/source/ui/inc/SlideSorter.hxx | 6 ++--
sd/source/ui/inc/framework/ConfigurationController.hxx | 4 +-
sd/source/ui/presenter/CanvasUpdateRequester.hxx | 8 +++--
sd/source/ui/presenter/PresenterCanvas.cxx | 6 ++--
sd/source/ui/presenter/PresenterCanvas.hxx | 6 ++--
sd/source/ui/presenter/PresenterHelper.hxx | 6 ++--
sd/source/ui/presenter/PresenterPreviewCache.hxx | 6 ++--
sd/source/ui/presenter/PresenterTextView.hxx | 6 ++--
sd/source/ui/presenter/SlideRenderer.hxx | 6 ++--
sd/source/ui/remotecontrol/IBluetoothSocket.hxx | 6 ++--
sd/source/ui/sidebar/PanelFactory.hxx | 6 ++--
sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx | 2 -
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 5 ++-
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 7 ++---
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 6 ++--
sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx | 8 ++---
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 9 +++---
sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 6 ++--
sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 6 ++--
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 6 ++--
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 6 ++--
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 6 ++--
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 1
sdext/source/pdfimport/misc/pwdinteract.cxx | 11 ++++---
sdext/source/presenter/PresenterBitmapContainer.hxx | 4 +-
sdext/source/presenter/PresenterButton.hxx | 6 ++--
sdext/source/presenter/PresenterCanvasHelper.hxx | 4 +-
sdext/source/presenter/PresenterFrameworkObserver.hxx | 8 ++---
sdext/source/presenter/PresenterHelpView.cxx | 5 ++-
sdext/source/presenter/PresenterPaneBase.hxx | 4 +-
sdext/source/presenter/PresenterPaneBorderManager.hxx | 6 ++--
sdext/source/presenter/PresenterPaneBorderPainter.hxx | 6 ++--
sdext/source/presenter/PresenterPaneContainer.hxx | 7 ++---
sdext/source/presenter/PresenterScreen.cxx | 6 ++--
sdext/source/presenter/PresenterScreen.hxx | 13 +++++----
sdext/source/presenter/PresenterScrollBar.hxx | 7 ++---
sdext/source/presenter/PresenterSlidePreview.hxx | 6 ++--
sdext/source/presenter/PresenterSlideShowView.hxx | 6 ++--
sdext/source/presenter/PresenterSlideSorter.cxx | 4 +-
sdext/source/presenter/PresenterSprite.hxx | 4 +-
sdext/source/presenter/PresenterToolBar.cxx | 11 +++++--
sdext/source/presenter/PresenterToolBar.hxx | 8 ++---
sdext/source/presenter/PresenterUIPainter.hxx | 4 +-
sdext/source/presenter/PresenterWindowManager.hxx | 6 ++--
72 files changed, 243 insertions(+), 203 deletions(-)
New commits:
commit c210bf4510585b554e0e9a371f27fa27e2874762
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Sun Apr 10 21:41:44 2016 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 283e8f2..f2ddca7 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -21,7 +21,6 @@
#include "dllapi.h"
-#include <boost/noncopyable.hpp>
#include <svx/svdoole2.hxx>
#include <svx/svdouno.hxx>
@@ -66,7 +65,7 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo
class OReportPage;
class OPropertyMediator;
-class REPORTDESIGN_DLLPUBLIC OObjectBase: private boost::noncopyable
+class REPORTDESIGN_DLLPUBLIC OObjectBase
{
public:
typedef rtl::Reference<OPropertyMediator> TMediator;
@@ -100,6 +99,8 @@ private:
const css::uno::Reference< css::uno::XInterface >& _rxShape );
public:
+ OObjectBase(const OObjectBase&) = delete;
+ OObjectBase& operator=(const OObjectBase&) = delete;
void StartListening();
void EndListening(bool bRemoveListener = true);
// PropertyChangeListener
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index db18d3f..cebe096 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -125,7 +125,6 @@
#include <vcl/virdev.hxx>
#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
// page styles
#define SC_UNO_PAGE_LEFTBORDER "LeftBorder"
@@ -2314,7 +2313,7 @@ typedef ::cppu::WeakImplHelper< container::XNameContainer,
container::XIndexAccess
> TStylesBASE;
class OStylesHelper:
- public cppu::BaseMutex, public TStylesBASE, private boost::noncopyable
+ public cppu::BaseMutex, public TStylesBASE
{
typedef ::std::map< OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements;
TStyleElements m_aElements;
@@ -2325,6 +2324,8 @@ protected:
virtual ~OStylesHelper(){}
public:
explicit OStylesHelper(const uno::Type& rType = cppu::UnoType<container::XElementAccess>::get());
+ OStylesHelper(const OStylesHelper&) = delete;
+ OStylesHelper& operator=(const OStylesHelper&) = delete;
// XNameContainer
virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx
index 7e6e0dc..060bcff 100644
--- a/reportdesign/source/core/inc/conditionupdater.hxx
+++ b/reportdesign/source/core/inc/conditionupdater.hxx
@@ -25,20 +25,17 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/report/XReportControlModel.hpp>
-#include <boost/noncopyable.hpp>
-
namespace rptui
{
-
- //= ConditionUpdater
-
- class ConditionUpdater : public ::boost::noncopyable
+ class ConditionUpdater
{
public:
ConditionUpdater();
~ConditionUpdater();
+ ConditionUpdater(const ConditionUpdater&) = delete;
+ ConditionUpdater& operator=(const ConditionUpdater&) = delete;
/// notifies the object about the change of a property value, somewhere in the report definition
void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent );
@@ -57,7 +54,6 @@ namespace rptui
ConditionalExpressions m_aConditionalExpressions;
};
-
} // namespace rptui
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index be672a7..4d20683 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -29,7 +29,6 @@
#include "RptResId.hrc"
#include "RptModel.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -88,7 +87,7 @@ struct ObjectInfo
typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterfaceCompare< XPropertySet > > PropertySetInfoCache;
-class OXUndoEnvironmentImpl: private boost::noncopyable
+class OXUndoEnvironmentImpl
{
public:
OReportModel& m_rModel;
@@ -103,6 +102,8 @@ public:
bool m_bIsUndo;
explicit OXUndoEnvironmentImpl(OReportModel& _rModel);
+ OXUndoEnvironmentImpl(const OXUndoEnvironmentImpl&) = delete;
+ OXUndoEnvironmentImpl& operator=(const OXUndoEnvironmentImpl&) = delete;
};
OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_rModel)
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index 6349418..d6249b4 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -24,8 +24,6 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/report/XFormattedField.hpp>
-#include <boost/noncopyable.hpp>
-
#include <vector>
@@ -37,7 +35,7 @@ namespace rptui
//= FormatNormalizer
- class FormatNormalizer : public ::boost::noncopyable
+ class FormatNormalizer
{
public:
struct Field
@@ -62,6 +60,8 @@ namespace rptui
public:
explicit FormatNormalizer( const OReportModel& _rModel );
~FormatNormalizer();
+ FormatNormalizer(const FormatNormalizer&) = delete;
+ FormatNormalizer& operator=(const FormatNormalizer&) = delete;
void notifyPropertyChange( const css::beans::PropertyChangeEvent& _rEvent );
void notifyElementInserted( const css::uno::Reference< css::uno::XInterface >& _rxElement );
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 4f89a2a..4546b21 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -18,7 +18,6 @@
*/
#include "xmlFixedContent.hxx"
#include "xmlfilter.hxx"
-#include <boost/noncopyable.hpp>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
@@ -38,7 +37,7 @@ namespace rptxml
{
using namespace ::com::sun::star;
-class OXMLCharContent: public XMLCharContext, private boost::noncopyable
+class OXMLCharContent: public XMLCharContext
{
OXMLFixedContent* m_pFixedContent;
@@ -58,6 +57,8 @@ public:
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Int16 nControl );
+ OXMLCharContent(const OXMLCharContent&) = delete;
+ OXMLCharContent& operator=(const OXMLCharContent&) = delete;
virtual void InsertControlCharacter(sal_Int16 _nControl) override;
virtual void InsertString(const OUString& _sString) override;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index db17d7e..5b7c205 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
@@ -83,7 +82,7 @@ using namespace ::com::sun::star::util;
class RptMLMasterStylesContext_Impl:
- public XMLTextMasterStylesContext, private boost::noncopyable
+ public XMLTextMasterStylesContext
{
ORptFilter& m_rImport;
@@ -95,6 +94,8 @@ public:
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~RptMLMasterStylesContext_Impl();
+ RptMLMasterStylesContext_Impl(const RptMLMasterStylesContext_Impl&) = delete;
+ RptMLMasterStylesContext_Impl& operator=(const RptMLMasterStylesContext_Impl&) = delete;
virtual void EndElement() override;
};
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 3d88444..5cfeb75 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -18,7 +18,6 @@
*/
#include "AddField.hxx"
#include "UITools.hxx"
-#include <boost/noncopyable.hpp>
#include <svx/dbaexchange.hxx>
#include <svx/svdpagv.hxx>
#include <com/sun/star/sdb/CommandType.hpp>
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index b5e3335..d491ae7 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -24,7 +24,6 @@
#include "UITools.hxx"
#include "RptUndo.hxx"
#include "reportformula.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/report/XFixedText.hpp>
@@ -871,10 +870,12 @@ Size NavigatorTree::GetOptimalSize() const
}
// class ONavigatorImpl
-class ONavigatorImpl: private boost::noncopyable
+class ONavigatorImpl
{
public:
ONavigatorImpl(OReportController& _rController,ONavigator* _pParent);
+ ONavigatorImpl(const ONavigatorImpl&) = delete;
+ ONavigatorImpl& operator=(const ONavigatorImpl&) = delete;
uno::Reference< report::XReportDefinition> m_xReport;
::rptui::OReportController& m_rController;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 2117333..c7ce37b 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -30,8 +30,6 @@
#include <vcl/layout.hxx>
#include <vcl/scrbar.hxx>
-#include <boost/noncopyable.hpp>
-
#include <vector>
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 2408d8a82..8df96aa 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -55,7 +55,6 @@
#include <svx/svdedtv.hxx>
#include <sfx2/zoomitem.hxx>
-#include <boost/noncopyable.hpp>
#include <functional>
#include <memory>
@@ -83,7 +82,6 @@ namespace rptui
,public SfxListener
,public ::comphelper::OPropertyStateContainer
,public ::comphelper::OPropertyArrayUsageHelper < OReportController_BASE >
- ,public ::boost::noncopyable
{
private:
OModuleClient m_aModuleClient;
@@ -333,7 +331,9 @@ namespace rptui
virtual ~OReportController();
public:
- OReportController(css::uno::Reference< css::uno::XComponentContext > const & the_context);
+ explicit OReportController(css::uno::Reference< css::uno::XComponentContext > const & the_context);
+ OReportController(const OReportController&) = delete;
+ OReportController& operator=(const OReportController&) = delete;
DECL_LINK_TYPED( EventLstHdl, VclWindowEvent&, void );
DECL_LINK_TYPED( OnCreateHdl, OAddFieldWindow&, void);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 5d36d32..ad510d4 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -141,7 +141,6 @@
#include "UndoEnv.hxx"
#include <boost/bind.hpp>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index c9596b2..c5594ec 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -23,7 +23,6 @@
#include <ReportControllerObserver.hxx>
#include <ReportController.hxx>
-#include <boost/noncopyable.hpp>
#include <svl/smplhint.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -48,7 +47,7 @@ namespace rptui
typedef std::map<OUString, bool> AllProperties;
typedef std::map<uno::Reference< beans::XPropertySet >, AllProperties> PropertySetInfoCache;
-class OXReportControllerObserverImpl: private boost::noncopyable
+class OXReportControllerObserverImpl
{
public:
::std::vector< uno::Reference< container::XChild> > m_aSections;
@@ -57,6 +56,8 @@ public:
bool m_bReadOnly;
explicit OXReportControllerObserverImpl();
+ OXReportControllerObserverImpl(const OXReportControllerObserverImpl&) = delete;
+ OXReportControllerObserverImpl& operator=(const OXReportControllerObserverImpl&) = delete;
};
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 30347c1..3beb901 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -52,7 +52,6 @@
#include "cppunit/plugin/DynamicLibraryManagerException.h"
#include "cppunit/portability/Stream.h"
-#include "boost/noncopyable.hpp"
#include <memory>
#include <boost/algorithm/string.hpp>
@@ -86,9 +85,11 @@ std::string convertLazy(rtl::OUString const & s16) {
//Output how long each test took
class TimingListener
: public CppUnit::TestListener
- , private boost::noncopyable
{
public:
+ TimingListener(const TimingListener&) = delete;
+ TimingListener& operator=(const TimingListener&) = delete;
+
void startTest( CppUnit::Test *) override
{
m_nStartTime = osl_getGlobalTimer();
@@ -112,9 +113,11 @@ private:
// have a useful value to identify the source
class EyecatcherListener
: public CppUnit::TestListener
- , private boost::noncopyable
{
public:
+ EyecatcherListener() = default;
+ EyecatcherListener(const EyecatcherListener&) = delete;
+ EyecatcherListener& operator=(const EyecatcherListener&) = delete;
void startTest( CppUnit::Test* test) override
{
std::unique_ptr<char[]> tn(new char [ test->getName().length() + 2 ]);
@@ -209,7 +212,6 @@ void addRecursiveTests(const std::vector<std::string>& test_names, CppUnit::Test
//exception before falling over and dying
class CPPUNIT_API ProtectedFixtureFunctor
: public CppUnit::Functor
- , private boost::noncopyable
{
private:
const std::string &testlib;
@@ -224,6 +226,8 @@ public:
, result(result_)
{
}
+ ProtectedFixtureFunctor(const ProtectedFixtureFunctor&) = delete;
+ ProtectedFixtureFunctor& operator=(const ProtectedFixtureFunctor&) = delete;
bool run() const
{
#ifdef DISABLE_DYNLOADING
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 3f44a10..2938e0e 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -19,7 +19,6 @@
#include <config_features.h>
-#include "boost/noncopyable.hpp"
#include "osl/file.hxx"
#include "osl/detail/file.h"
@@ -152,12 +151,14 @@ struct FileHandle_Impl
/** Buffer cache / allocator.
*/
- class Allocator: private boost::noncopyable
+ class Allocator
{
rtl_cache_type * m_cache;
size_t m_bufsiz;
public:
+ Allocator(const Allocator&) = delete;
+ Allocator& operator=(const Allocator&) = delete;
static Allocator & get();
void allocate (sal_uInt8 ** ppBuffer, size_t * pnSize);
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index ec8eeb5..23486c5 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -20,7 +20,6 @@
#include "file_path_helper.hxx"
#include "uunxapi.hxx"
-#include <boost/noncopyable.hpp>
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
@@ -157,7 +156,7 @@ bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry(
the specified character
**********************************************/
-class path_list_iterator: private boost::noncopyable
+class path_list_iterator
{
public:
@@ -173,6 +172,9 @@ public:
reset();
}
+ path_list_iterator(const path_list_iterator&) = delete;
+ path_list_iterator& operator=(const path_list_iterator&) = delete;
+
void reset()
{
m_path_segment_begin = m_path_segment_end = m_path_list.getStr();
diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx
index be0b030..d188b07 100644
--- a/sal/qa/osl/setthreadname/test-setthreadname.cxx
+++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx
@@ -22,7 +22,6 @@
#include <limits>
#include <sal/types.h>
-#include "boost/noncopyable.hpp"
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
@@ -31,9 +30,13 @@
namespace {
-class TestThread: public osl::Thread, private boost::noncopyable {
+class TestThread: public osl::Thread {
private:
virtual void SAL_CALL run() override;
+public:
+ TestThread() = default;
+ TestThread(const TestThread&) = delete;
+ TestThread& operator=(const TestThread&) = delete;
};
void TestThread::run() {
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 84fd1fc..030afe4 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -37,7 +37,6 @@
#include <rtl/malformeduriexception.hxx>
#include <rtl/uri.hxx>
-#include <boost/noncopyable.hpp>
#include <list>
#include <algorithm>
#include <unordered_map>
@@ -407,7 +406,7 @@ Bootstrap_Impl * get_static_bootstrap_handle()
return s_handle;
}
-struct FundamentalIniData: private boost::noncopyable {
+struct FundamentalIniData {
rtlBootstrapHandle ini;
FundamentalIniData() {
@@ -422,6 +421,9 @@ struct FundamentalIniData: private boost::noncopyable {
}
~FundamentalIniData() { rtl_bootstrap_args_close(ini); }
+
+ FundamentalIniData(const FundamentalIniData&) = delete;
+ FundamentalIniData& operator=(const FundamentalIniData&) = delete;
};
struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni >
@@ -578,11 +580,14 @@ void Bootstrap_Impl::expandValue(
namespace {
-struct bootstrap_map: private boost::noncopyable {
+struct bootstrap_map {
typedef std::unordered_map<
rtl::OUString, Bootstrap_Impl *,
rtl::OUStringHash > t;
+ bootstrap_map(const bootstrap_map&) = delete;
+ bootstrap_map& operator=(const bootstrap_map&) = delete;
+
// get and release must only be called properly synchronized via some mutex
// (e.g., osl::Mutex::getGlobalMutex()):
diff --git a/sal/rtl/rtl_process.cxx b/sal/rtl/rtl_process.cxx
index 5eb411b..a391dc8 100644
--- a/sal/rtl/rtl_process.cxx
+++ b/sal/rtl/rtl_process.cxx
@@ -21,7 +21,6 @@
#include <cstring>
-#include "boost/noncopyable.hpp"
#include "rtl/instance.hxx"
#include "rtl/process.h"
#include "rtl/uuid.h"
@@ -29,10 +28,13 @@
namespace {
-class Id: private boost::noncopyable {
+class Id {
public:
Id() { rtl_createUuid(uuid_, nullptr, false); }
+ Id(const Id&) = delete;
+ Id& operator=(const Id&) = delete;
+
void copy(sal_uInt8 * target) const
{ std::memcpy(target, uuid_, UUID_SIZE); }
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index e4a6a6c..afae9c2 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -26,7 +26,6 @@
#include <cstddef>
#include <cstdlib>
-#include "boost/noncopyable.hpp"
#include "osl/diagnose.h"
#include "osl/module.hxx"
#include "rtl/instance.hxx"
@@ -359,12 +358,15 @@ namespace {
extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
rtl_TextEncoding); // from tables.cxx in sal_textenc library
-class FullTextEncodingData: private boost::noncopyable {
+class FullTextEncodingData {
public:
ImplTextEncodingData const * get(rtl_TextEncoding encoding) {
(void) this; // loplugin:staticmethods
return sal_getFullTextEncodingData(encoding);
}
+ FullTextEncodingData() = default;
+ FullTextEncodingData(const FullTextEncodingData&) = delete;
+ FullTextEncodingData& operator=(const FullTextEncodingData&) = delete;
};
#else
@@ -377,7 +379,7 @@ void SAL_CALL thisModule() {}
};
-class FullTextEncodingData: private boost::noncopyable {
+class FullTextEncodingData {
public:
FullTextEncodingData() {
if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenclo")))
@@ -398,6 +400,9 @@ public:
return (*function_)(encoding);
}
+ FullTextEncodingData(const FullTextEncodingData&) = delete;
+ FullTextEncodingData& operator=(const FullTextEncodingData&) = delete;
+
private:
osl::Module module_;
TextEncodingFunction * function_;
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 44df1e7..3d2a61f 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -50,7 +50,6 @@
#include <memory>
#include <unordered_set>
#include <vector>
-#include <boost/noncopyable.hpp>
class ScDocument;
@@ -235,8 +234,7 @@ class ScChart2DataSequence : public
css::util::XModifyBroadcaster,
css::beans::XPropertySet,
css::lang::XServiceInfo>,
- public SfxListener,
- private boost::noncopyable
+ public SfxListener
{
public:
explicit ScChart2DataSequence( ScDocument* pDoc,
@@ -244,6 +242,9 @@ public:
::std::vector<ScTokenRef>&& rTokens, bool bIncludeHiddenCells );
virtual ~ScChart2DataSequence();
+ ScChart2DataSequence(const ScChart2DataSequence&) = delete;
+ ScChart2DataSequence& operator=(const ScChart2DataSequence&) = delete;
+
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
// XDataSequence
@@ -364,21 +365,20 @@ private:
DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void );
private:
- ScChart2DataSequence(const ScChart2DataSequence& r) = delete;
-
class ExternalRefListener : public ScExternalRefManager::LinkListener
{
public:
ExternalRefListener(ScChart2DataSequence& rParent, ScDocument* pDoc);
virtual ~ExternalRefListener();
+ ExternalRefListener(const ExternalRefListener&) = delete;
+ ExternalRefListener& operator=(const ExternalRefListener&) = delete;
+
virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) override;
void addFileId(sal_uInt16 nFileId);
void removeFileId(sal_uInt16 nFileId);
const std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
private:
- ExternalRefListener(const ExternalRefListener& r) = delete;
-
ScChart2DataSequence& mrParent;
std::unordered_set<sal_uInt16> maFileIds;
ScDocument* mpDoc;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index e696623..035ba28 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -47,7 +47,6 @@
#include "dpglobal.hxx"
#include "dpresfilter.hxx"
-#include <boost/noncopyable.hpp>
#include <list>
#include <memory>
#include <unordered_map>
@@ -299,7 +298,7 @@ public:
ScDPDimension* getByIndex(long nIndex) const;
};
-class ScDPDimension : private boost::noncopyable, public cppu::WeakImplHelper<
+class ScDPDimension : public cppu::WeakImplHelper<
css::sheet::XHierarchiesSupplier,
css::container::XNamed,
css::util::XCloneable,
@@ -325,6 +324,8 @@ class ScDPDimension : private boost::noncopyable, public cppu::WeakImplHelper<
public:
ScDPDimension( ScDPSource* pSrc, long nD );
virtual ~ScDPDimension();
+ ScDPDimension(const ScDPDimension&) = delete;
+ ScDPDimension& operator=(const ScDPDimension&) = delete;
long GetDimension() const { return nDim; } // dimension index in source
long GetSourceDim() const { return nSourceDim; } // >=0 if dup'ed
@@ -706,7 +707,7 @@ public:
SCROW GetSrcItemsCount();
};
-class ScDPMember : private boost::noncopyable, public cppu::WeakImplHelper<
+class ScDPMember : public cppu::WeakImplHelper<
css::container::XNamed,
css::beans::XPropertySet,
css::lang::XServiceInfo >
@@ -727,6 +728,8 @@ private:
public:
ScDPMember(ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex);
virtual ~ScDPMember();
+ ScDPMember(const ScDPMember&) = delete;
+ ScDPMember& operator=(const ScDPMember&) = delete;
OUString GetNameStr() const;
void FillItemData( ScDPItemData& rData ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fb85896..57075d8 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -38,7 +38,6 @@
#include <set>
#include <map>
#include <memory>
-#include <boost/noncopyable.hpp>
namespace utl {
class TextSearch;
@@ -115,7 +114,7 @@ class ScDBData;
class ScDocumentImport;
class ScHint;
-class ScTable : private boost::noncopyable
+class ScTable
{
private:
typedef ::std::vector< ScRange > ScRangeVec;
@@ -228,6 +227,8 @@ public:
ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName,
bool bColInfo = true, bool bRowInfo = true );
~ScTable();
+ ScTable(const ScTable&) = delete;
+ ScTable& operator=(const ScTable&) = delete;
ScDocument& GetDoc() { return *pDocument;}
const ScDocument& GetDoc() const { return *pDocument;}
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 89ba020..73434a7 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 da351ff..3a2b061 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 25bb921..07d7ad6 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 f0fac60..3a953db 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 4917321..55744ed 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 8fac456..cd44236 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 c6e78c7..dbb9cc9 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 b042819..c9662b7 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 2df5cda..0c19742 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 2484ea9..8e09370 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 0abe086..785cd17 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 3080700..af8985a 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 30c4a9e..7570ab7 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 15ed3cf..3f053d9 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 c229f92..a1f542d 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 d1ecf70..a60b3c7 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 8de015f..59509a7 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 9b90f36..5296db1 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 596fda6..835e45b 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 9b7af9b..935b4a6 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 56e2113..7e227b5 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 fc535c3..d8cbb7c 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 2e3753f..ad822cf 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 ff6a398..a7f9031 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 9f7e09c..b7ebe22 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 2f57b1f..c361dd3 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 84de2c9..67dfc70 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 0a6ac66..b6d3443 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>
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 48c9a75..ee189ad 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 cad6fff..78c83d8 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 5200e2c..4421c37 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 e26e845..d079785 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 5ce5bcf..35258e7e 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 ad1e873..77ab818 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 18037bf..0defffe 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 6d81840..f5251da 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 324f7e9..eb3f4ae 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 2cf299d..84fb3b5 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 5b9d9a4..0a66ff2 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 d707b4e..6dfc71a 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 5429723..73ccbfa 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 ff4208a..a0ec6d1 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 5340bf6..e30e2d9 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 d7ece04..d3d5ecf 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 594caa6..7043f189 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 50ad192..2203007 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 949a697..3348a8d 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 df1bf11..ed58fd4 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 9d61c3c..e8ecd9f 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;
More information about the Libreoffice-commits
mailing list