diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-06 11:35:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-06 18:14:26 +0200 |
commit | 358674b87b8d9cd78079fb105aa81b50f4b5029b (patch) | |
tree | 52e009fef9d106a3a69fdda510b34195d4cc6c16 /xmloff/source/transform/xof.component | |
parent | f4e122a1a7780b0b8b7362d40b2541cde8e5e9e7 (diff) |
xmloff/xof: create instances with uno constructors
See tdf#74608 for motivation
Also, the following
OOO_IMPORTER( XMLMathSettingsImportOOO,
"com.sun.star.comp.Math.XMLSettingsImporter",
"com.sun.star.comp.Math.XMLOasisSettingsImporter" )
was in the xof.component file, but was not listed in the factory class.
I fixed that, but it means we might see some differences in import
behaviour when reading math documents
Change-Id: I025b800ded28746d19e43b37032a5b37faee9b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98198
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/transform/xof.component')
-rw-r--r-- | xmloff/source/transform/xof.component | 89 |
1 files changed, 59 insertions, 30 deletions
diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component index 05ccc220ea6e..b7c5d3f5ebcb 100644 --- a/xmloff/source/transform/xof.component +++ b/xmloff/source/transform/xof.component @@ -18,92 +18,121 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="xof" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.Calc.XMLContentImporter"> + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.Calc.XMLContentImporter" + constructor="xmloff_XMLCalcContentImportOOO_get_implementation"> <service name="com.sun.star.comp.Calc.XMLContentImporter"/> </implementation> - <implementation name="com.sun.star.comp.Calc.XMLImporter"> + <implementation name="com.sun.star.comp.Calc.XMLImporter" + constructor="xmloff_XMLCalcImportOOO_get_implementation"> <service name="com.sun.star.comp.Calc.XMLImporter"/> </implementation> - <implementation name="com.sun.star.comp.Calc.XMLMetaImporter"> + <implementation name="com.sun.star.comp.Calc.XMLMetaImporter" + constructor="xmloff_XMLCalcMetaImportOOO_get_implementation"> <service name="com.sun.star.comp.Calc.XMLMetaImporter"/> </implementation> - <implementation name="com.sun.star.comp.Calc.XMLSettingsImporter"> + <implementation name="com.sun.star.comp.Calc.XMLSettingsImporter" + constructor="xmloff_XMLCalcSettingsImportOOO_get_implementation"> <service name="com.sun.star.comp.Calc.XMLSettingsImporter"/> </implementation> - <implementation name="com.sun.star.comp.Calc.XMLStylesImporter"> + <implementation name="com.sun.star.comp.Calc.XMLStylesImporter" + constructor="xmloff_XMLCalcStylesImportOOO_get_implementation"> <service name="com.sun.star.comp.Calc.XMLStylesImporter"/> </implementation> - <implementation name="com.sun.star.comp.Chart.XMLContentImporter"> + <implementation name="com.sun.star.comp.Chart.XMLContentImporter" + constructor="xmloff_XMLChartContentImportOOO_get_implementation"> <service name="com.sun.star.comp.Chart.XMLContentImporter"/> </implementation> - <implementation name="com.sun.star.comp.Chart.XMLImporter"> + <implementation name="com.sun.star.comp.Chart.XMLImporter" + constructor="xmloff_XMLChartImportOOO_get_implementation"> <service name="com.sun.star.comp.Chart.XMLImporter"/> </implementation> - <implementation name="com.sun.star.comp.Chart.XMLStylesImporter"> + <implementation name="com.sun.star.comp.Chart.XMLStylesImporter" + constructor="xmloff_XMLChartStylesImportOOO_get_implementation"> <service name="com.sun.star.comp.Chart.XMLStylesImporter"/> </implementation> - <implementation name="com.sun.star.comp.Draw.XMLContentImporter"> + <implementation name="com.sun.star.comp.Draw.XMLContentImporter" + constructor="xmloff_XMLDrawContentImportOOO_get_implementation"> <service name="com.sun.star.comp.Draw.XMLContentImporter"/> </implementation> - <implementation name="com.sun.star.comp.Draw.XMLImporter"> + <implementation name="com.sun.star.comp.Draw.XMLImporter" + constructor="xmloff_XMLDrawImportOOO_get_implementation"> <service name="com.sun.star.comp.Draw.XMLImporter"/> </implementation> - <implementation name="com.sun.star.comp.Draw.XMLMetaImporter"> + <implementation name="com.sun.star.comp.Draw.XMLMetaImporter" + constructor="xmloff_XMLDrawMetaImportOOO_get_implementation"> <service name="com.sun.star.comp.Draw.XMLMetaImporter"/> </implementation> - <implementation name="com.sun.star.comp.Draw.XMLSettingsImporter"> + <implementation name="com.sun.star.comp.Draw.XMLSettingsImporter" + constructor="xmloff_XMLDrawSettingsImportOOO_get_implementation"> <service name="com.sun.star.comp.Draw.XMLSettingsImporter"/> </implementation> - <implementation name="com.sun.star.comp.Draw.XMLStylesImporter"> + <implementation name="com.sun.star.comp.Draw.XMLStylesImporter" + constructor="xmloff_XMLDrawStylesImportOOO_get_implementation"> <service name="com.sun.star.comp.Draw.XMLStylesImporter"/> </implementation> - <implementation name="com.sun.star.comp.Impress.XMLContentImporter"> + <implementation name="com.sun.star.comp.Impress.XMLContentImporter" + constructor="xmloff_XMLImpressContentImportOOO_get_implementation"> <service name="com.sun.star.comp.Impress.XMLContentImporter"/> </implementation> - <implementation name="com.sun.star.comp.Impress.XMLImporter"> + <implementation name="com.sun.star.comp.Impress.XMLImporter" + constructor="xmloff_XMLImpressImportOOO_get_implementation"> <service name="com.sun.star.comp.Impress.XMLImporter"/> </implementation> - <implementation name="com.sun.star.comp.Impress.XMLMetaImporter"> + <implementation name="com.sun.star.comp.Impress.XMLMetaImporter" + constructor="xmloff_XMLImpressMetaImportOOO_get_implementation"> <service name="com.sun.star.comp.Impress.XMLMetaImporter"/> </implementation> - <implementation name="com.sun.star.comp.Impress.XMLSettingsImporter"> + <implementation name="com.sun.star.comp.Impress.XMLSettingsImporter" + constructor="xmloff_XMLImpressSettingsImportOOO_get_implementation"> <service name="com.sun.star.comp.Impress.XMLSettingsImporter"/> </implementation> - <implementation name="com.sun.star.comp.Impress.XMLStylesImporter"> + <implementation name="com.sun.star.comp.Impress.XMLStylesImporter" + constructor="xmloff_XMLImpressStylesImportOOO_get_implementation"> <service name="com.sun.star.comp.Impress.XMLStylesImporter"/> </implementation> - <implementation name="com.sun.star.comp.Math.XMLMetaImporter"> + <implementation name="com.sun.star.comp.Math.XMLMetaImporter" + constructor="xmloff_XMLMathMetaImportOOO_get_implementation"> <service name="com.sun.star.comp.Math.XMLMetaImporter"/> </implementation> - <implementation name="com.sun.star.comp.Math.XMLSettingsImporter"> + <implementation name="com.sun.star.comp.Math.XMLSettingsImporter" + constructor="xmloff_XMLMathSettingsImportOOO_get_implementation"> <service name="com.sun.star.comp.Math.XMLSettingsImporter"/> </implementation> - <implementation name="com.sun.star.comp.OOo2OasisTransformer"> + <implementation name="com.sun.star.comp.OOo2OasisTransformer" + constructor="xmloff_OOo2OasisTransformer_get_implementation"> <service name="com.sun.star.comp.OOo2OasisTransformer"/> </implementation> - <implementation name="com.sun.star.comp.Oasis2OOoTransformer"> + <implementation name="com.sun.star.comp.Oasis2OOoTransformer" + constructor="xmloff_Oasis2OOoTransformer_get_implementation"> <service name="com.sun.star.comp.Oasis2OOoTransformer"/> </implementation> - <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"> + <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter" + constructor="xmloff_XMLAutoTextEventImportOOO_get_implementation"> <service name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"/> </implementation> - <implementation name="com.sun.star.comp.Writer.XMLContentImporter"> + <implementation name="com.sun.star.comp.Writer.XMLContentImporter" + constructor="xmloff_XMLWriterContentImportOOO_get_implementation"> <service name="com.sun.star.comp.Writer.XMLContentImporter"/> </implementation> - <implementation name="com.sun.star.comp.Writer.XMLImporter"> + <implementation name="com.sun.star.comp.Writer.XMLImporter" + constructor="xmloff_XMLWriterImportOOO_get_implementation"> <service name="com.sun.star.comp.Writer.XMLImporter"/> </implementation> - <implementation name="com.sun.star.comp.Writer.XMLMetaImporter"> + <implementation name="com.sun.star.comp.Writer.XMLMetaImporter" + constructor="xmloff_XMLWriterMetaImportOOO_get_implementation"> <service name="com.sun.star.comp.Writer.XMLMetaImporter"/> </implementation> - <implementation name="com.sun.star.comp.Writer.XMLSettingsImporter"> + <implementation name="com.sun.star.comp.Writer.XMLSettingsImporter" + constructor="xmloff_XMLWriterSettingsImportOOO_get_implementation"> <service name="com.sun.star.comp.Writer.XMLSettingsImporter"/> </implementation> - <implementation name="com.sun.star.comp.Writer.XMLStylesImporter"> + <implementation name="com.sun.star.comp.Writer.XMLStylesImporter" + constructor="xmloff_XMLWriterStylesImportOOO_get_implementation"> <service name="com.sun.star.comp.Writer.XMLStylesImporter"/> </implementation> - <implementation name="com.sun.star.document.XMLMetaImporter"> + <implementation name="com.sun.star.document.XMLMetaImporter" + constructor="xmloff_XMLMetaImportOOO_get_implementation"> <service name="com.sun.star.document.XMLMetaImporter"/> </implementation> </component> |