3 files changed, 77 insertions, 50 deletions
diff --git a/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
new file mode 100644
index 000000000000..c803434c9580
--- /dev/null
+++ b/offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * 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: InteractionHandler.idl,v $
+ * $Revision: 1.12 $
+ *
+ * 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_sdb_InteractionHandler_idl__
+#define __com_sun_star_sdb_InteractionHandler_idl__
+
+module com { module sun { module star { module task {
+    published interface XInteractionHandler;
+}; }; }; };
+
+module com {  module sun {  module star {  module sdb {
+
+/** describes a service which is able to handle database-related interactions.
+
+    <p>Usually, you will not instantiate this service directly. Instead, you'll instantiate a generic
+    <type scope="com::sun::star::task">InteractionHandler</type> service, and pass it your request. Based on
+    configuration data, this implementation will decide where to forward the request to.</p>
+
+    <p>By default, the <code>DatabaseInteractionHandler</code> feels responsible (as per configuration) for the
+    following interaction types:
+    <ul>
+        <li><b>database related errors</b><br/>
+            The general structure to transport such errors is the <type scope="com::sun::star::sdbc">SQLException</type>,
+            and if your interaction request supplies such a <code>SQLException</code> (or an instance of any derived class),
+            the handler will display a generic error dialog, which is able to travel the object chain which may be contained
+            in the exception.
+        </li>
+        <li><b>parameter requests</b><br/>
+            If your interaction request supplies an <type scope="com::sun::star::sdb">ParametersRequest</type>,
+            the handler will open a standard dialog asking the user to fill in parameter values.
+            <br/>
+            In the case you want to use this feature of the handler, you should supply a special continuation
+            (<type scope="com::sun::star::sdb">XInteractionSupplyParameters</type>) as well, so the
+            handler can return the entered information.
+        </li>
+    </ul>
+    </p>
+*/
+service DatabaseInteractionHandler: com::sun::star::task::XInteractionHandler2;
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/sdb/InteractionHandler.idl b/offapi/com/sun/star/sdb/InteractionHandler.idl
index 62fe7ccbfa92..48c024b01eca 100644
--- a/offapi/com/sun/star/sdb/InteractionHandler.idl
+++ b/offapi/com/sun/star/sdb/InteractionHandler.idl
@@ -37,56 +37,11 @@ module com { module sun { module star { module task {
 module com {  module sun {  module star {  module sdb {
 
 /** is a service for user interaction for databases.
-    <p>
-    interaction requests that the handler can provide are:
-    <ul>
-        <li><b>database related errors</b><br/>
-            The general structure to transport such errors is the
-            <type scope="com::sun::star::sdbc">SQLException</type>
-            , and if your
-            <type scope="com::sun::star::task">XInteractionRequest</type>
-            supplies such a
-            <type scope="com::sun::star::sdbc">SQLException</type>
-            (or an instance of any derived class),
-            the handler will display a generic error dialog, which is able
-            to travel the object chain which may be contained in the exception.
-        </li>
-        <li><b>authentication</b><br/>
-            If your
-            <type scope="com::sun::star::task">XInteractionRequest</type>
-            (see
-            <member scope="com::sun::star::task">XInteractionHandler::handle()</member>
-            ) supplies a
-            <type scope="com::sun::star::ucb">AuthenticationRequest</type>
-            , the handler will open a standard login
-            dialog to allow user authentication.
-            <br/>
-            Besides the using the members of the AuthenticationRequest in the usual manner, the member <em>Server</em>
-            (if not empty) is interpreted as datasource name, thus leading to a slightly different message when
-            requesting the user to enter it's login data.
-            <br/>
-            In the case you want to use this authentication feature, you should supply a special authentication
-            continuation (
-            <type scope="com::sun::star::ucb">XInteractionSupplyAuthentication</type>
-            ) as well, so the
-            handler can return to you, the entered information.
-        </li>
-        <li><b>parameter requests</b><br/>
-            If your
-            <type scope="com::sun::star::task">XInteractionRequest</type>
-            supplies an
-            <type scope="com::sun::star::sdb">ParametersRequest</type>
-            , the handler will open a standard dialog asking
-            the user to fill in parameter values.
-            <br/>
-            In the case you want to use this feature of the handler, you should supply a special continuation
-            (
-            <type scope="com::sun::star::sdb">XInteractionSupplyParameters</type>
-            ) as well, so the
-            handler can return to you, the entered information.
-        </li>
-    </ul>
-    </p>
+    @deprecated
+        Do not use this service anymore. Instead, create a generic <type scope="com::sun::star::task">InteractionHandler</type>
+        instance, and pass it your request. It will determine, based on configuration data, which concrete interaction
+        handler implementation to use for a specific request. In particular, requests formerly server by this service here
+        are by default passed to a <type>DatabaseInteractionHandler</type>.
 */
 published service InteractionHandler: com::sun::star::task::XInteractionHandler;
 
diff --git a/offapi/com/sun/star/sdb/makefile.mk b/offapi/com/sun/star/sdb/makefile.mk
index b535584fc4b8..ef7655c4abbf 100644
--- a/offapi/com/sun/star/sdb/makefile.mk
+++ b/offapi/com/sun/star/sdb/makefile.mk
@@ -62,6 +62,7 @@ IDLFILES=\
     DatabaseContext.idl \
     DatabaseDocument.idl \
     DatabaseEnvironment.idl \
+    DatabaseInteractionHandler.idl \
     DataColumn.idl \
     DataSettings.idl \
     DataSource.idl \