Introduce com.sun.star.frame.ControllerFactory singletons:

com.sun.star.frame.thePopupMenuControllerFactory
com.sun.star.frame.theStatusbarControllerFactory
com.sun.star.frame.theToolbarControllerFactory

To replace their single-instance service variants.

Change-Id: I00586d0d61e63f9482cb659071e88aa9cf02d5b5

7 files changed, 147 insertions, 18 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index f2664e90d5e7..78c2e7dcd13f 100755
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -951,6 +951,9 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/frame,\
 	ToolbarController \
 	ToolbarControllerFactory \
 	TransientDocumentsDocumentContentFactory \
+	thePopupMenuControllerFactory \
+	theStatusbarControllerFactory \
+	theToolbarControllerFactory \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/gallery,\
 	GalleryItem \
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index f6c55b0bf238..009bb66a9734 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -24,13 +24,10 @@
 
 module com { module sun { module star { module frame {
 
-/** specifies a factory that creates instances of registered popup menu controller.
+/**
+    A legacy (single-instance) service-variant of thePopupMenuControllerFactory singleton.
 
-    <p>
-    A pop-up menu controller can be registered for a command URL and a model service name.
-    A menu bar or context menu will automatically create a pop-up menu controller if
-    it contains a registered command URL.
-    </p>
+    @deprecated Use thePopupMenuControllerFactory singleton instead.
 
     @since OOo 2.0
 */
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index ffffabf06699..4f74f6d6c132 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -24,14 +24,10 @@
 
 module com { module sun { module star { module frame {
 
-/** specifies a factory that creates instances of registered status bar
-    controller.
-
-    <p>
-    A status bar controller can be registered for a command URL and a model
-    service name. A status bar will automatically create a status bar controller
-    if it contains a registered command URL.
-    </p>
+/**
+    A legacy (single-instance) service-variant of theStatusbarControllerFactory singleton.
+
+    @deprecated Use theStatusbarControllerFactory singleton instead.
 
     @since OOo 2.0
 */
diff --git a/offapi/com/sun/star/frame/ToolbarControllerFactory.idl b/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
index 69b1314808a5..56e8e3fa1026 100644
--- a/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
@@ -22,11 +22,10 @@
 
 module com { module sun { module star { module frame {
 
-/** specifies a factory that creates instances of registered toolbar controller.
+/**
+    A legacy (single-instance) service-variant of theToolbarControllerFactory singleton.
 
-    <p>
-    A toolbar controller can be registered for a command URL and a model service name.
-    </p>
+    @deprecated Use theToolbarControllerFactory singleton instead.
 
     @since OOo 2.0
 */
diff --git a/offapi/com/sun/star/frame/thePopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/thePopupMenuControllerFactory.idl
new file mode 100644
index 000000000000..48511b7b563e
--- /dev/null
+++ b/offapi/com/sun/star/frame/thePopupMenuControllerFactory.idl
@@ -0,0 +1,46 @@
+/* -*- 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_thePopupMenuControllerFactory_idl__
+#define __com_sun_star_frame_thePopupMenuControllerFactory_idl__
+
+#include <com/sun/star/frame/XUIControllerFactory.idl>
+
+module com { module sun { module star { module frame {
+
+/** specifies a factory that creates instances of registered popup menu controller.
+
+    <p>
+    A pop-up menu controller can be registered for a command URL and a model service name.
+    A menu bar or context menu will automatically create a pop-up menu controller if
+    it contains a registered command URL.
+    </p>
+
+    Prior to LibreOffice 4.3, this singleton was only available as a
+    (single-instance) PopupMenuControllerFactory service.
+
+    @since LibreOffice 4.3
+*/
+singleton thePopupMenuControllerFactory : XUIControllerFactory;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/frame/theStatusbarControllerFactory.idl b/offapi/com/sun/star/frame/theStatusbarControllerFactory.idl
new file mode 100644
index 000000000000..3fdfb1101ab7
--- /dev/null
+++ b/offapi/com/sun/star/frame/theStatusbarControllerFactory.idl
@@ -0,0 +1,47 @@
+/* -*- 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_theStatusbarControllerFactory_idl__
+#define __com_sun_star_frame_theStatusbarControllerFactory_idl__
+
+#include <com/sun/star/frame/XUIControllerFactory.idl>
+
+module com { module sun { module star { module frame {
+
+/** specifies a factory that creates instances of registered status bar
+    controller.
+
+    <p>
+    A status bar controller can be registered for a command URL and a model
+    service name. A status bar will automatically create a status bar controller
+    if it contains a registered command URL.
+    </p>
+
+    Prior to LibreOffice 4.3, this singleton was only available as a
+    (single-instance) StatusbarControllerFactory service.
+
+    @since LibreOffice 4.3
+*/
+singleton theStatusbarControllerFactory : XUIControllerFactory;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/frame/theToolbarControllerFactory.idl b/offapi/com/sun/star/frame/theToolbarControllerFactory.idl
new file mode 100644
index 000000000000..b0222af96ae8
--- /dev/null
+++ b/offapi/com/sun/star/frame/theToolbarControllerFactory.idl
@@ -0,0 +1,41 @@
+/*
+ * 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_theToolbarControllerFactory_idl__
+#define __com_sun_star_frame_theToolbarControllerFactory_idl__
+
+#include <com/sun/star/frame/XUIControllerFactory.idl>
+
+module com { module sun { module star { module frame {
+
+/** specifies a factory that creates instances of registered toolbar controller.
+
+    <p>
+    A toolbar controller can be registered for a command URL and a model service name.
+    </p>
+
+    Prior to LibreOffice 4.3, this singleton was only available as a
+    (single-instance) ToolbarControllerFactory service.
+
+    @since LibreOffice 4.3
+*/
+
+singleton theToolbarControllerFactory : XUIControllerFactory;
+
+}; }; }; };
+
+#endif