fdo#46808, Convert ui::ModuleUIConfigurationManager service to new style

.. and convert it to WeakImplHelper at the same time.

Change-Id: I20549f5cc6efb60c5210d3f9b6ecf3ade7e4a75a

3 files changed, 73 insertions, 26 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 592f1b910780..2232124d1035 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -423,6 +423,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
 	DocumentAcceleratorConfiguration \
 	GlobalAcceleratorConfiguration \
 	ModuleAcceleratorConfiguration \
+	ModuleUIConfigurationManager \
     ModuleUIConfigurationManagerSupplier \
 	UICategoryDescription \
 	UIConfigurationManager \
@@ -1538,7 +1539,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
 	ItemDescriptor \
 	ModuleUICategoryDescription \
 	ModuleUICommandDescription \
-	ModuleUIConfigurationManager \
 	ModuleWindowStateConfiguration \
 	UIElement \
 	UIElementFactory \
@@ -3972,6 +3972,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\
 	XDockingAreaAcceptor \
 	XImageManager \
 	XModuleUIConfigurationManager \
+	XModuleUIConfigurationManager2 \
 	XModuleUIConfigurationManagerSupplier \
 	XSidebar \
 	XSidebarPanel \
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
index fbad249636b5..3c418fadd964 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManager.idl
@@ -19,11 +19,10 @@
 #ifndef __com_sun_star_ui_ModuleUIConfigurationManager_idl__
 #define __com_sun_star_ui_ModuleUIConfigurationManager_idl__
 
-#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/ui/XUIConfigurationManager.idl>
-#include <com/sun/star/ui/XUIConfigurationPersistence.idl>
-#include <com/sun/star/ui/XModuleUIConfigurationManager.idl>
-#include <com/sun/star/ui/XUIConfiguration.idl>
+#include <com/sun/star/ui/XModuleUIConfigurationManager2.idl>
+#include <com/sun/star/configuration/CorruptedUIConfigurationException.idl>
+#include <com/sun/star/beans/UnknownPropertyException.idl>
+#include <com/sun/star/lang/WrappedTargetException.idl>
 
 module com { module sun { module star { module ui {
 
@@ -44,7 +43,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service ModuleUIConfigurationManager
+service ModuleUIConfigurationManager : XModuleUIConfigurationManager2
 {
     /** provides a function to initialize a module user interface configuration manager instance.
 
@@ -65,27 +64,12 @@ service ModuleUIConfigurationManager
         as a read-only container.
         </p>
     */
-    interface com::sun::star::lang::XInitialization;
+    createDefault([in] string ModuleShortName, [in] string ModuleIdentifier)
+        raises ( com::sun::star::configuration::CorruptedUIConfigurationException,
+               com::sun::star::beans::UnknownPropertyException,
+               com::sun::star::lang::WrappedTargetException );
 
-    /** provides access to persistence functions to load/store user interface element
-        settings from/to a module storage.
-    */
-    interface com::sun::star::ui::XUIConfigurationPersistence;
-
-    /** provides functions to change, insert and remove user interface element settings
-        from a module user interface configuration manager.
-    */
-    interface com::sun::star::ui::XUIConfigurationManager;
 
-    /** provides access to the default layer of a module based ui configuration
-        manager.
-    */
-    interface com::sun::star::ui::XModuleUIConfigurationManager;
-
-    /** provides functions to add and remove listeners for changes within a module user
-        interface configuration manager.
-    */
-    interface com::sun::star::ui::XUIConfiguration;
 };
 
 
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManager2.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManager2.idl
new file mode 100644
index 000000000000..3dd4b480556a
--- /dev/null
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManager2.idl
@@ -0,0 +1,62 @@
+/* -*- 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_ui_XModuleUIConfigurationManager2_idl__
+#define __com_sun_star_ui_XModuleUIConfigurationManager2_idl__
+
+#include <com/sun/star/ui/XUIConfigurationManager.idl>
+#include <com/sun/star/ui/XUIConfigurationPersistence.idl>
+#include <com/sun/star/ui/XModuleUIConfigurationManager.idl>
+#include <com/sun/star/ui/XUIConfiguration.idl>
+
+module com { module sun { module star { module ui {
+
+/**
+    Provides a unified interface for the ModuleUIConfigurationManager service.
+
+    @since LibreOffice 4.2
+*/
+interface XModuleUIConfigurationManager2
+{
+    /** provides access to persistence functions to load/store user interface element
+        settings from/to a module storage.
+    */
+    interface com::sun::star::ui::XUIConfigurationPersistence;
+
+    /** provides functions to change, insert and remove user interface element settings
+        from a module user interface configuration manager.
+    */
+    interface com::sun::star::ui::XUIConfigurationManager;
+
+    /** provides access to the default layer of a module based ui configuration
+        manager.
+    */
+    interface com::sun::star::ui::XModuleUIConfigurationManager;
+
+    /** provides functions to add and remove listeners for changes within a module user
+        interface configuration manager.
+    */
+    interface com::sun::star::ui::XUIConfiguration;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */