[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

[Miklos Vajna (via logerrit)]

 qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java |    6 +++---
 solenv/bin/native-code.py                                 |    1 -
 xmloff/source/draw/sdxmlexp.cxx                           |    8 --------
 xmloff/util/xo.component                                  |    4 ----
 4 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit b8285ae5133cd74df6930ada54bf12bdd22fce36
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Aug 13 21:53:22 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Aug 14 08:40:49 2020 +0200

    xmloff: remove dead com.sun.star.comp.Draw.XMLMetaExporter
    
    And test com.sun.star.comp.Draw.XMLOasisMetaExporter instead in
    JunitTest_xmloff_unoapi.
    
    Change-Id: I1cd485378097b094e6773a7c37798b9aadf3070f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100687
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
index 8a731cfcdfa7..0e2835d41570 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/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.Draw.XMLMetaExporter</code>. <p>
+ * <code>com.sun.star.comp.Draw.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.Draw.XMLMetaExporter</code> with
+    * <code>com.sun.star.comp.Draw.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 {
         Any arg = new Any(new Type(XDocumentHandler.class),filter);
 
         oObj = (XInterface) xMSF.createInstanceWithArguments(
-            "com.sun.star.comp.Draw.XMLMetaExporter", new Object[] {arg});
+            "com.sun.star.comp.Draw.XMLOasisMetaExporter", new Object[] {arg});
         XExporter xEx = UnoRuntime.queryInterface(XExporter.class, oObj);
         xEx.setSourceDocument(xDrawDoc);
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d283c4043110..d0ebd3147d42 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -473,7 +473,6 @@ core_constructor_list = [
     "com_sun_star_comp_Draw_XMLExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLStylesExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLContentExporter_get_implementation",
-    "com_sun_star_comp_Draw_XMLMetaExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 8d9ef7e21eed..1061aee617cc 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2681,14 +2681,6 @@ com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentCont
                                              | SvXMLExportFlags::FONTDECLS));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Draw_XMLMetaExporter_get_implementation(uno::XComponentContext* pCtx,
-                                                            uno::Sequence<uno::Any> const& /*rSeq*/)
-{
-    return cppu::acquire(
-        new SdXMLExport(pCtx, "XMLDrawMetaExportOOO", true, SvXMLExportFlags::META));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Draw_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 4ff1cff861c7..12ffcad76bc2 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -83,10 +83,6 @@
     constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisImporter"/>
   </implementation>
-  <implementation name="XMLDrawMetaExportOOO"
-    constructor="com_sun_star_comp_Draw_XMLMetaExporter_get_implementation">
-    <service name="com.sun.star.comp.Draw.XMLMetaExporter"/>
-  </implementation>
   <implementation name="XMLDrawMetaExportOasis"
     constructor="com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/>