diff options
Diffstat (limited to 'chart2/source/view')
33 files changed, 250 insertions, 250 deletions
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 74c784b794d6..df1d24ba20f8 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -48,15 +48,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const Date m_aNullDate; @@ -80,15 +80,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index ca96020934bf..4952e64ecf6a 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -69,8 +69,8 @@ class PureTickIter : public TickIter public: PureTickIter( ::std::vector< TickInfo >& rTickInfoVector ); virtual ~PureTickIter(); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; private: ::std::vector< TickInfo >& m_rTickVector; @@ -125,7 +125,7 @@ public: , bool bIncludeFarAwayDistanceIfSo = false , bool bIncludeSpaceBetweenTickAndText = true ) const; - virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; + virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const SAL_OVERRIDE; bool isHorizontalAxis() const; bool isVerticalAxis() const; diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 5c1252eb4210..5301d753bdee 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -39,8 +39,8 @@ public: virtual double* firstValue(); virtual double* nextValue(); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; sal_Int32 getCurrentDepth() const { return m_nCurrentDepth; } diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index d74bff750934..ed1efd86313b 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -53,7 +53,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 9539a2b6732c..526ec8e84b6a 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -39,7 +39,7 @@ public: VAxisOrGridBase( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount ); virtual ~VAxisOrGridBase(); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) SAL_OVERRIDE; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 5e8c829992b2..c7badd1cf865 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -208,8 +208,8 @@ public: , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine ); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; private: //methods LabelIterator(); @@ -380,8 +380,8 @@ public: , sal_Int32 nLongestLabelIndex ); virtual ~MaxLabelTickIter(); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; private: ::std::vector< TickInfo >& m_rTickInfoVector; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index e0fef479a07a..b5122d9bf955 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -37,21 +37,21 @@ public: virtual ~VCartesianAxis(); - virtual void createMaximumLabels(); - virtual void createLabels(); - virtual void updatePositions(); + virtual void createMaximumLabels() SAL_OVERRIDE; + virtual void createLabels() SAL_OVERRIDE; + virtual void updatePositions() SAL_OVERRIDE; - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; - virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); - virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); + virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; + virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) SAL_OVERRIDE; void createAllTickInfosFromComplexCategories( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShiftedPosition ); TickIter* createLabelTickIterator( sal_Int32 nTextLevel ); TickIter* createMaximumLabelTickIterator( sal_Int32 nTextLevel ); sal_Int32 getTextLevelCount() const; - virtual TickFactory* createTickFactory(); + virtual TickFactory* createTickFactory() SAL_OVERRIDE; double getLogicValueWhereMainLineCrossesOtherAxis() const; double getLogicValueWhereLabelLineCrossesOtherAxis() const; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 956ff81485a1..03eca709063d 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -46,7 +46,7 @@ public: //XTextualDataSequence virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException, std::exception) + throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_aTextSequence; } diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index 67402802b31a..71bdbf45c813 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -36,12 +36,12 @@ public: virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; - virtual void initVAxisInList(); - virtual void updateScalesAndIncrementsOnAxes(); + virtual void initVAxisInList() SAL_OVERRIDE; + virtual void updateScalesAndIncrementsOnAxes() SAL_OVERRIDE; - virtual void createGridShapes(); + virtual void createGridShapes() SAL_OVERRIDE; private: VCartesianCoordinateSystem(); diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index da370e0c4cff..cb816a7390d4 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -39,7 +39,7 @@ public: ); virtual ~VCartesianGrid(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList , const ::com::sun::star::uno::Sequence< diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index 87baa81dec8c..247b2662b641 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -36,11 +36,11 @@ public: , sal_Int32 nDimensionCount ); virtual ~VPolarAngleAxis(); - virtual void createMaximumLabels(); - virtual void createLabels(); - virtual void updatePositions(); + virtual void createMaximumLabels() SAL_OVERRIDE; + virtual void createLabels() SAL_OVERRIDE; + virtual void updatePositions() SAL_OVERRIDE; - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; private: //methods bool createTextShapes_ForAngleAxis( diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index d26ed48b741e..09f6052bef59 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -38,7 +38,7 @@ public: void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); - virtual sal_Bool isAnythingToDraw(); + virtual sal_Bool isAnythingToDraw() SAL_OVERRIDE; virtual ~VPolarAxis(); diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 120de9cbaa52..b5c5b858bdab 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -35,17 +35,17 @@ public: //better performance for big data virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize - , const ::com::sun::star::awt::Size& rPageResolution ); + , const ::com::sun::star::awt::Size& rPageResolution ) SAL_OVERRIDE; virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; - virtual void initVAxisInList(); - virtual void updateScalesAndIncrementsOnAxes(); + virtual void initVAxisInList() SAL_OVERRIDE; + virtual void updateScalesAndIncrementsOnAxes() SAL_OVERRIDE; - virtual void createGridShapes(); + virtual void createGridShapes() SAL_OVERRIDE; private: VPolarCoordinateSystem(); diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index e16f58ffcd59..95576b9cb093 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -42,7 +42,7 @@ public: ); virtual ~VPolarGrid(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index 56b1119e70bd..81aec8928a04 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -46,31 +46,31 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (::com::sun::star::uno::RuntimeException ); + ) throw (::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) SAL_OVERRIDE; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; - virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); + virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; - virtual void createMaximumLabels(); - virtual void createLabels(); - virtual void updatePositions(); + virtual void createMaximumLabels() SAL_OVERRIDE; + virtual void createLabels() SAL_OVERRIDE; + virtual void updatePositions() SAL_OVERRIDE; - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; protected: //methods - virtual bool prepareShapeCreation(); + virtual bool prepareShapeCreation() SAL_OVERRIDE; private: //member boost::scoped_ptr<VCartesianAxis> m_apAxisWithLabels; diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 7e8fe7e2fe5e..1c50f79cdcb4 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -37,19 +37,19 @@ public: ); virtual ~AreaChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual double getMaximumX(); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual double getMaximumX() SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 5fbbe6cfb931..e1099e2c5675 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -35,11 +35,11 @@ public: , sal_Int32 nDimensionCount ); virtual ~BarChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; private: //methods //no default constructor @@ -62,7 +62,7 @@ private: //methods , double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue , BarPositionHelper* pPosHelper ) const; - virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) + virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const SAL_OVERRIDE;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) void adaptOverlapAndGapwidthForGroupBarsPerAxis(); diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 4e01b254a18c..8e7fa3d739f1 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -36,12 +36,12 @@ public: BarPositionHelper( const BarPositionHelper& rSource ); virtual ~BarPositionHelper(); - virtual PlottingPositionHelper* clone() const; + virtual PlottingPositionHelper* clone() const SAL_OVERRIDE; void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ - virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const; - virtual void setScaledCategoryWidth( double fScaledCategoryWidth ); + virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const SAL_OVERRIDE; + virtual void setScaledCategoryWidth( double fScaledCategoryWidth ) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 0ed111d35ce6..583df2129ade 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -34,17 +34,17 @@ public: , sal_Int32 nDimensionCount ); virtual ~BubbleChart(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index 736c9ce9d13f..2a69d10fdbe8 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -35,15 +35,15 @@ public: , sal_Int32 nDimensionCount ); virtual ~CandleStickChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/GL3DBarChart.hxx b/chart2/source/view/charttypes/GL3DBarChart.hxx index d5ecf7766680..87128a87188e 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.hxx +++ b/chart2/source/view/charttypes/GL3DBarChart.hxx @@ -20,7 +20,7 @@ public: GL3DBarChart( const css::uno::Reference<css::chart2::XChartType>& xChartTypeModel ); virtual ~GL3DBarChart(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; }; } diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index 8b041bb294a9..6f3e42b89669 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -37,19 +37,19 @@ public: ); virtual ~NetChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual double getMaximumX(); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual double getMaximumX() SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 313fb9a49bd4..6814b86b3297 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -37,27 +37,27 @@ public: , sal_Int32 nDimensionCount, bool bExcludingPositioning ); virtual ~PieChart(); - virtual void createShapes(); - virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ); + virtual void createShapes() SAL_OVERRIDE; + virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ) SAL_OVERRIDE; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; - virtual bool shouldSnapRectToUsedArea(); + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; + virtual bool shouldSnapRectToUsedArea() SAL_OVERRIDE; //MinimumAndMaximumSupplier - virtual double getMinimumX(); - virtual double getMaximumX(); - virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - - virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); - virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual double getMinimumX() SAL_OVERRIDE; + virtual double getMaximumX() SAL_OVERRIDE; + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index d27bc7d39104..ca0790551bac 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::drawing::HomogenMatrix m_Matrix; diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index c777756cf567..01959188a89d 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -69,21 +69,21 @@ public: void clearMinimumAndMaximumSupplierList(); //--MinimumAndMaximumSupplier - virtual double getMinimumX(); - virtual double getMaximumX(); - virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMinimumZ(); - virtual double getMaximumZ(); - - virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); - virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - - virtual long calculateTimeResolutionOnXAxis(); - virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); + virtual double getMinimumX() SAL_OVERRIDE; + virtual double getMaximumX() SAL_OVERRIDE; + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMinimumZ() SAL_OVERRIDE; + virtual double getMaximumZ() SAL_OVERRIDE; + + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + + virtual long calculateTimeResolutionOnXAxis() SAL_OVERRIDE; + virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) SAL_OVERRIDE; private: typedef ::std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet; diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index 823ad4e17dfe..e9b2614131fa 100644 --- a/chart2/source/view/inc/OpenglShapeFactory.hxx +++ b/chart2/source/view/inc/OpenglShapeFactory.hxx @@ -26,13 +26,13 @@ public: createGroup2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCube( const ::com::sun::star::uno::Reference< @@ -42,14 +42,14 @@ public: , sal_Int32 nRotateZAngleHundredthDegree , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bRounded = false); + , bool bRounded = false) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCylinder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , sal_Int32 nRotateZAngleHundredthDegree ); + , sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPyramid( const ::com::sun::star::uno::Reference< @@ -60,21 +60,21 @@ public: , bool bRotateZ , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp - , const tPropertyNameMap& rPropertyNameMap); + , const tPropertyNameMap& rPropertyNameMap) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCone( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ); + , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ); + , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -82,7 +82,7 @@ public: , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene - , double fDepth ); + , double fDepth ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -91,16 +91,16 @@ public: , const tPropertyNameMap& rPropertyNameMap , sal_Bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities - , bool bFlatNormals=true ); + , bool bFlatNormals=true ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon - , double fDepth); + , double fDepth) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon); + , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -108,37 +108,37 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ); + , sal_Int32 nFillColor=0 ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ); + , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ); + , const VLineProperties* pLineProperties = NULL ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ); + const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , const VLineProperties& rLineProperties ); + , const VLineProperties& rLineProperties ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ); + , const ::com::sun::star::drawing::Direction3D& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ); + , const ::com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D @@ -146,7 +146,7 @@ public: , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, @@ -155,13 +155,13 @@ public: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & xTextProperties, - double nRotation, const OUString& aName ); + double nRotation, const OUString& aName ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createInvisibleRectangle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ); + , const ::com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( @@ -171,18 +171,18 @@ public: const com::sun::star::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, - StackPosition ePos = Top ); + StackPosition ePos = Top ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + ::com::sun::star::drawing::XShapes >& xTarget ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ); + ::com::sun::star::drawing::XDrawPage>& xPage ) SAL_OVERRIDE; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ); + virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE; diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index e2a6cf327e69..f2f81dee7428 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -150,15 +150,15 @@ public: PolarPlottingPositionHelper( const PolarPlottingPositionHelper& rSource ); virtual ~PolarPlottingPositionHelper(); - virtual PlottingPositionHelper* clone() const; + virtual PlottingPositionHelper* clone() const SAL_OVERRIDE; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) SAL_OVERRIDE; + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; ::basegfx::B3DHomMatrix getUnitCartesianToScene() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > - getTransformationScaledLogicToScene() const; + getTransformationScaledLogicToScene() const SAL_OVERRIDE; //the resulting values should be used for input to the transformation //received with 'getTransformationScaledLogicToScene' @@ -168,9 +168,9 @@ public: virtual ::com::sun::star::drawing::Position3D - transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const; + transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE; virtual ::com::sun::star::drawing::Position3D - transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const; + transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE; ::com::sun::star::drawing::Position3D transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling=true ) const; ::com::sun::star::drawing::Position3D diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 40551932ae95..77940e83ac5b 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -36,13 +36,13 @@ public: createGroup2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; @@ -54,14 +54,14 @@ public: , sal_Int32 nRotateZAngleHundredthDegree , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bRounded = false); + , bool bRounded = false) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCylinder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , sal_Int32 nRotateZAngleHundredthDegree ); + , sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPyramid( const ::com::sun::star::uno::Reference< @@ -72,21 +72,21 @@ public: , bool bRotateZ , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp - , const tPropertyNameMap& rPropertyNameMap); + , const tPropertyNameMap& rPropertyNameMap) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCone( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ); + , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ); + , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -94,7 +94,7 @@ public: , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene - , double fDepth ); + , double fDepth ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -103,16 +103,16 @@ public: , const tPropertyNameMap& rPropertyNameMap , sal_Bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities - , bool bFlatNormals=true ); + , bool bFlatNormals=true ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon - , double fDepth); + , double fDepth) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon); + , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -120,37 +120,37 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ); + , sal_Int32 nFillColor=0 ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ); + , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ); + , const VLineProperties* pLineProperties = NULL ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ); + const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , const VLineProperties& rLineProperties ); + , const VLineProperties& rLineProperties ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ); + , const ::com::sun::star::drawing::Direction3D& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ); + , const ::com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D @@ -158,7 +158,7 @@ public: , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, @@ -167,13 +167,13 @@ public: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & xTextProperties, - double nRotation, const OUString& aName ); + double nRotation, const OUString& aName ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createInvisibleRectangle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ); + , const ::com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( @@ -183,18 +183,18 @@ public: const com::sun::star::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, - StackPosition ePos = Top ); + StackPosition ePos = Top ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + ::com::sun::star::drawing::XShapes >& xTarget ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ); + ::com::sun::star::drawing::XDrawPage>& xPage ) SAL_OVERRIDE; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ); + virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; /** * not necessary right now diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index 470952f9c8d5..3c85a00a55dd 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 6b708addf668..d95c8e00f590 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -158,23 +158,23 @@ public: // MinimumAndMaximumSupplier - virtual double getMinimumX(); - virtual double getMaximumX(); + virtual double getMinimumX() SAL_OVERRIDE; + virtual double getMaximumX() SAL_OVERRIDE; - virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; - virtual double getMinimumZ(); - virtual double getMaximumZ(); + virtual double getMinimumZ() SAL_OVERRIDE; + virtual double getMaximumZ() SAL_OVERRIDE; - virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); - virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual long calculateTimeResolutionOnXAxis(); - virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); + virtual long calculateTimeResolutionOnXAxis() SAL_OVERRIDE; + virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) SAL_OVERRIDE; @@ -192,10 +192,10 @@ public: ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext - ); + ) SAL_OVERRIDE; virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio(); + virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio() SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index 0d3fa7726e8b..899e0ed7bcac 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -37,8 +37,8 @@ protected: virtual ~ChartItemPool(); public: - virtual SfxItemPool* Clone() const; - SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; + virtual SfxItemPool* Clone() const SAL_OVERRIDE; + SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; /// creates a pure chart item pool static SfxItemPool* CreateChartItemPool(); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index bdec56519512..c3978f4484d9 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -87,13 +87,13 @@ public: mrProperties(rProps) {} virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception); + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const std::map<OUString, uno::Any>& mrProperties; diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 032651fb3f0d..d480bae65f6a 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -114,54 +114,54 @@ public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // normal non UNO methods @@ -220,7 +220,7 @@ public: DummyPieSegment2D(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree, double fUnitCircleInnerRadius, double fUnitCircleOuterRadius, const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene); - void render(); + void render() SAL_OVERRIDE; private: double mfUnitCircleStartAngleDegree; double mfUnitCircleWidthAngleDegree; @@ -277,7 +277,7 @@ class DummySymbol2D : public DummyXShape public: DummySymbol2D(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize, sal_Int32 nStandardSymbol, sal_Int32 nFillColor); - void render(); + void render() SAL_OVERRIDE; private: drawing::Position3D mrPosition; drawing::Direction3D mrSize; @@ -344,9 +344,9 @@ public: virtual void render() SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); @@ -361,25 +361,25 @@ class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes { public: - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // normal methods - virtual void render(); + virtual void render() SAL_OVERRIDE; protected: std::vector<com::sun::star::uno::Reference< com::sun::star::drawing::XShape > > maUNOShapes; @@ -391,10 +391,10 @@ class DummyChart : public DummyXShapes public: DummyChart(com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xDrawPage); ~DummyChart(); - virtual DummyChart* getRootShape(); + virtual DummyChart* getRootShape() SAL_OVERRIDE; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void render() SAL_OVERRIDE; @@ -415,10 +415,10 @@ class DummyGroup2D : public DummyXShapes public: DummyGroup2D(const OUString& rName); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class DummyGroup3D : public DummyXShapes |