fdo#46808, Convert various chart2:*Scaling services to new style

Change-Id: I93294be4c822160e609ae6aab552edd64478e34b

6 files changed, 14 insertions, 31 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 796fff58503d..46055c9fdf81 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -80,10 +80,15 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2,\
 	CartesianCoordinateSystem2d \
 	CartesianCoordinateSystem3d \
+	ExponentialScaling \
 	FormattedString \
+	LogarithmicScaling \
+	LinearScaling \
 	PolarCoordinateSystem2d \
 	PolarCoordinateSystem3d \
+	PowerScaling \
 	RegressionEquation \
+	Scaling \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\
 	DatabaseDataProvider \
@@ -622,17 +627,12 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,
 	DataSeries \
 	Diagram \
 	ErrorBar \
-	ExponentialScaling \
 	GridProperties \
 	Legend \
-	LinearScaling \
-	LogarithmicScaling \
 	LogicTargetModel \
-	PowerScaling \
 	PropertyPool \
 	RegressionCurve \
 	RegressionCurveEquation \
-	Scaling \
 	StandardDiagramCreationParameters \
 	Title \
 ))
diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl
index b22bef2dc8fe..edd74063646e 100644
--- a/offapi/com/sun/star/chart2/ExponentialScaling.idl
+++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl
@@ -19,7 +19,7 @@
 #ifndef com_sun_star_chart2_ExponentialScaling_idl
 #define com_sun_star_chart2_ExponentialScaling_idl
 
-#include <com/sun/star/chart2/Scaling.idl>
+#include <com/sun/star/chart2/XScaling.idl>
 
 
 module com {  module sun {  module star {  module chart2 {
@@ -31,10 +31,7 @@ module com {  module sun {  module star {  module chart2 {
     <p>If not mentioned explicitly, the base for the power function is
     10.0</p>
 */
-service ExponentialScaling
-{
-    service Scaling;
-};
+service ExponentialScaling : com::sun::star::chart2::XScaling;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl
index 4867ded98b28..2c2e04d12fab 100644
--- a/offapi/com/sun/star/chart2/LinearScaling.idl
+++ b/offapi/com/sun/star/chart2/LinearScaling.idl
@@ -19,7 +19,7 @@
 #ifndef com_sun_star_chart2_LinearScaling_idl
 #define com_sun_star_chart2_LinearScaling_idl
 
-#include <com/sun/star/chart2/Scaling.idl>
+#include <com/sun/star/chart2/XScaling.idl>
 
 
 module com {  module sun {  module star {  module chart2 {
@@ -32,10 +32,7 @@ module com {  module sun {  module star {  module chart2 {
     and <em>t</em> is 0.0, which means the transformation is an
     identical mapping.</p>
 */
-service LinearScaling
-{
-    service Scaling;
-};
+service LinearScaling : com::sun::star::chart2::XScaling;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
index 55c871dde2f2..6be520793a0e 100644
--- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl
+++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl
@@ -19,7 +19,7 @@
 #ifndef com_sun_star_chart2_LogarithmicScaling_idl
 #define com_sun_star_chart2_LogarithmicScaling_idl
 
-#include <com/sun/star/chart2/Scaling.idl>
+#include <com/sun/star/chart2/XScaling.idl>
 
 
 module com {  module sun {  module star {  module chart2 {
@@ -30,10 +30,7 @@ module com {  module sun {  module star {  module chart2 {
     <p>If not mentioned explicitly, the base for the logarithm is
     10.0</p>
 */
-service LogarithmicScaling
-{
-    service Scaling;
-};
+service LogarithmicScaling : com::sun::star::chart2::XScaling;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl
index 1685e120c3f5..3f8111b267df 100644
--- a/offapi/com/sun/star/chart2/PowerScaling.idl
+++ b/offapi/com/sun/star/chart2/PowerScaling.idl
@@ -19,7 +19,7 @@
 #ifndef com_sun_star_chart2_PowerScaling_idl
 #define com_sun_star_chart2_PowerScaling_idl
 
-#include <com/sun/star/chart2/Scaling.idl>
+#include <com/sun/star/chart2/XScaling.idl>
 
 
 module com {  module sun {  module star {  module chart2 {
@@ -31,10 +31,7 @@ module com {  module sun {  module star {  module chart2 {
     <p>If not mentioned explicitly, the exponent for the power
     function is 10.0</p>
 */
-service PowerScaling
-{
-    service Scaling;
-};
+service PowerScaling : com::sun::star::chart2::XScaling;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/chart2/Scaling.idl b/offapi/com/sun/star/chart2/Scaling.idl
index d7cd705dc34d..e68c52314a08 100644
--- a/offapi/com/sun/star/chart2/Scaling.idl
+++ b/offapi/com/sun/star/chart2/Scaling.idl
@@ -27,12 +27,7 @@ module com {  module sun {  module star {  module chart2 {
 
 /** stateless service
 */
-service Scaling
-{
-    /** required interface
-    */
-    interface com::sun::star::chart2::XScaling;
-};
+service Scaling : com::sun::star::chart2::XScaling;
 
 
 }; }; }; };