diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /chart2 | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/dialogs/ChangingResource.hxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 10 | ||||
-rw-r--r-- | chart2/source/controller/inc/AccessibleBase.hxx | 4 | ||||
-rw-r--r-- | chart2/source/controller/inc/AccessibleChartView.hxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/main/DragMethod_Base.hxx | 2 | ||||
-rw-r--r-- | chart2/source/inc/ErrorBar.hxx | 4 | ||||
-rw-r--r-- | chart2/source/inc/MutexContainer.hxx | 2 | ||||
-rw-r--r-- | chart2/source/inc/OPropertySet.hxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/UndoManager.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/axes/Tickmarks_Equidistant.hxx | 4 | ||||
-rw-r--r-- | chart2/source/view/charttypes/CategoryPositionHelper.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/inc/PlottingPositionHelper.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/inc/VCoordinateSystem.hxx | 16 | ||||
-rw-r--r-- | chart2/source/view/inc/VSeriesPlotter.hxx | 16 |
15 files changed, 37 insertions, 37 deletions
diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx index c823979616b1..242b41e13206 100644 --- a/chart2/source/controller/dialogs/ChangingResource.hxx +++ b/chart2/source/controller/dialogs/ChangingResource.hxx @@ -40,7 +40,7 @@ public: ChangingResource(); virtual ~ChangingResource(); - virtual void setChangeListener( ResourceChangeListener* pListener ); + void setChangeListener( ResourceChangeListener* pListener ); protected: ResourceChangeListener* m_pChangeListener; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index f27fd813c549..413ff20c7f7d 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -111,16 +111,16 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); - virtual bool isSubType( const OUString& rServiceName ); - virtual ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< + bool isSubType( const OUString& rServiceName ); + ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ); virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); - virtual OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; - virtual bool commitToModel( const ChartTypeParameter& rParameter + OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const; + bool commitToModel( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel ); - virtual ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xTemplateManager ) const; diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index a0794da69994..6508a4d8d7f1 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -133,7 +133,7 @@ protected: @return If an object is the addressee of the event it should return true, false otherwise. */ - virtual bool NotifyEvent( EventType eType, const AccessibleUniqueId & rId ); + bool NotifyEvent( EventType eType, const AccessibleUniqueId & rId ); /** Adds a state to the set. */ @@ -200,7 +200,7 @@ protected: This method cares about mutex locking, and thus should be called without the mutex locked. */ - virtual void KillAllChildren(); + void KillAllChildren(); /** Is called from getAccessibleChild(). Before this method is called, an update of children is done if necessary. diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index e54fefb2e054..5e20108a562f 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -110,7 +110,7 @@ private: // methods a decoration. Thus you have an offset of (currently) (2,2) which isn't taken into account. */ - virtual ::com::sun::star::awt::Rectangle GetWindowPosSize() const; + ::com::sun::star::awt::Rectangle GetWindowPosSize() const; ExplicitValueProvider* getExplicitValueProvider(); diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index a068a0134d82..505053516756 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -35,7 +35,7 @@ public: , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE ); virtual ~DragMethod_Base(); - virtual OUString getUndoDescription() const; + OUString getUndoDescription() const; virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index c5ff30df1390..6d81e4b0ed63 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -158,9 +158,9 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChild ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( + 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); diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx index dafd0a77eb31..59c0d43edf8f 100644 --- a/chart2/source/inc/MutexContainer.hxx +++ b/chart2/source/inc/MutexContainer.hxx @@ -33,7 +33,7 @@ public: protected: mutable ::osl::Mutex m_aMutex; - virtual ::osl::Mutex & GetMutex() const; + ::osl::Mutex & GetMutex() const; }; } // namespace chart diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 697f6cfaf225..1ea2c64d03f1 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -151,7 +151,7 @@ protected: virtual void firePropertyChangeEvent(); /// call this when a derived component is disposed - virtual void disposePropertySet(); + void disposePropertySet(); // Interfaces diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 7d074000b1cf..16f43c65323c 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -77,7 +77,7 @@ namespace chart } // IUndoManagerImplementation - virtual ::osl::Mutex& getMutex(); + ::osl::Mutex& getMutex(); virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE; virtual Reference< XUndoManager > getThis() SAL_OVERRIDE; diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 4835b6785fa0..b13e8eafb1b2 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -116,7 +116,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL applyStyles( + void SAL_CALL applyStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) throw (::com::sun::star::uno::RuntimeException); @@ -224,7 +224,7 @@ protected: represents one of the dimensions of the coordinate systems. If there are series requesting asecondary axes a secondary y axes is added</p> */ - virtual void createAxes( + void createAxes( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ); diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 66f6760438db..259708ffc606 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -36,8 +36,8 @@ public: , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); virtual ~EquidistantTickIter(); - virtual double* firstValue(); - virtual double* nextValue(); + double* firstValue(); + double* nextValue(); virtual TickInfo* firstInfo() SAL_OVERRIDE; virtual TickInfo* nextInfo() SAL_OVERRIDE; diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index ee0e2aa95ca5..efa3e6e639aa 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -35,7 +35,7 @@ public: double getScaledSlotWidth() const; virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const; - virtual void setCategoryWidth( double fCategoryWidth ); + void setCategoryWidth( double fCategoryWidth ); //Distance between two neighboring bars in same category, seen relative to width of the bar void setInnerDistance( double fInnerDistance ); diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 27ee100d3d31..e913cdd0ed51 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -45,7 +45,7 @@ public: virtual ~PlottingPositionHelper(); virtual PlottingPositionHelper* clone() const; - virtual PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ); + PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ); virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 8408f6661a30..645149edf498 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -51,7 +51,7 @@ public: static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel ); - virtual void initPlottingTargets( + void initPlottingTargets( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget , const ::com::sun::star::uno::Reference< @@ -64,7 +64,7 @@ public: void setParticle( const OUString& rCooSysParticle ); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;} //better performance for big data @@ -109,18 +109,18 @@ public: virtual void initVAxisInList(); virtual void updateScalesAndIncrementsOnAxes(); - virtual void createMaximumAxesLabels(); - virtual void createAxesLabels(); - virtual void updatePositions(); - virtual void createAxesShapes(); + void createMaximumAxesLabels(); + void createAxesLabels(); + void updatePositions(); + void createAxesShapes(); virtual void createGridShapes(); - virtual bool getPropertySwapXAndYAxis() const; + bool getPropertySwapXAndYAxis() const; sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const; - virtual bool needSeriesNamesForAxis() const; + bool needSeriesNamesForAxis() const; void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames ); protected: //methods diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 0f45b401a376..16218f7a4a9d 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -153,7 +153,7 @@ public: ) */ - virtual void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) + void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) throw (::com::sun::star::uno::RuntimeException); // MinimumAndMaximumSupplier @@ -210,7 +210,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory ); - virtual std::vector< ViewLegendEntry > createLegendEntriesForSeries( + std::vector< ViewLegendEntry > createLegendEntriesForSeries( const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, const VDataSeries& rSeries, const ::com::sun::star::uno::Reference< @@ -330,7 +330,7 @@ protected: @param bVertical for y-error bars this is true, for x-error-bars it is false. */ - virtual void createErrorBar( + void createErrorBar( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D & rPos @@ -342,26 +342,26 @@ protected: , double* pfScaledLogicX ); - virtual void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition + void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double* pfScaledLogicX=0 ); - virtual void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition + void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double* pfScaledLogicX=0 ); - virtual void createRegressionCurvesShapes( VDataSeries& rVDataSeries + void createRegressionCurvesShapes( VDataSeries& rVDataSeries , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xEquationTarget , bool bMaySkipPointsInRegressionCalculation ); - virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID + void createRegressionCurveEquationShapes( const OUString & rEquationCID , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xEquationProperties , const ::com::sun::star::uno::Reference< @@ -370,7 +370,7 @@ protected: ::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator , ::com::sun::star::awt::Point aDefaultPos ); - virtual void setMappedProperties( + void setMappedProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTarget , const ::com::sun::star::uno::Reference< |