qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java | 6 +++--- xmloff/source/draw/sdxmlexp.cxx | 8 -------- xmloff/util/xo.component | 4 ---- 3 files changed, 3 insertions(+), 15 deletions(-)
New commits: commit 46308ce281ae93e22c0b051b68dad1ee21c6646e Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Thu Jun 25 21:10:44 2020 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Fri Jun 26 08:50:17 2020 +0200 xmloff: remove dead com.sun.star.comp.Impress.XMLMetaExporter And test com.sun.star.comp.Impress.XMLOasisMetaExporter instead in JunitTest_xmloff_unoapi. Change-Id: Iec2da56b569c283686de1bd4aad5fb7ebebfbc2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97183 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java index a63767f6a99a..360a3ac3a09c 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java @@ -40,7 +40,7 @@ import com.sun.star.xml.sax.XDocumentHandler; /** * Test for object which is represented by service - * <code>com.sun.star.comp.Impress.XMLMetaExporter</code>. <p> + * <code>com.sun.star.comp.Impress.XMLOasisMetaExporter</code>. <p> * Object implements the following interfaces : * <ul> * <li><code>com::sun::star::lang::XInitialization</code></li> @@ -88,7 +88,7 @@ public class XMLMetaExporter extends TestCase { /** * Creating a TestEnvironment for the interfaces to be tested. * Creates an instance of the service - * <code>com.sun.star.comp.Impress.XMLMetaExporter</code> with + * <code>com.sun.star.comp.Impress.XMLOasisMetaExporter</code> with * argument which is an implementation of <code>XDocumentHandler</code> * and which can check if required tags and character data is * exported. <p> @@ -118,7 +118,7 @@ public class XMLMetaExporter extends TestCase { final String NAME = "XMLMetaExporter"; oObj = (XInterface) xMSF.createInstanceWithArguments( - "com.sun.star.comp.Impress.XMLMetaExporter", + "com.sun.star.comp.Impress.XMLOasisMetaExporter", new Object[]{arg}); XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj); xEx.setSourceDocument(xImpressDoc); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 417aac6d75c2..cbeb6a6b4096 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2653,14 +2653,6 @@ com_sun_star_comp_Impress_XMLContentExporter_get_implementation( | SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* -com_sun_star_comp_Impress_XMLMetaExporter_get_implementation( - uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) -{ - return cppu::acquire( - new SdXMLExport(pCtx, "XMLImpressMetaExportOOO", false, SvXMLExportFlags::META)); -} - extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation( uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index f0130e8cd84d..7e0564eacef6 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -143,10 +143,6 @@ constructor="com_sun_star_comp_Impress_XMLOasisImporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisImporter"/> </implementation> - <implementation name="XMLImpressMetaExportOOO" - constructor="com_sun_star_comp_Impress_XMLMetaExporter_get_implementation"> - <service name="com.sun.star.comp.Impress.XMLMetaExporter"/> - </implementation> <implementation name="XMLImpressMetaExportOasis" constructor="com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits