[Libreoffice-commits] core.git: chart2/inc chart2/source chart2/workbench
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 11 06:59:43 UTC 2016
chart2/inc/ChartModel.hxx | 3
chart2/inc/ChartView.hxx | 3
chart2/source/controller/accessibility/AccessibleBase.cxx | 10
chart2/source/controller/accessibility/AccessibleChartView.cxx | 8
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 23 -
chart2/source/controller/chartapiwrapper/AreaWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 22 -
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 20 -
chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 23 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 30 --
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 32 --
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 24 --
chart2/source/controller/chartapiwrapper/GridWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 24 --
chart2/source/controller/chartapiwrapper/LegendWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 36 ---
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 24 --
chart2/source/controller/chartapiwrapper/TitleWrapper.hxx | 3
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 31 --
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 24 --
chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx | 3
chart2/source/controller/dialogs/DataBrowser.cxx | 14 -
chart2/source/controller/dialogs/DataBrowser.hxx | 4
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 13 -
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 13 -
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 7
chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx | 7
chart2/source/controller/inc/AccessibleChartView.hxx | 2
chart2/source/controller/inc/ChartController.hxx | 3
chart2/source/controller/inc/ChartDocumentWrapper.hxx | 3
chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 3
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 3
chart2/source/controller/inc/dlg_DataEditor.hxx | 4
chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 2
chart2/source/controller/main/ChartController.cxx | 20 -
chart2/source/controller/main/ChartFrameloader.cxx | 10
chart2/source/controller/main/ChartFrameloader.hxx | 3
chart2/source/controller/main/ElementSelector.cxx | 11
chart2/source/controller/main/ElementSelector.hxx | 3
chart2/source/inc/CachedDataSequence.hxx | 3
chart2/source/inc/ConfigColorScheme.hxx | 3
chart2/source/inc/DataSource.hxx | 3
chart2/source/inc/ErrorBar.hxx | 3
chart2/source/inc/InternalDataProvider.hxx | 5
chart2/source/inc/LabeledDataSequence.hxx | 3
chart2/source/inc/ModifyListenerHelper.hxx | 2
chart2/source/inc/Scaling.hxx | 12 -
chart2/source/inc/UncachedDataSequence.hxx | 3
chart2/source/model/filter/XMLFilter.cxx | 23 -
chart2/source/model/inc/CartesianCoordinateSystem.hxx | 9
chart2/source/model/inc/ChartTypeManager.hxx | 3
chart2/source/model/inc/DataSeries.hxx | 3
chart2/source/model/inc/Diagram.hxx | 3
chart2/source/model/inc/PolarCoordinateSystem.hxx | 9
chart2/source/model/inc/StockBar.hxx | 2
chart2/source/model/inc/XMLFilter.hxx | 9
chart2/source/model/main/Axis.cxx | 17 -
chart2/source/model/main/Axis.hxx | 3
chart2/source/model/main/BaseCoordinateSystem.cxx | 7
chart2/source/model/main/CartesianCoordinateSystem.cxx | 51 ----
chart2/source/model/main/ChartModel.cxx | 21 -
chart2/source/model/main/DataPoint.cxx | 27 --
chart2/source/model/main/DataPoint.hxx | 5
chart2/source/model/main/DataSeries.cxx | 19 -
chart2/source/model/main/Diagram.cxx | 20 -
chart2/source/model/main/FormattedString.cxx | 25 --
chart2/source/model/main/FormattedString.hxx | 3
chart2/source/model/main/GridProperties.cxx | 22 -
chart2/source/model/main/GridProperties.hxx | 5
chart2/source/model/main/Legend.cxx | 31 --
chart2/source/model/main/Legend.hxx | 5
chart2/source/model/main/PageBackground.cxx | 23 -
chart2/source/model/main/PageBackground.hxx | 5
chart2/source/model/main/PolarCoordinateSystem.cxx | 49 ----
chart2/source/model/main/StockBar.cxx | 5
chart2/source/model/main/Title.cxx | 22 -
chart2/source/model/main/Title.hxx | 3
chart2/source/model/main/Wall.cxx | 5
chart2/source/model/main/Wall.hxx | 2
chart2/source/model/template/AreaChartType.cxx | 18 -
chart2/source/model/template/AreaChartType.hxx | 3
chart2/source/model/template/AreaChartTypeTemplate.cxx | 7
chart2/source/model/template/BarChartType.cxx | 18 -
chart2/source/model/template/BarChartType.hxx | 3
chart2/source/model/template/BubbleChartType.cxx | 20 -
chart2/source/model/template/BubbleChartType.hxx | 3
chart2/source/model/template/CandleStickChartType.cxx | 20 -
chart2/source/model/template/CandleStickChartType.hxx | 3
chart2/source/model/template/ChartTypeManager.cxx | 18 -
chart2/source/model/template/ColumnChartType.cxx | 18 -
chart2/source/model/template/ColumnChartType.hxx | 3
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 7
chart2/source/model/template/DataInterpreter.cxx | 13 -
chart2/source/model/template/DataInterpreter.hxx | 3
chart2/source/model/template/FilledNetChartType.cxx | 20 -
chart2/source/model/template/FilledNetChartType.hxx | 3
chart2/source/model/template/GL3DBarChartType.cxx | 19 -
chart2/source/model/template/GL3DBarChartType.hxx | 3
chart2/source/model/template/LineChartType.cxx | 20 -
chart2/source/model/template/LineChartType.hxx | 3
chart2/source/model/template/NetChartType.cxx | 20 -
chart2/source/model/template/NetChartType.hxx | 3
chart2/source/model/template/PieChartType.cxx | 20 -
chart2/source/model/template/PieChartType.hxx | 3
chart2/source/model/template/ScatterChartType.cxx | 20 -
chart2/source/model/template/ScatterChartType.hxx | 3
chart2/source/tools/CachedDataSequence.cxx | 23 -
chart2/source/tools/ConfigColorScheme.cxx | 13 -
chart2/source/tools/DataSource.cxx | 12 -
chart2/source/tools/ErrorBar.cxx | 19 -
chart2/source/tools/ImplOPropertySet.cxx | 12 -
chart2/source/tools/ImplOPropertySet.hxx | 2
chart2/source/tools/InternalDataProvider.cxx | 20 -
chart2/source/tools/LabeledDataSequence.cxx | 13 -
chart2/source/tools/ModifyListenerHelper.cxx | 7
chart2/source/tools/RegressionCurveModel.cxx | 119 +---------
chart2/source/tools/RegressionCurveModel.hxx | 21 -
chart2/source/tools/RegressionEquation.cxx | 26 --
chart2/source/tools/RegressionEquation.hxx | 3
chart2/source/tools/Scaling.cxx | 52 ----
chart2/source/tools/UncachedDataSequence.cxx | 23 -
chart2/source/view/axes/DateScaling.cxx | 26 --
chart2/source/view/axes/DateScaling.hxx | 6
chart2/source/view/inc/GL3DRenderer.hxx | 1
chart2/source/view/main/ChartView.cxx | 10
chart2/source/view/main/GL3DRenderer.cxx | 7
chart2/workbench/addin/sampleaddin.cxx | 14 -
133 files changed, 271 insertions(+), 1426 deletions(-)
New commits:
commit 22d0d2455f9aa699fac95c450da725c603333132
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 10 15:06:03 2016 +0200
loplugin:expandablemethods in chart2
Change-Id: Ie6650628683ec7c67359351eec0e09033f2b50cb
Reviewed-on: https://gerrit.libreoffice.org/30750
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index f6c556c..d45b67f 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 c26122f..aa1e309 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 b06f6d4..497e1e5 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 823c3b5..0cce8bd 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 26926b35..69c9183 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 6565379..de77aaf 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 1699805..cfab846 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 6dec247..352778b 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 f824d8b..2378a1d 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 20f57af..34a35ee 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 2fc1735..f6b1f22 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 001b63c..430172f 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 25d8121..c2bcf4e 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 78195fc..bea455e 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 756587a..24649f6 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 4e92d9b..6ad675d 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 9c56d6a..818b5fe 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 87bac97..4853347 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 92f098a..3c539c6 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 cea132d..4b3f287 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 3d02bea..860e70e 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 f2e26d6..b0c901d 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 273b9b0..9eb67a8 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 6dac6a7..ef048b1 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 ed4ae9a..dca66c5 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 8878a60..9610bb6 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 abb4af9..60cd15a 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 5e67f52..acf2195 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 cc67b5b..6eec67a 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 6e10a33..fc1384d 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 16696b0..c1138a1 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 15971ef..40f854d 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 9846c20..fc0e2fb 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 89721b3..8f37db1 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 b056c79..3b34491 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 3208a9e..c0112a8 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 4ae8e94..826948c 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 3868211..2c26841 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 f372f4d..baffffa 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 2f62ad6..43a6749 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 c79a917..5998cfd 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 594be4b..a8d5068 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 765fdfc..159375b 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 e45b280..ef9a451 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 d8e6e89..acb7d2c 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 425b65d..2cbe9c6 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 894944b..a8feeb1 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 af885c6..f0d6eb8 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 8b1496e..107d2ab 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 19e2e1e..5142ef7 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 899e76c..b36ba32 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 8d1b20d8..5f16723 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 bac4b7f..3b1b4ef 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 5373b76..bea4028 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 7302b71..019dd86 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 5cd1296..79aac4c 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 b416641..30e2b24 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 030d0ce..27b9513 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 9dbec67..7e72418 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 70773f0..f886d06 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 51d3db9..40cf1f2 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 1c7ce84..bc8b75e 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 f29567c..8ba10b1 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 00f0d65..6758b92d 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 d3eeedf..6a10d84 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 3196127..5befaff 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 b9647eb..1997c56 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 19a54e0..0f35964 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 2262079..8335509 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 d016f21..3f60181 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 8ab8c66..f8323f0 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 d34dfa5..4396a58 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 8f47554..2eb5565 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 cd506a4..6c6dee2 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 75dd9a3..a38481e 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 29ebc46..3df5156 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 066a595..8b1a270 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 c8654e3..117eafb 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 7216420..99abf81 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 aa982cd..6c26feb 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()
-{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list