diff options
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/bastyp/helper.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/templateremoteview.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/templateinfodlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 5 |
8 files changed, 16 insertions, 20 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 96f19ec9100b..f8cf04083351 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -438,9 +438,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR int nArgs=3; Sequence< PropertyValue > aArgs(3); - Reference < com::sun::star::task::XInteractionHandler > xInteraction( - task::InteractionHandler::createDefault(::comphelper::getProcessComponentContext()), - com::sun::star::uno::UNO_QUERY_THROW ); + Reference < com::sun::star::task::XInteractionHandler2 > xInteraction( + task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) ); aArgs[0].Name = OUString("InteractionHandler"); aArgs[0].Value <<= xInteraction; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 248595c2a453..c97d92f10596 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -170,8 +170,8 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin try { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() ); uno::Reference< sdbc::XResultSet > xResultSet; @@ -254,8 +254,8 @@ String SfxContentHelper::GetActiveHelpString( const String& rURL ) try { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler > xInteractionHandler( + task::InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() ); // open the "active help" stream uno::Reference< io::XInputStream > xStream = aCnt.openStream(); diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 40f9208d53ec..776bab1513e2 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -53,8 +53,8 @@ TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool mpItemView->setChangeNameHdl(LINK(this,TemplateRemoteView,ChangeNameHdl)); 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/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 06ecbbf661a4..32fa7d89f6d1 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -75,8 +75,8 @@ void SfxTemplateInfoDlg::loadDocument(const OUString &rURL) try { - uno::Reference<task::XInteractionHandler> xInteractionHandler( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + uno::Reference<task::XInteractionHandler2> xInteractionHandler( + task::InteractionHandler::createWithParent(xContext, 0) ); uno::Sequence<beans::PropertyValue> aProps(1); aProps[0].Name = "InteractionHandler"; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 666d37fd915d..9c199ad53fb3 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2527,8 +2527,8 @@ SfxMedium::GetInteractionHandler() // create default handler and cache it! Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - pImp->xInteraction = Reference< task::XInteractionHandler >( - task::InteractionHandler::createDefault(xContext), UNO_QUERY_THROW ); + pImp->xInteraction.set( + task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW ); return pImp->xInteraction; } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index bb06eddb1587..75e294ca2b00 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -391,7 +391,7 @@ void SfxDocTplService_Impl::init_Impl() { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference < task::XInteractionHandler > xInteractionHandler( - task::InteractionHandler::createDefault(xContext), uno::UNO_QUERY_THROW ); + task::InteractionHandler::createWithParent(xContext, 0), uno::UNO_QUERY_THROW ); maCmdEnv = new TplTaskEnvironment( xInteractionHandler ); ::osl::ClearableMutexGuard aGuard( maMutex ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 7bbfd072422d..3add4b1aacfe 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -440,9 +440,7 @@ void ModelData_Impl::CheckInteractionHandler() { try { m_aMediaDescrHM[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")) ] - <<= uno::Reference< task::XInteractionHandler >( - task::InteractionHandler::createDefault(comphelper::getComponentContext(m_pOwner->GetServiceFactory())), - uno::UNO_QUERY ); + <<= task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_pOwner->GetServiceFactory()), 0); } catch( const uno::Exception& ) { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index c6caa28ff4c3..70a4f1dd6c48 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -555,9 +555,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( !pInteractionHandlerItem ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - uno::Reference< task::XInteractionHandler > xInteract( - task::InteractionHandler::createDefault(xContext), - UNO_QUERY_THROW ); + uno::Reference< task::XInteractionHandler2 > xInteract( + task::InteractionHandler::createWithParent(xContext, 0) ); SfxUnoAnyItem aInteractionItem( SID_INTERACTIONHANDLER, uno::makeAny( xInteract ) ); if ( nId == SID_SAVEDOC ) |