[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-09-18 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java |4 ++--
 solenv/bin/native-code.py |1 -
 xmloff/source/draw/sdxmlexp.cxx   |8 
 xmloff/util/xo.component  |4 
 4 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 681fb06143e6bbb679282bac071aa3113bc1bd8f
Author: Miklos Vajna 
AuthorDate: Thu Sep 17 21:02:20 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Sep 18 09:08:38 2020 +0200

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

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: I2152f32fd798b7a7df7086b125e77fe804185157
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102973
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java 
b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
index d4368af7454a..261852b8eb51 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java
@@ -41,7 +41,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * com.sun.star.comp.Draw.XMLSettingsExporter. 
+ * com.sun.star.comp.Draw.XMLOasisSettingsExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -118,7 +118,7 @@ public class XMLSettingsExporter extends TestCase {
 Any arg = new Any(new Type(XDocumentHandler.class),filter);
 
 oObj = (XInterface) xMSF.createInstanceWithArguments(
-"com.sun.star.comp.Draw.XMLSettingsExporter",
+"com.sun.star.comp.Draw.XMLOasisSettingsExporter",
 new Object[] {arg});
 XExporter xEx = UnoRuntime.queryInterface(XExporter.class, oObj);
 xEx.setSourceDocument(xDrawDoc);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 060c01033f7a..87b29db10c4e 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -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_XMLSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 4b30b508b4cd..708dfb3fa085 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2659,14 +2659,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_XMLSettingsExporter_get_implementation(
-uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
-{
-return cppu::acquire(
-new SdXMLExport(pCtx, "XMLDrawSettingsExportOOO", true, 
SvXMLExportFlags::SETTINGS));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation(
 uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index c1fce200cfb1..db63a5cd0519 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -83,10 +83,6 @@
 
constructor="com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-09-11 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java |6 +++---
 solenv/bin/native-code.py|1 -
 xmloff/source/draw/sdxmlexp.cxx  |   10 --
 xmloff/util/xo.component |4 
 4 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 72b5478390457fa2dcf90e310bb3903e910ca8f2
Author: Miklos Vajna 
AuthorDate: Thu Sep 10 21:13:38 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Sep 11 09:03:31 2020 +0200

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

And test com.sun.star.comp.Draw.XMLOasisContentExporter instead in
JunitTest_xmloff_unoapi.

Change-Id: I22bf816d08bcd04b277e461a5055883b730811b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102401
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java 
b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
index 98992f53ce5b..e0e26b710920 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java
@@ -42,7 +42,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * com.sun.star.comp.Draw.XMLContentExporter. 
+ * com.sun.star.comp.Draw.XMLOasisContentExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -88,7 +88,7 @@ public class XMLContentExporter extends TestCase {
 /**
 * Creating a TestEnvironment for the interfaces to be tested.
 * Creates an instance of the service
-* com.sun.star.comp.Draw.XMLContentExporter with
+* com.sun.star.comp.Draw.XMLOasisContentExporter with
 * argument which is an implementation of XDocumentHandler
 * and which can check if required tags and character data is
 * exported. 
@@ -125,7 +125,7 @@ public class XMLContentExporter extends TestCase {
 filter.addTag(new XMLTools.Tag("draw:page","draw:name","NewSlide2"));
 
 oObj = (XInterface) xMSF.createInstanceWithArguments(
-"com.sun.star.comp.Draw.XMLContentExporter",
+"com.sun.star.comp.Draw.XMLOasisContentExporter",
 new Object[] {arg});
 XExporter xEx = UnoRuntime.queryInterface(XExporter.class,oObj);
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e104ea067fa9..060c01033f7a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -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_XMLContentExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index dbb761e9ddec..4b30b508b4cd 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2659,16 +2659,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_XMLContentExporter_get_implementation(uno::XComponentContext*
 pCtx,
-
uno::Sequence const& /*rSeq*/)
-{
-return cppu::acquire(new SdXMLExport(pCtx, "XMLDrawContentExportOOO", true,
- SvXMLExportFlags::AUTOSTYLES | 
SvXMLExportFlags::CONTENT
- | SvXMLExportFlags::SCRIPTS
- | SvXMLExportFlags::FONTDECLS));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation(
 uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 4f08390ed5f8..c1fce200cfb1 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -63,10 +63,6 @@
   
constructor="com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-09-04 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java |6 +++---
 solenv/bin/native-code.py   |1 -
 xmloff/source/draw/sdxmlexp.cxx |   10 --
 xmloff/util/xo.component|4 
 4 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 739ce73e9957fa1f553f3246e5ed67de0f3eb47f
Author: Miklos Vajna 
AuthorDate: Thu Sep 3 21:35:16 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Sep 4 09:11:39 2020 +0200

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 

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java 
b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
index b139fff75ac9..2fbf238ca67c 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java
@@ -42,7 +42,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * com.sun.star.comp.Draw.XMLStylesExporter. 
+ * com.sun.star.comp.Draw.XMLOasisStylesExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -91,7 +91,7 @@ public class XMLStylesExporter extends TestCase {
 /**
 * Creating a TestEnvironment for the interfaces to be tested.
 * Creates an instance of the service
-* com.sun.star.comp.Draw.XMLStylesExporter with
+* com.sun.star.comp.Draw.XMLOasisStylesExporter with
 * argument which is an implementation of XDocumentHandler
 * and which can check if required tags and character data is
 * exported. 
@@ -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);
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b3a7828460d0..e104ea067fa9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -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",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 0297c6f4e285..d5b8463b0d6e 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -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 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 const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 12ffcad76bc2..4f08390ed5f8 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -95,10 +95,6 @@
 
constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-08-14 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java |6 +++---
 solenv/bin/native-code.py |1 -
 xmloff/source/draw/sdxmlexp.cxx   |8 
 xmloff/util/xo.component  |4 
 4 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit b8285ae5133cd74df6930ada54bf12bdd22fce36
Author: Miklos Vajna 
AuthorDate: Thu Aug 13 21:53:22 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 14 08:40:49 2020 +0200

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

And test com.sun.star.comp.Draw.XMLOasisMetaExporter instead in
JunitTest_xmloff_unoapi.

Change-Id: I1cd485378097b094e6773a7c37798b9aadf3070f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100687
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java 
b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
index 8a731cfcdfa7..0e2835d41570 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java
@@ -40,7 +40,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * com.sun.star.comp.Draw.XMLMetaExporter. 
+ * com.sun.star.comp.Draw.XMLOasisMetaExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -88,7 +88,7 @@ public class XMLMetaExporter extends TestCase {
 /**
 * Creating a TestEnvironment for the interfaces to be tested.
 * Creates an instance of the service
-* com.sun.star.comp.Draw.XMLMetaExporter with
+* com.sun.star.comp.Draw.XMLOasisMetaExporter with
 * argument which is an implementation of XDocumentHandler
 * and which can check if required tags and character data is
 * exported. 
@@ -118,7 +118,7 @@ public class XMLMetaExporter extends TestCase {
 Any arg = new Any(new Type(XDocumentHandler.class),filter);
 
 oObj = (XInterface) xMSF.createInstanceWithArguments(
-"com.sun.star.comp.Draw.XMLMetaExporter", new Object[] {arg});
+"com.sun.star.comp.Draw.XMLOasisMetaExporter", new Object[] {arg});
 XExporter xEx = UnoRuntime.queryInterface(XExporter.class, oObj);
 xEx.setSourceDocument(xDrawDoc);
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d283c4043110..d0ebd3147d42 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -473,7 +473,6 @@ core_constructor_list = [
 "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_XMLMetaExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 8d9ef7e21eed..1061aee617cc 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2681,14 +2681,6 @@ 
com_sun_star_comp_Draw_XMLContentExporter_get_implementation(uno::XComponentCont
  | SvXMLExportFlags::FONTDECLS));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Draw_XMLMetaExporter_get_implementation(uno::XComponentContext*
 pCtx,
-
uno::Sequence const& /*rSeq*/)
-{
-return cppu::acquire(
-new SdXMLExport(pCtx, "XMLDrawMetaExportOOO", true, 
SvXMLExportFlags::META));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Draw_XMLSettingsExporter_get_implementation(
 uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 4ff1cff861c7..12ffcad76bc2 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -83,10 +83,6 @@
 constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-08-07 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java |6 +++---
 solenv/bin/native-code.py|1 -
 xmloff/source/draw/sdxmlexp.cxx  |8 

 xmloff/util/xo.component |4 
 4 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit e87fb75453b26f8f452f4db1130f672a681eaf71
Author: Miklos Vajna 
AuthorDate: Thu Aug 6 21:05:10 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Aug 7 09:19:58 2020 +0200

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

And test com.sun.star.comp.Impress.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.Impress.XMLSettingsExporter line, but let's not regress even more
in that code.

Change-Id: Ibca21fddc051253adef40df6f1da584c23b4423d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100269
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java 
b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
index 60177f670b53..b733d67fd983 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
@@ -41,7 +41,7 @@ import com.sun.star.xml.sax.XDocumentHandler;
 
 /**
  * Test for object which is represented by service
- * com.sun.star.comp.Impress.XMLSettingsExporter. 
+ * com.sun.star.comp.Impress.XMLOasisSettingsExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -87,7 +87,7 @@ public class XMLSettingsExporter extends TestCase {
 /**
 * Creating a TestEnvironment for the interfaces to be tested.
 * Creates an instance of the service
-* com.sun.star.comp.Impress.XMLSettingsExporter with
+* com.sun.star.comp.Impress.XMLOasisSettingsExporter with
 * argument which is an implementation of XDocumentHandler
 * and which can check if required tags and character data is
 * exported. 
@@ -115,7 +115,7 @@ public class XMLSettingsExporter extends TestCase {
 final boolean NewDataValue;
 
 oObj = (XInterface) xMSF.createInstanceWithArguments(
-"com.sun.star.comp.Impress.XMLSettingsExporter",
+"com.sun.star.comp.Impress.XMLOasisSettingsExporter",
 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 c7e664c8c270..198768b9c28a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -419,7 +419,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_XMLSettingsExporter_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",
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index cc5a588cdc76..8d9ef7e21eed 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2637,14 +2637,6 @@ 
com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation(
  SvXMLExportFlags::OASIS | 
SvXMLExportFlags::SETTINGS));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation(
-uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
-{
-return cppu::acquire(
-new SdXMLExport(pCtx, "XMLImpressSettingsExportOOO", false, 
SvXMLExportFlags::SETTINGS));
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 
com_sun_star_comp_Impress_XMLExporter_get_implementation(uno::XComponentContext*
 pCtx,
  
uno::Sequence const& /*rSeq*/)
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 9e84d6f3b382..4ff1cff861c7 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -151,10 +151,6 @@
 
constructor="com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-07-24 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java |6 +++---
 solenv/bin/native-code.py   |1 -
 xmloff/source/draw/sdxmlexp.cxx |   10 
--
 xmloff/util/xo.component|4 
 4 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 8e62e20f1f4da93f84b135d0b221ecd39667b0e4
Author: Miklos Vajna 
AuthorDate: Thu Jul 23 20:03:49 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 24 09:03:22 2020 +0200

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

And test com.sun.star.comp.Impress.XMLOasisContentExporter 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.XMLContentExporter line, but let's not regress even more
in that code.

Change-Id: I5bbffaf512ea803c9265050cbe587f2e9743f09b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99336
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

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
- * com.sun.star.comp.Impress.XMLContentExporter. 
+ * com.sun.star.comp.Impress.XMLOasisContentExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -89,7 +89,7 @@ public class XMLContentExporter extends TestCase {
 /**
 * Creating a TestEnvironment for the interfaces to be tested.
 * Creates an instance of the service
-* com.sun.star.comp.Impress.XMLContentExporter with
+* com.sun.star.comp.Impress.XMLOasisContentExporter with
 * argument which is an implementation of XDocumentHandler
 * and which can check if required tags and character data is
 * exported. 
@@ -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
@@ -2633,16 +2633,6 @@ 
com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation(
  SvXMLExportFlags::OASIS | 
SvXMLExportFlags::SETTINGS));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Impress_XMLContentExporter_get_implementation(
-uno::XComponentContext* pCtx, uno::Sequence 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 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">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: qadevOOo/tests solenv/bin xmloff/source xmloff/util

2020-07-17 Thread Miklos Vajna (via logerrit) 
 qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java |6 +++---
 solenv/bin/native-code.py  |1 -
 xmloff/source/draw/sdxmlexp.cxx|   10 
--
 xmloff/util/xo.component   |4 
 4 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 39bdb12a57b7606029bae33e3fe26634ca8a891b
Author: Miklos Vajna 
AuthorDate: Thu Jul 16 21:45:36 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 17 09:08:11 2020 +0200

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 

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
- * com.sun.star.comp.Impress.XMLStylesExporter. 
+ * com.sun.star.comp.Impress.XMLOasisStylesExporter. 
  * Object implements the following interfaces :
  * 
  *  com::sun::star::lang::XInitialization
@@ -90,7 +90,7 @@ public class XMLStylesExporter extends TestCase {
 /**
 * Creating a TestEnvironment for the interfaces to be tested.
 * Creates an instance of the service
-* com.sun.star.comp.Impress.XMLStylesExporter with
+* com.sun.star.comp.Impress.XMLOasisStylesExporter with
 * argument which is an implementation of XDocumentHandler
 * and which can check if required tags and character data is
 * exported. 
@@ -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
@@ -2633,16 +2633,6 @@ 
com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation(
  SvXMLExportFlags::OASIS | 
SvXMLExportFlags::SETTINGS));
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
-com_sun_star_comp_Impress_XMLStylesExporter_get_implementation(
-uno::XComponentContext* pCtx, uno::Sequence 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 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">
 
   
-  
-
-  
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org