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@collabora.com>
This commit is contained in:
@@ -42,7 +42,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Test for object which is represented by service
|
* 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 :
|
* Object implements the following interfaces :
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li><code>com::sun::star::lang::XInitialization</code></li>
|
* <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.
|
* Creating a TestEnvironment for the interfaces to be tested.
|
||||||
* Creates an instance of the service
|
* 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>
|
* argument which is an implementation of <code>XDocumentHandler</code>
|
||||||
* and which can check if required tags and character data is
|
* and which can check if required tags and character data is
|
||||||
* exported. <p>
|
* exported. <p>
|
||||||
@@ -121,7 +121,7 @@ public class XMLStylesExporter extends TestCase {
|
|||||||
final String STYLE_NAME = "New style" + counter++ ;
|
final String STYLE_NAME = "New style" + counter++ ;
|
||||||
|
|
||||||
oObj = (XInterface) xMSF.createInstanceWithArguments(
|
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);
|
XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj);
|
||||||
xEx.setSourceDocument(xDrawDoc);
|
xEx.setSourceDocument(xDrawDoc);
|
||||||
|
|
||||||
|
@@ -471,7 +471,6 @@ core_constructor_list = [
|
|||||||
"com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
|
"com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
|
||||||
"com_sun_star_comp_Impress_XMLExporter_get_implementation",
|
"com_sun_star_comp_Impress_XMLExporter_get_implementation",
|
||||||
"com_sun_star_comp_Draw_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_XMLContentExporter_get_implementation",
|
||||||
"com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
|
"com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
|
||||||
"com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
|
"com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
|
||||||
|
@@ -2661,16 +2661,6 @@ com_sun_star_comp_Draw_XMLExporter_get_implementation(uno::XComponentContext* pC
|
|||||||
| SvXMLExportFlags::EMBEDDED));
|
| 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*
|
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
|
||||||
com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentContext* pCtx,
|
com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentContext* pCtx,
|
||||||
uno::Sequence<uno::Any> const& /*rSeq*/)
|
uno::Sequence<uno::Any> const& /*rSeq*/)
|
||||||
|
@@ -95,10 +95,6 @@
|
|||||||
constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
|
constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
|
||||||
<service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
|
<service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
|
||||||
</implementation>
|
</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"
|
<implementation name="XMLDrawStylesExportOasis"
|
||||||
constructor="com_sun_star_comp_Draw_XMLOasisStylesExporter_get_implementation">
|
constructor="com_sun_star_comp_Draw_XMLOasisStylesExporter_get_implementation">
|
||||||
<service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/>
|
<service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/>
|
||||||
|
Reference in New Issue
Block a user