mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#74608 Constructor function for XMLBasicExporter

Browse Source 
Change-Id: Ib4721b3f67956a8da48851841ef86bb7b79df1e7
Reviewed-on: https://gerrit.libreoffice.org/24553
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Yeliz Taneroğlu 2016-05-01 13:46:53 +03:00 committed by Stephan Bergmann
parent 955ca134fd
commit d46bfe1367
4 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xmlscript/source/inc/unoservices.hxx
View File

@ -42,14 +42,6 @@ OUString SAL_CALL getImplementationName_DocumentHandlerImpl();
css::uno::Reference<css::uno::XInterface> SAL_CALL create_DocumentHandlerImpl(
css::uno::Reference<css::uno::XComponentContext> const & xContext);
css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames_XMLBasicExporter();
OUString SAL_CALL getImplementationName_XMLBasicExporter();
css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicExporter(
css::uno::Reference<css::uno::XComponentContext> const & xContext);
}
#endif

5
xmlscript/source/misc/unoservices.cxx
View File

@ -32,11 +32,6 @@ namespace xmlscript
getSupportedServiceNames_DocumentHandlerImpl, ::cppu::createSingleComponentFactory,
nullptr, 0
},
{
create_XMLBasicExporter, getImplementationName_XMLBasicExporter,
getSupportedServiceNames_XMLBasicExporter, ::cppu::createSingleComponentFactory,
nullptr, 0
},
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
};
}

35
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
View File

@ -38,20 +38,6 @@ using namespace ::com::sun::star::uno;
namespace xmlscript
{
// component operations
OUString getImplementationName_XMLBasicExporter()
{
return OUString( "com.sun.star.comp.xmlscript.XMLBasicExporter" );
}
Sequence< OUString > getSupportedServiceNames_XMLBasicExporter()
{
Sequence< OUString > aNames { "com.sun.star.document.XMLBasicExporter" };
return aNames;
}
// XMLBasicExporterBase
XMLBasicExporterBase::XMLBasicExporterBase( bool bOasis )
@ -365,12 +351,13 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
OUString XMLBasicExporter::getImplementationName( ) throw (RuntimeException, std::exception)
{
return getImplementationName_XMLBasicExporter();
return OUString( "com.sun.star.comp.xmlscript.XMLBasicExporter" );
}
Sequence< OUString > XMLBasicExporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
{
return getSupportedServiceNames_XMLBasicExporter();
Sequence< OUString > aNames { "com.sun.star.document.XMLBasicExporter" };
return aNames;
}
// XMLOasisBasicExporter
@ -397,16 +384,16 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
return aNames;
}
// component operations
Reference< XInterface > SAL_CALL create_XMLBasicExporter(
Reference< XComponentContext > const & )
{
return static_cast< lang::XTypeProvider * >( new XMLBasicExporter );
}
} // namespace xmlscript
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_xmlscript_XMLBasicExporter(
css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new xmlscript::XMLBasicExporter());
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_xmlscript_XMLOasisBasicExporter(
css::uno::XComponentContext *,

3
xmlscript/util/xmlscript.component
View File

@ -22,7 +22,8 @@
<implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler">
<service name="com.sun.star.xml.input.SaxDocumentHandler"/>
</implementation>
<implementation name="com.sun.star.comp.xmlscript.XMLBasicExporter">
<implementation name="com.sun.star.comp.xmlscript.XMLBasicExporter"
constructor="com_sun_star_comp_xmlscript_XMLBasicExporter">
<service name="com.sun.star.document.XMLBasicExporter"/>
</implementation>
<implementation name="com.sun.star.comp.xmlscript.XMLBasicImporter"