diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 14:36:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 14:42:52 +0200 |
| commit | dd11a1e57a2565560803dc3fef5fccc9e7157105 (patch) | |
| tree | 4adf17c00e21a17b0137a286ce1547b0e56bea2f /fpicker | |
| parent | c25cb8a641723ab098980bb842caf75c0dc9b059 (diff) | |
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
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/fpsmartcontent.cxx | 8 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 98cbd32ae464..9a68aaecb086 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -81,8 +81,8 @@ namespace svt void SmartContent::enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::EInterceptedInteractions eInterceptions) { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_pOwnInteraction = new ::svt::OFilePickerInteractionHandler(xGlobalInteractionHandler); m_pOwnInteraction->enableInterceptions(eInterceptions); @@ -100,8 +100,8 @@ namespace svt m_xOwnInteraction = Reference< XInteractionHandler >(); Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XInteractionHandler > xGlobalInteractionHandler = Reference< XInteractionHandler >( - InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + Reference< XInteractionHandler > xGlobalInteractionHandler( + InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 264e673b883d..f44c4c3f34ce 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2000,10 +2000,8 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode new ::comphelper::OInteractionRequest( makeAny( aException ) ); pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) ); - Reference< XInteractionHandler > xHandler( - InteractionHandler::createDefault( ::comphelper::getProcessComponentContext() ), - UNO_QUERY_THROW - ); + Reference< XInteractionHandler2 > xHandler( + InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ) ); xHandler->handle( xRequest ); } catch( const Exception& ) |