diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-22 14:05:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-24 14:24:34 +0000 |
| commit | ef597d80dc18f9662a50f3abad5d39d0fd76449e (patch) | |
| tree | 343c0be676a4c41c76e1e14e3a3e48c9aa1329dd /sfx2 | |
| parent | 4b1ecc4c7da84eee69c583222b62afbf6afed3ab (diff) | |
Introduce com.sun.star.task.theJobExecutor singleton.
To replace com.sun.star.task.JobExecutor single-instance service,
incorrectly converted in 748aa84e9808ad31c6ff6b71459525c82de10e58
[including changes by Stephan Bergmann <sbergman@redhat.com>]
Change-Id: I4cea2c63a20b5b22f6e1f822fb35fcc4d0397687
Reviewed-on: https://gerrit.libreoffice.org/7609
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/notify/globalevents.cxx | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 13139d9c451a..1c8c73b01026 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -392,7 +392,7 @@ #include <com/sun/star/task/FutureDocumentVersionProductUpdateRequest.hpp> #include <com/sun/star/task/InteractionClassification.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <com/sun/star/task/JobExecutor.hpp> +#include <com/sun/star/task/theJobExecutor.hpp> #include <com/sun/star/task/StatusIndicatorFactory.hpp> #include <com/sun/star/task/XInteractionAskLater.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 4b25de6ed29b..4ed2da689951 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/task/JobExecutor.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <tools/urlobj.hxx> diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index de482dcd0746..d5931e920db7 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -19,7 +19,7 @@ #include <sal/types.h> -#include <com/sun/star/task/JobExecutor.hpp> +#include <com/sun/star/task/theJobExecutor.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/document/XEventListener.hpp> @@ -230,7 +230,7 @@ uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() //----------------------------------------------------------------------------- SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XComponentContext >& rxContext) : ModelCollectionMutexBase( ) - , m_xJobExecutorListener( task::JobExecutor::create( rxContext ), uno::UNO_QUERY_THROW ) + , m_xJobExecutorListener( task::theJobExecutor::get( rxContext ), uno::UNO_QUERY_THROW ) , m_aLegacyListeners (m_aLock) , m_aDocumentListeners (m_aLock) , pImp (0 ) |