fdo#46808, Adapt document::XMLOasisBasicImporter UNO service to new style

Change-Id: Ic494847cf56c7661474d2a096dccc675780c9ce1

4 files changed, 56 insertions, 16 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index da049875a358..257ccd07f89f 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
 	OOXMLDocumentPropertiesImporter \
 	XMLBasicExporter \
 	XMLOasisBasicExporter \
+	XMLOasisBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
 	ShapeCollection \
@@ -668,7 +669,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/documen
 	Settings \
 	TypeDetection \
 	XMLBasicImporter \
-	XMLOasisBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\
 	AccessibleDrawDocumentView \
@@ -2174,6 +2174,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\
 	XUndoManagerSupplier \
 	XViewDataSupplier \
 	XXMLBasicExporter \
+	XXMLOasisBasicImporter \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\
 	Alignment \
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
index 399ac430f9d6..5f5bb33d89a4 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
@@ -19,8 +19,7 @@
 #ifndef __com_sun_star_document_XMLOasisBasicImporter_idl__
 #define __com_sun_star_document_XMLOasisBasicImporter_idl__
 
-#include <com/sun/star/document/XImporter.idl>
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/document/XXMLOasisBasicImporter.idl>
 
 
 
@@ -37,19 +36,7 @@ module com { module sun { module star { module document {
 
     @since OOo 2.0
  */
-published service XMLOasisBasicImporter
-{
-
-    /** sets the target document for this filter.
-     */
-    interface com::sun::star::document::XImporter;
-
-
-    /** receives notification of general document events.
-     */
-    interface com::sun::star::xml::sax::XDocumentHandler;
-
-};
+published service XMLOasisBasicImporter : XXMLOasisBasicImporter;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/document/XXMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XXMLOasisBasicImporter.idl
new file mode 100644
index 000000000000..e867151c8f5a
--- /dev/null
+++ b/offapi/com/sun/star/document/XXMLOasisBasicImporter.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_XXMLOasisBasicImporter_idl__
+#define __com_sun_star_document_XXMLOasisBasicImporter_idl__
+
+#include <com/sun/star/document/XImporter.idl>
+#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+
+
+
+module com { module sun { module star { module document {
+
+
+/**
+    @since LibreOffice 4.1
+ */
+published interface XXMLOasisBasicImporter
+{
+
+    /** sets the target document for this filter.
+     */
+    interface com::sun::star::document::XImporter;
+
+
+    /** receives notification of general document events.
+     */
+    interface com::sun::star::xml::sax::XDocumentHandler;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 527015291d91..dee150aff27e 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb