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

[Miklos Vajna (via logerrit)]

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

New commits:
commit 681fb06143e6bbb679282bac071aa3113bc1bd8f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Sep 17 21:02:20 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Sep 18 09:08:38 2020 +0200

    xmloff: remove dead com.sun.star.comp.Draw.XMLSettingsExporter
    
    And test com.sun.star.comp.Draw.XMLOasisSettingsExporter instead in
    JunitTest_xmloff_unoapi. Note that the test code is also dead at the
    moment, because xmloff/qa/unoapi/xmloff.sce disables the
    xmloff.Draw.XMLSettingsExporter line, but let's not regress even more in
    that code.
    
    Change-Id: I2152f32fd798b7a7df7086b125e77fe804185157
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102973
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
index d4368af7454a..261852b8eb51 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
@@ -41,7 +41,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * <code>com.sun.star.comp.Draw.XMLSettingsExporter</code>. <p>
+ * <code>com.sun.star.comp.Draw.XMLOasisSettingsExporter</code>. <p>
  * Object implements the following interfaces :
  * <ul>
  *  <li><code>com::sun::star::lang::XInitialization</code></li>
@@ -118,7 +118,7 @@ public class XMLSettingsExporter extends TestCase {
         Any arg = new Any(new Type(XDocumentHandler.class),filter);
 
         oObj = (XInterface) xMSF.createInstanceWithArguments(
-            "com.sun.star.comp.Draw.XMLSettingsExporter",
+            "com.sun.star.comp.Draw.XMLOasisSettingsExporter",
             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 060c01033f7a..87b29db10c4e 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_XMLSettingsExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 4b30b508b4cd..708dfb3fa085 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2659,14 +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_XMLSettingsExporter_get_implementation(
-    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
-{
-    return cppu::acquire(
-        new SdXMLExport(pCtx, "XMLDrawSettingsExportOOO", true, SvXMLExportFlags::SETTINGS));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation(
     uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index c1fce200cfb1..db63a5cd0519 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -83,10 +83,6 @@
     constructor="com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/>
   </implementation>
-  <implementation name="XMLDrawSettingsExportOOO"
-    constructor="com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation">
-    <service name="com.sun.star.comp.Draw.XMLSettingsExporter"/>
-  </implementation>
   <implementation name="XMLDrawSettingsExportOasis"
     constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>