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 /cui | |
| parent | fdo#46808, Adapt task::InteractionHandler UNO service to new style (diff) | |
| download | core-dd11a1e57a2565560803dc3fef5fccc9e7157105.tar.gz core-dd11a1e57a2565560803dc3fef5fccc9e7157105.zip | |
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 'cui')
| -rw-r--r-- | cui/source/dialogs/insdlg.cxx | 5 | ||||
| -rw-r--r-- | cui/source/options/webconninfo.cxx | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 95b2eb13f0d5..e15c328af33f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -342,9 +342,8 @@ short SvInsertOleDlg::Execute() aMedium[0].Value <<= ::rtl::OUString( aFileName ); uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteraction( - task::InteractionHandler::createDefault(xContext), - uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler2 > xInteraction( + task::InteractionHandler::createWithParent(xContext, 0) ); aMedium[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) ); aMedium[1].Value <<= xInteraction; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 5b4ca5fcb09f..bc7bb02b7856 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -188,8 +188,8 @@ void WebConnectionInfoDialog::FillPasswordList() if ( xMasterPasswd->isPersistentStoringAllowed() ) { uno::Reference< task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY); uno::Sequence< task::UrlRecord > aURLEntries = xMasterPasswd->getAllPersistent( xInteractionHandler ); sal_Int32 nCount = 0; @@ -297,8 +297,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest ); uno::Reference< task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(comphelper::getProcessComponentContext()), - uno::UNO_QUERY_THROW ); + task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(), 0), + uno::UNO_QUERY ); xInteractionHandler->handle( rRequest ); if ( pPasswordRequest->isPassword() ) |