svl: use constructor syntax in svl.component

Change-Id: I2cb78695ede4017dfc4594175268e3d3c7eb4eca
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 29 insertions, 16 deletions

diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 15e10a764760..f486ed7a0071 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -33,8 +33,6 @@
 #include <svl/zformat.hxx>
 #include <svl/itemprop.hxx>
 
-#include <registerservices.hxx>
-
 using namespace com::sun::star;
 
 #define PROPERTYNAME_FMTSTR     "FormatString"
@@ -115,11 +113,6 @@ SvNumberFormatterServiceObj::~SvNumberFormatterServiceObj()
 {
 }
 
-com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvNumberFormatterServiceObj_CreateInstance( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
-{
-    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >( ( ::cppu::OWeakObject* ) new SvNumberFormatterServiceObj );
-}
-
 // XNumberFormatter
 
 void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const uno::Reference<util::XNumberFormatsSupplier>& _xSupplier )
@@ -1099,4 +1092,14 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceN
     return aRet;
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                                                                ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new SvNumberFormatterServiceObj());
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index a2f609914f3a..416ddef688ae 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -22,6 +22,7 @@
 #include <comphelper/sharedmutex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/weak.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
@@ -29,7 +30,6 @@
 #include <tools/stream.hxx>
 #include <svl/instrm.hxx>
 
-#include <registerservices.hxx>
 #include <strmadpt.hxx>
 
 using namespace ::com::sun::star::uno;
@@ -39,10 +39,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::utl;
 
-Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
-{
-    return static_cast< ::cppu::OWeakObject* >(new SvNumberFormatsSupplierServiceObject( comphelper::getComponentContext(_rxFactory) ));
-}
 
 SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB)
     :m_pOwnFormatter(NULL)
@@ -169,4 +165,14 @@ void SvNumberFormatsSupplierServiceObject::implEnsureFormatter()
     }
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                    ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new SvNumberFormatsSupplierServiceObject(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index b2bed8e78c74..e49f3996835c 100644
--- a/svl/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
@@ -25,7 +25,10 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <registerservices.hxx>
+extern "C" ::com::sun::star::uno::XInterface *
+    SAL_CALL com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation(
+        ::com::sun::star::uno::XComponentContext* context,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &);
 
 /**
  * SvNumberFormatsSupplierServiceObject - a number formats supplier which
@@ -40,9 +43,10 @@ class SvNumberFormatsSupplierServiceObject
             ,public ::com::sun::star::lang::XServiceInfo
 {   // don't want the Set-/GetNumberFormatter to be accessible from outside
 
-    friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-        SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
+    friend ::com::sun::star::uno::XInterface *
+        SAL_CALL com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation(
+                ::com::sun::star::uno::XComponentContext* context,
+                ::com::sun::star::uno::Sequence<css::uno::Any> const &);
 
 protected:
     SvNumberFormatter*  m_pOwnFormatter;