autorecovery: commit resolved merge (after rebase to m71)

3 files changed, 65 insertions, 2 deletions

diff --git a/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl b/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
new file mode 100644
index 000000000000..ded6c6c23f77
--- /dev/null
+++ b/offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_task_PasswordContainerInteractionHandler_idl__
+#define __com_sun_star_task_PasswordContainerInteractionHandler_idl__
+
+module com { module sun { module star {
+    module task { published interface XInteractionHandler; };
+}; }; };
+
+module com { module sun { module star { module task {
+
+//============================================================================
+/** An interaction request handler that uses the
+    <type scope="com::sun::star::task">PasswordContainer</type> service to
+    handle <type scope="com::sun::star::ucb">AuthenticationRequest</type>s.
+
+    If the password container contains credentials matching the authentication
+    request, the service implementation selects the
+    <type scope="com::sun::star::ucb">XInteractionSupplyAuthentication</type>
+    continuation, that should be supplied with the interaction request.
+
+    If the password container does not contain credentials matching the
+    authentication request, the service implementation selects no continuation.
+
+    @since OOo 3.3
+ */
+published service PasswordContainerInteractionHandler
+   : com::sun::star::task::XInteractionHandler;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/task/XUrlContainer.idl b/offapi/com/sun/star/task/XUrlContainer.idl
index 93839e68fb07..9ac704c56ba0 100644
--- a/offapi/com/sun/star/task/XUrlContainer.idl
+++ b/offapi/com/sun/star/task/XUrlContainer.idl
@@ -46,6 +46,8 @@ module com { module sun { module star { module task {
 //=============================================================================
 /** Allows to store and retrieve URLs. URLs can be stored persistently or
     until end of OOo session.
+
+    @since OOo 3.2
 */
 /*published*/ interface XUrlContainer : com::sun::star::uno::XInterface
 {
@@ -63,7 +65,7 @@ module com { module sun { module star { module task {
     /** Lookup a URL in the container.
 
         @param Url     URL to lookup.
-         @returns       Best matched URL or empty string.
+        @returns       Best matched URL or empty string.
     */
     string findUrl( [in] string Url );
 
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index a4695b0fd0ce..ac6dac61bc06 100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 # Copyright IBM Corporation 2009.
 #
@@ -58,6 +58,7 @@ IDLFILES=\
     MasterPasswordRequest.idl\
     NoMasterException.idl\
     PasswordContainer.idl\
+    PasswordContainerInteractionHandler.idl\
     PasswordRequest.idl\
     PasswordRequestMode.idl\
     UnsupportedOverwriteRequest.idl\