diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /chart2/source/view | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'chart2/source/view')
36 files changed, 288 insertions, 288 deletions
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 0bc3018b37c8..e94f7e5e7fbb 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -42,26 +42,26 @@ public: /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: const Date m_aNullDate; @@ -82,26 +82,26 @@ public: /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 52542ade9e77..7ab71d5e1414 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -74,8 +74,8 @@ class PureTickIter : public TickIter public: explicit PureTickIter( TickInfoArrayType& rTickInfoVector ); virtual ~PureTickIter(); - virtual TickInfo* firstInfo() SAL_OVERRIDE; - virtual TickInfo* nextInfo() SAL_OVERRIDE; + virtual TickInfo* firstInfo() override; + virtual TickInfo* nextInfo() override; private: TickInfoArrayType& m_rTickVector; @@ -134,7 +134,7 @@ public: , bool bIncludeFarAwayDistanceIfSo = false , bool bIncludeSpaceBetweenTickAndText = true ) const; - virtual void updateScreenValues( TickInfoArraysType& rAllTickInfos ) const SAL_OVERRIDE; + virtual void updateScreenValues( TickInfoArraysType& rAllTickInfos ) const 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 6e09ac9cbada..0155af96fdad 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -39,8 +39,8 @@ public: double* firstValue(); double* nextValue(); - virtual TickInfo* firstInfo() SAL_OVERRIDE; - virtual TickInfo* nextInfo() SAL_OVERRIDE; + virtual TickInfo* firstInfo() override; + virtual TickInfo* nextInfo() override; private: //methods sal_Int32 getIntervalCount( sal_Int32 nDepth ); diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 998f0da4e9bc..5d85f3c95a3b 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -57,7 +57,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ); diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 526ec8e84b6a..25f820437812 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 ) SAL_OVERRIDE; + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) 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 46feff4866d9..3b54bf8465be 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -211,8 +211,8 @@ public: , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine ); - virtual TickInfo* firstInfo() SAL_OVERRIDE; - virtual TickInfo* nextInfo() SAL_OVERRIDE; + virtual TickInfo* firstInfo() override; + virtual TickInfo* nextInfo() override; private: //member PureTickIter m_aPureTickIter; @@ -425,8 +425,8 @@ public: MaxLabelTickIter( TickInfoArrayType& rTickInfoVector, size_t nLongestLabelIndex ); virtual ~MaxLabelTickIter(); - virtual TickInfo* firstInfo() SAL_OVERRIDE; - virtual TickInfo* nextInfo() SAL_OVERRIDE; + virtual TickInfo* firstInfo() override; + virtual TickInfo* nextInfo() override; private: TickInfoArrayType& m_rTickInfoVector; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index c1937a48ef6d..69c9904f9767 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() SAL_OVERRIDE; - virtual void createLabels() SAL_OVERRIDE; - virtual void updatePositions() SAL_OVERRIDE; + virtual void createMaximumLabels() override; + virtual void createLabels() override; + virtual void updatePositions() override; - virtual void createShapes() SAL_OVERRIDE; + virtual void createShapes() override; - virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; - virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ) SAL_OVERRIDE; + virtual sal_Int32 estimateMaximumAutoMainIncrementCount() override; + virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ) override; void createAllTickInfosFromComplexCategories( TickInfoArraysType& rAllTickInfos, bool bShiftedPosition ); TickIter* createLabelTickIterator( sal_Int32 nTextLevel ); TickIter* createMaximumLabelTickIterator( sal_Int32 nTextLevel ); sal_Int32 getTextLevelCount() const; - virtual TickFactory* createTickFactory() SAL_OVERRIDE; + virtual TickFactory* createTickFactory() override; /** * Get the value at which the other axis crosses. diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 3408d28674cd..3ddf2f998943 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -47,7 +47,7 @@ public: //XTextualDataSequence virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE + throw ( uno::RuntimeException, std::exception) override { return m_aTextSequence; } diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index b062f38cea3f..388ce088f301 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::chart2::XChartDocument> &ChartDoc , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) override; - virtual void initVAxisInList() SAL_OVERRIDE; - virtual void updateScalesAndIncrementsOnAxes() SAL_OVERRIDE; + virtual void initVAxisInList() override; + virtual void updateScalesAndIncrementsOnAxes() override; - virtual void createGridShapes() SAL_OVERRIDE; + virtual void createGridShapes() override; private: VCartesianCoordinateSystem(); diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index cb816a7390d4..baee07527a58 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() SAL_OVERRIDE; + virtual void createShapes() 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 247b2662b641..ef835cec68ff 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() SAL_OVERRIDE; - virtual void createLabels() SAL_OVERRIDE; - virtual void updatePositions() SAL_OVERRIDE; + virtual void createMaximumLabels() override; + virtual void createLabels() override; + virtual void updatePositions() override; - virtual void createShapes() SAL_OVERRIDE; + virtual void createShapes() override; private: //methods bool createTextShapes_ForAngleAxis( diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index e0c63e3f745a..df8cdc24b810 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 bool isAnythingToDraw() SAL_OVERRIDE; + virtual bool isAnythingToDraw() override; virtual ~VPolarAxis(); diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 2f5de670890a..395666ea6636 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 ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Size& rPageResolution ) override; virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument> & xChartDoc , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) override; - virtual void initVAxisInList() SAL_OVERRIDE; - virtual void updateScalesAndIncrementsOnAxes() SAL_OVERRIDE; + virtual void initVAxisInList() override; + virtual void updateScalesAndIncrementsOnAxes() override; - virtual void createGridShapes() SAL_OVERRIDE; + virtual void createGridShapes() override; private: VPolarCoordinateSystem(); diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index ab2251387b3a..d6f9ad551fac 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() SAL_OVERRIDE; + virtual void createShapes() 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 d02d06fcad6f..0e639e6895b6 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 ) SAL_OVERRIDE; + ) throw (::com::sun::star::uno::RuntimeException ) override; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) SAL_OVERRIDE; + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) override; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; + virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException) override; virtual void initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) override; - virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; + virtual sal_Int32 estimateMaximumAutoMainIncrementCount() override; - virtual void createMaximumLabels() SAL_OVERRIDE; - virtual void createLabels() SAL_OVERRIDE; - virtual void updatePositions() SAL_OVERRIDE; + virtual void createMaximumLabels() override; + virtual void createLabels() override; + virtual void updatePositions() override; - virtual void createShapes() SAL_OVERRIDE; + virtual void createShapes() override; protected: //methods - virtual bool prepareShapeCreation() SAL_OVERRIDE; + virtual bool prepareShapeCreation() override; private: //member std::unique_ptr<VCartesianAxis> m_apAxisWithLabels; diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 01403500ab8d..76f9d541fcb5 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -37,18 +37,18 @@ public: ); virtual ~AreaChart(); - 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 void createShapes() override; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier - virtual double getMaximumX() SAL_OVERRIDE; - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual double getMaximumX() override; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; - 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; + virtual LegendSymbolStyle getLegendSymbolStyle() override; + virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index b6237da58bc1..7b8344f4033b 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -35,10 +35,10 @@ public: , sal_Int32 nDimensionCount ); virtual ~BarChart(); - 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 void createShapes() override; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; private: //methods //no default constructor @@ -61,7 +61,7 @@ private: //methods , double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue , BarPositionHelper* pPosHelper ) const; - 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 ) + virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const 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 b1fe0bc9245f..c34d67207382 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 SAL_OVERRIDE; + virtual PlottingPositionHelper* clone() const override; void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ - virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const SAL_OVERRIDE; - virtual void setScaledCategoryWidth( double fScaledCategoryWidth ) SAL_OVERRIDE; + virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const override; + virtual void setScaledCategoryWidth( double fScaledCategoryWidth ) override; }; } //namespace chart diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 583df2129ade..6f92cb460004 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() SAL_OVERRIDE; + virtual void createShapes() override; - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; - virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; + virtual LegendSymbolStyle getLegendSymbolStyle() override; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index 2a69d10fdbe8..fff4d88b9f2c 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() SAL_OVERRIDE; - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; + virtual void createShapes() override; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; - virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; + virtual LegendSymbolStyle getLegendSymbolStyle() override; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 5bc02d39453b..5aba63ef136b 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -142,7 +142,7 @@ public: protected: - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; }; void RenderOneFrameThread::execute() @@ -165,7 +165,7 @@ public: protected: - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; private: glm::vec3 maStartPos; @@ -206,7 +206,7 @@ public: osl_getSystemTime(&maClickFlyBackEndTime); } protected: - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; private: void ProcessMouseEvent(); void MoveCamera(); diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index 520ec9a4163b..68909acea3ac 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -37,18 +37,18 @@ public: ); virtual ~NetChart(); - 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 void createShapes() override; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; // MinimumAndMaximumSupplier - virtual double getMaximumX() SAL_OVERRIDE; - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual double getMaximumX() override; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; - 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; + virtual LegendSymbolStyle getLegendSymbolStyle() override; + virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 8450572705dc..64acb90aeb19 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -40,26 +40,26 @@ public: /** This method creates all shapes needed for representing the pie chart. */ - virtual void createShapes() SAL_OVERRIDE; - virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ) SAL_OVERRIDE; + virtual void createShapes() override; + virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ) override; - 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 void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; - virtual bool shouldSnapRectToUsedArea() SAL_OVERRIDE; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const override; + virtual bool shouldSnapRectToUsedArea() override; //MinimumAndMaximumSupplier - 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; + virtual double getMinimumX() override; + virtual double getMaximumX() override; + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) override; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) override; + + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) override; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; private: //methods //no default constructor diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index 215173e5b763..1c2d61b2c171 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -63,7 +63,7 @@ class Bar : public Renderable3DObject public: Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nColor, sal_uInt32 nId); - virtual void render() SAL_OVERRIDE; + virtual void render() override; private: bool mbRoundedCorners; glm::mat4 maPos; @@ -75,7 +75,7 @@ class Line : public Renderable3DObject public: Line(OpenGL3DRenderer* pRenderer, sal_uInt32 nId); - virtual void render() SAL_OVERRIDE; + virtual void render() override; void setPosition(const glm::vec3& rBegin, const glm::vec3& rEnd); void setLineColor(const Color& rColor); @@ -90,7 +90,7 @@ class Text : public Renderable3DObject { public: Text(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, sal_uInt32 nId); - virtual void render() SAL_OVERRIDE; + virtual void render() override; void setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight); @@ -107,7 +107,7 @@ public: ScreenText(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, glm::vec4 rColor, sal_uInt32 nId, bool bIs3dText = false); - virtual void render() SAL_OVERRIDE; + virtual void render() override; void setPosition(const glm::vec2& rTopLeft, const glm::vec2& rBottomRight, const glm::vec3& r3DPos = glm::vec3(0.0, 0.0, 0.0)); @@ -123,7 +123,7 @@ class Rectangle : public Renderable3DObject { public: Rectangle(OpenGL3DRenderer* pRenderer, sal_uInt32 nId); - virtual void render() SAL_OVERRIDE; + virtual void render() override; void setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight); void setFillColor(const Color& rColor); @@ -141,7 +141,7 @@ class Camera : public Renderable3DObject { public: Camera(OpenGL3DRenderer* pRenderer); - virtual void render() SAL_OVERRIDE; + virtual void render() override; void setPosition(const glm::vec3& rPos); void setDirection(const glm::vec3& rPos); diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index b608aa330966..d74616708433 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -72,22 +72,22 @@ public: virtual ~GL3DBarChart(); virtual void create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSeries, - ExplicitCategoriesProvider& rCatProvider) SAL_OVERRIDE; + ExplicitCategoriesProvider& rCatProvider) override; - virtual void render() SAL_OVERRIDE; + virtual void render() override; /// Render one frame of the 3D bar chart. void renderFrame(); - virtual void update() SAL_OVERRIDE; + virtual void update() override; /// Draw to the framebuffer context, and provide the ID of the bar that the user has clicked. sal_uInt32 barIdAtPosition(const Point& rPos); - virtual void clickedAt(const Point& rPos, sal_uInt16 nButtons) SAL_OVERRIDE; + virtual void clickedAt(const Point& rPos, sal_uInt16 nButtons) override; - virtual void mouseDragMove(const Point& rStartPos, const Point& rEndPos, sal_uInt16 nButtons) SAL_OVERRIDE; - virtual void scroll(long nDelta) SAL_OVERRIDE; - virtual void contextDestroyed() SAL_OVERRIDE; + virtual void mouseDragMove(const Point& rStartPos, const Point& rEndPos, sal_uInt16 nButtons) override; + virtual void scroll(long nDelta) override; + virtual void contextDestroyed() override; void setOpenGLWindow(OpenGLWindow* pWindow); diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index bf8ba44f6364..127900307edf 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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 22d37281d5b7..5df15a3e7ecc 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() 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; + virtual double getMinimumX() override; + virtual double getMaximumX() override; + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) override; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) override; + virtual double getMinimumZ() override; + virtual double getMaximumZ() override; + + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) override; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; + + virtual long calculateTimeResolutionOnXAxis() override; + virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) override; private: typedef ::std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet; diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index bab5cb239d24..c0645b6e7fc5 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() ) SAL_OVERRIDE; + , const OUString& aName = OUString() ) 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() ) SAL_OVERRIDE; + , const OUString& aName = OUString() ) 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) SAL_OVERRIDE; + , bool bRounded = false) 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_OVERRIDE; + , sal_Int32 nRotateZAngleHundredthDegree ) 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) SAL_OVERRIDE; + , const tPropertyNameMap& rPropertyNameMap) 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 ) SAL_OVERRIDE; + , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) 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 ) SAL_OVERRIDE; + , double fDepth ) 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 , bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities - , bool bFlatNormals=true ) SAL_OVERRIDE; + , bool bFlatNormals=true ) 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) SAL_OVERRIDE; + , double fDepth) 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) SAL_OVERRIDE; + , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) 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_OVERRIDE; + , sal_Int32 nFillColor=0 ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) 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 ) SAL_OVERRIDE; + , const VLineProperties* pLineProperties = NULL ) 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 ) SAL_OVERRIDE; + const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) 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 ) SAL_OVERRIDE; + , const VLineProperties& rLineProperties ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::drawing::Direction3D& rSize ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Point& rPosition ) 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; + ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -155,7 +155,7 @@ public: , const ::com::sun::star::uno::Sequence< tAnySequence >& rParaPropValues , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation ) SAL_OVERRIDE; + , const ::com::sun::star::uno::Any& rATransformation ) 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, @@ -164,13 +164,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 ) SAL_OVERRIDE; + double nRotation, const OUString& aName ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Size& rSize ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( @@ -180,25 +180,25 @@ public: const com::sun::star::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, - StackPosition ePos = Top ) SAL_OVERRIDE; + StackPosition ePos = Top ) 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 ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShapes >& xTarget ) 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 ) SAL_OVERRIDE; + ::com::sun::star::drawing::XDrawPage>& xPage ) override; - 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 setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) override; - virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xDrawPage, bool bInitOpenGL = true) SAL_OVERRIDE; + virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xDrawPage, bool bInitOpenGL = true) override; - virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) SAL_OVERRIDE; - virtual void postRender(OpenGLWindow* pWindow) SAL_OVERRIDE; + virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) override; + virtual void postRender(OpenGLWindow* pWindow) override; - virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xDrawPage) SAL_OVERRIDE; + virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xDrawPage) override; }; } diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 9ffcb5c57c13..9a568f1db10b 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 SAL_OVERRIDE; + virtual PlottingPositionHelper* clone() const override; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) SAL_OVERRIDE; - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) override; + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override; ::basegfx::B3DHomMatrix getUnitCartesianToScene() const { return m_aUnitCartesianToScene;} virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > - getTransformationScaledLogicToScene() const SAL_OVERRIDE; + getTransformationScaledLogicToScene() const override; //the resulting values provided by the following 3 methods should be used //for input to the transformation received with @@ -182,9 +182,9 @@ public: double getWidthAngleDegree( double& fStartLogicValueOnAngleAxis, double& fEndLogicValueOnAngleAxis ) const; virtual ::com::sun::star::drawing::Position3D - transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE; + transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const override; virtual ::com::sun::star::drawing::Position3D - transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE; + transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const override; ::com::sun::star::drawing::Position3D transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling=true ) const; diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 362b4d4d5de8..333faf191a72 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() ) SAL_OVERRIDE; + , const OUString& aName = OUString() ) 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() ) SAL_OVERRIDE; + , const OUString& aName = OUString() ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCube( const ::com::sun::star::uno::Reference< @@ -52,14 +52,14 @@ public: , sal_Int32 nRotateZAngleHundredthDegree , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bRounded = false) SAL_OVERRIDE; + , bool bRounded = false) 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_OVERRIDE; + , sal_Int32 nRotateZAngleHundredthDegree ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPyramid( const ::com::sun::star::uno::Reference< @@ -70,21 +70,21 @@ public: , bool bRotateZ , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp - , const tPropertyNameMap& rPropertyNameMap) SAL_OVERRIDE; + , const tPropertyNameMap& rPropertyNameMap) 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 ) SAL_OVERRIDE; + , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) 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 @@ -92,7 +92,7 @@ public: , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene - , double fDepth ) SAL_OVERRIDE; + , double fDepth ) 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 @@ -101,16 +101,16 @@ public: , const tPropertyNameMap& rPropertyNameMap , bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities - , bool bFlatNormals=true ) SAL_OVERRIDE; + , bool bFlatNormals=true ) 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) SAL_OVERRIDE; + , double fDepth) 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) SAL_OVERRIDE; + , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) 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 @@ -118,37 +118,37 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ) SAL_OVERRIDE; + , sal_Int32 nFillColor=0 ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) 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 ) SAL_OVERRIDE; + , const VLineProperties* pLineProperties = NULL ) 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 ) SAL_OVERRIDE; + const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) 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 ) SAL_OVERRIDE; + , const VLineProperties& rLineProperties ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::drawing::Direction3D& rSize ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Point& rPosition ) 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 @@ -156,7 +156,7 @@ public: , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation - ) SAL_OVERRIDE; + ) override; /** This method creates a text shape made up by a set of paragraphs. * For each paragraph the related text style is passed to the method. @@ -192,7 +192,7 @@ public: , const ::com::sun::star::uno::Sequence< tAnySequence >& rParaPropValues , const tNameSequence& rPropNames , const tAnySequence& rPropValues - , const ::com::sun::star::uno::Any& rATransformation ) SAL_OVERRIDE; + , const ::com::sun::star::uno::Any& rATransformation ) 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, @@ -201,13 +201,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 ) SAL_OVERRIDE; + double nRotation, const OUString& aName ) 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 ) SAL_OVERRIDE; + , const ::com::sun::star::awt::Size& rSize ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( @@ -217,28 +217,28 @@ public: const com::sun::star::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, - StackPosition ePos = Top ) SAL_OVERRIDE; + StackPosition ePos = Top ) 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 ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShapes >& xTarget ) 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 ) SAL_OVERRIDE; + ::com::sun::star::drawing::XDrawPage>& xPage ) override; - 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 setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) override; /** * not necessary right now */ - virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >, bool ) SAL_OVERRIDE {} + virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >, bool ) override {} - virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >, OpenGLWindow*) SAL_OVERRIDE { return true; } - virtual void postRender(OpenGLWindow*) SAL_OVERRIDE {} + virtual bool preRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >, OpenGLWindow*) override { return true; } + virtual void postRender(OpenGLWindow*) override {} - virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {} + virtual void clearPage(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > ) override {} private: ShapeFactory(); diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index 7a2e3ab5c865..24aa2d1148c3 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 2edc39092275..47575f2f8961 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -157,23 +157,23 @@ public: // MinimumAndMaximumSupplier - virtual double getMinimumX() SAL_OVERRIDE; - virtual double getMaximumX() SAL_OVERRIDE; + virtual double getMinimumX() override; + virtual double getMaximumX() 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 getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) override; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) override; - virtual double getMinimumZ() SAL_OVERRIDE; - virtual double getMaximumZ() SAL_OVERRIDE; + virtual double getMinimumZ() override; + virtual double getMaximumZ() 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 bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) override; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) override; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; - virtual long calculateTimeResolutionOnXAxis() SAL_OVERRIDE; - virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) SAL_OVERRIDE; + virtual long calculateTimeResolutionOnXAxis() override; + virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) override; void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const; void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const; @@ -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; + ) override; virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio() SAL_OVERRIDE; + virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio() 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 899e0ed7bcac..7b0d28cb6094 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 SAL_OVERRIDE; - SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; + virtual SfxItemPool* Clone() const override; + SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override; /// creates a pure chart item pool static SfxItemPool* CreateChartItemPool(); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 80f85f5d2230..969b0eef2a26 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1080,11 +1080,11 @@ public: explicit GL2DRenderer(ChartView* pView); virtual ~GL2DRenderer(); - virtual void update() SAL_OVERRIDE; - virtual void clickedAt(const Point& rPos, sal_uInt16 nButton) SAL_OVERRIDE; - virtual void mouseDragMove(const Point& rBegin, const Point& rEnd, sal_uInt16 nButton) SAL_OVERRIDE; - virtual void scroll(long nDelta) SAL_OVERRIDE; - virtual void contextDestroyed() SAL_OVERRIDE; + virtual void update() override; + virtual void clickedAt(const Point& rPos, sal_uInt16 nButton) override; + virtual void mouseDragMove(const Point& rBegin, const Point& rEnd, sal_uInt16 nButton) override; + virtual void scroll(long nDelta) override; + virtual void contextDestroyed() override; const OpenGLWindow* getOpenGLWindow() const; void updateOpenGLWindow(); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index b4b98fe93196..ae242c290258 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -85,13 +85,13 @@ public: mrProperties(rProps) {} virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) override; virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) override; virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(uno::RuntimeException, std::exception) 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 3467d2381ede..5ce54c429619 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -111,53 +111,53 @@ public: DummyXShape(); // XNamed - 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; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XShape - 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; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet - 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) 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) 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) SAL_OVERRIDE; + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) 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) 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) 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) 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) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XChild - 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; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override; // XServiceInfo - 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; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // normal non UNO methods @@ -216,7 +216,7 @@ public: DummyPieSegment2D(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree, double fUnitCircleInnerRadius, double fUnitCircleOuterRadius, const css::drawing::Direction3D& rOffset, const css::drawing::HomogenMatrix& rUnitCircleToScene); - void render() SAL_OVERRIDE; + void render() override; private: double mfUnitCircleStartAngleDegree; double mfUnitCircleWidthAngleDegree; @@ -262,7 +262,7 @@ class DummyArea2D : public DummyXShape public: explicit DummyArea2D(const css::drawing::PointSequenceSequence& rShape); - virtual void render() SAL_OVERRIDE; + virtual void render() override; private: css::drawing::PointSequenceSequence maShapes; @@ -273,7 +273,7 @@ class DummySymbol2D : public DummyXShape public: DummySymbol2D(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize, sal_Int32 nStandardSymbol, sal_Int32 nFillColor); - void render() SAL_OVERRIDE; + void render() override; private: css::drawing::Position3D mrPosition; css::drawing::Direction3D mrSize; @@ -296,7 +296,7 @@ class DummyCircle : public DummyXShape public: DummyCircle(const css::awt::Point& rPosition, const css::awt::Size& rSize); - virtual void render() SAL_OVERRIDE; + virtual void render() override; }; class DummyLine3D : public DummyXShape @@ -314,7 +314,7 @@ public: DummyLine2D(const css::drawing::PointSequenceSequence& rPoints, const VLineProperties* pProperties); DummyLine2D(const css::awt::Size& rSize, const css::awt::Point& rPosition); - virtual void render() SAL_OVERRIDE; + virtual void render() override; private: css::drawing::PointSequenceSequence maPoints; @@ -328,7 +328,7 @@ public: DummyRectangle(const css::awt::Size& rSize, const css::awt::Point& rPoint, const tNameSequence& rNames, const tAnySequence& rValues ); - virtual void render() SAL_OVERRIDE; + virtual void render() override; }; class DummyText : public DummyXShape @@ -338,11 +338,11 @@ public: const tAnySequence& rValues, const css::uno::Any& rTrans, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xTarget, double nRotation); - virtual void render() SAL_OVERRIDE; + virtual void render() 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 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) 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 setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; private: void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); @@ -357,25 +357,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) 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; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() 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) 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; + 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) 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) override; // XElementAccess - 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; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - 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; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override; // normal methods - virtual void render() SAL_OVERRIDE; + virtual void render() override; protected: std::vector<com::sun::star::uno::Reference< com::sun::star::drawing::XShape > > maUNOShapes; @@ -387,12 +387,12 @@ class DummyChart : public DummyXShapes public: DummyChart(); virtual ~DummyChart(); - virtual DummyChart* getRootShape() SAL_OVERRIDE; + virtual DummyChart* getRootShape() 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; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override; - virtual void render() SAL_OVERRIDE; + virtual void render() override; void clear(); void invalidateInit() { mbNotInit = true; } @@ -415,10 +415,10 @@ class DummyGroup2D : public DummyXShapes public: explicit DummyGroup2D(const OUString& rName); - 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; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) 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) override; }; class DummyGroup3D : public DummyXShapes |