diff options
Diffstat (limited to 'chart2/source/controller/inc')
5 files changed, 14 insertions, 18 deletions
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 28d4fa9a5d86..7e2e942bebe6 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -60,6 +60,8 @@ public: AccessibleChartView(SdrView* pView ); virtual ~AccessibleChartView(); + AccessibleChartView() = delete; + // ____ WeakComponentHelper (called from XComponent::dispose()) ____ virtual void SAL_CALL disposing() override; @@ -123,9 +125,6 @@ private: // members AccessibleUniqueId m_aCurrentSelectionOID; SdrView* m_pSdrView; ::accessibility::IAccessibleViewForwarder* m_pViewForwarder; - - //no default constructor - AccessibleChartView(); }; } //namespace chart diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 2906ade9cedb..f73d7e449370 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -105,7 +105,7 @@ class ChartController : public ::cppu::WeakImplHelper < friend class ShapeController; public: - //no default constructor + ChartController() = delete; explicit ChartController(css::uno::Reference< css::uno::XComponentContext > const & xContext); virtual ~ChartController(); @@ -378,9 +378,6 @@ public: DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void ); -public: - //private - private: DrawViewWrapper* GetDrawViewWrapper(); diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx index ddcbc523963d..ae7ce735573a 100644 --- a/chart2/source/controller/inc/ChartToolbarController.hxx +++ b/chart2/source/controller/inc/ChartToolbarController.hxx @@ -21,8 +21,6 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> -#include <boost/noncopyable.hpp> - namespace chart { namespace { @@ -34,14 +32,16 @@ typedef cppu::WeakComponentImplHelper< } -class ChartToolbarController : private boost::noncopyable, - private cppu::BaseMutex, +class ChartToolbarController : private cppu::BaseMutex, public ChartToolbarControllerBase { public: ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties); virtual ~ChartToolbarController(); + ChartToolbarController(const ChartToolbarController&) = delete; + const ChartToolbarController& operator=(const ChartToolbarController&) = delete; + // XToolbarContoller virtual void SAL_CALL execute(sal_Int16 nKeyModifier) throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 7e7255c4cadc..18b2904b91e2 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -28,7 +28,6 @@ #include <svtools/roadmapwizard.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <boost/noncopyable.hpp> #include <memory> namespace chart @@ -44,7 +43,11 @@ public: CreationWizard( vcl::Window* pParent, const css::uno::Reference< css::frame::XModel >& xChartModel , const css::uno::Reference< css::uno::XComponentContext >& xContext - , sal_Int32 nOnePageOnlyIndex=-1 );//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap + // if nOnePageOnlyIndex is an index of an exsisting page starting with 0 + // then only this page is displayed without next/previous and roadmap + , sal_Int32 nOnePageOnlyIndex=-1 ); + + CreationWizard() = delete; bool isClosable() { /*@todo*/ return m_bIsClosable;} @@ -60,9 +63,6 @@ protected: virtual OUString getStateDisplayName( WizardState nState ) const override; private: - //no default constructor - CreationWizard(); - virtual VclPtr<TabPage> createPage(WizardState nState) override; css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index d9493cfb0d83..0e144f2775a9 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -47,6 +47,8 @@ class CreationWizardUnoDlg : public MutexContainer , public css::beans::XPropertySet { public: + CreationWizardUnoDlg() = delete; + CreationWizardUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~CreationWizardUnoDlg(); @@ -101,8 +103,6 @@ protected: virtual void SAL_CALL disposing() override; private: - //no default constructor - CreationWizardUnoDlg(); void createDialogOnDemand(); private: |