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

[Miklos Vajna (via logerrit)]

 qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.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 739ce73e9957fa1f553f3246e5ed67de0f3eb47f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Sep 3 21:35:16 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Sep 4 09:11:39 2020 +0200

    xmloff: remove dead com.sun.star.comp.Draw.XMLStylesExporter
    
    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: I04eb38aad193dfbfde5df42f3e367aa47dfd12ab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102019
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
index b139fff75ac9..2fbf238ca67c 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.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.XMLStylesExporter</code>. <p>
+ * <code>com.sun.star.comp.Draw.XMLOasisStylesExporter</code>. <p>
  * Object implements the following interfaces :
  * <ul>
  *  <li><code>com::sun::star::lang::XInitialization</code></li>
@@ -91,7 +91,7 @@ public class XMLStylesExporter extends TestCase {
     /**
     * Creating a TestEnvironment for the interfaces to be tested.
     * Creates an instance of the service
-    * <code>com.sun.star.comp.Draw.XMLStylesExporter</code> with
+    * <code>com.sun.star.comp.Draw.XMLOasisStylesExporter</code> with
     * argument which is an implementation of <code>XDocumentHandler</code>
     * and which can check if required tags and character data is
     * exported. <p>
@@ -121,7 +121,7 @@ public class XMLStylesExporter extends TestCase {
         final String STYLE_NAME = "New style" + counter++ ;
 
         oObj = (XInterface) xMSF.createInstanceWithArguments(
-            "com.sun.star.comp.Draw.XMLStylesExporter", new Object[] {arg});
+            "com.sun.star.comp.Draw.XMLOasisStylesExporter", 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 b3a7828460d0..e104ea067fa9 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_XMLStylesExporter_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",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 0297c6f4e285..d5b8463b0d6e 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2661,16 +2661,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_XMLStylesExporter_get_implementation(uno::XComponentContext* pCtx,
-                                                            uno::Sequence<uno::Any> const& /*rSeq*/)
-{
-    return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawStylesExportOOO", true,
-                                         SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES
-                                             | SvXMLExportFlags::AUTOSTYLES
-                                             | SvXMLExportFlags::FONTDECLS));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentContext* pCtx,
                                                             uno::Sequence<uno::Any> const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 12ffcad76bc2..4f08390ed5f8 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -95,10 +95,6 @@
     constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
   </implementation>
-  <implementation name="XMLDrawStylesExportOOO"
-    constructor="com_sun_star_comp_Draw_XMLStylesExporter_get_implementation">
-    <service name="com.sun.star.comp.Draw.XMLStylesExporter"/>
-  </implementation>
   <implementation name="XMLDrawStylesExportOasis"
     constructor="com_sun_star_comp_Draw_XMLOasisStylesExporter_get_implementation">
     <service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/>