Improvement on previous commit

Change-Id: I10984b6ac4128ad46f512dade0f4e0084d0b9348

3 files changed, 9 insertions, 5 deletions

diff --git a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
index 8842030db072..bb1c5401a990 100644
--- a/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
+++ b/offapi/com/sun/star/task/XMasterPasswordHandling2.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module task {
 
 /** allows to change the master password, or let it be requested and checked.
 */
-interface XMasterPasswordHandling2 : XMasterPasswordHandling
+published interface XMasterPasswordHandling2 : XMasterPasswordHandling
 {
     /** allows to let the default password be used
 
diff --git a/offapi/com/sun/star/task/XPasswordContainer2.idl b/offapi/com/sun/star/task/XPasswordContainer2.idl
index d22a28f1432f..0c551d5e5371 100644
--- a/offapi/com/sun/star/task/XPasswordContainer2.idl
+++ b/offapi/com/sun/star/task/XPasswordContainer2.idl
@@ -19,14 +19,16 @@
 #ifndef __com_sun_star_task_XPasswordContainer2_idl__
 #define __com_sun_star_task_XPasswordContainer2_idl__
 
+#include <com/sun/star/task/XMasterPasswordHandling2.idl>
 #include <com/sun/star/task/XPasswordContainer.idl>
-#include <com/sun/star/task/XMasterPasswordHandling.idl>
-
+#include <com/sun/star/task/XUrlContainer.idl>
 
 module com {  module sun {  module star {  module task {
 
 /**
   Provides a unified interface for the PasswordContainer service to implement.
+
+  @since LibreOffice 3.7
 */
 published interface XPasswordContainer2
 {
@@ -44,7 +46,9 @@ published interface XPasswordContainer2
         Use this interface to store\retrieve passwords.
         </p>
      */
-    [optional] interface com::sun::star::task::XMasterPasswordHandling;
+    interface com::sun::star::task::XMasterPasswordHandling2;
+
+    interface com::sun::star::task::XUrlContainer;
 };
 
 
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index d872f2b73e2b..46bcbeca8aa9 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module task {
 
     @since OOo 3.2
 */
-/*published*/ interface XUrlContainer : com::sun::star::uno::XInterface
+published interface XUrlContainer : com::sun::star::uno::XInterface
 {
     /** Add a URL to the container.