inline UNO helper macro APPHELPER_SERVICE_FACTORY_HELPER

Change-Id: Ib416efb59ae166bb8d55dd7f3c84b7e5f72864e8

6 files changed, 40 insertions, 8 deletions

diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index a7061dbd2453..d547621f2bbc 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -60,7 +60,11 @@ public:
     virtual ~CartesianCoordinateSystem2d();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( CartesianCoordinateSystem2d )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new CartesianCoordinateSystem2d( xContext );
+    }
     // ____ XServiceInfo ____
     APPHELPER_XSERVICEINFO_DECL()
 };
@@ -74,7 +78,11 @@ public:
     virtual ~CartesianCoordinateSystem3d();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( CartesianCoordinateSystem3d )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new CartesianCoordinateSystem3d( xContext );
+    }
     // ____ XServiceInfo ____
     APPHELPER_XSERVICEINFO_DECL()
 };
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 28a29a203c04..6ea717251c39 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -62,7 +62,11 @@ public:
         getSupportedServiceNames_Static();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeManager )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new ChartTypeManager( xContext );
+    }
 
 protected:
     // ____ XMultiServiceFactory ____
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 22878fcc029a..0636de652e6d 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -74,7 +74,11 @@ public:
     virtual ~DataSeries();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( DataSeries )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new DataSeries( xContext );
+    }
     /// XServiceInfo declarations
     APPHELPER_XSERVICEINFO_DECL()
 
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 1b54819d50d5..8245df8f4413 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -68,7 +68,11 @@ public:
     virtual ~Diagram();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( Diagram )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new Diagram( xContext );
+    }
 
     /// XServiceInfo declarations
     APPHELPER_XSERVICEINFO_DECL()
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index dad791765a17..af1bbce6d348 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -60,7 +60,11 @@ public:
     virtual ~PolarCoordinateSystem2d();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( PolarCoordinateSystem2d )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new PolarCoordinateSystem2d( xContext );
+    }
     // ____ XServiceInfo ____
     APPHELPER_XSERVICEINFO_DECL()
 };
@@ -74,7 +78,11 @@ public:
     virtual ~PolarCoordinateSystem3d();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( PolarCoordinateSystem3d )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new PolarCoordinateSystem3d( xContext );
+    }
     // ____ XServiceInfo ____
     APPHELPER_XSERVICEINFO_DECL()
 };
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 9004264eab87..a091a0a086bb 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -64,7 +64,11 @@ public:
     virtual ~XMLFilter();
 
     /// establish methods for factory instatiation
-    APPHELPER_SERVICE_FACTORY_HELPER( XMLFilter )
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        throw(css::uno::Exception)
+    {
+        return (::cppu::OWeakObject *)new XMLFilter( xContext );
+    }
     /// XServiceInfo declarations
     APPHELPER_XSERVICEINFO_DECL()