Introduce com.sun.star.ui.theModuleUIConfigurationManagerSupplier singleton.

Change-Id: I7b503e5d49865c9ff287bf72eaff1995ce871790

3 files changed, 58 insertions, 14 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 9df3d699f801..936073c9068c 100755
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -418,13 +418,13 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/ui,\
 	GlobalAcceleratorConfiguration \
 	ModuleAcceleratorConfiguration \
 	ModuleUIConfigurationManager \
-    ModuleUIConfigurationManagerSupplier \
 	UICategoryDescription \
 	UIConfigurationManager \
     UIElementFactoryManager \
 	WindowContentFactory \
     WindowContentFactoryManager \
 	WindowStateConfiguration \
+    theModuleUIConfigurationManagerSupplier \
 	theUICategoryDescription \
     theUIElementFactoryManager \
     theWindowContentFactoryManager \
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index 7c46a99a325f..60e1bd58b529 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -24,21 +24,13 @@
 
 module com { module sun { module star { module ui {
 
-/** specifies a central user interface configuration provider which gives
-    access to module based user interface configuration managers.
+/**
+    A legacy (single-instance) service-variant of
+    theModuleUIConfigurationManagerSupplier singleton.
 
-    @since OOo 2.0
-
-    Controls module based user interface configuration managers.
+    @deprecated Use theModuleUIConfigurationManagerSupplier singleton instead.
 
-    <p>
-    There can only exists one user interface configuration manager for
-    a module. A user interface configuration manager supports to get and set
-    user interface configuration data for configurable user interface elements.
-
-    @see ConfigurableUIElement
-    @see XUIConfigurationManager
-    </p>
+    @since OOo 2.0
 */
 service ModuleUIConfigurationManagerSupplier : XModuleUIConfigurationManagerSupplier;
 
diff --git a/offapi/com/sun/star/ui/theModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/theModuleUIConfigurationManagerSupplier.idl
new file mode 100644
index 000000000000..fbc3778b5624
--- /dev/null
+++ b/offapi/com/sun/star/ui/theModuleUIConfigurationManagerSupplier.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_ui_theModuleUIConfigurationManagerSupplier_idl__
+#define __com_sun_star_ui_theModuleUIConfigurationManagerSupplier_idl__
+
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl>
+#include <com/sun/star/beans/XPropertySet.idl>
+
+module com { module sun { module star { module ui {
+
+/** specifies a central user interface configuration provider which gives
+    access to module based user interface configuration managers.
+
+    Controls module based user interface configuration managers.
+
+    <p>
+    There can only exist one user interface configuration manager for
+    a module. A user interface configuration manager supports to get and set
+    user interface configuration data for configurable user interface elements.
+
+    @see ConfigurableUIElement
+    @see XUIConfigurationManager
+    </p>
+
+    Prior to LibreOffice 4.3, this singleton was only available as a
+    (single-instance) ModuleUIConfigurationManagerSupplier service.
+
+    @since LibreOffice 4.3
+*/
+singleton theModuleUIConfigurationManagerSupplier : XModuleUIConfigurationManagerSupplier;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */