fdo#46808, Adapt bridge::BridgeFactory UNO service to new style

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

Change-Id: I7309f4d30f0e772bc203c701eb3407b920ffafcc

3 files changed, 54 insertions, 14 deletions

diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index cdffbda1dd7c..164e439685aa 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\
 	Bridge \
-	BridgeFactory \
 	IiopBridge \
 	OleApplicationRegistration \
 	OleBridgeSupplier \
@@ -229,11 +228,13 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\
 	BridgeExistsException \
+	BridgeFactory \
 	InvalidProtocolChangeException \
 	ModelDependent \
 	ProtocolProperty \
 	XBridge \
 	XBridgeFactory \
+	XBridgeFactory2 \
 	XBridgeSupplier \
 	XBridgeSupplier2 \
 	XInstanceProvider \
diff --git a/udkapi/com/sun/star/bridge/BridgeFactory.idl b/udkapi/com/sun/star/bridge/BridgeFactory.idl
index 75fe2f78204f..765d2e481ad1 100644
--- a/udkapi/com/sun/star/bridge/BridgeFactory.idl
+++ b/udkapi/com/sun/star/bridge/BridgeFactory.idl
@@ -19,11 +19,10 @@
 #ifndef __com_sun_star_bridge_BridgeFactory_idl__
 #define __com_sun_star_bridge_BridgeFactory_idl__
 
-#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/bridge/XBridgeFactory.idl>
+#include <com/sun/star/bridge/XBridgeFactory2.idl>
 
 
- module com {  module sun {  module star {  module bridge {
+module com {  module sun {  module star {  module bridge {
 
 
 /** allows to create new or access existing interprocess bridges.
@@ -34,16 +33,7 @@
 
     @see com::sun::star::bridge::Bridge
  */
-published service BridgeFactory
-{
-    /** The main interface of the service
-     */
-    interface com::sun::star::bridge::XBridgeFactory;
-
-    /** This interface allows to break possible cyclic references.
-     */
-    interface com::sun::star::lang::XComponent;
-};
+published service BridgeFactory : com::sun::star::bridge::XBridgeFactory2;
 
 
 }; }; }; };
diff --git a/udkapi/com/sun/star/bridge/XBridgeFactory2.idl b/udkapi/com/sun/star/bridge/XBridgeFactory2.idl
new file mode 100644
index 000000000000..b301024a1e5a
--- /dev/null
+++ b/udkapi/com/sun/star/bridge/XBridgeFactory2.idl
@@ -0,0 +1,49 @@
+/* -*- 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_bridge_XBridgeFactory2_idl__
+#define __com_sun_star_bridge_XBridgeFactory2_idl__
+
+#include <com/sun/star/lang/XComponent.idl>
+#include <com/sun/star/bridge/XBridgeFactory.idl>
+
+
+module com {  module sun {  module star {  module bridge {
+
+
+/**
+  Provides a unified interface for the BridgeFactory service to implement.
+
+  @since LibreOffice 3.7
+ */
+published interface XBridgeFactory2
+{
+    /** The main interface of the service
+     */
+    interface com::sun::star::bridge::XBridgeFactory;
+
+    /** This interface allows to break possible cyclic references.
+     */
+    interface com::sun::star::lang::XComponent;
+};
+
+
+}; }; }; };
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */