diff options
Diffstat (limited to 'chart2/source/controller')
43 files changed, 94 insertions, 401 deletions
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; |