summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsolenv/bin/native-code.py1
-rw-r--r--xmloff/inc/facreg.hxx7
-rw-r--r--xmloff/source/core/facreg.cxx5
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.cxx21
-rw-r--r--xmloff/util/xo.component3
5 files changed, 9 insertions, 28 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index db44ea3c1a51..ce4fcdec6d1f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -338,6 +338,7 @@ core_constructor_list = [
"com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation",
"com_sun_star_comp_Chart_XMLOasisExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisAutotextEventsExporter_get_implementation",
+ "com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
# xmlscript/util/xmlscript.component
"com_sun_star_comp_xmlscript_XMLBasicExporter",
"com_sun_star_comp_xmlscript_XMLOasisBasicExporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 82d5d3e73b59..2a98fb344721 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -31,13 +31,6 @@ namespace com::sun::star {
namespace uno { class XInterface; }
}
-// writer autotext event import
-OUString XMLAutoTextEventImport_getImplementationName() throw();
-css::uno::Sequence<OUString> XMLAutoTextEventImport_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> XMLAutoTextEventImport_createInstance(
- css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
-
// writer autotext event export OOo
OUString XMLAutoTextEventExportOOO_getImplementationName() throw();
css::uno::Sequence<OUString> XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 377f05204c1a..cdc52d6c6a6e 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -54,9 +54,8 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const char * pImplName, void *
const sal_Int32 nImplNameLen = strlen( pImplName );
- // auto text import/export
- SINGLEFACTORY( XMLAutoTextEventImport )
- else SINGLEFACTORY( XMLAutoTextEventExportOOO )
+ // auto text export
+ SINGLEFACTORY( XMLAutoTextEventExportOOO )
if( xFactory.is())
{
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 9f74c41ce1b1..bf6b9af0118d 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -91,24 +91,11 @@ SvXMLImportContext* XMLAutoTextEventImport::CreateFastContext(
return nullptr;
}
-
-Sequence< OUString >
- XMLAutoTextEventImport_getSupportedServiceNames()
- throw()
-{
- Sequence<OUString> aSeq { XMLAutoTextEventImport_getImplementationName() };
- return aSeq;
-}
-
-OUString XMLAutoTextEventImport_getImplementationName() throw()
-{
- return "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter";
-}
-
-Reference< XInterface > XMLAutoTextEventImport_createInstance(
- const Reference< XMultiServiceFactory > & rSMgr)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
{
- return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventImport( comphelper::getComponentContext(rSMgr) ));
+ return cppu::acquire(new XMLAutoTextEventImport(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 0219cc5328ad..2e43c129673d 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -216,7 +216,8 @@
<service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"/>
</implementation>
<implementation
- name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter">
+ name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"
+ constructor="com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation">
<service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"/>
</implementation>
<implementation name="xmloff::AnimationsImport"