From dd11a1e57a2565560803dc3fef5fccc9e7157105 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Oct 2012 14:36:34 +0200 Subject: 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 --- forms/source/xforms/submission/replace.cxx | 4 ++-- forms/source/xforms/submission/submission_get.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'forms/source') diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 902ba9cffaf5..cb53a0bf7eb3 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -130,8 +130,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH if( _xHandler.is() ) pHelper->m_aInteractionHandler = _xHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( - InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); + pHelper->m_aInteractionHandler.set( + InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = Reference< XProgressHandler >(pProgressHelper); diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 156972404302..9a141a1bf459 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -73,8 +73,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< if( aInteractionHandler.is() ) pHelper->m_aInteractionHandler = aInteractionHandler; else - pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >( - CSS::task::InteractionHandler::createDefault(m_xContext), UNO_QUERY_THROW); + pHelper->m_aInteractionHandler.set( + CSS::task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY_THROW); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); -- cgit