diff options
79 files changed, 130 insertions, 126 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 4a1c94ddf889..ceddbafaeca2 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -52,7 +52,7 @@ struct StaticAreaWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 20889b2754be..ee32f16fbd46 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -367,7 +367,7 @@ struct StaticAxisWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index b0d009c69358..2c2663e8d3fe 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -249,7 +249,7 @@ struct StaticChartDocumentWrapperPropertyArray_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 50163df910cf..1c0d37b6646f 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -459,7 +459,7 @@ struct StaticDiagramWrapperPropertyArray_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index b1a2ec43720e..e6ea629bbc4e 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -55,7 +55,7 @@ struct StaticGridWrapperPropertyArray_Initializer return &aPropSeq; } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 7fcb53ccc576..755b78ecbcaa 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -246,7 +246,7 @@ struct StaticLegendWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 92c67a194078..023eed13ed15 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -53,7 +53,7 @@ struct StaticMinMaxLineWrapperDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); } @@ -72,7 +72,7 @@ struct StaticMinMaxLineWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 3143222fe0dd..33926f442e4d 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -111,7 +111,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods - ::cppu::IPropertyArrayHelper& getInfoHelper(); + static ::cppu::IPropertyArrayHelper& getInfoHelper(); private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 23a9a3b302eb..bf716954c16a 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -170,7 +170,7 @@ struct StaticTitleWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 3d622d36f43f..99c3ca3f1e47 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -53,7 +53,7 @@ struct StaticUpDownBarWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; @@ -108,7 +108,7 @@ struct StaticUpDownBarWrapperDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 314a8b98b9ea..340da198447c 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -110,7 +110,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods - ::cppu::IPropertyArrayHelper& getInfoHelper(); + static ::cppu::IPropertyArrayHelper& getInfoHelper(); private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index fac7b7a1adda..a3061a2d20f8 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -56,7 +56,7 @@ struct StaticWallFloorWrapperPropertyArray_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::FillProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 9c0e387c9548..6a4e118e165e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -180,7 +180,7 @@ public: virtual ~WrappedStatisticProperty() {}; protected: - uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const + static uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) { if(!xSeriesPropertySet.is()) return 0; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 74670143d312..62ab1a2b9a3d 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -623,7 +623,7 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const return OUString(); } -OUString DataBrowser::GetRowString( sal_Int32 nRow ) const +OUString DataBrowser::GetRowString( sal_Int32 nRow ) { return OUString::number(nRow + 1); } diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 9e72939d40cd..ee6030081f59 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -180,7 +180,7 @@ private: void ImplAdjustHeaderControls(); OUString GetColString( sal_Int32 nColumnId ) const; - OUString GetRowString( sal_Int32 nRow ) const; + static OUString GetRowString( sal_Int32 nRow ); DECL_LINK( SeriesHeaderGotFocus, impl::SeriesHeaderEdit* ); DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit* ); diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 4123ac6c3b8d..f8ea3f7782e7 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -515,7 +515,7 @@ void addNewSeriesToContainer( DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( const Reference< XDataSeries > & xSeries, const OUString & aRoleOfSequenceForLabel, - const Reference< chart2::XChartType > & xChartType ) const + const Reference< chart2::XChartType > & xChartType ) { DialogModel::tRolesWithRanges aResult; try diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index 99a92b8d63cd..f44a366c90e9 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -99,12 +99,12 @@ public: ::std::vector< tSeriesWithChartTypeByName > getAllDataSeriesWithLabel() const; - tRolesWithRanges getRolesWithRanges( + static tRolesWithRanges getRolesWithRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xSeries, const OUString & aRoleOfSequenceForLabel, const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartType > & xChartType ) const; + ::com::sun::star::chart2::XChartType > & xChartType ); enum eMoveDirection { diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 8e7416b1bdf2..e2c30c5b1e08 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -439,7 +439,7 @@ void DataSourceTabPage::fillRoleListBox() if( bHasSelectedEntry ) { DialogModel::tRolesWithRanges aRoles( - m_rDialogModel.getRolesWithRanges( + DialogModel::getRolesWithRanges( pSeriesEntry->m_xDataSeries, lcl_GetSequenceNameForLabel( pSeriesEntry ), pSeriesEntry->m_xChartType )); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 9dc9deaebd41..dbf9c4856c00 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -302,7 +302,7 @@ SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const return 0; } -bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const +bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) { if(pObj) { diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index ea1579464455..89acd16b9471 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -75,7 +75,7 @@ public: SfxItemSet getPositionAndSizeItemSetFromMarkedObject() const; SdrObject* getNamedSdrObject( const OUString& rName ) const; - bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const; + static bool IsObjectHit( SdrObject* pObj, const Point& rPnt ); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index cd21f372e9ca..76d67301894e 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -102,7 +102,7 @@ private: @note this code is taken from dbaccess/source/ui/inc/UITools.hxx */ - void notifySystemWindow(vcl::Window* pWindow, + static void notifySystemWindow(vcl::Window* pWindow, vcl::Window* pToRegister, const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc); }; diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 81382eadaab1..c447af4e1874 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -651,7 +651,7 @@ private: const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY ); bool impl_DragDataPoint( const OUString & rCID, double fOffset ); - ::std::set< OUString > impl_getAvailableCommands(); + static ::std::set< OUString > impl_getAvailableCommands(); /** Creates a helper accesibility class that must be initialized via XInitialization. For parameters see diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 9b611bdc802b..adea7db9f2bb 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -105,7 +105,7 @@ public: void DisposeAndClear(); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getContainerDispatchForURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & xChartController, const ::com::sun::star::util::URL & rURL ); diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index a37a624ffd04..9f5d5ed624ae 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -146,7 +146,7 @@ private: void createDataSeriesTree( ObjectHierarchy::tChildContainer & rOutDiagramSubContainer, const Reference< XDiagram > & xDiagram ); - void createWallAndFloor( + static void createWallAndFloor( ObjectHierarchy::tChildContainer & rContainer, const Reference< XDiagram > & xDiagram ); void createLegendTree( diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 1435dfbadf23..c6da54051ce9 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -260,7 +260,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* SdrObject* pDiagram = pDrawViewWrapper->getNamedSdrObject( aDiagramCID ); if( pDiagram ) { - if( pDrawViewWrapper->IsObjectHit( pDiagram, rMousePos ) ) + if( DrawViewWrapper::IsObjectHit( pDiagram, rMousePos ) ) { m_aSelectedOID = ObjectIdentifier( aDiagramCID ); } @@ -273,7 +273,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID ); if( pLegend ) { - if( pDrawViewWrapper->IsObjectHit( pLegend, rMousePos ) ) + if( DrawViewWrapper::IsObjectHit( pLegend, rMousePos ) ) { m_aSelectedOID = ObjectIdentifier( aLegendCID ); } @@ -375,7 +375,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos return false; SolarMutexGuard aSolarGuard; SdrObject* pObj = rDrawViewWrapper.getNamedSdrObject( rNameOfSelectedObject ); - if( !rDrawViewWrapper.IsObjectHit( pObj, rMPos ) ) + if( !DrawViewWrapper::IsObjectHit( pObj, rMPos ) ) return false; return true; } @@ -423,7 +423,7 @@ OUString SelectionHelper::getHitObjectCID( SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID ); if( pDiagram ) { - if( rDrawViewWrapper.IsObjectHit( pDiagram, rMPos ) ) + if( DrawViewWrapper::IsObjectHit( pDiagram, rMPos ) ) { aRet = aDiagramCID; } diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 72d2a0bdcb46..403eb01dc844 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -45,10 +45,10 @@ protected: const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey ) const = 0; - OUString getFormattedString( + static OUString getFormattedString( const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey, - double fNumber ) const; + double fNumber ); double m_fCorrelationCoeffitient; diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 314592da0c43..b187dd34bb0e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -221,7 +221,7 @@ struct StaticAxisDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::CharacterProperties::AddDefaultsToMap( rOutMap ); ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); @@ -262,7 +262,7 @@ struct StaticAxisInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 965c7c358f05..22701436688e 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -67,7 +67,7 @@ struct StaticCooSysDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false ); } @@ -86,7 +86,7 @@ struct StaticCooSysInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 7afc38c6804b..8f9ea9cb6384 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -51,7 +51,7 @@ struct StaticDataPointInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::DataPointProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index aad77d8e2f6c..9f95cee79723 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -210,7 +210,7 @@ struct StaticDiagramDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, true ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_SORT_BY_X_VALUES, false ); @@ -240,7 +240,7 @@ struct StaticDiagramInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index e4d9c50491ff..f30eb31a4098 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -46,7 +46,7 @@ struct StaticFormattedStringDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::CharacterProperties::AddDefaultsToMap( rOutMap ); } @@ -65,7 +65,7 @@ struct StaticFormattedStringInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::CharacterProperties::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index c49be891eacb..5aa3f35301fe 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -66,7 +66,7 @@ struct StaticGridDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); @@ -91,7 +91,7 @@ struct StaticGridInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 369da0f1037a..9d22b6eb7ffb 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -115,7 +115,7 @@ struct StaticLegendDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -145,7 +145,7 @@ struct StaticLegendInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 0cd7544bd500..ab3ceb0b3935 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -52,7 +52,7 @@ struct StaticPageBackgroundDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -76,7 +76,7 @@ struct StaticPageBackgroundInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index de6eae867a13..0b05ee094fcc 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -50,7 +50,7 @@ struct StaticStockBarInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); @@ -92,7 +92,7 @@ struct StaticStockBarDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 6808484b8a6f..653abe45d1aa 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -155,7 +155,7 @@ struct StaticTitleDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -194,7 +194,7 @@ struct StaticTitleInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index d7eeeb2b4c01..ef1b9e38988b 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -55,7 +55,7 @@ struct StaticWallDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -78,7 +78,7 @@ struct StaticWallInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index f30bbfd157f1..37c6c16a74a9 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -65,7 +65,7 @@ struct StaticAreaChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 ); } @@ -84,7 +84,7 @@ struct StaticAreaChartTypeTemplateInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 8a504c82002c..971f666a6a5c 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -72,7 +72,7 @@ struct StaticBarChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_BAR_TEMPLATE_DIMENSION, 2 ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BAR_TEMPLATE_GEOMETRY3D, ::chart2::DataPointGeometry3D::CUBOID ); @@ -92,7 +92,7 @@ struct StaticBarChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index d5228542adb4..4b494b7943bc 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -63,7 +63,7 @@ struct StaticBubbleChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 006e64eb797d..e070942b14c0 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -65,7 +65,7 @@ struct StaticBubbleChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index d92aaf42e8b2..1d46372591d6 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -93,7 +93,7 @@ struct StaticCandleStickChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { // must match default in CTOR! ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_JAPANESE, false ); @@ -115,7 +115,7 @@ struct StaticCandleStickChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 3584a3d61aa9..f11b2a1b77a7 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -65,7 +65,7 @@ struct StaticColumnChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { Sequence< sal_Int32 > aSeq(2); @@ -90,7 +90,7 @@ struct StaticColumnChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 64375568c233..e44a97ef010d 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -70,7 +70,7 @@ struct StaticColumnLineChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 ); } @@ -89,7 +89,7 @@ struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index 8141359179de..b4dbd06cfaf9 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -40,7 +40,7 @@ struct DefaultsInitializer } private: - void addDefaults( tPropertyValueMap & rOutMap ) + static void addDefaults( tPropertyValueMap & rOutMap ) { PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false); } @@ -56,7 +56,7 @@ struct InfoHelperInitializer return &aHelper; } - uno::Sequence<beans::Property> getProperties() + static uno::Sequence<beans::Property> getProperties() { uno::Sequence<beans::Property> aRet(1); diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 6ea9e6d77740..51ccde36f3e9 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -43,7 +43,7 @@ struct DefaultsInitializer } private: - void addDefaults( tPropertyValueMap & rOutMap ) + static void addDefaults( tPropertyValueMap & rOutMap ) { PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false); } @@ -59,7 +59,7 @@ struct InfoHelperInitializer return &aHelper; } - uno::Sequence<beans::Property> getProperties() + static uno::Sequence<beans::Property> getProperties() { uno::Sequence<beans::Property> aRet(1); diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index a565baab69c8..553dce43169b 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -79,7 +79,7 @@ struct StaticLineChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_CURVE_STYLE, ::chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_CURVE_RESOLUTION, 20 ); @@ -103,7 +103,7 @@ struct StaticLineChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index b928eb0cd113..a7c1814a4213 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -84,7 +84,7 @@ struct StaticLineChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 ); @@ -108,7 +108,7 @@ struct StaticLineChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 683d764bd103..2a6ebf659e0a 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -71,7 +71,7 @@ struct StaticPieChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIECHARTTYPE_USE_RINGS, false ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, 100 ); @@ -91,7 +91,7 @@ struct StaticPieChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 77cd1e85e245..dc337df83490 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -95,7 +95,7 @@ struct StaticPieChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_OFFSET_MODE, chart2::PieChartOffsetMode_NONE ); ::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_PIE_TEMPLATE_DEFAULT_OFFSET, 0.5 ); @@ -117,7 +117,7 @@ struct StaticPieChartTypeTemplateInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 2e7b79cd8ff6..106f88f67a07 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -83,7 +83,7 @@ struct StaticScatterChartTypeDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_STYLE, chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, 20 ); @@ -107,7 +107,7 @@ struct StaticScatterChartTypeInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 0c04c417ea5b..781cefd65c28 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -86,7 +86,7 @@ struct StaticScatterChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 ); @@ -110,7 +110,7 @@ struct StaticScatterChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 6177bd67deeb..e1f5d9f0d7d8 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -97,7 +97,7 @@ struct StaticStockChartTypeTemplateDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, false ); @@ -119,7 +119,7 @@ struct StaticStockChartTypeTemplateInfoHelper_Initializer } private: - Sequence< Property > lcl_GetPropertySequence() + static Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 59dc730ae9ec..d8dc8c7916a2 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -82,7 +82,7 @@ void RegressionCurveCalculator::setRegressionProperties( OUString RegressionCurveCalculator::getFormattedString( const Reference< util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey, - double fNumber ) const + double fNumber ) { OUString aResult; diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index be309fba0ead..6857be4bd386 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -128,7 +128,7 @@ struct StaticXXXDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); } @@ -147,7 +147,7 @@ struct StaticRegressionCurveInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 0c97028a5732..0ddc2c97bd7f 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -106,7 +106,7 @@ struct StaticRegressionEquationDefaults_Initializer return &aStaticDefaults; } private: - void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) + static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); ::chart::FillProperties::AddDefaultsToMap( rOutMap ); @@ -140,7 +140,7 @@ struct StaticRegressionEquationInfoHelper_Initializer } private: - uno::Sequence< Property > lcl_GetPropertySequence() + static uno::Sequence< Property > lcl_GetPropertySequence() { ::std::vector< ::com::sun::star::beans::Property > aProperties; lcl_AddPropertiesToVector( aProperties ); diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 509709a3bed3..998f0da4e9bc 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -65,7 +65,7 @@ public: void setExtraLinePositionAtOtherAxis( double fCrossingAt ); protected: //methods - size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels ); + static size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels ); void removeTextShapesFromTicks(); void updateUnscaledValuesAtTicks( TickIter& rIter ); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 747a12044ecc..c8ae9e095be7 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -499,7 +499,7 @@ bool VCartesianAxis::isBreakOfLabelsAllowed( } bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( - const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const + const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) { if( rAxisLabelProperties.eStaggering != STAGGER_AUTO ) return false; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 839d5e817d5e..c1937a48ef6d 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -150,8 +150,8 @@ private: //methods * @return true if we can try to stagger labels in order to avoid * overlaps, otherwise false. */ - bool isAutoStaggeringOfLabelsAllowed( - const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const; + static bool isAutoStaggeringOfLabelsAllowed( + const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ); /** * @return true if we can break a single line label text into multiple diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 4710d5e0a15f..df7d1bcef449 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -79,7 +79,7 @@ void VCartesianCoordinateSystem::createGridShapes() if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - VCartesianGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis )); + VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis )); aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex) , this->getExplicitIncrement(nDimensionIndex,nAxisIndex) ); aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 5bd7329a89f3..9d7ebf2994b9 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -221,7 +221,7 @@ Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromA return ContainerHelper::ContainerToSequence( aRet ); } -void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) const +void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) { if( rDimensionIndex<0 ) rDimensionIndex=0; diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 7ad142175b34..6e34ab242aa3 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -173,7 +173,7 @@ void VPolarCoordinateSystem::createGridShapes() if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - VPolarGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis )); + VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis )); aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory , this->createCIDForGrid( xAxis, nDimensionIndex, nAxisIndex ) ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 911a6258fa36..7763f2cfe9e9 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -462,7 +462,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking @@ -538,7 +538,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes , aPoly ); } - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 1c50f79cdcb4..e6c2d080a001 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -63,7 +63,7 @@ private: //methods bool impl_createLine( VDataSeries* pSeries , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); - bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly + static bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly , ::com::sun::star::chart2::CurveStyle eCurveStyle , PlottingPositionHelper* pPosHelper , ::com::sun::star::drawing::PolyPolygonShape3D &aPoly ); diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index e5cbbe40915a..6184d01e2470 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( return xShape; } if( nGeometry3D != DataPointGeometry3D::PYRAMID ) - this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); + setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); return xShape; } @@ -801,7 +801,7 @@ void BarChart::createShapes() AddPointToPoly( aPoly, drawing::Position3D( fLogicX-fLogicBarWidth/2.0,fLowerYValue,fLogicZ) ); pPosHelper->transformScaledLogicToScene( aPoly ); xShape = m_pShapeFactory->createArea2D( xPointGroupShape_Shapes, aPoly ); - this->setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); + setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); } if(bHasFillColorMapping) @@ -913,7 +913,7 @@ void BarChart::createShapes() getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); uno::Reference< drawing::XShape > xShape( m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes, PolyToPointSequence( aPoly ) ) ); - this->setMappedProperties( xShape, pSeries->getPropertiesOfSeries() + setMappedProperties( xShape, pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); } } diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index cce9a3349989..2adc03c6fb71 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -317,7 +317,7 @@ void BubbleChart::createShapes() xShape = m_pShapeFactory->createCircle2D( xPointGroupShape_Shapes , aScenePosition, aSymbolSize ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfPoint( nIndex ) , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 50e3d2f5519b..c3621ceaf1cf 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -239,7 +239,7 @@ void CandleStickChart::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes, PolyToPointSequence(aPoly), NULL); - this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); + setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } //create first-last shape @@ -294,7 +294,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if(xProp.is()) { - this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); + setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } } } diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 6b778138309c..09fef837f55f 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -424,7 +424,7 @@ void RenderBenchMarkThread::ProcessClickFlyBack() if (!mbNeedFlyBack) return; osl_getSystemTime(&maClickFlyBackEndTime); - int nDeltaMs = mpChart->calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime); + int nDeltaMs = GL3DBarChart::calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime); if(nDeltaMs >= 10000) { mpChart->maRenderEvent = EVENT_MOVE_TO_DEFAULT; diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 854fc073ee71..5bd26237adb4 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -170,7 +170,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking @@ -241,7 +241,7 @@ bool NetChart::impl_createArea( VDataSeries* pSeries uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes , aPoly ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 58f1b04348f6..21233648dcbc 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -263,7 +263,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius , aOffset, B3DHomMatrixToHomogenMatrix( m_pPosHelper->getUnitCartesianToScene() ) ); } - this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap ); + setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap ); return xShape; } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 471c6c923575..52e75964b1ff 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -929,7 +929,7 @@ void VSeriesPlotter::createErrorBar( } uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, PolyToPointSequence( aPoly) ); - this->setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() ); + setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() ); } catch( const uno::Exception & e ) { diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index c68a38510d66..9f8664d73fce 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -103,7 +103,7 @@ private: void updateRenderFPS(); void updateDataUpdateFPS(); DECL_LINK(UpdateTimerHdl, void*); - int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); + static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag = true, const glm::vec4& rColor = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f), const glm::vec3& rPos = glm::vec3(0.0f, 0.0f, 0.0f), @@ -111,10 +111,10 @@ private: void recordBarHistory(sal_uInt32 &nBarID, float &nVal); void updateClickEvent(); void calcDistance(std::vector<sal_uInt32> &vectorNearest); - float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos); + static float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos); void initDistanceHeap(std::vector<sal_uInt32> &vectorNearest); void keepHeap(std::vector<sal_uInt32> &vectorNearest, int index); - void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest); + static void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest); void getNearestBars(std::vector<sal_uInt32> &vectorNearest); void updateScroll(); void processAutoFly(sal_uInt32 nId, sal_uInt32 nColor); diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 69eabae5b78d..afaa0f0e278e 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -228,7 +228,7 @@ public: private: void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale); - void ClearBuffer(); + static void ClearBuffer(); void RenderPolygon3DObject(); void RenderLine3D(const Polygon3DInfo &polygon); void RenderPolygon3D(const Polygon3DInfo &polygon); @@ -247,17 +247,17 @@ private: void AddNormalData(GLuint normalBuf); void AddIndexData(GLuint indexBuf); void RenderNonRoundedBar(const Extrude3DInfo& extrude3D); - bool GetSimilarVertexIndex(PackedVertex & packed, + static bool GetSimilarVertexIndex(PackedVertex & packed, std::map<PackedVertex,unsigned short> & VertexToOutIndex, unsigned short & result ); - void SetVertex(PackedVertex &packed, + static void SetVertex(PackedVertex &packed, std::map<PackedVertex,unsigned short> &VertexToOutIndex, std::vector<glm::vec3> &vertex, std::vector<glm::vec3> &normal, std::vector<unsigned short> &indeices); void CreateActualRoundedCube(float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth); - int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY, + static int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth); void CreateSceneBoxView(); diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index 0656cc565291..20ba20f6657c 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -52,9 +52,9 @@ public: void InvertNormal( bool bInvertNormal ); - ::com::sun::star::uno::Any getPolyPolygonShape3D() const; - ::com::sun::star::uno::Any getNormalsPolygon() const; - ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ) const; //0 to 7 are the different possibilities + ::com::sun::star::uno::Any getPolyPolygonShape3D() const; + ::com::sun::star::uno::Any getNormalsPolygon() const; + static ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities ::com::sun::star::drawing::Position3D GetPosition1() const { return m_aPoint1; } ::com::sun::star::drawing::Position3D GetPosition2() const { return m_aPoint2; } diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 291c1a2c1c64..ea64683a7e28 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -143,7 +143,7 @@ protected: //methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > getGridListFromAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -161,7 +161,7 @@ protected: //methods ::com::sun::star::chart2::XChartDocument>& xChartDoc); private: //methods - void impl_adjustDimension( sal_Int32& rDimensionIndex ) const; + static void impl_adjustDimension( sal_Int32& rDimensionIndex ); void impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex, sal_Int32& rAxisIndex ) const; protected: //member diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 03bbc8083eb2..84d1d3f52fde 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -405,7 +405,7 @@ protected: ::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator , ::com::sun::star::awt::Point aDefaultPos ); - void setMappedProperties( + static void setMappedProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTarget , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index b165b442f895..1251eafbfb49 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1004,7 +1004,7 @@ uno::Reference< drawing::XShape > //TexturePolygon xProp->setPropertyValue( UNO_NAME_3D_TEXTUREPOLYGON3D - , rStripe.getTexturePolygon( nRotatedTexture ) ); + , Stripe::getTexturePolygon( nRotatedTexture ) ); //Normals Polygon xProp->setPropertyValue( UNO_NAME_3D_NORMALSPOLYGON3D diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index 6d4bb9074f0d..c9455a0e9d53 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -175,7 +175,7 @@ uno::Any Stripe::getNormalsPolygon() const return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get()); } -uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const +uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) { drawing::PolyPolygonShape3D aPP; diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index f1186b019ae7..7b1966001b37 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -162,6 +162,10 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) || fqn == "SfxApplication::InitializeDde" || fqn == "SfxApplication::RemoveDdeTopic") { return true; } + // debugging stuff + if (fqn == "chart::InternalData::dump") { + return true; + } // used in a function-pointer-table if (startsWith(fqn, "SbiRuntime::Step")) { return true; @@ -181,7 +185,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) return true; } -loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true); +loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false); } |