diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-10-11 22:58:00 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-10-12 09:08:45 +0200 |
| commit | b6137b659e5358dfb5be4c4191bc1199de190f9e (patch) | |
| tree | 6efbcbfc7664b1f3bc92874e6227a1cfcd369b7e /sw/source/filter/ww8 | |
| parent | a0ed677fbc17ac9daea42d6264982c62a4a2f338 (diff) | |
sw: create DocxExport instances with an uno constructor
Change-Id: I34e674e4f3225e724fd9ed6d513fb66c2d5ebdd9
Reviewed-on: https://gerrit.libreoffice.org/61696
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/docxexportfilter.cxx | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 208f60bb0ec1..67167e6c7039 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -96,47 +96,17 @@ bool DocxExportFilter::exportDocument() } // UNO stuff so that the filter is registered -#define IMPL_NAME "com.sun.star.comp.Writer.DocxExport" - -static OUString DocxExport_getImplementationName() -{ - return OUString( IMPL_NAME ); -} OUString DocxExportFilter::getImplementationName() { - return DocxExport_getImplementationName(); -} - -static uno::Sequence< OUString > DocxExport_getSupportedServiceNames() throw() -{ - return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" }; -} - -/// @throws uno::Exception -static uno::Reference< uno::XInterface > DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) -{ - return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx )); + return OUString("com.sun.star.comp.Writer.DocxExport"); } -extern "C" -{ - -::cppu::ImplementationEntry const entries [] = +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_comp_Writer_DocxExport_get_implementation(uno::XComponentContext* pCtx, + uno::Sequence<uno::Any> const& /*rSeq*/) { - { - DocxExport_createInstance, DocxExport_getImplementationName, - DocxExport_getSupportedServiceNames, ::cppu::createSingleComponentFactory, - nullptr, 0 - }, - { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } -}; - -SAL_DLLPUBLIC_EXPORT void* msword_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) -{ - return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries ); + return cppu::acquire(new DocxExportFilter(pCtx)); } -} // extern "C" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |