sb118: merged in re/DEV300_next towards DEV300_m76

odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs

@@ -1084,7 +1084,7 @@ public class SpreadsheetSample : SpreadsheetDocHelper
         unoidl.com.sun.star.task.XInteractionHandler xHandler =
             (unoidl.com.sun.star.task.XInteractionHandler)
               xServiceManager.createInstance(
-                  "com.sun.star.sdb.InteractionHandler" );
+                  "com.sun.star.task.InteractionHandler" );
          unoidl.com.sun.star.sdbcx.XTablesSupplier xSupplier =
             (unoidl.com.sun.star.sdbcx.XTablesSupplier)
               xSource.connectWithCompletion( xHandler );

odk/examples/DevelopersGuide/Forms/GridFieldValidator.java

@@ -112,7 +112,7 @@ class GridFieldValidator implements XUpdateListener
             XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(
                 XInteractionHandler.class,
                 m_xCtx.getServiceManager().createInstanceWithContext(
-                    "com.sun.star.sdb.InteractionHandler", m_xCtx ) );
+                    "com.sun.star.task.InteractionHandler", m_xCtx ) );
 
             // create a new request and execute it
             InteractionRequest aRequest = new InteractionRequest( aError );

odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java

@@ -1100,7 +1100,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
                 (com.sun.star.task.XInteractionHandler)UnoRuntime.queryInterface(
                     com.sun.star.task.XInteractionHandler.class,
                     xServiceManager.createInstanceWithContext(
-                        "com.sun.star.sdb.InteractionHandler", getContext()) );
+                        "com.sun.star.task.InteractionHandler", getContext()) );
             com.sun.star.sdbcx.XTablesSupplier xSupplier =
                 (com.sun.star.sdbcx.XTablesSupplier)UnoRuntime.queryInterface(
                     com.sun.star.sdbcx.XTablesSupplier.class,