fdo#46808, Adapt document::XML*BasicExporter UNO services to new style

The services are
   document::XMLBasicExporter
   document::XMLOasisBasicExporter

Change-Id: Ifd93e5735cae94d34904d79769cdb3edf587fe43

5 files changed, 63 insertions, 40 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 6788d86f49bd..a38f4c6697ec 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -101,6 +101,8 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
 	NamedPropertyValues \
 	OleEmbeddedServerRegistration \
 	OOXMLDocumentPropertiesImporter \
+	XMLBasicExporter \
+	XMLOasisBasicExporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
 	ShapeCollection \
@@ -654,9 +656,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/documen
 	PDFDialog \
 	Settings \
 	TypeDetection \
-	XMLBasicExporter \
 	XMLBasicImporter \
-	XMLOasisBasicExporter \
 	XMLOasisBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
@@ -2171,6 +2171,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
 	XUndoManagerListener \
 	XUndoManagerSupplier \
 	XViewDataSupplier \
+	XXMLBasicExporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
 	Alignment \
diff --git a/offapi/com/sun/star/document/XMLBasicExporter.idl b/offapi/com/sun/star/document/XMLBasicExporter.idl
index 47efa6dfe0b1..a8d618c817da 100644
--- a/offapi/com/sun/star/document/XMLBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicExporter.idl
@@ -19,9 +19,8 @@
 #ifndef __com_sun_star_document_XMLBasicExporter_idl__
 #define __com_sun_star_document_XMLBasicExporter_idl__
 
-#include <com/sun/star/document/XExporter.idl>
-#include <com/sun/star/document/XFilter.idl>
-#include <com/sun/star/lang/XInitialization.idl>
+#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/document/XXMLBasicExporter.idl>
 
 
 
@@ -37,23 +36,9 @@ module com { module sun { module star { module document {
 
     @since OOo 2.0
  */
-published service XMLBasicExporter
+published service XMLBasicExporter : XXMLBasicExporter
 {
-
-    /** sets the source document for this filter.
-     */
-    interface com::sun::star::document::XExporter;
-
-
-    /** filters the document.
-     */
-    interface com::sun::star::document::XFilter;
-
-
-    /** initializes the component.
-     */
-    [optional] interface com::sun::star::lang::XInitialization;
-
+    createWithHandler([in] com::sun::star::xml::sax::XDocumentHandler DocumentHandler);
 };
 
 
diff --git a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
index 23dd454c0c5b..d983f07d7333 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
@@ -19,9 +19,8 @@
 #ifndef __com_sun_star_document_XMLOasisBasicExporter_idl__
 #define __com_sun_star_document_XMLOasisBasicExporter_idl__
 
-#include <com/sun/star/document/XExporter.idl>
-#include <com/sun/star/document/XFilter.idl>
-#include <com/sun/star/lang/XInitialization.idl>
+#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/document/XXMLBasicExporter.idl>
 
 
 
@@ -37,23 +36,9 @@ module com { module sun { module star { module document {
 
     @since OOo 2.0
  */
-published service XMLOasisBasicExporter
+published service XMLOasisBasicExporter : XXMLBasicExporter
 {
-
-    /** sets the source document for this filter.
-     */
-    interface com::sun::star::document::XExporter;
-
-
-    /** filters the document.
-     */
-    interface com::sun::star::document::XFilter;
-
-
-    /** initializes the component.
-     */
-    [optional] interface com::sun::star::lang::XInitialization;
-
+    createWithHandler([in] com::sun::star::xml::sax::XDocumentHandler DocumentHandler);
 };
 
 
diff --git a/offapi/com/sun/star/document/XXMLBasicExporter.idl b/offapi/com/sun/star/document/XXMLBasicExporter.idl
new file mode 100644
index 000000000000..35ee98cbd8dc
--- /dev/null
+++ b/offapi/com/sun/star/document/XXMLBasicExporter.idl
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_document_XXMLBasicExporter_idl__
+#define __com_sun_star_document_XXMLBasicExporter_idl__
+
+#include <com/sun/star/document/XExporter.idl>
+#include <com/sun/star/document/XFilter.idl>
+
+
+
+module com { module sun { module star { module document {
+
+
+/** Provides unified interface for XMLOasisBasicExporter and XMLBasicExporter services.
+    @since LibreOffice 4.1
+ */
+published interface XXMLBasicExporter
+{
+
+    /** sets the source document for this filter.
+     */
+    interface com::sun::star::document::XExporter;
+
+
+    /** filters the document.
+     */
+    interface com::sun::star::document::XFilter;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index a80baa46eadb..e890208f2fe5 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb