diff options
Diffstat (limited to 'chart2/source/controller')
25 files changed, 31 insertions, 31 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; } |