fdo#46808, Adapt xml::dom::SAXDocumentBuilderr UNO service to new style

Create a merged XSAXDocumentBuilder2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: Iaa96031a0b7c27e957d2edb0394e5eeaaa84cdca

3 files changed, 49 insertions, 10 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 20eafe067baa..17b3711cf29c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -307,6 +307,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\
 	DocumentBuilder \
+	SAXDocumentBuilder \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
 	FastShapeContextHandler \
@@ -1529,9 +1530,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/cry
 	SignatureCreator \
 	SignatureVerifier \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\
-	SAXDocumentBuilder \
-))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\
 	SaxDocumentHandler \
 ))
@@ -4201,6 +4199,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\
 	XNotation \
 	XProcessingInstruction \
 	XSAXDocumentBuilder \
+	XSAXDocumentBuilder2 \
 	XText \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\
diff --git a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
index 7e25bce146b3..b8c4146e6175 100644
--- a/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
+++ b/offapi/com/sun/star/xml/dom/SAXDocumentBuilder.idl
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
 #ifndef __com_sun_star_xml_dom_documentbuilder_idl
 #define __com_sun_star_xml_dom_documentbuilder_idl
-#include <com/sun/star/xml/sax/XDocumentHandler.idl>
-#include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
+
+#include <com/sun/star/xml/dom/XSAXDocumentBuilder2.idl>
 
 module com {  module sun {  module star {  module xml { module dom {
 
-    service SAXDocumentBuilder
-    {
-        interface XSAXDocumentBuilder;
-        interface com::sun::star::xml::sax::XDocumentHandler;
-    };
+service SAXDocumentBuilder : XSAXDocumentBuilder2;
+
 };};};};};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder2.idl b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder2.idl
new file mode 100644
index 000000000000..9463176f498f
--- /dev/null
+++ b/offapi/com/sun/star/xml/dom/XSAXDocumentBuilder2.idl
@@ -0,0 +1,41 @@
+/* -*- 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_xml_dom_XSAXDocumentBuilder2_idl
+#define __com_sun_star_xml_dom_XSAXDocumentBuilder2_idl
+
+#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/xml/dom/XSAXDocumentBuilder.idl>
+
+module com {  module sun {  module star {  module xml { module dom {
+
+/**
+  Provides a unified interface for the SAXDocumentBuilder service to implement.
+*/
+interface XSAXDocumentBuilder2
+{
+    interface XSAXDocumentBuilder;
+    interface com::sun::star::xml::sax::XDocumentHandler;
+};
+
+};};};};};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */