diff options
| -rw-r--r-- | xmlscript/source/inc/unoservices.hxx | 9 | ||||
| -rw-r--r-- | xmlscript/source/misc/unoservices.cxx | 5 | ||||
| -rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 30 | ||||
| -rw-r--r-- | xmlscript/util/xmlscript.component | 3 |
4 files changed, 13 insertions, 34 deletions
diff --git a/xmlscript/source/inc/unoservices.hxx b/xmlscript/source/inc/unoservices.hxx index 61e10d9e5b22..bdeea6a3f0e0 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 87eb33e401ea..204d4deb668f 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 81d7cbdfa6e3..35cdec0b9873 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 298d8745374a..e212b9bc2d6a 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> |