diff options
Diffstat (limited to 'chart2/source/model/template')
27 files changed, 47 insertions, 247 deletions
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 ); |