Kaydet (Commit) 25934dec authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) David Tardon

tdf#94306 replace boost::noncopyable in chart2

Replace with C++11 delete copy-constructur
and copy-assignment.
Delete default-constructors when comments suggested it.

Change-Id: Ieeaf6ca998a4165d6eacf5e900c6a09aafdcfbe6
Reviewed-on: https://gerrit.libreoffice.org/23903Reviewed-by: 's avatarJochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst fd61dee6
...@@ -213,7 +213,7 @@ private: ...@@ -213,7 +213,7 @@ private:
void insertDefaultChart(); void insertDefaultChart();
public: public:
//no default constructor ChartModel() = delete;
ChartModel(css::uno::Reference< css::uno::XComponentContext > const & xContext); ChartModel(css::uno::Reference< css::uno::XComponentContext > const & xContext);
explicit ChartModel( const ChartModel & rOther ); explicit ChartModel( const ChartModel & rOther );
virtual ~ChartModel(); virtual ~ChartModel();
......
...@@ -60,6 +60,8 @@ public: ...@@ -60,6 +60,8 @@ public:
AccessibleChartView(SdrView* pView ); AccessibleChartView(SdrView* pView );
virtual ~AccessibleChartView(); virtual ~AccessibleChartView();
AccessibleChartView() = delete;
// ____ WeakComponentHelper (called from XComponent::dispose()) ____ // ____ WeakComponentHelper (called from XComponent::dispose()) ____
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
...@@ -123,9 +125,6 @@ private: // members ...@@ -123,9 +125,6 @@ private: // members
AccessibleUniqueId m_aCurrentSelectionOID; AccessibleUniqueId m_aCurrentSelectionOID;
SdrView* m_pSdrView; SdrView* m_pSdrView;
::accessibility::IAccessibleViewForwarder* m_pViewForwarder; ::accessibility::IAccessibleViewForwarder* m_pViewForwarder;
//no default constructor
AccessibleChartView();
}; };
} //namespace chart } //namespace chart
......
...@@ -105,7 +105,7 @@ class ChartController : public ::cppu::WeakImplHelper < ...@@ -105,7 +105,7 @@ class ChartController : public ::cppu::WeakImplHelper <
friend class ShapeController; friend class ShapeController;
public: public:
//no default constructor ChartController() = delete;
explicit ChartController(css::uno::Reference< css::uno::XComponentContext > const & xContext); explicit ChartController(css::uno::Reference< css::uno::XComponentContext > const & xContext);
virtual ~ChartController(); virtual ~ChartController();
...@@ -378,9 +378,6 @@ public: ...@@ -378,9 +378,6 @@ public:
DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void ); DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void );
public:
//private
private: private:
DrawViewWrapper* GetDrawViewWrapper(); DrawViewWrapper* GetDrawViewWrapper();
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp>
#include <boost/noncopyable.hpp>
namespace chart { namespace chart {
namespace { namespace {
...@@ -34,14 +32,16 @@ typedef cppu::WeakComponentImplHelper< ...@@ -34,14 +32,16 @@ typedef cppu::WeakComponentImplHelper<
} }
class ChartToolbarController : private boost::noncopyable, class ChartToolbarController : private cppu::BaseMutex,
private cppu::BaseMutex,
public ChartToolbarControllerBase public ChartToolbarControllerBase
{ {
public: public:
ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties); ChartToolbarController(const css::uno::Sequence<css::uno::Any>& rProperties);
virtual ~ChartToolbarController(); virtual ~ChartToolbarController();
ChartToolbarController(const ChartToolbarController&) = delete;
const ChartToolbarController& operator=(const ChartToolbarController&) = delete;
// XToolbarContoller // XToolbarContoller
virtual void SAL_CALL execute(sal_Int16 nKeyModifier) virtual void SAL_CALL execute(sal_Int16 nKeyModifier)
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <svtools/roadmapwizard.hxx> #include <svtools/roadmapwizard.hxx>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <boost/noncopyable.hpp>
#include <memory> #include <memory>
namespace chart namespace chart
...@@ -44,7 +43,11 @@ public: ...@@ -44,7 +43,11 @@ public:
CreationWizard( vcl::Window* pParent, CreationWizard( vcl::Window* pParent,
const css::uno::Reference< css::frame::XModel >& xChartModel const css::uno::Reference< css::frame::XModel >& xChartModel
, const css::uno::Reference< css::uno::XComponentContext >& xContext , 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;} bool isClosable() { /*@todo*/ return m_bIsClosable;}
...@@ -60,9 +63,6 @@ protected: ...@@ -60,9 +63,6 @@ protected:
virtual OUString getStateDisplayName( WizardState nState ) const override; virtual OUString getStateDisplayName( WizardState nState ) const override;
private: private:
//no default constructor
CreationWizard();
virtual VclPtr<TabPage> createPage(WizardState nState) override; virtual VclPtr<TabPage> createPage(WizardState nState) override;
css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; css::uno::Reference< css::chart2::XChartDocument > m_xChartModel;
......
...@@ -47,6 +47,8 @@ class CreationWizardUnoDlg : public MutexContainer ...@@ -47,6 +47,8 @@ class CreationWizardUnoDlg : public MutexContainer
, public css::beans::XPropertySet , public css::beans::XPropertySet
{ {
public: public:
CreationWizardUnoDlg() = delete;
CreationWizardUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext ); CreationWizardUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~CreationWizardUnoDlg(); virtual ~CreationWizardUnoDlg();
...@@ -101,8 +103,6 @@ protected: ...@@ -101,8 +103,6 @@ protected:
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
private: private:
//no default constructor
CreationWizardUnoDlg();
void createDialogOnDemand(); void createDialogOnDemand();
private: private:
......
...@@ -39,10 +39,11 @@ private: ...@@ -39,10 +39,11 @@ private:
::osl::Condition m_oCancelFinished; ::osl::Condition m_oCancelFinished;
private: private:
bool impl_checkCancel(); bool impl_checkCancel();
//no default constructor
ChartFrameLoader(){}
public: public:
ChartFrameLoader() = delete;
explicit ChartFrameLoader(css::uno::Reference< css::uno::XComponentContext > const & xContext); explicit ChartFrameLoader(css::uno::Reference< css::uno::XComponentContext > const & xContext);
virtual ~ChartFrameLoader(); virtual ~ChartFrameLoader();
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <com/sun/star/chart2/XInternalDataProvider.hpp>
#include <boost/noncopyable.hpp>
namespace chart namespace chart
{ {
...@@ -35,7 +33,7 @@ namespace chart ...@@ -35,7 +33,7 @@ namespace chart
E_MODEL_WITH_SELECTION E_MODEL_WITH_SELECTION
}; };
class ChartModelClone : public ::boost::noncopyable class ChartModelClone
{ {
public: public:
ChartModelClone( ChartModelClone(
...@@ -45,6 +43,9 @@ namespace chart ...@@ -45,6 +43,9 @@ namespace chart
~ChartModelClone(); ~ChartModelClone();
ChartModelClone(const ChartModelClone&) = delete;
const ChartModelClone& operator=(const ChartModelClone&) = delete;
ModelFacet getFacet() const; ModelFacet getFacet() const;
void applyToModel( const css::uno::Reference< css::frame::XModel >& i_model ) const; void applyToModel( const css::uno::Reference< css::frame::XModel >& i_model ) const;
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include <deque> #include <deque>
#include <utility> #include <utility>
#include <boost/noncopyable.hpp>
class SdrUndoAction; class SdrUndoAction;
namespace chart namespace chart
...@@ -48,7 +46,6 @@ typedef ::cppu::WeakComponentImplHelper< css::document::XUndoAction > UndoElemen ...@@ -48,7 +46,6 @@ typedef ::cppu::WeakComponentImplHelper< css::document::XUndoAction > UndoElemen
class UndoElement :public UndoElement_MBase class UndoElement :public UndoElement_MBase
,public UndoElement_TBase ,public UndoElement_TBase
,public ::boost::noncopyable
{ {
public: public:
/** creates a new undo action /** creates a new undo action
...@@ -66,6 +63,9 @@ public: ...@@ -66,6 +63,9 @@ public:
const std::shared_ptr< ChartModelClone >& i_modelClone const std::shared_ptr< ChartModelClone >& i_modelClone
); );
UndoElement(const UndoElement&) = delete;
const UndoElement& operator=(const UndoElement&) = delete;
// XUndoAction // XUndoAction
virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp>
#include <boost/noncopyable.hpp>
namespace chart { namespace sidebar { namespace chart { namespace sidebar {
...@@ -37,14 +36,16 @@ namespace ...@@ -37,14 +36,16 @@ namespace
} }
class ChartPanelFactory class ChartPanelFactory
: private ::boost::noncopyable, : private ::cppu::BaseMutex,
private ::cppu::BaseMutex,
public PanelFactoryInterfaceBase public PanelFactoryInterfaceBase
{ {
public: public:
ChartPanelFactory(); ChartPanelFactory();
virtual ~ChartPanelFactory(); virtual ~ChartPanelFactory();
ChartPanelFactory(const ChartPanelFactory&) = delete;
const ChartPanelFactory& operator=(const ChartPanelFactory&) = delete;
// XUIElementFactory // XUIElementFactory
virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
const ::rtl::OUString& rsResourceURL, const ::rtl::OUString& rsResourceURL,
......
...@@ -47,6 +47,7 @@ typedef ::cppu::WeakImplHelper< ...@@ -47,6 +47,7 @@ typedef ::cppu::WeakImplHelper<
class NameContainer : public impl::NameContainer_Base class NameContainer : public impl::NameContainer_Base
{ {
public: public:
NameContainer() = delete;
NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); NameContainer( const css::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
explicit NameContainer( const NameContainer & rOther ); explicit NameContainer( const NameContainer & rOther );
virtual ~NameContainer(); virtual ~NameContainer();
...@@ -75,9 +76,6 @@ public: ...@@ -75,9 +76,6 @@ public:
// XCloneable // XCloneable
virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override;
private: //methods
NameContainer();//no default constructor
private: //member private: //member
const css::uno::Type m_aType; const css::uno::Type m_aType;
const OUString m_aServicename; const OUString m_aServicename;
......
...@@ -41,10 +41,9 @@ private: ...@@ -41,10 +41,9 @@ private:
VclPtr<OutputDevice> m_pRefDevice; VclPtr<OutputDevice> m_pRefDevice;
//no default constructor
DrawModelWrapper();
public: public:
DrawModelWrapper() = delete;
SAL_DLLPRIVATE DrawModelWrapper( SAL_DLLPRIVATE DrawModelWrapper(
const css::uno::Reference<css::uno::XComponentContext>& xContext ); const css::uno::Reference<css::uno::XComponentContext>& xContext );
SAL_DLLPRIVATE virtual ~DrawModelWrapper(); SAL_DLLPRIVATE virtual ~DrawModelWrapper();
......
...@@ -30,6 +30,8 @@ class AreaChart : public VSeriesPlotter ...@@ -30,6 +30,8 @@ class AreaChart : public VSeriesPlotter
{ {
// public methods // public methods
public: public:
AreaChart() = delete;
AreaChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel AreaChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount , sal_Int32 nDimensionCount
, bool bCategoryXAxis, bool bNoArea=false , bool bCategoryXAxis, bool bNoArea=false
...@@ -50,9 +52,6 @@ public: ...@@ -50,9 +52,6 @@ public:
virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override;
private: //methods private: //methods
//no default constructor
AreaChart();
void impl_createSeriesShapes(); void impl_createSeriesShapes();
bool impl_createArea( VDataSeries* pSeries bool impl_createArea( VDataSeries* pSeries
, css::drawing::PolyPolygonShape3D* pSeriesPoly , css::drawing::PolyPolygonShape3D* pSeriesPoly
......
...@@ -30,6 +30,8 @@ class BarChart : public VSeriesPlotter ...@@ -30,6 +30,8 @@ class BarChart : public VSeriesPlotter
{ {
// public methods // public methods
public: public:
BarChart() = delete;
BarChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel BarChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount ); , sal_Int32 nDimensionCount );
virtual ~BarChart(); virtual ~BarChart();
...@@ -40,9 +42,6 @@ public: ...@@ -40,9 +42,6 @@ public:
virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override; virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override;
private: //methods private: //methods
//no default constructor
BarChart();
css::uno::Reference< css::drawing::XShape > css::uno::Reference< css::drawing::XShape >
createDataPoint3D_Bar( createDataPoint3D_Bar(
const css::uno::Reference< css::drawing::XShapes >& xTarget const css::uno::Reference< css::drawing::XShapes >& xTarget
......
...@@ -29,6 +29,8 @@ class BubbleChart : public VSeriesPlotter ...@@ -29,6 +29,8 @@ class BubbleChart : public VSeriesPlotter
{ {
// public methods // public methods
public: public:
BubbleChart() = delete;
BubbleChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel BubbleChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount ); , sal_Int32 nDimensionCount );
virtual ~BubbleChart(); virtual ~BubbleChart();
...@@ -46,9 +48,6 @@ public: ...@@ -46,9 +48,6 @@ public:
virtual LegendSymbolStyle getLegendSymbolStyle() override; virtual LegendSymbolStyle getLegendSymbolStyle() override;
private: //methods private: //methods
//no default constructor
BubbleChart();
void calculateMaximumLogicBubbleSize(); void calculateMaximumLogicBubbleSize();
void calculateBubbleSizeScalingFactor(); void calculateBubbleSizeScalingFactor();
......
...@@ -30,6 +30,8 @@ class CandleStickChart : public VSeriesPlotter ...@@ -30,6 +30,8 @@ class CandleStickChart : public VSeriesPlotter
{ {
// public methods // public methods
public: public:
CandleStickChart() = delete;
CandleStickChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel CandleStickChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount ); , sal_Int32 nDimensionCount );
virtual ~CandleStickChart(); virtual ~CandleStickChart();
...@@ -44,10 +46,6 @@ public: ...@@ -44,10 +46,6 @@ public:
virtual LegendSymbolStyle getLegendSymbolStyle() override; virtual LegendSymbolStyle getLegendSymbolStyle() override;
private: //methods
//no default constructor
CandleStickChart();
private: //member private: //member
BarPositionHelper* m_pMainPosHelper; BarPositionHelper* m_pMainPosHelper;
}; };
......
...@@ -29,6 +29,8 @@ class NetChart : public VSeriesPlotter ...@@ -29,6 +29,8 @@ class NetChart : public VSeriesPlotter
{ {
// public methods // public methods
public: public:
NetChart() = delete;
NetChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel NetChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount , sal_Int32 nDimensionCount
, bool bNoArea , bool bNoArea
...@@ -50,9 +52,6 @@ public: ...@@ -50,9 +52,6 @@ public:
virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override;
private: //methods private: //methods
//no default constructor
NetChart();
void impl_createSeriesShapes(); void impl_createSeriesShapes();
bool impl_createArea( VDataSeries* pSeries bool impl_createArea( VDataSeries* pSeries
, css::drawing::PolyPolygonShape3D* pSeriesPoly , css::drawing::PolyPolygonShape3D* pSeriesPoly
......
...@@ -33,6 +33,8 @@ class PieChart : public VSeriesPlotter ...@@ -33,6 +33,8 @@ class PieChart : public VSeriesPlotter
struct ShapeParam; struct ShapeParam;
public: public:
PieChart() = delete;
PieChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel PieChart( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
, sal_Int32 nDimensionCount, bool bExcludingPositioning ); , sal_Int32 nDimensionCount, bool bExcludingPositioning );
virtual ~PieChart(); virtual ~PieChart();
...@@ -61,9 +63,6 @@ public: ...@@ -61,9 +63,6 @@ public:
virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override;
private: //methods private: //methods
//no default constructor
PieChart();
css::uno::Reference<css::drawing::XShape> css::uno::Reference<css::drawing::XShape>
createDataPoint( createDataPoint(
const css::uno::Reference<css::drawing::XShapes>& xTarget, const css::uno::Reference<css::drawing::XShapes>& xTarget,
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <map> #include <map>
#include <boost/noncopyable.hpp>
namespace chart namespace chart
{ {
...@@ -56,13 +55,16 @@ public: ...@@ -56,13 +55,16 @@ public:
mutable css::uno::Sequence<double> Doubles; mutable css::uno::Sequence<double> Doubles;
}; };
class VDataSeries final : private boost::noncopyable class VDataSeries final
{ {
public: public:
VDataSeries( const css::uno::Reference<css::chart2::XDataSeries>& xDataSeries ); VDataSeries( const css::uno::Reference<css::chart2::XDataSeries>& xDataSeries );
~VDataSeries(); ~VDataSeries();
VDataSeries(const VDataSeries&) = delete;
const VDataSeries& operator=(const VDataSeries&) = delete;
css::uno::Reference<css::chart2::XDataSeries> getModel() const; css::uno::Reference<css::chart2::XDataSeries> getModel() const;
void setCategoryXAxis(); void setCategoryXAxis();
......
...@@ -119,6 +119,8 @@ private: ...@@ -119,6 +119,8 @@ private:
class VSeriesPlotter : public PlotterBase, public MinimumAndMaximumSupplier, public LegendEntryProvider class VSeriesPlotter : public PlotterBase, public MinimumAndMaximumSupplier, public LegendEntryProvider
{ {
public: public:
VSeriesPlotter() = delete;
virtual ~VSeriesPlotter(); virtual ~VSeriesPlotter();
/* /*
...@@ -253,10 +255,6 @@ public: ...@@ -253,10 +255,6 @@ public:
bool WantToPlotInFrontOfAxisLine(); bool WantToPlotInFrontOfAxisLine();
virtual bool shouldSnapRectToUsedArea(); virtual bool shouldSnapRectToUsedArea();
private:
//no default constructor
VSeriesPlotter();
protected: protected:
VSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel VSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment