fdo#46808, Adapt task::PasswordContainer UNO service to new style

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

Change-Id: I245b566b43e4646f10914b0aee13b2a0b0e296ae

4 files changed, 59 insertions, 21 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index db5f8ccec969..20eafe067baa 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -270,6 +270,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
 	InteractionRequestStringResolver \
 	JobExecutor \
 	OfficeRestartManager \
+	PasswordContainer \
 	PasswordContainerInteractionHandler \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
@@ -1216,7 +1217,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\
 	AsyncJob \
 	InteractionHandler \
 	Job \
-	PasswordContainer \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
 	AccessibleEndnoteView \
@@ -3616,6 +3616,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\
 	XMasterPasswordHandling \
 	XMasterPasswordHandling2 \
 	XPasswordContainer \
+	XPasswordContainer2 \
 	XRestartManager \
 	XStatusIndicator \
 	XStatusIndicatorFactory \
diff --git a/offapi/com/sun/star/task/PasswordContainer.idl b/offapi/com/sun/star/task/PasswordContainer.idl
index 830feef57523..69f9b3b15a68 100644
--- a/offapi/com/sun/star/task/PasswordContainer.idl
+++ b/offapi/com/sun/star/task/PasswordContainer.idl
@@ -30,8 +30,7 @@
 
 module com {  module sun {  module star {
     module task {
-        published interface XPasswordContainer;
-        published interface XMasterPasswordHandling;
+        published interface XPasswordContainer2;
     };
 }; }; };
 
@@ -57,24 +56,7 @@ module com {  module sun {  module star {  module task {
     non-persistent way explicitly.
     </p>
 */
-published service PasswordContainer
-{
-    /** handles passwords
-
-        <p>
-        Use this interface to store\retrieve passwords.
-        </p>
-     */
-    interface com::sun::star::task::XPasswordContainer;
-
-    /** handles passwords
-
-        <p>
-        Use this interface to store\retrieve passwords.
-        </p>
-     */
-    [optional] interface com::sun::star::task::XMasterPasswordHandling;
-};
+published service PasswordContainer : com::sun::star::task::XPasswordContainer2;
 
 }; }; }; };
 #endif
diff --git a/offapi/com/sun/star/task/XPasswordContainer2.idl b/offapi/com/sun/star/task/XPasswordContainer2.idl
new file mode 100644
index 000000000000..d22a28f1432f
--- /dev/null
+++ b/offapi/com/sun/star/task/XPasswordContainer2.idl
@@ -0,0 +1,55 @@
+/* -*- 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_task_XPasswordContainer2_idl__
+#define __com_sun_star_task_XPasswordContainer2_idl__
+
+#include <com/sun/star/task/XPasswordContainer.idl>
+#include <com/sun/star/task/XMasterPasswordHandling.idl>
+
+
+module com {  module sun {  module star {  module task {
+
+/**
+  Provides a unified interface for the PasswordContainer service to implement.
+*/
+published interface XPasswordContainer2
+{
+    /** handles passwords
+
+        <p>
+        Use this interface to store\retrieve passwords.
+        </p>
+     */
+    interface com::sun::star::task::XPasswordContainer;
+
+    /** handles passwords
+
+        <p>
+        Use this interface to store\retrieve passwords.
+        </p>
+     */
+    [optional] interface com::sun::star::task::XMasterPasswordHandling;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index e6e15796737f..753f0bcddc16 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb