diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 10:19:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 10:30:42 +0200 |
| commit | 272f0e97b12e634cdf49a1bff45e1b9068af7d9c (patch) | |
| tree | d3ba7bf2885c4d5e2285caf3bb89aaedacc08a4c /desktop | |
| parent | cd693ff598bbabba66d8ca353a32bcbd81a5b12b (diff) | |
Improvements on previous commit
* Made XGlobalEventBroadcaster inherit document::XDocumentEventBroadcaster/
Listener replacements for obsolete document::XEventBroadcaster/Listener. This
means some client sides unfortunately still need to use UNO_QUERY_THROW to
obtain the obsolete interfaces; those client sides should be cleaned up to use
the replacement interfaces instead.
* Added @since tag (even to unpublished entities, on "it doesn't hurt" grounds).
* Made client sides use XGlobalEventBroadcaster directly instead of querying for
its super-interfaces.
* Replaced new uses of comphelper::ComponentContext::getUNOContext with
comphelper::getComponentContext (see 03a9f139bd9ea1a4f9096fc982e6b326def58532
"ComponentContext::getUnoContext -> getComponentContext simplification;" I
intend to get rid of comphelper/componentcontext.hxx much sooner than of
comphelper/processfactory.hxx).
Change-Id: I6d971ebdaea83d0c3fa9ba299fb6b37e58cdfe9b
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 378d18808207..4741ce6833a8 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1532,7 +1532,7 @@ int Desktop::Main() // create service for loadin SFX (still needed in startup) pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener > - ( css::frame::GlobalEventBroadcaster::create(comphelper::ComponentContext(xSMgr).getUNOContext()), UNO_QUERY ); + ( css::frame::GlobalEventBroadcaster::create(comphelper::getComponentContext(xSMgr)), UNO_QUERY_THROW ); /* ensure existance of a default window that messages can be dispatched to This is for the benefit of testtool which uses PostUserEvent extensively @@ -1567,12 +1567,9 @@ int Desktop::Main() // keep a language options instance... pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True)); - if (pExecGlobals->xGlobalBroadcaster.is()) - { - css::document::EventObject aEvent; - aEvent.EventName = ::rtl::OUString("OnStartApp"); - pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent); - } + css::document::EventObject aEvent; + aEvent.EventName = ::rtl::OUString("OnStartApp"); + pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent); SetSplashScreenProgress(50); |