[Libreoffice-commits] core.git: xmlscript/source xmlscript/util

[Yeliz Taneroğlu]

 xmlscript/source/inc/unoservices.hxx             |    9 ------
 xmlscript/source/misc/unoservices.cxx            |    5 ---
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx |   30 ++++++++---------------
 xmlscript/util/xmlscript.component               |    3 +-
 4 files changed, 13 insertions(+), 34 deletions(-)

New commits:
commit 2dc8f1b25c157a597905fb33f1527244baf977f3
Author: Yeliz Taneroğlu <yeliztaneroglu at gmail.com>
Date:   Sun May 1 13:33:41 2016 +0300

    tdf#74608 Constructor function for XMLOasisBasicImporter
    
    Change-Id: Iec1c875f6aa34c37ac26a5dac008db547e8965ca
    Reviewed-on: https://gerrit.libreoffice.org/24551
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmlscript/source/inc/unoservices.hxx b/xmlscript/source/inc/unoservices.hxx
index 61e10d9..bdeea6a 100644
--- a/xmlscript/source/inc/unoservices.hxx
+++ b/xmlscript/source/inc/unoservices.hxx
@@ -57,15 +57,6 @@ OUString SAL_CALL getImplementationName_XMLBasicImporter();
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicImporter(
     css::uno::Reference<css::uno::XComponentContext> const & xContext);
-
-css::uno::Sequence<OUString> SAL_CALL
-getSupportedServiceNames_XMLOasisBasicImporter();
-
-OUString SAL_CALL getImplementationName_XMLOasisBasicImporter();
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLOasisBasicImporter(
-    css::uno::Reference<css::uno::XComponentContext> const & xContext);
-
 }
 
 #endif
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 87eb33e..204d4de 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -42,11 +42,6 @@ namespace xmlscript
             getSupportedServiceNames_XMLBasicImporter, ::cppu::createSingleComponentFactory,
             nullptr, 0
         },
-        {
-            create_XMLOasisBasicImporter, getImplementationName_XMLOasisBasicImporter,
-            getSupportedServiceNames_XMLOasisBasicImporter, ::cppu::createSingleComponentFactory,
-            nullptr, 0
-        },
         { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
     };
 }
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 81d7cbd..35cdec0 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -510,17 +510,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
         return aNames;
     }
 
-    OUString getImplementationName_XMLOasisBasicImporter()
-    {
-        return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicImporter" );
-    }
-
-    Sequence< OUString > getSupportedServiceNames_XMLOasisBasicImporter()
-    {
-        Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicImporter" };
-        return aNames;
-    }
-
     // XMLBasicImporterBase
 
     XMLBasicImporterBase::XMLBasicImporterBase( const Reference< XComponentContext >& rxContext, bool bOasis )
@@ -679,12 +668,13 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     OUString XMLOasisBasicImporter::getImplementationName(  ) throw (RuntimeException, std::exception)
     {
-        return getImplementationName_XMLOasisBasicImporter();
+        return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicImporter" );
     }
 
     Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
-        return getSupportedServiceNames_XMLOasisBasicImporter();
+        Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicImporter" };
+        return aNames;
     }
 
     // component operations
@@ -695,12 +685,14 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
         return static_cast< lang::XTypeProvider * >( new XMLBasicImporter( xContext ) );
     }
 
-    Reference< XInterface > SAL_CALL create_XMLOasisBasicImporter(
-        Reference< XComponentContext > const & xContext )
-    {
-        return static_cast< lang::XTypeProvider * >( new XMLOasisBasicImporter( xContext ) );
-    }
-
 }   // namespace xmlscript
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_xmlscript_XMLOasisBasicImporter(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new xmlscript::XMLOasisBasicImporter(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/util/xmlscript.component b/xmlscript/util/xmlscript.component
index 298d874..e212b9b 100644
--- a/xmlscript/util/xmlscript.component
+++ b/xmlscript/util/xmlscript.component
@@ -32,7 +32,8 @@
      constructor="com_sun_star_comp_xmlscript_XMLOasisBasicExporter">
     <service name="com.sun.star.document.XMLOasisBasicExporter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter">
+  <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter"
+     constructor="com_sun_star_comp_xmlscript_XMLOasisBasicImporter">
     <service name="com.sun.star.document.XMLOasisBasicImporter"/>
   </implementation>
 </component>