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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/license_dialog.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/license_dialog.hxx | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 9b32f6cf1b68..43b99e117ce5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -64,7 +64,7 @@ #include <com/sun/star/configuration/InstallationIncompleteException.hpp> #include <com/sun/star/configuration/backend/BackendSetupException.hpp> #include <com/sun/star/configuration/backend/BackendAccessException.hpp> -#include <com/sun/star/task/JobExecutor.hpp> +#include <com/sun/star/task/theJobExecutor.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XEventListener.hpp> @@ -2848,7 +2848,7 @@ void Desktop::DoFirstRunInitializations() { try { - Reference< XJobExecutor > xExecutor = JobExecutor::create( ::comphelper::getProcessComponentContext() ); + Reference< XJobExecutor > xExecutor = theJobExecutor::get( ::comphelper::getProcessComponentContext() ); xExecutor->trigger( OUString("onFirstRunInitialization") ); } catch(const ::com::sun::star::uno::Exception&) diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 23c6b92c8bbb..d98fceb1da24 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -45,7 +45,6 @@ #include "com/sun/star/deployment/ui/LicenseDialog.hpp" #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index f67566164653..a0c3c18548c1 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -28,7 +28,6 @@ #include "vcl/msgbox.hxx" #include "toolkit/helper/vclunohelper.hxx" #include "com/sun/star/lang/XServiceInfo.hpp" -#include "com/sun/star/task/XJobExecutor.hpp" #include "svtools/svmedit.hxx" #include "svl/lstner.hxx" #include "vcl/xtextedt.hxx" diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 24cfae66a7d4..acdf147c7e46 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -22,7 +22,6 @@ #include "dp_gui.h" #include "cppuhelper/implbase1.hxx" #include "com/sun/star/lang/XServiceInfo.hpp" -#include "com/sun/star/task/XJobExecutor.hpp" #include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" #include "boost/bind.hpp" |