From c210bf4510585b554e0e9a371f27fa27e2874762 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Sun, 10 Apr 2016 21:41:44 +0200 Subject: 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 Reviewed-by: Noel Grandin --- 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 +++-- 13 files changed, 30 insertions(+), 31 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 283e8f2ac5d7..f2ddca7fcced 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -21,7 +21,6 @@ #include "dllapi.h" -#include #include #include @@ -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 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 db18d3f4b4cf..cebe09651612 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -125,7 +125,6 @@ #include #include -#include // 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::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 7e6e0dc50ddf..060bcff58aa1 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -25,20 +25,17 @@ #include #include -#include - 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 be672a76da80..4d20683c8d1f 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 #include #include #include @@ -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 63494188bd1f..d6249b4c1913 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -24,8 +24,6 @@ #include #include -#include - #include @@ -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 4f89a2acf3a1..4546b21cdd3a 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 #include #include #include @@ -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 db17d7e1ad50..5b7c20501b4c 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -19,7 +19,6 @@ #include -#include #include #include #include @@ -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 3d88444a4abf..5cfeb7565e80 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 #include #include #include diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index b5e333585264..d491ae70773f 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 #include #include #include @@ -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 211733394be1..c7ce37b1d671 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -30,8 +30,6 @@ #include #include -#include - #include diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 2408d8a82e9f..8df96aa6e920 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -55,7 +55,6 @@ #include #include -#include #include #include @@ -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 5d36d3236b12..ad510d4d9bbe 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -141,7 +141,6 @@ #include "UndoEnv.hxx" #include -#include #include #include diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index c9596b290708..c5594ec34d3e 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -48,7 +47,7 @@ namespace rptui typedef std::map AllProperties; typedef std::map, 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; }; -- cgit v1.2.3