diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-07 15:14:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 10:30:42 +0200 |
| commit | cd693ff598bbabba66d8ca353a32bcbd81a5b12b (patch) | |
| tree | 525e9fe8fdd44e6ccba4f61e999aeb1332d2b896 /basctl | |
| parent | 526e007bb6340e2c4a2cb96f5612ba268fcd5583 (diff) | |
fdo#46808, Adapt frame::GlobalEventBroadcaster UNO service to new style
Create a merged XGlobalEventBroadcaster interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Also add two interfaces to the IDL, which the service already implemented,
and existing client code already used.
Change-Id: Ib7a9a30c0e50146ef621f3fe5227f8aad3190516
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/doceventnotifier.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index 56559e56b4cb..0bff061c09d3 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -21,6 +21,7 @@ #include "doceventnotifier.hxx" #include "scriptdocument.hxx" +#include <com/sun/star/frame/GlobalEventBroadcaster.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <vcl/svapp.hxx> @@ -44,11 +45,13 @@ namespace basctl using ::com::sun::star::document::XEventBroadcaster; using ::com::sun::star::document::XEventListener; using ::com::sun::star::document::EventObject; + using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Exception; using ::com::sun::star::frame::XModel; + using ::com::sun::star::frame::GlobalEventBroadcaster; using ::com::sun::star::uno::UNO_QUERY; /** === end UNO using === **/ namespace csslang = ::com::sun::star::lang; @@ -210,10 +213,7 @@ namespace basctl { Reference< com::sun::star::uno::XComponentContext > aContext( comphelper::getProcessComponentContext() ); - xBroadcaster.set( - aContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.frame.GlobalEventBroadcaster", aContext ), - UNO_QUERY_THROW ); + xBroadcaster.set( GlobalEventBroadcaster::create(aContext), UNO_QUERY_THROW ); } void ( SAL_CALL XEventBroadcaster::*listenerAction )( const Reference< XEventListener >& ) = |