fdo#46808, Adapt frame::ModuleManager UNO service to new style

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

Explicitly document the XNameReplace interface in the IDL, which
is already implemented by the service, since there is code currently using it.

Change-Id: Ib46349174b1ce495c240031e93c9427fc33d9853

3 files changed, 61 insertions, 22 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 291699a24c33..8a56c3b87939 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
 	DispatchRecorderSupplier \
 	DocumentTemplates \
 	MediaTypeDetectionHelper \
+	ModuleManager \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
 	GraphicObject \
@@ -811,7 +812,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\
 	FramesContainer \
 	GlobalEventBroadcaster \
 	LayoutManager \
-	ModuleManager \
 	PopupMenuController \
 	PopupMenuControllerFactory \
 	ProtocolHandler \
@@ -2538,6 +2538,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\
 	XModel2 \
 	XModule \
 	XModuleManager \
+	XModuleManager2 \
 	XNotifyingDispatch \
 	XPopupMenuController \
 	XRecordableDispatch \
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index 53ccdc675516..b2db408830ce 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -29,8 +29,7 @@
 #ifndef __com_sun_star_frame_ModuleManager_idl__
 #define __com_sun_star_frame_ModuleManager_idl__
 
-#include <com/sun/star/frame/XModuleManager.idl>
-#include <com/sun/star/container/XNameAccess.idl>
+#include <com/sun/star/frame/XModuleManager2.idl>
 
 
 module com { module sun { module star { module frame {
@@ -45,25 +44,7 @@ module com { module sun { module star { module frame {
     @since OOo 2.0
  */
 
-service ModuleManager
-{
-    /** provides functions to identify office modules.
-     */
-    interface XModuleManager;
-
-    /** provides read access to the configuration of office modules.
-
-        <p>
-        Every module is referenced by an unique service name
-        (which is used inside configuration as set node name too)
-        and is further represented by a sequence of elements of type
-        <type scope="com::sun::star::beans">PropertyValue</type>.
-        A list of properties can be gotten from the configuration template
-        org.openoffice.Setup/Factory.
-        </p>
-     */
-    interface ::com::sun::star::container::XNameAccess;
-};
+service ModuleManager : XModuleManager2;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/frame/XModuleManager2.idl b/offapi/com/sun/star/frame/XModuleManager2.idl
new file mode 100644
index 000000000000..277c0e688d23
--- /dev/null
+++ b/offapi/com/sun/star/frame/XModuleManager2.idl
@@ -0,0 +1,57 @@
+/* -*- 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_frame_XModuleManager2_idl__
+#define __com_sun_star_frame_XModuleManager2_idl__
+
+#include <com/sun/star/frame/XModuleManager.idl>
+#include <com/sun/star/container/XNameReplace.idl>
+
+
+module com {  module sun {  module star {  module frame {
+
+/**
+  This interface provides a merged single interface for the ModuleManager
+  service to implement
+*/
+interface XModuleManager2
+{
+    /** provides functions to identify office modules.
+     */
+    interface XModuleManager;
+
+    /** provides read access to the configuration of office modules.
+
+        <p>
+        Every module is referenced by an unique service name
+        (which is used inside configuration as set node name too)
+        and is further represented by a sequence of elements of type
+        <type scope="com::sun::star::beans">PropertyValue</type>.
+        A list of properties can be gotten from the configuration template
+        org.openoffice.Setup/Factory.
+        </p>
+     */
+    interface ::com::sun::star::container::XNameReplace;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */