mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmloff: remove dead com.sun.star.comp.Impress.XMLMetaExporter

Browse Source 
And test com.sun.star.comp.Impress.XMLOasisMetaExporter instead in
JunitTest_xmloff_unoapi.

Change-Id: Iec2da56b569c283686de1bd4aad5fb7ebebfbc2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97183
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna
2020-06-25 21:10:44 +02:00
parent 1428b06e1f
commit 46308ce281
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
View File

@@ -40,7 +40,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.Impress.XMLMetaExporter</code>. <p> * <code>com.sun.star.comp.Impress.XMLOasisMetaExporter</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>
@@ -88,7 +88,7 @@ public class XMLMetaExporter 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.Impress.XMLMetaExporter</code> with * <code>com.sun.star.comp.Impress.XMLOasisMetaExporter</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>
@@ -118,7 +118,7 @@ public class XMLMetaExporter extends TestCase {
final String NAME = "XMLMetaExporter"; final String NAME = "XMLMetaExporter";
oObj = (XInterface) xMSF.createInstanceWithArguments( oObj = (XInterface) xMSF.createInstanceWithArguments(
"com.sun.star.comp.Impress.XMLMetaExporter", "com.sun.star.comp.Impress.XMLOasisMetaExporter",
new Object[]{arg}); new Object[]{arg});
XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj); XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj);
xEx.setSourceDocument(xImpressDoc); xEx.setSourceDocument(xImpressDoc);

8
xmloff/source/draw/sdxmlexp.cxx
View File

@@ -2653,14 +2653,6 @@ com_sun_star_comp_Impress_XMLContentExporter_get_implementation(
| SvXMLExportFlags::FONTDECLS)); | SvXMLExportFlags::FONTDECLS));
} }
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_Impress_XMLMetaExporter_get_implementation(
uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(
new SdXMLExport(pCtx, "XMLImpressMetaExportOOO", false, SvXMLExportFlags::META));
}
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation( com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation(
uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)

4
xmloff/util/xo.component
View File

@@ -143,10 +143,6 @@
constructor="com_sun_star_comp_Impress_XMLOasisImporter_get_implementation"> constructor="com_sun_star_comp_Impress_XMLOasisImporter_get_implementation">
<service name="com.sun.star.comp.Impress.XMLOasisImporter"/> <service name="com.sun.star.comp.Impress.XMLOasisImporter"/>
</implementation> </implementation>
<implementation name="XMLImpressMetaExportOOO"
constructor="com_sun_star_comp_Impress_XMLMetaExporter_get_implementation">
<service name="com.sun.star.comp.Impress.XMLMetaExporter"/>
</implementation>
<implementation name="XMLImpressMetaExportOasis" <implementation name="XMLImpressMetaExportOasis"
constructor="com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation"> constructor="com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation">
<service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/> <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/>