tdf#74608 Constructor function for XMLOasisBasicExporter

Change-Id: If5409621f515918e715e3c0b71ec1b3d6fd1ef92
Reviewed-on: https://gerrit.libreoffice.org/24518
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Yeliz Taneroğlu
2016-04-30 15:56:22 +03:00
committed by Stephan Bergmann
parent 7aa67d528b
commit b8c04ea449
4 changed files with 14 additions and 33 deletions

View File

@@ -50,14 +50,6 @@ OUString SAL_CALL getImplementationName_XMLBasicExporter();
css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicExporter( css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicExporter(
css::uno::Reference<css::uno::XComponentContext> const & xContext); css::uno::Reference<css::uno::XComponentContext> const & xContext);
css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames_XMLOasisBasicExporter();
OUString SAL_CALL getImplementationName_XMLOasisBasicExporter();
css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLOasisBasicExporter(
css::uno::Reference<css::uno::XComponentContext> const & xContext);
css::uno::Sequence<OUString> SAL_CALL css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames_XMLBasicImporter(); getSupportedServiceNames_XMLBasicImporter();

View File

@@ -37,11 +37,6 @@ namespace xmlscript
getSupportedServiceNames_XMLBasicExporter, ::cppu::createSingleComponentFactory, getSupportedServiceNames_XMLBasicExporter, ::cppu::createSingleComponentFactory,
nullptr, 0 nullptr, 0
}, },
{
create_XMLOasisBasicExporter, getImplementationName_XMLOasisBasicExporter,
getSupportedServiceNames_XMLOasisBasicExporter, ::cppu::createSingleComponentFactory,
nullptr, 0
},
{ {
create_XMLBasicImporter, getImplementationName_XMLBasicImporter, create_XMLBasicImporter, getImplementationName_XMLBasicImporter,
getSupportedServiceNames_XMLBasicImporter, ::cppu::createSingleComponentFactory, getSupportedServiceNames_XMLBasicImporter, ::cppu::createSingleComponentFactory,

View File

@@ -52,17 +52,6 @@ namespace xmlscript
return aNames; return aNames;
} }
OUString getImplementationName_XMLOasisBasicExporter()
{
return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicExporter" );
}
Sequence< OUString > getSupportedServiceNames_XMLOasisBasicExporter()
{
Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicExporter" };
return aNames;
}
// XMLBasicExporterBase // XMLBasicExporterBase
XMLBasicExporterBase::XMLBasicExporterBase( bool bOasis ) XMLBasicExporterBase::XMLBasicExporterBase( bool bOasis )
@@ -399,12 +388,13 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
OUString XMLOasisBasicExporter::getImplementationName( ) throw (RuntimeException, std::exception) OUString XMLOasisBasicExporter::getImplementationName( ) throw (RuntimeException, std::exception)
{ {
return getImplementationName_XMLOasisBasicExporter(); return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicExporter" );
} }
Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
{ {
return getSupportedServiceNames_XMLOasisBasicExporter(); Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicExporter" };
return aNames;
} }
// component operations // component operations
@@ -415,12 +405,15 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
return static_cast< lang::XTypeProvider * >( new XMLBasicExporter ); return static_cast< lang::XTypeProvider * >( new XMLBasicExporter );
} }
Reference< XInterface > SAL_CALL create_XMLOasisBasicExporter(
Reference< XComponentContext > const & )
{
return static_cast< lang::XTypeProvider * >( new XMLOasisBasicExporter );
}
} // namespace xmlscript } // namespace xmlscript
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_xmlscript_XMLOasisBasicExporter(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new xmlscript::XMLOasisBasicExporter());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@@ -28,7 +28,8 @@
<implementation name="com.sun.star.comp.xmlscript.XMLBasicImporter"> <implementation name="com.sun.star.comp.xmlscript.XMLBasicImporter">
<service name="com.sun.star.document.XMLBasicImporter"/> <service name="com.sun.star.document.XMLBasicImporter"/>
</implementation> </implementation>
<implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicExporter"> <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicExporter"
constructor="com_sun_star_comp_xmlscript_XMLOasisBasicExporter">
<service name="com.sun.star.document.XMLOasisBasicExporter"/> <service name="com.sun.star.document.XMLOasisBasicExporter"/>
</implementation> </implementation>
<implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter"> <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter">