Fixes/improvements on previous commit

* UUIInteractionHandler still needs to implement XInitialization.

* Moved ambiguating InteractionHandler typedef out of the way.

* Removed InteractionHandler.createDefault, as it was originally stated that "it
is strongly recommended that [the "Parent"] property is supplied."

* Added back documentation about Parent and Context.

* Simplified some call-sites to directly use XInteractionHandler2.

Change-Id: I1029b8f3cf079171c75920cafaaa44b5bbada883

4 files changed, 8 insertions, 9 deletions

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 9b23732e70e9..0577224521d7 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -527,10 +527,9 @@ namespace abp
         Reference< XInteractionHandler > xInteractions;
         try
         {
-            xInteractions = Reference< XInteractionHandler >(
-                InteractionHandler::createDefault(comphelper::getComponentContext(m_pImpl->xORB)),
-                UNO_QUERY_THROW
-            );
+            xInteractions.set(
+                InteractionHandler::createWithParent(comphelper::getComponentContext(m_pImpl->xORB), 0),
+                UNO_QUERY);
         }
         catch(const Exception&)
         {
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 1146aaf64d13..242733b52744 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -119,7 +119,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY);
         try
         {
-            Reference<task::XInteractionHandler> xIHdl( task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW);
+            Reference<task::XInteractionHandler> xIHdl( task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW);
             xConn = xComplConn->connectWithCompletion(xIHdl);
         }
         catch (const SQLException&)
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index cb5a0d4721f1..767088ea8fcb 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -518,7 +518,7 @@ namespace dbp
         Reference< XInteractionHandler > xHandler;
         try
         {
-            xHandler = Reference< XInteractionHandler >( InteractionHandler::createDefault(comphelper::getComponentContext(getServiceFactory())), UNO_QUERY_THROW );
+            xHandler = Reference< XInteractionHandler >( InteractionHandler::createWithParent(comphelper::getComponentContext(getServiceFactory()), 0), UNO_QUERY_THROW );
         }
         catch(const Exception&) { }
         if (!xHandler.is())
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 6ee4458f411f..e4d125f8e20d 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -450,9 +450,9 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest >
         if( !xServiceManager.is() )
             throw uno::RuntimeException( UNISTRING( "UpdateHandler: unable to obtain service manager from component context" ), *this );
 
-        mxInteractionHdl = uno::Reference<task::XInteractionHandler> (
-                                task::InteractionHandler::createDefault(mxContext),
-                                uno::UNO_QUERY_THROW);
+        mxInteractionHdl.set(
+            task::InteractionHandler::createWithParent(mxContext, 0),
+            uno::UNO_QUERY_THROW);
     }
     uno::Reference< task::XInteractionRequestStringResolver > xStrResolver =
             task::InteractionRequestStringResolver::create( mxContext );