diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-07-16 21:45:36 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-17 09:08:11 +0200 |
commit | 39bdb12a57b7606029bae33e3fe26634ca8a891b (patch) | |
tree | e7130ef5eeda0f2d48e0db148fd8b011c545bdac | |
parent | 4d78d8a0648bbbbacabb0a3e809f8788b37b1396 (diff) |
xmloff: remove dead com.sun.star.comp.Impress.XMLStylesExporter
And test com.sun.star.comp.Impress.XMLOasisStylesExporter 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.XMLStylesExporter line, but let's not regress even more
in that code.
Change-Id: I7912ce45421b9a2d5209696c6ec4074b15111f86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98930
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r-- | qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java | 6 | ||||
-rwxr-xr-x | solenv/bin/native-code.py | 1 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 10 | ||||
-rw-r--r-- | xmloff/util/xo.component | 4 |
4 files changed, 3 insertions, 18 deletions
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java index 588909433618..2a44f8a8ed6b 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/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.Impress.XMLStylesExporter</code>. <p> + * <code>com.sun.star.comp.Impress.XMLOasisStylesExporter</code>. <p> * Object implements the following interfaces : * <ul> * <li><code>com::sun::star::lang::XInitialization</code></li> @@ -90,7 +90,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.Impress.XMLStylesExporter</code> with + * <code>com.sun.star.comp.Impress.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> @@ -125,7 +125,7 @@ public class XMLStylesExporter extends TestCase { filter.addTag(new XMLTools.Tag("style:style","style:name", newName)); oObj = (XInterface) xMSF.createInstanceWithArguments( - "com.sun.star.comp.Impress.XMLStylesExporter", + "com.sun.star.comp.Impress.XMLOasisStylesExporter", 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 164b8039735d..2f1255248d44 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -399,7 +399,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_XMLStylesExporter_get_implementation", "com_sun_star_comp_Impress_XMLContentExporter_get_implementation", "com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation", "com_sun_star_comp_Impress_XMLExporter_get_implementation", diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 57c42fa23c33..f00d1702b6dd 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2634,16 +2634,6 @@ com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation( } extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* -com_sun_star_comp_Impress_XMLStylesExporter_get_implementation( - uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) -{ - return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressStylesExportOOO", false, - SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES - | SvXMLExportFlags::AUTOSTYLES - | SvXMLExportFlags::FONTDECLS)); -} - -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Impress_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 809ecf340ae5..84c9a4e2fe26 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -171,10 +171,6 @@ constructor="com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/> </implementation> - <implementation name="XMLImpressStylesExportOOO" - constructor="com_sun_star_comp_Impress_XMLStylesExporter_get_implementation"> - <service name="com.sun.star.comp.Impress.XMLStylesExporter"/> - </implementation> <implementation name="XMLImpressStylesExportOasis" constructor="com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/> |