diff options
author | Noel Grandin <noel@peralex.com> | 2012-10-02 15:03:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 14:42:52 +0200 |
commit | c25cb8a641723ab098980bb842caf75c0dc9b059 (patch) | |
tree | e264e2727309789e06147a7275b91abd05f9fcff /ucb | |
parent | 0f3f9cb63056715845d9c3565bde69470c73efb2 (diff) |
fdo#46808, Adapt task::InteractionHandler UNO service to new style
Since we don't need to expose XInitialisation, we can make the new-style
service implement XInteractionHandler2.
Change-Id: Ib27beed1c12df17592c6472d6f58c233d2c41558
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/workben/ucb/ucbdemo.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 00f44655aa75..d24d8e61b1f9 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -650,10 +650,8 @@ uno::Any UcbCommandProcessor::executeCommand( const rtl::OUString& rName, if (m_rUCB.getServiceFactory().is()) xInteractionHandler = uno::Reference< task::XInteractionHandler >( - m_rUCB.getServiceFactory()-> - createInstance( - rtl::OUString( "com.sun.star.task.InteractionHandler")), - uno::UNO_QUERY); + task::InteractionHandler::create(m_rUCB.getServiceFactory()), + uno::UNO_QUERY_THROW); uno::Reference< ucb::XProgressHandler > xProgressHandler(new ProgressHandler(m_rUCB)); uno::Reference< ucb::XCommandEnvironment > xEnv( @@ -1308,10 +1306,8 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) if (m_rUCB.getServiceFactory().is()) xInteractionHandler = uno::Reference< task::XInteractionHandler >( - m_rUCB.getServiceFactory()-> - createInstance( - rtl::OUString( "com.sun.star.task.InteractionHandler")), - uno::UNO_QUERY); + task::InteractionHandler::createDefault(comphelper::getComponentContext(m_rUCB.getServiceFactory())), + uno::UNO_QUERY_THROW); uno::Reference< ucb::XProgressHandler > xProgressHandler( new ProgressHandler(m_rUCB)); uno::Reference< ucb::XCommandEnvironment > xEnv( |