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

[Miklos Vajna (via logerrit)]

 qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.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 e87fb75453b26f8f452f4db1130f672a681eaf71
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Aug 6 21:05:10 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Aug 7 09:19:58 2020 +0200

    xmloff: remove dead com.sun.star.comp.Impress.XMLSettingsExporter
    
    And test com.sun.star.comp.Impress.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.Impress.XMLSettingsExporter line, but let's not regress even more
    in that code.
    
    Change-Id: Ibca21fddc051253adef40df6f1da584c23b4423d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100269
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
index 60177f670b53..b733d67fd983 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/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.Impress.XMLSettingsExporter</code>. <p>
+ * <code>com.sun.star.comp.Impress.XMLOasisSettingsExporter</code>. <p>
  * Object implements the following interfaces :
  * <ul>
  *  <li><code>com::sun::star::lang::XInitialization</code></li>
@@ -87,7 +87,7 @@ public class XMLSettingsExporter extends TestCase {
     /**
     * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
-    * <code>com.sun.star.comp.Impress.XMLSettingsExporter</code> with
+    * <code>com.sun.star.comp.Impress.XMLOasisSettingsExporter</code> with
     * argument which is an implementation of <code>XDocumentHandler</code>
     * and which can check if required tags and character data is
     * exported. <p>
@@ -115,7 +115,7 @@ public class XMLSettingsExporter extends TestCase {
         final boolean NewDataValue;
 
         oObj = (XInterface) xMSF.createInstanceWithArguments(
-            "com.sun.star.comp.Impress.XMLSettingsExporter",
+            "com.sun.star.comp.Impress.XMLOasisSettingsExporter",
             new Object[] {arg});
         XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj);
         xEx.setSourceDocument(xImpressDoc);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c7e664c8c270..198768b9c28a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -419,7 +419,6 @@ core_constructor_list = [
     "com_sun_star_comp_Impress_XMLOasisStylesImporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
-    "com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation",
     "com_sun_star_comp_Impress_XMLExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLExporter_get_implementation",
     "com_sun_star_comp_Draw_XMLStylesExporter_get_implementation",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index cc5a588cdc76..8d9ef7e21eed 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2637,14 +2637,6 @@ com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation(
                                          SvXMLExportFlags::OASIS | SvXMLExportFlags::SETTINGS));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation(
-    uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
-{
-    return cppu::acquire(
-        new SdXMLExport(pCtx, "XMLImpressSettingsExportOOO", false, SvXMLExportFlags::SETTINGS));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Impress_XMLExporter_get_implementation(uno::XComponentContext* pCtx,
                                                          uno::Sequence<uno::Any> const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 9e84d6f3b382..4ff1cff861c7 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -151,10 +151,6 @@
     constructor="com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/>
   </implementation>
-  <implementation name="XMLImpressSettingsExportOOO"
-    constructor="com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation">
-    <service name="com.sun.star.comp.Impress.XMLSettingsExporter"/>
-  </implementation>
   <implementation name="XMLImpressSettingsExportOasis"
     constructor="com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/>