diff options
| -rw-r--r-- | qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.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/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java index eae3f905ec16..b5a46cfffa03 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java @@ -41,7 +41,7 @@ import com.sun.star.xml.sax.XDocumentHandler; /** * Test for object which is represented by service - * <code>com.sun.star.comp.Impress.XMLContentExporter</code>. <p> + * <code>com.sun.star.comp.Impress.XMLOasisContentExporter</code>. <p> * Object implements the following interfaces : * <ul> * <li><code>com::sun::star::lang::XInitialization</code></li> @@ -89,7 +89,7 @@ public class XMLContentExporter extends TestCase { /** * Creating a TestEnvironment for the interfaces to be tested. * Creates an instance of the service - * <code>com.sun.star.comp.Impress.XMLContentExporter</code> with + * <code>com.sun.star.comp.Impress.XMLOasisContentExporter</code> with * argument which is an implementation of <code>XDocumentHandler</code> * and which can check if required tags and character data is * exported. <p> @@ -119,7 +119,7 @@ public class XMLContentExporter extends TestCase { Any arg = new Any(new Type(XDocumentHandler.class),filter); oObj = (XInterface) xMSF.createInstanceWithArguments( - "com.sun.star.comp.Impress.XMLContentExporter", + "com.sun.star.comp.Impress.XMLOasisContentExporter", 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 c7c3f952446f..748f84dc4256 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -403,7 +403,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_XMLContentExporter_get_implementation", "com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation", "com_sun_star_comp_Impress_XMLExporter_get_implementation", "com_sun_star_comp_Draw_XMLExporter_get_implementation", diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index f00d1702b6dd..c56272c2570d 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_XMLContentExporter_get_implementation( - uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) -{ - return cppu::acquire(new SdXMLExport(pCtx, "XMLImpressContentExportOOO", false, - SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT - | SvXMLExportFlags::SCRIPTS - | SvXMLExportFlags::FONTDECLS)); -} - -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation( uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/) { diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component index 84c9a4e2fe26..9e84d6f3b382 100644 --- a/xmloff/util/xo.component +++ b/xmloff/util/xo.component @@ -115,10 +115,6 @@ constructor="com_sun_star_comp_Impress_XMLClipboardExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLClipboardExporter"/> </implementation> - <implementation name="XMLImpressContentExportOOO" - constructor="com_sun_star_comp_Impress_XMLContentExporter_get_implementation"> - <service name="com.sun.star.comp.Impress.XMLContentExporter"/> - </implementation> <implementation name="XMLImpressContentExportOasis" constructor="com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation"> <service name="com.sun.star.comp.Impress.XMLOasisContentExporter"/> |