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

[Miklos Vajna (via logerrit)]

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

New commits:
commit 72b5478390457fa2dcf90e310bb3903e910ca8f2
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Sep 10 21:13:38 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Sep 11 09:03:31 2020 +0200

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

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
index 98992f53ce5b..e0e26b710920 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
@@ -42,7 +42,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * <code>com.sun.star.comp.Draw.XMLContentExporter</code>. <p>
+ * <code>com.sun.star.comp.Draw.XMLOasisContentExporter</code>. <p>
  * Object implements the following interfaces :
  * <ul>
  *  <li><code>com::sun::star::lang::XInitialization</code></li>
@@ -88,7 +88,7 @@ public class XMLContentExporter extends TestCase {
     /**
     * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
-    * <code>com.sun.star.comp.Draw.XMLContentExporter</code> with
+    * <code>com.sun.star.comp.Draw.XMLOasisContentExporter</code> with
     * argument which is an implementation of <code>XDocumentHandler</code>
     * and which can check if required tags and character data is
     * exported. <p>
@@ -125,7 +125,7 @@ public class XMLContentExporter extends TestCase {
         filter.addTag(new XMLTools.Tag("draw:page","draw:name","NewSlide2"));
 
         oObj = (XInterface) xMSF.createInstanceWithArguments(
-            "com.sun.star.comp.Draw.XMLContentExporter",
+            "com.sun.star.comp.Draw.XMLOasisContentExporter",
             new Object[] {arg});
         XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj);
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e104ea067fa9..060c01033f7a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -471,7 +471,6 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
     "com_sun_star_comp_Impress_XMLExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLExporter_get_implementation",
-    "com_sun_star_comp_Draw_XMLContentExporter_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 dbb761e9ddec..4b30b508b4cd 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2659,16 +2659,6 @@ com_sun_star_comp_Draw_XMLExporter_get_implementation(uno::XComponentContext* pC
             | SvXMLExportFlags::EMBEDDED));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentContext* pCtx,
-                                                            uno::Sequence<uno::Any> const& /*rSeq*/)
-{
-    return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawContentExportOOO", true,
-                                         SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT
-                                             | SvXMLExportFlags::SCRIPTS
-                                             | SvXMLExportFlags::FONTDECLS));
-}
-
 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 4f08390ed5f8..c1fce200cfb1 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -63,10 +63,6 @@
       constructor="com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation">
     <service name="com.sun.star.comp.Chart.XMLOasisStylesImporter"/>
   </implementation>
-  <implementation name="XMLDrawContentExportOOO"
-    constructor="com_sun_star_comp_Draw_XMLContentExporter_get_implementation">
-    <service name="com.sun.star.comp.Draw.XMLContentExporter"/>
-  </implementation>
   <implementation name="XMLDrawContentExportOasis"
     constructor="com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/>