diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-16 16:06:33 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-16 18:40:05 +0100 |
commit | 62951cdd17530f6218232f3d482bfd4ddd8a95ec (patch) | |
tree | 98376b3704c388143eefcb6abce624a48236eb74 /framework | |
parent | 997d21183322a0a94b96868073808841d2773902 (diff) |
Introduce com.sun.star.frame.theGlobalEventBroadcaster singleton
...to supersede com.sun.star.frame.GlobalEventBroadcaster single-instance
service.
Change-Id: I74ecaadadb4c600d39979aa7c13b6389bed38fd7
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/services/autorecovery.hxx | 2 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index 02ae9a808258..04f0c8f4fdb5 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -31,8 +31,8 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/GlobalEventBroadcaster.hpp> #include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XGlobalEventBroadcaster.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index fef85c4b985a..1e12efcad48b 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/GlobalEventBroadcaster.hpp> +#include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -1364,7 +1364,7 @@ void AutoRecovery::implts_startListening() if (!xBroadcaster.is()) { - xBroadcaster = css::frame::GlobalEventBroadcaster::create( xContext ); + xBroadcaster = css::frame::theGlobalEventBroadcaster::get( xContext ); // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_xNewDocBroadcaster = xBroadcaster; @@ -2597,7 +2597,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa since our last AutoSave. And we deregister us in case we know this state. But directly after one document as recovered ... we must start listening. Otherwhise the first "modify" doesn't reach us. Because we ourself called setModified() - on the document via API. And currently we dont listen for any events (not at the GlobalEventBroadcaster + on the document via API. And currently we dont listen for any events (not at theGlobalEventBroadcaster nor at any document!). */ implts_startModifyListeningOnDoc(rInfo); |