strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xmloff: remove dead com.sun.star.comp.Draw.XMLStylesExporter

Browse source 
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@collabora.com>
This commit is contained in:
Miklos Vajna 2020-09-03 21:35:16 +02:00
parent 1d203d9547
commit 739ce73e99
4 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
View file

@ -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);

1
solenv/bin/native-code.py
View file

@ -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",

10
xmloff/source/draw/sdxmlexp.cxx
View file

@ -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*/)

4
xmloff/util/xo.component
View file

@ -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"/>