summaryrefslogtreecommitdiff
path: root/chart2/source/view/axes
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/axes')
-rw-r--r--chart2/source/view/axes/DateScaling.hxx12
-rw-r--r--chart2/source/view/axes/Tickmarks.hxx6
-rw-r--r--chart2/source/view/axes/Tickmarks_Equidistant.hxx4
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx2
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.hxx2
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx8
-rw-r--r--chart2/source/view/axes/VCartesianAxis.hxx14
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx2
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.hxx8
-rw-r--r--chart2/source/view/axes/VCartesianGrid.hxx2
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.hxx8
-rw-r--r--chart2/source/view/axes/VPolarAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.hxx10
-rw-r--r--chart2/source/view/axes/VPolarGrid.hxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx22
15 files changed, 52 insertions, 52 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 14:24:13 +0000