diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-10 15:06:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-11 06:59:15 +0000 |
| commit | 22d0d2455f9aa699fac95c450da725c603333132 (patch) | |
| tree | 2f619071b7967291b3767292c2a91fbc8b7a2d09 /chart2 | |
| parent | 78b4a1fb01af9ad3b3395a22f6e396be914b553e (diff) | |
loplugin:expandablemethods in chart2
Change-Id: Ie6650628683ec7c67359351eec0e09033f2b50cb
Reviewed-on: https://gerrit.libreoffice.org/30750
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
133 files changed, 271 insertions, 1426 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index f6c556c1332a..d45b67fad208 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -227,9 +227,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // css::lang::XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index c26122f6ca02..aa1e30949da1 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -120,9 +120,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ___lang::XInitialization___ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index b06f6d456263..497e1e546a59 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -879,12 +879,10 @@ sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() throw (RuntimeException, std::exception) { - uno::Sequence< OUString > aSeq( 2 ); - OUString* pStr = aSeq.getArray(); - pStr[ 0 ] = "com.sun.star.accessibility.Accessible"; - pStr[ 1 ] = "com.sun.star.accessibility.AccessibleContext"; - - return aSeq; + return { + "com.sun.star.accessibility.Accessible", + "com.sun.star.accessibility.AccessibleContext" + }; } // ________ AccessibleBase::XEventListener ________ diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 823c3b5872fc..0cce8bd4b88b 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -306,7 +306,8 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments MutexGuard aGuard( GetMutex()); Reference< chart2::XChartDocument > xChartDoc( xChartModel, uno::UNO_QUERY ); if( xChartDoc.is()) - m_spObjectHierarchy.reset( new ObjectHierarchy( xChartDoc, getExplicitValueProvider() )); + m_spObjectHierarchy.reset( + new ObjectHierarchy( xChartDoc, ExplicitValueProvider::getExplicitValueProvider(m_xChartView) )); else m_spObjectHierarchy.reset(); } @@ -335,11 +336,6 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments } } -ExplicitValueProvider* AccessibleChartView::getExplicitValueProvider() -{ - return ExplicitValueProvider::getExplicitValueProvider(m_xChartView); -} - // view::XSelectionChangeListener void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ ) diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 26926b35d22f..69c9183bae25 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -164,26 +164,9 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() return aWrappedProperties; } -Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 1 ] = "com.sun.star.beans.PropertySet"; - aServices[ 2 ] = "com.sun.star.drawing.FillProperties"; - aServices[ 3 ] = "com.sun.star.drawing.LineProperties"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL AreaWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString AreaWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.Area"); } @@ -196,7 +179,11 @@ sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.beans.PropertySet", + "com.sun.star.drawing.FillProperties", + "com.sun.star.drawing.LineProperties" }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 6565379a67fa..de77aafe0472 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -58,9 +58,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XShape ____ virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 16998053aba9..cfab846edcd3 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -690,25 +690,9 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() return aWrappedProperties; } -Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = "com.sun.star.chart.ChartAxis"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 2 ] = "com.sun.star.style.CharacterProperties"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL AxisWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString AxisWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.Axis"); } @@ -721,7 +705,11 @@ sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartAxis", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.style.CharacterProperties" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 6dec247f073f..352778b8f0b3 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -74,9 +74,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; virtual css::uno::Any getReferenceSize() override; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index f824d8baba5c..2378a1d579bf 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -701,24 +701,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) // \-- locked controllers } -uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = "com.sun.star.chart.ChartDataArray"; - aServices[ 1 ] = "com.sun.star.chart.ChartData"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ChartDataWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartDataWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.ChartData"); } @@ -731,7 +716,10 @@ sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartDataArray", + "com.sun.star.chart.ChartData" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 20f57af786a9..34a35ee7643b 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -61,9 +61,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - protected: // ____ XDateCategories ____ virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 2fc1735c2508..f6b1f22f1b4e 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1540,25 +1540,9 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert return aWrappedProperties; } -uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.chart.ChartDocument"; - aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 3 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ChartDocumentWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartDocumentWrapper::getImplementationName_Static() -{ return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME); } @@ -1571,7 +1555,12 @@ sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartDocument", + CHART_CHARTAPIWRAPPER_SERVICE_NAME, + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.beans.PropertySet" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 001b63c3b287..430172f07eff 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -908,29 +908,9 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty return WrappedPropertySet::getPropertyValue( rPropertyName ); } -uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 7 ); - aServices[ 0 ] = "com.sun.star.chart.ChartDataRowProperties"; - aServices[ 1 ] = "com.sun.star.chart.ChartDataPointProperties"; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 3 ] = "com.sun.star.beans.PropertySet"; - aServices[ 4 ] = "com.sun.star.drawing.FillProperties"; - aServices[ 5 ] = "com.sun.star.drawing.LineProperties"; - aServices[ 6 ] = "com.sun.star.style.CharacterProperties"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DataSeriesPointWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.DataSeries"); } @@ -943,7 +923,15 @@ sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServ css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartDataRowProperties", + "com.sun.star.chart.ChartDataPointProperties", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.beans.PropertySet", + "com.sun.star.drawing.FillProperties", + "com.sun.star.drawing.LineProperties", + "com.sun.star.style.CharacterProperties" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 25d8121d3bee..c2bcf4ea3cdc 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -80,9 +80,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ___lang::XInitialization___ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 78195fc5ce1d..bea455e4e9da 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -2066,30 +2066,9 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() return aWrappedProperties; } -uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 8 ); - aServices[ 0 ] = "com.sun.star.chart.Diagram"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 2 ] = "com.sun.star.chart.StackableDiagram"; - aServices[ 3 ] = "com.sun.star.chart.ChartAxisXSupplier"; - aServices[ 4 ] = "com.sun.star.chart.ChartAxisYSupplier"; - aServices[ 5 ] = "com.sun.star.chart.ChartAxisZSupplier"; - aServices[ 6 ] = "com.sun.star.chart.ChartTwoAxisXSupplier"; - aServices[ 7 ] = "com.sun.star.chart.ChartTwoAxisYSupplier"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DiagramWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DiagramWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.Diagram"); } @@ -2102,7 +2081,16 @@ sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.Diagram", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.chart.StackableDiagram", + "com.sun.star.chart.ChartAxisXSupplier", + "com.sun.star.chart.ChartAxisYSupplier", + "com.sun.star.chart.ChartAxisZSupplier", + "com.sun.star.chart.ChartTwoAxisXSupplier", + "com.sun.star.chart.ChartTwoAxisYSupplier" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 756587a55b04..24649f66bc0b 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -82,9 +82,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XComponent ____ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 4e92d9b0f4a2..6ad675d1dcab 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -169,26 +169,9 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties() return aWrappedProperties; } -Sequence< OUString > GridWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.chart.ChartGrid"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 2 ] = "com.sun.star.drawing.LineProperties"; - aServices[ 3 ] = "com.sun.star.beans.PropertySet"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL GridWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString GridWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.Grid"); } @@ -201,7 +184,12 @@ sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartGrid", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.drawing.LineProperties", + "com.sun.star.beans.PropertySet"\ + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 9c56d6a520ea..818b5fea65b6 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -68,9 +68,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XComponent ____ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 87bac97c0cf9..4853347743e1 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -418,26 +418,9 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() return aWrappedProperties; } -Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.chart.ChartLegend"; - aServices[ 1 ] = "com.sun.star.drawing.Shape"; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 3 ] = "com.sun.star.style.CharacterProperties"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL LegendWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString LegendWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.Legend"); } @@ -450,7 +433,12 @@ sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartLegend", + "com.sun.star.drawing.Shape", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.style.CharacterProperties" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 92f098a2ed3e..3c539c6aa779 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -61,9 +61,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; virtual css::uno::Any getReferenceSize() override; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index cea132d0928a..4b3f28773c2d 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -47,14 +47,9 @@ struct StaticMinMaxLineWrapperDefaults_Initializer ::chart::tPropertyValueMap* operator()() { static ::chart::tPropertyValueMap aStaticDefaults; - lcl_AddDefaultsToMap( aStaticDefaults ); + ::chart::LinePropertiesHelper::AddDefaultsToMap( aStaticDefaults ); return &aStaticDefaults; } -private: - static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) - { - ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); - } }; struct StaticMinMaxLineWrapperDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticMinMaxLineWrapperDefaults_Initializer > @@ -155,11 +150,6 @@ void SAL_CALL MinMaxLineWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -::cppu::IPropertyArrayHelper& MinMaxLineWrapper::getInfoHelper() -{ - return *StaticMinMaxLineWrapperInfoHelper::get(); -} - //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo() throw (uno::RuntimeException, std::exception) @@ -363,7 +353,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get(); - tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) ); + tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); if( aFound == rStaticDefaults.end() ) return uno::Any(); return (*aFound).second; @@ -406,25 +396,9 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const return aRetSeq; } -Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = "com.sun.star.chart.ChartLine"; - aServices[ 1 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 2 ] = "com.sun.star.drawing.LineProperties"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL MinMaxLineWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString MinMaxLineWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.ChartLine"); } @@ -437,7 +411,11 @@ sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceNa css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartLine", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.drawing.LineProperties" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 3d02bea8b4ca..860e70e1923c 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -66,9 +66,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XComponent ____ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; @@ -108,9 +105,6 @@ public: virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; -private: //methods - static ::cppu::IPropertyArrayHelper& getInfoHelper(); - private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index f2e26d6209e5..b0c901dc3c47 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -509,26 +509,9 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() return aWrappedProperties; } -Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.chart.ChartTitle"; - aServices[ 1 ] = "com.sun.star.drawing.Shape"; - aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 3 ] = "com.sun.star.style.CharacterProperties"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL TitleWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString TitleWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.Title"); } @@ -541,7 +524,12 @@ sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartTitle", + "com.sun.star.drawing.Shape", + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.style.CharacterProperties" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 273b9b00b7d0..9eb67a824604 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -60,9 +60,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; virtual css::uno::Any getReferenceSize() override; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 6dac6a7ffb12..ef048b1d945d 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -158,11 +158,6 @@ void SAL_CALL UpDownBarWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -::cppu::IPropertyArrayHelper& UpDownBarWrapper::getInfoHelper() -{ - return *StaticUpDownBarWrapperInfoHelper::get(); -} - //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo() throw (uno::RuntimeException, std::exception) @@ -326,7 +321,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); - tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) ); + tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); if( aFound == rStaticDefaults.end() ) return uno::Any(); return (*aFound).second; @@ -369,26 +364,9 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const return aRetSeq; } -Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.chart.ChartArea"; - aServices[ 1 ] = "com.sun.star.drawing.LineProperties"; - aServices[ 2 ] = "com.sun.star.drawing.FillProperties"; - aServices[ 3 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL UpDownBarWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString UpDownBarWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.ChartArea"); } @@ -401,7 +379,12 @@ sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart.ChartArea", + "com.sun.star.drawing.LineProperties", + "com.sun.star.drawing.FillProperties", + "com.sun.star.xml.UserDefinedAttributesSupplier" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index ed4ae9abe35a..dca66c5333fc 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -65,9 +65,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XComponent ____ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; @@ -109,9 +106,6 @@ public: virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; -private: //methods - static ::cppu::IPropertyArrayHelper& getInfoHelper(); - private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; ::comphelper::OInterfaceContainerHelper2 m_aEventListenerContainer; diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 8878a601b38b..9610bb600392 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -152,26 +152,9 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties( return aWrappedProperties; } -Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier"; - aServices[ 1 ] = "com.sun.star.drawing.FillProperties"; - aServices[ 2 ] = "com.sun.star.drawing.LineProperties"; - aServices[ 3 ] = "com.sun.star.beans.PropertySet"; - - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL WallFloorWrapper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString WallFloorWrapper::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.WallOrFloor"); } @@ -184,7 +167,12 @@ sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.xml.UserDefinedAttributesSupplier", + "com.sun.star.drawing.FillProperties", + "com.sun.star.drawing.LineProperties", + "com.sun.star.beans.PropertySet" + }; } } // namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index abb4af9c080f..60cd15aff708 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -55,9 +55,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XComponent ____ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 5e67f52b1bff..acf2195e717e 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -617,18 +617,13 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const return OUString(); } -OUString DataBrowser::GetRowString( sal_Int32 nRow ) -{ - return OUString::number(nRow + 1); -} - OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const { OUString aResult; if( nColumnId == 0 ) { - aResult = GetRowString( static_cast< sal_Int32 >( nRow )); + aResult = OUString::number(static_cast< sal_Int32 >( nRow ) + 1); } else if( nRow >= 0 && m_apDataBrowserModel.get()) { @@ -1171,11 +1166,6 @@ bool DataBrowser::EndEditing() return ShowQueryBox(); } -sal_Int16 DataBrowser::GetFirstVisibleColumNumber() const -{ - return GetFirstVisibleColNumber(); -} - void DataBrowser::ColumnResized( sal_uInt16 nColId ) { bool bLastUpdateMode = GetUpdateMode(); @@ -1250,7 +1240,7 @@ void DataBrowser::ImplAdjustHeaderControls() pColorWin->set_margin_left(nCurrentPos); tSeriesHeaderContainer::iterator aIt( m_aSeriesHeaders.begin()); - sal_uInt16 i = this->GetFirstVisibleColumNumber(); + sal_uInt16 i = GetFirstVisibleColNumber(); while( (aIt != m_aSeriesHeaders.end()) && ((*aIt)->GetStartColumn() < i) ) { (*aIt)->Hide(); diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index cc67b5b07dfd..6eec67a58336 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -128,9 +128,6 @@ public: /// confirms all pending changes to be ready to be closed bool EndEditing(); - // calls the protected inline-function BrowseBox::GetFirstVisibleColNumber() - sal_Int16 GetFirstVisibleColumNumber() const; - bool CellContainsNumbers( sal_Int32 nRow, sal_uInt16 nCol ) const; sal_uInt32 GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const; @@ -173,7 +170,6 @@ private: void ImplAdjustHeaderControls(); OUString GetColString( sal_Int32 nColumnId ) const; - static OUString GetRowString( sal_Int32 nRow ); DECL_LINK( SeriesHeaderGotFocus, Control&, void ); DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void ); diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 6e10a3331175..fc1384d52e3f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -43,23 +43,12 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() // lang::XServiceInfo OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception) { - return getImplementationName_Static(); -} - -OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException) -{ return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME); } css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() -{ - uno::Sequence<OUString> aSNS { CHART_TYPE_DIALOG_SERVICE_NAME }; - return aSNS; + return { CHART_TYPE_DIALOG_SERVICE_NAME }; } uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) { diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 16696b0b7c34..c1138a17e217 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -60,11 +60,6 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() OUString SAL_CALL CreationWizardUnoDlg::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString CreationWizardUnoDlg::getImplementationName_Static() -{ return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME); } @@ -77,13 +72,7 @@ sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence< OUString > CreationWizardUnoDlg::getSupportedServiceNames_Static() -{ - uno::Sequence<OUString> aSNS { CHART_WIZARD_DIALOG_SERVICE_NAME }; - return aSNS; + return { CHART_WIZARD_DIALOG_SERVICE_NAME }; } // XInterface diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 15971efc442e..40f854d9ef75 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -71,7 +71,7 @@ DataEditor::DataEditor(vcl::Window* pParent, m_xBrwData->SetCursorMovedHdl( LINK( this, DataEditor, BrowserCursorMovedHdl )); - UpdateData(); + m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); GrabFocus(); m_xBrwData->GrabFocus(); @@ -175,11 +175,6 @@ IMPL_LINK_NOARG(DataEditor, MiscHdl, LinkParamNone*, void) m_pTbxData->SetOutStyle( nStyle ); } -void DataEditor::UpdateData() -{ - m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); -} - bool DataEditor::Close() { if( ApplyChangesToModel() ) diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 9846c20fc127..fc0e2fb1178f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -31,16 +31,11 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAt m_rInAttrs(rInAttrs) { m_apDataLabelResources->SetNumberFormatter( pFormatter ); - Reset(); + m_apDataLabelResources->Reset(m_rInAttrs); } DataLabelsDialog::~DataLabelsDialog() = default; -void DataLabelsDialog::Reset() -{ - m_apDataLabelResources->Reset(m_rInAttrs); -} - void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs) { m_apDataLabelResources->FillItemSet(&rOutAttrs); diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 89721b330f4a..8f37db11a1da 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -112,8 +112,6 @@ private: // methods */ css::awt::Rectangle GetWindowPosSize() const; - ExplicitValueProvider* getExplicitValueProvider(); - private: // members css::uno::WeakReference< css::view::XSelectionSupplier > m_xSelectionSupplier; css::uno::WeakReference< css::frame::XModel > m_xChartModel; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index b056c794546d..3b3449170eec 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -119,9 +119,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // css::frame::XController (required interface) virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 3208a9ebf605..c0112a85f1ba 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -69,9 +69,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn ); const css::uno::Reference< css::util::XRefreshable >& getAddIn() const { return m_xAddIn;} diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 4ae8e94871b1..826948c09697 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -36,9 +36,6 @@ class ChartTypeUnoDlg : public ChartTypeUnoDlg_BASE public: ChartTypeUnoDlg( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - // XServiceInfo - static methods - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); private: virtual ~ChartTypeUnoDlg() override; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 3868211faf0e..2c2684127065 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -70,9 +70,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index f372f4d1afc8..baffffaea214 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -75,10 +75,6 @@ private: /// this is called if MiscOptions change, esp. High-Contrast mode DECL_LINK( MiscHdl, LinkParamNone*, void ); - void UpdateData(); - /// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox -// void ImplAdjustHeaderControls( bool bRefreshFromModel ); - /** notifySystemWindow adds or remove the given window pToRegister at the Systemwindow found when search pWindow. @param pWindow The window which is used to search for the SystemWindow. diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index 2f62ad625655..43a67490648f 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -40,8 +40,6 @@ private: const SfxItemSet& m_rInAttrs; - void Reset(); - public: DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); virtual ~DataLabelsDialog() override; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index c79a917ba285..5998cfd8343f 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -361,11 +361,6 @@ bool ChartController::impl_isDisposedOrSuspended() const OUString SAL_CALL ChartController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartController::getImplementationName_Static() -{ return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME); } @@ -378,16 +373,11 @@ sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aSNS( 2 ); - aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME; - aSNS.getArray()[ 1 ] = "com.sun.star.frame.Controller"; - //// @todo : add additional services if you support any further - return aSNS; + return { + CHART_CONTROLLER_SERVICE_NAME, + "com.sun.star.frame.Controller" + //// @todo : add additional services if you support any further + }; } namespace { diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 594be4bd3dc2..a8d506834150 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -59,11 +59,6 @@ bool ChartFrameLoader::impl_checkCancel() OUString SAL_CALL ChartFrameLoader::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartFrameLoader::getImplementationName_Static() -{ return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME); } @@ -76,11 +71,6 @@ sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static() -{ return { CHART_FRAMELOADER_SERVICE_NAME }; } diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 765fdfc8e5b4..159375b21d36 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -55,9 +55,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // css::frame::XFrameLoader virtual sal_Bool SAL_CALL diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index e45b280d6f94..ef9a4515a41d 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -243,15 +243,9 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() return ListBox::CreateAccessible(); } -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ElementSelectorToolbarController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ElementSelectorToolbarController::getImplementationName_Static() -{ return OUString(lcl_aServiceName); } @@ -264,11 +258,6 @@ sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUStr css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() -{ return { "com.sun.star.frame.ToolbarController" }; } ElementSelectorToolbarController::ElementSelectorToolbarController() diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index d8e6e896c213..acb7d2cf3034 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -80,9 +80,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 425b65d7935c..2cbe9c6bd048 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -89,9 +89,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 894944b51a1a..a8feeb12b8a9 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -56,9 +56,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ ConfigItemListener ____ void notify( const OUString & rPropertyName ); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index af885c667649..f0d6eb851157 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -50,9 +50,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - protected: // ____ XDataSource ____ virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 8b1496e84f3d..107d2ab1f4d7 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -93,9 +93,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 19e2e1e2ee64..5142ef7ac6ce 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -79,8 +79,6 @@ public: explicit InternalDataProvider( const InternalDataProvider & rOther ); virtual ~InternalDataProvider() override; - void createDefaultData(); - /// declare XServiceInfo methods virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; @@ -89,9 +87,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XInternalDataProvider ____ virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 899e76c4bab5..b36ba3298c3c 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -62,9 +62,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - protected: // ____ XLabeledDataSequence ____ virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 8d1b20d81361..5f167233da00 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -59,8 +59,6 @@ class ModifyEventForwarder : public: ModifyEventForwarder(); - void FireEvent( const css::lang::EventObject & rEvent ); - void AddListener( const css::uno::Reference< css::util::XModifyListener >& aListener ); void RemoveListener( diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index bac4b7f5bb25..3b1b4ef14b05 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -52,9 +52,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) throw (css::uno::RuntimeException, std::exception) override; @@ -93,9 +90,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) @@ -133,9 +127,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) throw (css::uno::RuntimeException, std::exception) override; @@ -172,9 +163,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 5373b76b74c4..bea4028d36d9 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -98,9 +98,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 7302b71e6885..019dd864a402 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -732,17 +732,6 @@ sal_Int32 XMLFilter::impl_ExportStream( return nWarning; } -Sequence< OUString > XMLFilter::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = "com.sun.star.document.ImportFilter"; - aServices[ 1 ] = "com.sun.star.document.ExportFilter"; - - // todo: services are incomplete. Missing: - // XInitialization, XNamed - return aServices; -} - void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) { apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor ); @@ -757,11 +746,6 @@ OUString XMLFilter::getMediaType(bool _bOasis) OUString SAL_CALL XMLFilter::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString XMLFilter::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.XMLFilter"); } @@ -774,7 +758,12 @@ sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.document.ImportFilter", + "com.sun.star.document.ExportFilter" + }; + // todo: services are incomplete. Missing: + // XInitialization, XNamed } void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 5cd12965bd36..79aac4c21bb1 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -50,9 +50,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class CartesianCoordinateSystem2d : public CartesianCoordinateSystem @@ -69,9 +66,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class CartesianCoordinateSystem3d : public CartesianCoordinateSystem @@ -89,9 +83,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // namespace chart diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index b41664120019..30e2b24cffb1 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -55,9 +55,6 @@ public: getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: // ____ XMultiServiceFactory ____ diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 030d0ce3c219..27b9513e6528 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -78,9 +78,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 9dbec671422c..7e724184ba1e 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -72,9 +72,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 70773f03153e..f886d066895f 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -50,9 +50,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class PolarCoordinateSystem2d : public PolarCoordinateSystem @@ -69,9 +66,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class PolarCoordinateSystem3d : public PolarCoordinateSystem @@ -88,9 +82,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // namespace chart diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 51d3db993fb5..40cf1f2ac212 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -92,8 +92,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; - void fireModifyEvent(); - private: const bool m_bRisingCourse; css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 1c7ce84131ad..bc8b75ee4a2d 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -69,9 +69,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - protected: // ____ XFilter ____ virtual sal_Bool SAL_CALL filter( @@ -152,16 +149,12 @@ public: explicit XMLReportFilterHelper( css::uno::Reference< css::uno::XComponentContext > const & _xContext ) :XMLFilter(_xContext) {} - static OUString getImplementationName_Static() - { - return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); - } protected: virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override { - return getImplementationName_Static(); + return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); } // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index f29567c9b9fb..8ba10b145626 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -633,14 +633,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() return *StaticAxisInfo::get(); } -Sequence< OUString > Axis::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = "com.sun.star.chart2.Axis"; - aServices[ 1 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - using impl::Axis_Base; IMPLEMENT_FORWARD_XINTERFACE2( Axis, Axis_Base, ::property::OPropertySet ) @@ -650,11 +642,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet ) OUString SAL_CALL Axis::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString Axis::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.Axis"); } @@ -667,7 +654,9 @@ sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.Axis", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 00f0d6503b19..6758b92d45b4 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -65,9 +65,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index d3eeedfade34..6a10d8404327 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -60,14 +60,9 @@ struct StaticCooSysDefaults_Initializer ::chart::tPropertyValueMap* operator()() { static ::chart::tPropertyValueMap aStaticDefaults; - lcl_AddDefaultsToMap( aStaticDefaults ); + ::chart::PropertyHelper::setPropertyValueDefault( aStaticDefaults, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false ); return &aStaticDefaults; } -private: - static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) - { - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false ); - } }; struct StaticCooSysDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticCooSysDefaults_Initializer > diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 31961279ac8a..5befaffb9748 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -74,20 +74,9 @@ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClo } // ____ XServiceInfo ____ -Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static() -{ - return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL CartesianCoordinateSystem::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString CartesianCoordinateSystem::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"); } @@ -100,7 +89,7 @@ sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rS css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME }; } // ==== CartesianCoordinateSystem2d ==== @@ -114,23 +103,9 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d() {} // ____ XServiceInfo ____ -Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; - aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem2d"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString CartesianCoordinateSystem2d::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d"); } @@ -143,7 +118,10 @@ sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, + "com.sun.star.chart2.CartesianCoordinateSystem2d" + }; } // ==== CartesianCoordinateSystem3d ==== @@ -157,23 +135,9 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d() {} // ____ XServiceInfo ____ -Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; - aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem3d"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString CartesianCoordinateSystem3d::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d"); } @@ -186,7 +150,10 @@ sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, + "com.sun.star.chart2.CartesianCoordinateSystem3d" + }; } } // namespace chart diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index b9647eb16b67..1997c565101f 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -318,11 +318,6 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV OUString SAL_CALL ChartModel::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartModel::getImplementationName_Static() -{ return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME); } @@ -335,17 +330,11 @@ sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aSNS( 3 ); - aSNS[0] = CHART_MODEL_SERVICE_NAME; - aSNS[1] = "com.sun.star.document.OfficeDocument"; - aSNS[2] = "com.sun.star.chart.ChartDocument"; - //// @todo : add additional services if you support any further - return aSNS; + return { + CHART_MODEL_SERVICE_NAME, + "com.sun.star.document.OfficeDocument", + "com.sun.star.chart.ChartDocument" + }; } // frame::XModel (required interface) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 19a54e067fb4..0f359648f31f 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -272,24 +272,9 @@ void SAL_CALL DataPoint::disposing( const lang::EventObject& ) // ____ OPropertySet ____ void DataPoint::firePropertyChangeEvent() { - fireModifyEvent(); -} - -void DataPoint::fireModifyEvent() -{ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -Sequence< OUString > DataPoint::getSupportedServiceNames_Static() -{ - return Sequence< OUString >{ - "com.sun.star.drawing.FillProperties", - "com.sun.star.chart2.DataPoint", - "com.sun.star.chart2.DataPointProperties", - "com.sun.star.beans.PropertySet" - }; -} - // needed by MSC compiler using impl::DataPoint_Base; @@ -299,11 +284,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS OUString SAL_CALL DataPoint::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DataPoint::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.DataPoint") ; } @@ -316,7 +296,12 @@ sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return Sequence< OUString >{ + "com.sun.star.drawing.FillProperties", + "com.sun.star.chart2.DataPoint", + "com.sun.star.chart2.DataPointProperties", + "com.sun.star.beans.PropertySet" + }; } } // namespace chart diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 2262079f0e59..8335509b8f8f 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -64,9 +64,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - protected: explicit DataPoint( const DataPoint & rOther ); @@ -119,8 +116,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; - void fireModifyEvent(); - private: css::uno::WeakReference< css::beans::XPropertySet > m_xParentProperties; diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index d016f2160476..3f60181ac8ec 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -232,15 +232,6 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() return xResult; } -Sequence< OUString > DataSeries::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = "com.sun.star.chart2.DataSeries"; - aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - // ____ OPropertySet ____ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const throw (beans::UnknownPropertyException, @@ -569,11 +560,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) OUString SAL_CALL DataSeries::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DataSeries::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.DataSeries"); } @@ -586,7 +572,10 @@ sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.DataSeries", + "com.sun.star.chart2.DataPointProperties", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 8ab8c6609f28..f8323f06df61 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -646,16 +646,6 @@ void Diagram::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -Sequence< OUString > Diagram::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 3 ); - - aServices[ 0 ] = "com.sun.star.chart2.Diagram"; - aServices[ 1 ] = "com.sun.star.layout.LayoutElement"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - // ____ OPropertySet ____ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -747,11 +737,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe OUString SAL_CALL Diagram::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString Diagram::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.Diagram"); } @@ -764,7 +749,10 @@ sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.Diagram", + "com.sun.star.layout.LayoutElement", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index d34dfa5b3440..4396a584b71a 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -39,14 +39,9 @@ struct StaticFormattedStringDefaults_Initializer ::chart::tPropertyValueMap* operator()() { static ::chart::tPropertyValueMap aStaticDefaults; - lcl_AddDefaultsToMap( aStaticDefaults ); + ::chart::CharacterProperties::AddDefaultsToMap( aStaticDefaults ); return &aStaticDefaults; } -private: - static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) - { - ::chart::CharacterProperties::AddDefaultsToMap( rOutMap ); - } }; struct StaticFormattedStringDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticFormattedStringDefaults_Initializer > @@ -197,15 +192,6 @@ void FormattedString::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -Sequence< OUString > FormattedString::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - - aServices[ 0 ] = "com.sun.star.chart2.FormattedString"; - aServices[ 1 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - // ____ OPropertySet ____ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const throw (beans::UnknownPropertyException, uno::RuntimeException) @@ -241,11 +227,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope OUString SAL_CALL FormattedString::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString FormattedString::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.FormattedString"); } @@ -258,7 +239,9 @@ sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.FormattedString", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 8f4755405260..2eb5565bd64b 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -61,9 +61,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index cd506a4ba97f..6c6dee23a355 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -223,31 +223,13 @@ void SAL_CALL GridProperties::disposing( const lang::EventObject& /* Source */ ) // ____ OPropertySet ____ void GridProperties::firePropertyChangeEvent() { - fireModifyEvent(); -} - -void GridProperties::fireModifyEvent() -{ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -Sequence< OUString > GridProperties::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = "com.sun.star.chart2.GridProperties"; - aServices[ 1 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL GridProperties::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString GridProperties::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.GridProperties"); } @@ -260,7 +242,9 @@ sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.GridProperties", + "com.sun.star.beans.PropertySet" }; } // needed by MSC compiler diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 75dd9a33ce1a..a38481edaf06 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -63,9 +63,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations @@ -111,8 +108,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; - void fireModifyEvent(); - private: css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 29ebc46a081a..3df5156c86b0 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -252,26 +252,9 @@ void SAL_CALL Legend::disposing( const lang::EventObject& /* Source */ ) // ____ OPropertySet ____ void Legend::firePropertyChangeEvent() { - fireModifyEvent(); -} - -void Legend::fireModifyEvent() -{ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -Sequence< OUString > Legend::getSupportedServiceNames_Static() -{ - return Sequence< OUString >{ - "com.sun.star.chart2.Legend", - "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties", - "com.sun.star.style.CharacterProperties", - "com.sun.star.layout.LayoutElement" - }; -} - // ____ OPropertySet ____ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const throw (beans::UnknownPropertyException, uno::RuntimeException) @@ -299,11 +282,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() OUString SAL_CALL Legend::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString Legend::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.Legend"); } @@ -316,7 +294,14 @@ sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.Legend", + "com.sun.star.beans.PropertySet", + "com.sun.star.drawing.FillProperties", + "com.sun.star.drawing.LineProperties", + "com.sun.star.style.CharacterProperties", + "com.sun.star.layout.LayoutElement" + }; } // needed by MSC compiler diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 066a595b3606..8b1a270f1412 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -62,9 +62,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations @@ -111,8 +108,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; - void fireModifyEvent(); - private: css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; }; diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index c8654e31d2f0..117eafb212ee 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -203,31 +203,12 @@ void SAL_CALL PageBackground::disposing( const lang::EventObject& /* Source */ ) // ____ OPropertySet ____ void PageBackground::firePropertyChangeEvent() { - fireModifyEvent(); -} - -void PageBackground::fireModifyEvent() -{ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = "com.sun.star.chart2.PageBackground"; - aServices[ 1 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL PageBackground::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString PageBackground::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.PageBackground"); } @@ -240,7 +221,9 @@ sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.PageBackground", + "com.sun.star.beans.PropertySet" }; } using impl::PageBackground_Base; diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 721642059028..99abf8150929 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -59,9 +59,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() @@ -106,8 +103,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; - void fireModifyEvent(); - private: css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index aa982cd687f7..6c26feb60da2 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -74,20 +74,9 @@ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() } // ____ XServiceInfo ____ -Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() -{ - return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL PolarCoordinateSystem::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString PolarCoordinateSystem::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.PolarCoordinateSystem"); } @@ -100,7 +89,7 @@ sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServi css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME }; } // ==== PolarCoordinateSystem2d ==== @@ -114,23 +103,9 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d() {} // ____ XServiceInfo ____ -Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME; - aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem2d"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString PolarCoordinateSystem2d::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ; } @@ -143,7 +118,9 @@ sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rSer css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_COOSYSTEM_POLAR_SERVICE_NAME, + "com.sun.star.chart2.PolarCoordinateSystem2d" }; } // ==== PolarCoordinateSystem3d ==== @@ -157,23 +134,9 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d() {} // ____ XServiceInfo ____ -Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME; - aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem3d"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString PolarCoordinateSystem3d::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d"); } @@ -186,7 +149,9 @@ sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rSer css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_COOSYSTEM_POLAR_SERVICE_NAME, + "com.sun.star.chart2.PolarCoordinateSystem3d" }; } } // namespace chart diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 4b922bbbe6e0..206e48bd85d9 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -212,11 +212,6 @@ void SAL_CALL StockBar::disposing( const lang::EventObject& /* Source */ ) // ____ OPropertySet ____ void StockBar::firePropertyChangeEvent() { - fireModifyEvent(); -} - -void StockBar::fireModifyEvent() -{ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index e704c1ffda81..621ec2b3143a 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -372,25 +372,9 @@ void Title::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -uno::Sequence< OUString > Title::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = "com.sun.star.chart2.Title"; - aServices[ 1 ] = "com.sun.star.style.ParagraphProperties"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - aServices[ 3 ] = "com.sun.star.layout.LayoutElement"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Title::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString Title::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.Title"); } @@ -403,7 +387,11 @@ sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.Title", + "com.sun.star.style.ParagraphProperties", + "com.sun.star.beans.PropertySet", + "com.sun.star.layout.LayoutElement" }; } // needed by MSC compiler diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index b484ccec66cf..e6ff363c6019 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -60,9 +60,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 40e7e43ce028..d47824fef502 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -205,11 +205,6 @@ void SAL_CALL Wall::disposing( const lang::EventObject& /* Source */ ) // ____ OPropertySet ____ void Wall::firePropertyChangeEvent() { - fireModifyEvent(); -} - -void Wall::fireModifyEvent() -{ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index e35d936312b7..5a67938c1684 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -95,8 +95,6 @@ protected: virtual void firePropertyChangeEvent() override; using OPropertySet::disposing; - void fireModifyEvent(); - private: css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder; diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index e9e057f1e490..21d96fac7e9d 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -53,23 +53,9 @@ OUString SAL_CALL AreaChartType::getChartType() return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA); } -uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL AreaChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString AreaChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.AreaChartType"); } @@ -82,7 +68,9 @@ sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_AREA, + "com.sun.star.chart2.ChartType" }; } } // namespace chart diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index b3c2843197eb..2a9c99f5cd1d 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -39,9 +39,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit AreaChartType( const AreaChartType & rOther ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 0128bb043b6c..d26bc1569ddc 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -58,14 +58,9 @@ struct StaticAreaChartTypeTemplateDefaults_Initializer ::chart::tPropertyValueMap* operator()() { static ::chart::tPropertyValueMap aStaticDefaults; - lcl_AddDefaultsToMap( aStaticDefaults ); + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aStaticDefaults, PROP_AREA_TEMPLATE_DIMENSION, 2 ); return &aStaticDefaults; } -private: - static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) - { - ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 ); - } }; struct StaticAreaChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticAreaChartTypeTemplateDefaults_Initializer > diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index d7423110a126..3a61a04dc177 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -64,23 +64,9 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() return aPropRoles; } -uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL BarChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString BarChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.BarChartType"); } @@ -93,7 +79,9 @@ sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_BAR, + "com.sun.star.chart2.ChartType" }; } } // namespace chart diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 96b706e41999..6c79298d6609 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -39,9 +39,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit BarChartType( const BarChartType & rOther ); diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index d274060208ac..ba23686d24d7 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -204,24 +204,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS return *StaticBubbleChartTypeInfo::get(); } -uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL BubbleChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString BubbleChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.BubbleChartType"); } @@ -234,7 +219,10 @@ sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 66d7508b00ae..cc0e94406f45 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -41,9 +41,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit BubbleChartType( const BubbleChartType & rOther ); diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index fb9d7023181b..3062cc2151c7 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -324,24 +324,9 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( ::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue ); } -uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL CandleStickChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString CandleStickChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.CandleStickChartType") ; } @@ -354,7 +339,10 @@ sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index a4079f2b86fd..1bbca51d7814 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -40,9 +40,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 9871b1c11c10..664f3e2eeaa4 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -603,23 +603,9 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() } // ____ XServiceInfo ____ -Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = "com.sun.star.chart2.ChartTypeManager"; - aServices[ 1 ] = "com.sun.star.lang.MultiServiceFactory"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ChartTypeManager::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartTypeManager::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.ChartTypeManager"); } @@ -632,7 +618,9 @@ sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + "com.sun.star.chart2.ChartTypeManager", + "com.sun.star.lang.MultiServiceFactory" }; } } // namespace chart diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index c2b01466da8f..3b6f23cca403 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -185,23 +185,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS return *StaticColumnChartTypeInfo::get(); } -uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ColumnChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ColumnChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.ColumnChartType"); } @@ -214,7 +200,9 @@ sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_COLUMN, + "com.sun.star.chart2.ChartType" }; } } // namespace chart diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3616a28ddece..f37f845c7ee4 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -39,9 +39,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit ColumnChartType( const ColumnChartType & rOther ); diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 55a8f1e6e685..100b6287a0cc 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -63,14 +63,9 @@ struct StaticColumnLineChartTypeTemplateDefaults_Initializer ::chart::tPropertyValueMap* operator()() { static ::chart::tPropertyValueMap aStaticDefaults; - lcl_AddDefaultsToMap( aStaticDefaults ); + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aStaticDefaults, PROP_COL_LINE_NUMBER_OF_LINES, 1 ); return &aStaticDefaults; } -private: - static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) - { - ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 ); - } }; struct StaticColumnLineChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticColumnLineChartTypeTemplateDefaults_Initializer > diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 73899a6d5976..9d106dabc2ca 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -379,20 +379,9 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & return bUseCategoriesAsX; } -Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() -{ - return { "com.sun.star.chart2.DataInterpreter" }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataInterpreter::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DataInterpreter::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.DataInterpreter"); } @@ -405,7 +394,7 @@ sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { "com.sun.star.chart2.DataInterpreter" }; } } // namespace chart diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 8815496681fb..008144b54af8 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -46,9 +46,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // convenience methods static OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq ); diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 6831eaa999ab..661805a4a474 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -62,24 +62,9 @@ OUString SAL_CALL FilledNetChartType::getChartType() return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET); } -uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL FilledNetChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString FilledNetChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.FilledNetChartType"); } @@ -92,7 +77,10 @@ sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index d7ddbaa9f790..e308258426ae 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -39,9 +39,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index e936caa983ce..f18c9c941b23 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -104,11 +104,6 @@ GL3DBarChartType::~GL3DBarChartType() {} OUString SAL_CALL GL3DBarChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString GL3DBarChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.GL3DBarChartType"); } @@ -121,16 +116,10 @@ sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence<OUString> GL3DBarChartType::getSupportedServiceNames_Static() -{ - uno::Sequence<OUString> aServices(3); - aServices[0] = CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR; - aServices[1] = "com.sun.star.chart2.ChartType"; - aServices[2] = "com.sun.star.beans.PropertySet"; - return aServices; + return { + CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } OUString SAL_CALL GL3DBarChartType::getChartType() diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index dc2680871c72..939b9819516c 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -36,9 +36,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: GL3DBarChartType( const GL3DBarChartType& rOther ); diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index f2e2b5a5da34..db1a2bd2f748 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -186,24 +186,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet return *StaticLineChartTypeInfo::get(); } -uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL LineChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString LineChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.LineChartType"); } @@ -216,7 +201,10 @@ sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_LINE, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 17190dd59084..fa7e2b405d4a 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -40,9 +40,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit LineChartType( const LineChartType & rOther ); diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index b04892f6bd45..b079b87e7360 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -166,24 +166,9 @@ OUString SAL_CALL NetChartType::getChartType() return OUString(CHART2_SERVICE_NAME_CHARTTYPE_NET); } -uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL NetChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString NetChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.NetChartType"); } @@ -196,7 +181,10 @@ sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_NET, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index ea931ea702df..b12a4cc3e78c 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -66,9 +66,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit NetChartType( const NetChartType & rOther ); diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 1f7adf73f1df..70badb000b23 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -223,24 +223,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI return *StaticPieChartTypeInfo::get(); } -uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL PieChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString PieChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.PieChartType"); } @@ -253,7 +238,10 @@ sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_PIE, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 19aa8f2050b0..f67987073cba 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -40,9 +40,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit PieChartType( const PieChartType & rOther ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 9caf5a0437d0..f178d5383ebb 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -246,24 +246,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty return *StaticScatterChartTypeInfo::get(); } -uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; - aServices[ 1 ] = "com.sun.star.chart2.ChartType"; - aServices[ 2 ] = "com.sun.star.beans.PropertySet"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ScatterChartType::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ScatterChartType::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.ScatterChartType"); } @@ -276,7 +261,10 @@ sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + CHART2_SERVICE_NAME_CHARTTYPE_SCATTER, + "com.sun.star.chart2.ChartType", + "com.sun.star.beans.PropertySet" }; } } // namespace chart diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 117364065550..64ea32e308aa 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -44,9 +44,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); protected: explicit ScatterChartType( const ScatterChartType & rOther ); diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 02ddf0f0b3ee..14792358c3b1 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -221,16 +221,6 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const return aResult; } -Sequence< OUString > CachedDataSequence::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.data.DataSequence"; - aServices[ 2 ] = "com.sun.star.chart2.data.NumericalDataSequence"; - aServices[ 3 ] = "com.sun.star.chart2.data.TextualDataSequence"; - return aServices; -} - IMPLEMENT_FORWARD_XINTERFACE2( CachedDataSequence, CachedDataSequence_Base, OPropertyContainer ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, OPropertyContainer ) @@ -257,15 +247,9 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet return new ::cppu::OPropertyArrayHelper( aProps ); } -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL CachedDataSequence::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString CachedDataSequence::getImplementationName_Static() -{ return OUString(lcl_aServiceName); } @@ -278,7 +262,12 @@ sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + lcl_aServiceName, + "com.sun.star.chart2.data.DataSequence", + "com.sun.star.chart2.data.NumericalDataSequence", + "com.sun.star.chart2.data.TextualDataSequence" + }; } // ________ XNumericalDataSequence ________ diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 309c05650495..2093878539b0 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -166,20 +166,9 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) m_bNeedsUpdate = true; } -Sequence< OUString > ConfigColorScheme::getSupportedServiceNames_Static() -{ - return { "com.sun.star.chart2.ColorScheme" }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ConfigColorScheme::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ConfigColorScheme::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ; } @@ -192,7 +181,7 @@ sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceNa css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { "com.sun.star.chart2.ColorScheme" }; } } // namespace chart diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 3bf13bced5a1..16c18ddb8e2b 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -57,19 +57,9 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab m_aDataSeq = aData; } -Sequence< OUString > DataSource::getSupportedServiceNames_Static() -{ - return { "com.sun.star.chart2.data.DataSource" }; -} - OUString SAL_CALL DataSource::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DataSource::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart.DataSource"); } @@ -82,7 +72,7 @@ sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { "com.sun.star.chart2.data.DataSource" }; } } // namespace chart diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index d40d25145325..ee4c228fe3e5 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -475,23 +475,9 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL E return comphelper::containerToSequence( m_aDataSequences ); } -uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.ErrorBar"; - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ErrorBar::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ErrorBar::getImplementationName_Static() -{ return OUString(lcl_aServiceName); } @@ -504,7 +490,10 @@ sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + lcl_aServiceName, + "com.sun.star.chart2.ErrorBar" + }; } // needed by MSC compiler diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index f86fe8007f8b..52c2c971ef5c 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -99,7 +99,11 @@ ImplOPropertySet::ImplOPropertySet( const ImplOPropertySet & rOther ) { ::std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(), ::std::inserter( m_aProperties, m_aProperties.begin() )); - cloneInterfaceProperties(); + + // clone interface properties + ::std::for_each( m_aProperties.begin(), m_aProperties.end(), + lcl_replaceInterfacePropertiesByClones()); + m_xStyle.set( ::chart::CloneHelper::CreateRefClone< style::XStyle >()( rOther.m_xStyle )); } @@ -174,12 +178,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle ) return true; } -void ImplOPropertySet::cloneInterfaceProperties() -{ - ::std::for_each( m_aProperties.begin(), m_aProperties.end(), - lcl_replaceInterfacePropertiesByClones()); -} - } // namespace impl } // namespace chart diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index dc015b0921a9..0881c89e4ac4 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -73,8 +73,6 @@ public: tPropertyMap; private: - void cloneInterfaceProperties(); - tPropertyMap m_aProperties; css::uno::Reference< css::style::XStyle > m_xStyle; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index a8a59a6cae67..e2e1ad333202 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -646,11 +646,6 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc return xSeq; } -void InternalDataProvider::createDefaultData() -{ - m_aInternalData.createDefaultData(); -} - // ____ XDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ ) throw (uno::RuntimeException, std::exception) @@ -1526,8 +1521,9 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & { comphelper::SequenceAsHashMap aArgs(_aArguments); if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) - createDefaultData(); + m_aInternalData.createDefaultData(); } + // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() throw (uno::RuntimeException, std::exception) @@ -1535,19 +1531,9 @@ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() return Reference< util::XCloneable >( new InternalDataProvider( *this )); } -Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static() -{ - return { "com.sun.star.chart2.data.DataProvider" }; -} - OUString SAL_CALL InternalDataProvider::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString InternalDataProvider::getImplementationName_Static() -{ // note: in xmloff this name is used to indicate usage of own data return OUString("com.sun.star.comp.chart.InternalDataProvider"); } @@ -1561,7 +1547,7 @@ sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { "com.sun.star.chart2.data.DataProvider" }; } } // namespace chart diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 2900b3789a01..d5c45694d9c6 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -149,20 +149,9 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } } -Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static() -{ - return { "com.sun.star.chart2.data.LabeledDataSequence" }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL LabeledDataSequence::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString LabeledDataSequence::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.LabeledDataSequence"); } @@ -175,7 +164,7 @@ sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rService css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { "com.sun.star.chart2.data.LabeledDataSequence" }; } } // namespace chart diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 167d3a0ddb96..7b4c26156e11 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -101,11 +101,6 @@ ModifyEventForwarder::ModifyEventForwarder() : { } -void ModifyEventForwarder::FireEvent( const lang::EventObject & rEvent ) -{ - lcl_fireModifyEvent( m_aModifyListeners, Reference< uno::XWeak >(), & rEvent ); -} - void ModifyEventForwarder::AddListener( const Reference< util::XModifyListener >& aListener ) { try @@ -177,7 +172,7 @@ void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util: void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) { - FireEvent( aEvent ); + lcl_fireModifyEvent( m_aModifyListeners, Reference< uno::XWeak >(), &aEvent ); } // ____ XEventListener (base of XModifyListener) ____ diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index d09e46e558ef..addd33acdb30 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -122,14 +122,9 @@ struct StaticXXXDefaults_Initializer ::chart::tPropertyValueMap* operator()() { static ::chart::tPropertyValueMap aStaticDefaults; - lcl_AddDefaultsToMap( aStaticDefaults ); + ::chart::LinePropertiesHelper::AddDefaultsToMap( aStaticDefaults ); return &aStaticDefaults; } -private: - static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) - { - ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap ); - } }; struct StaticXXXDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticXXXDefaults_Initializer > @@ -360,22 +355,10 @@ MeanValueRegressionCurve::MeanValueRegressionCurve( {} MeanValueRegressionCurve::~MeanValueRegressionCurve() {} -uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.MeanValueRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& MeanValueRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_MeanValue; } @@ -388,7 +371,7 @@ sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rSe css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.MeanValueRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() @@ -407,22 +390,10 @@ LinearRegressionCurve::LinearRegressionCurve( {} LinearRegressionCurve::~LinearRegressionCurve() {} -uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.LinearRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL LinearRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& LinearRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_Linear; } @@ -435,7 +406,7 @@ sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServi css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.LinearRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() @@ -454,22 +425,10 @@ LogarithmicRegressionCurve::LogarithmicRegressionCurve( {} LogarithmicRegressionCurve::~LogarithmicRegressionCurve() {} -uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.LogarithmicRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& LogarithmicRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_Logarithmic; } @@ -482,7 +441,7 @@ sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& r css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.LogarithmicRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() @@ -501,22 +460,10 @@ ExponentialRegressionCurve::ExponentialRegressionCurve( {} ExponentialRegressionCurve::~ExponentialRegressionCurve() {} -uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.ExponentialRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& ExponentialRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_Exponential; } @@ -529,7 +476,7 @@ sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& r css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.ExponentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() @@ -548,22 +495,10 @@ PotentialRegressionCurve::PotentialRegressionCurve( {} PotentialRegressionCurve::~PotentialRegressionCurve() {} -uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.PotentialRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL PotentialRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& PotentialRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_Potential; } @@ -576,7 +511,7 @@ sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rSe css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.PotentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() @@ -595,22 +530,10 @@ PolynomialRegressionCurve::PolynomialRegressionCurve( {} PolynomialRegressionCurve::~PolynomialRegressionCurve() {} -uno::Sequence< OUString > PolynomialRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.PolynomialRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& PolynomialRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_Polynomial; } @@ -623,7 +546,7 @@ sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rS css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.PolynomialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() @@ -642,22 +565,10 @@ MovingAverageRegressionCurve::MovingAverageRegressionCurve( {} MovingAverageRegressionCurve::~MovingAverageRegressionCurve() {} -uno::Sequence< OUString > MovingAverageRegressionCurve::getSupportedServiceNames_Static() -{ - uno::Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.MovingAverageRegressionCurve"; - return aServices; -} -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static + OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -const OUString& MovingAverageRegressionCurve::getImplementationName_Static() -{ return lcl_aImplementationName_MovingAverage; } @@ -670,7 +581,7 @@ sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName, "com.sun.star.chart2.MovingAverageRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 5f56f766b672..db135247c52d 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -158,9 +158,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class LinearRegressionCurve : public RegressionCurveModel @@ -184,9 +181,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class LogarithmicRegressionCurve : public RegressionCurveModel @@ -210,9 +204,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class ExponentialRegressionCurve : public RegressionCurveModel @@ -235,9 +226,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class PotentialRegressionCurve : public RegressionCurveModel @@ -261,9 +249,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class PolynomialRegressionCurve : public RegressionCurveModel @@ -286,9 +271,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class MovingAverageRegressionCurve : public RegressionCurveModel @@ -311,9 +293,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - static const OUString& getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // namespace chart diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 658c7c365359..ce759a3fb68f 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -314,29 +314,9 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< fireModifyEvent(); } -uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static() -{ - const sal_Int32 nNumServices( 5 ); - sal_Int32 nI = 0; - uno::Sequence< OUString > aServices( nNumServices ); - aServices[ nI++ ] = "com.sun.star.chart2.RegressionEquation"; - aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; - aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; - aServices[ nI++ ] = "com.sun.star.drawing.LineProperties"; - aServices[ nI++ ] = "com.sun.star.style.CharacterProperties"; - OSL_ASSERT( nNumServices == nI ); - return aServices; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL RegressionEquation::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString RegressionEquation::getImplementationName_Static() -{ return OUString("com.sun.star.comp.chart2.RegressionEquation"); } @@ -349,7 +329,11 @@ sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { "com.sun.star.chart2.RegressionEquation", + "com.sun.star.beans.PropertySet", + "com.sun.star.drawing.FillProperties", + "com.sun.star.drawing.LineProperties", + "com.sun.star.style.CharacterProperties" }; } using impl::RegressionEquation_Base; diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index cd2d4456843a..6dcdd605f2d8 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -68,9 +68,6 @@ public: getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > - getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index bfdd3f4404e0..83084b9126ae 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -76,20 +76,9 @@ OUString SAL_CALL LogarithmicScaling::getServiceName() return OUString(lcl_aServiceName_Logarithmic); } -uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static() -{ - return { lcl_aServiceName_Logarithmic }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL LogarithmicScaling::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString LogarithmicScaling::getImplementationName_Static() -{ return OUString(lcl_aServiceName_Logarithmic); } @@ -102,7 +91,7 @@ sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName_Logarithmic }; } ExponentialScaling::ExponentialScaling() : @@ -142,20 +131,9 @@ OUString SAL_CALL ExponentialScaling::getServiceName() return OUString(lcl_aServiceName_Exponential); } -uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static() -{ - return { lcl_aServiceName_Exponential }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL ExponentialScaling::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ExponentialScaling::getImplementationName_Static() -{ return OUString(lcl_aServiceName_Exponential); } @@ -168,7 +146,7 @@ sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName_Exponential }; } LinearScaling::LinearScaling() : @@ -212,20 +190,9 @@ OUString SAL_CALL LinearScaling::getServiceName() return OUString(lcl_aServiceName_Linear); } -uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static() -{ - return { lcl_aServiceName_Linear }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL LinearScaling::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString LinearScaling::getImplementationName_Static() -{ return OUString(lcl_aServiceName_Linear) ; } @@ -238,7 +205,7 @@ sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName_Linear }; } PowerScaling::PowerScaling() : @@ -281,20 +248,9 @@ PowerScaling::getServiceName() return OUString(lcl_aServiceName_Power); } -uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static() -{ - return { lcl_aServiceName_Power }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL PowerScaling::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString PowerScaling::getImplementationName_Static() -{ return OUString(lcl_aServiceName_Power); } @@ -307,7 +263,7 @@ sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName_Power }; } } //namespace chart diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 1531ae253007..67a99d72c361 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -120,16 +120,6 @@ void UncachedDataSequence::registerProperties() cppu::UnoType<decltype(m_aXMLRange)>::get() ); } -Sequence< OUString > UncachedDataSequence::getSupportedServiceNames_Static() -{ - Sequence< OUString > aServices( 4 ); - aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = "com.sun.star.chart2.data.DataSequence"; - aServices[ 2 ] = "com.sun.star.chart2.data.NumericalDataSequence"; - aServices[ 3 ] = "com.sun.star.chart2.data.TextualDataSequence"; - return aServices; -} - IMPLEMENT_FORWARD_XINTERFACE2( UncachedDataSequence, UncachedDataSequence_Base, OPropertyContainer ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Base, OPropertyContainer ) @@ -156,15 +146,9 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS return new ::cppu::OPropertyArrayHelper( aProps ); } -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL UncachedDataSequence::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString UncachedDataSequence::getImplementationName_Static() -{ return OUString(lcl_aServiceName); } @@ -177,7 +161,12 @@ sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { + lcl_aServiceName, + "com.sun.star.chart2.data.DataSequence", + "com.sun.star.chart2.data.NumericalDataSequence", + "com.sun.star.chart2.data.TextualDataSequence" + }; } // ________ XNumericalDataSequence ________ diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index d6d8323465b4..2dd8e3427835 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -104,20 +104,9 @@ OUString SAL_CALL DateScaling::getServiceName() return OUString(lcl_aServiceName_DateScaling); } -uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static() -{ - return { lcl_aServiceName_DateScaling }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DateScaling::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString DateScaling::getImplementationName_Static() -{ return OUString(lcl_aServiceName_DateScaling); } @@ -130,7 +119,7 @@ sal_Bool SAL_CALL DateScaling::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DateScaling::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName_DateScaling }; } InverseDateScaling::InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted ) @@ -204,20 +193,9 @@ OUString SAL_CALL InverseDateScaling::getServiceName() return OUString(lcl_aServiceName_InverseDateScaling); } -uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static() -{ - return { lcl_aServiceName_InverseDateScaling }; -} - -// implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL InverseDateScaling::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString InverseDateScaling::getImplementationName_Static() -{ return OUString(lcl_aServiceName_InverseDateScaling); } @@ -230,7 +208,7 @@ sal_Bool SAL_CALL InverseDateScaling::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL InverseDateScaling::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); + return { lcl_aServiceName_InverseDateScaling }; } } //namespace chart diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 2aedbe5c56df..3ee7f22a8568 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -48,9 +48,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) throw (css::uno::RuntimeException, std::exception) override; @@ -88,9 +85,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 49feca78e73e..b0d45df09e54 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -267,7 +267,6 @@ private: void InitBatch3DUniformBlock(); void UpdateBatch3DUniformBlock(); void RenderBatchBars(bool bNewScene); - void CheckGLSLVersion(); void RenderTextShapeBatch(); void ReleaseTextShapesBatch(); void CreateTextTextureSingle(const boost::shared_array<sal_uInt8> &bitmapBuf, diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 5f81d854f1ee..2b03c767e450 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1381,11 +1381,6 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav OUString SAL_CALL ChartView::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return getImplementationName_Static(); -} - -OUString ChartView::getImplementationName_Static() -{ return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME); } @@ -1398,11 +1393,6 @@ sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL ChartView::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - return getSupportedServiceNames_Static(); -} - -uno::Sequence< OUString > ChartView::getSupportedServiceNames_Static() -{ return { CHART_VIEW_SERVICE_NAME }; } diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index b21f970a0a69..fb4fb137c929 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -211,11 +211,6 @@ OpenGL3DRenderer::ShaderResources::~ShaderResources() glDeleteProgram(m_BatchTextProID); } -void OpenGL3DRenderer::CheckGLSLVersion() -{ - maResources.m_b330Support = GLEW_VERSION_3_3; -} - void OpenGL3DRenderer::ShaderResources::LoadShaders() { CHECK_GL_ERROR(); @@ -406,7 +401,7 @@ void OpenGL3DRenderer::init() m_fViewAngle = 30.0f; m_3DProjection = glm::perspective(m_fViewAngle, (float)m_iWidth / (float)m_iHeight, 0.01f, 6000.0f); - CheckGLSLVersion(); + maResources.m_b330Support = GLEW_VERSION_3_3; CHECK_GL_ERROR(); maResources.LoadShaders(); maPickingResources.LoadShaders(); diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index a136747f9068..6fc40ebc7d86 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -158,14 +158,12 @@ OUString SampleAddIn::getImplementationName_Static() uno::Sequence< OUString > SampleAddIn::getSupportedServiceNames_Static() { - uno::Sequence< OUString > aSeq( 4 ); - - aSeq[ 0 ] = "com.sun.star.chart.ChartAxisXSupplier"; - aSeq[ 1 ] = "com.sun.star.chart.ChartAxisYSupplier"; - aSeq[ 2 ] = "com.sun.star.chart.Diagram"; - aSeq[ 3 ] = "com.sun.star.chart.SampleAddIn"; - - return aSeq; + return { + "com.sun.star.chart.ChartAxisXSupplier", + "com.sun.star.chart.ChartAxisYSupplier", + "com.sun.star.chart.Diagram", + "com.sun.star.chart.SampleAddIn" + }; } uno::Reference< uno::XInterface > SAL_CALL SampleAddIn_CreateInstance( |