diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-29 12:55:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-29 16:40:52 +0200 |
| commit | 61fcf830aa5d94e6cc8075d0eaf6af8a6d405bad (patch) | |
| tree | 15e7d9475d47d6638dea7afe74eb7bb87074ca6d /desktop | |
| parent | 733023dd10d2f7e95dca2e8e7096ec216d5e9fb2 (diff) | |
Call framework::Desktop::shutdown directly
...instead of via the XJob hack introduced in
a6862a26d6cd17f6b4e4f6577bcd778bf952e65b "tdf#134106: Get rid of
XDesktopInternal again"
Change-Id: Ic533e8faba1a3da65ead74d78f0ab9c4aab1ca6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97397
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CppunitTest_desktop_app.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 1 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index adb57add6e7a..15b681cef048 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ $(if $(ENABLE_BREAKPAD),crashreport) \ deploymentmisc \ editeng \ + fwk \ i18nlangtag \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ sal \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 9dd91971a825..33deef07a69a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ ) \ deploymentmisc \ editeng \ + fwk \ i18nlangtag \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ sal \ diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index e5ed6e491edb..ddd4e78e0082 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -42,6 +42,7 @@ #include "updater.hxx" #endif +#include <framework/desktop.hxx> #include <i18nlangtag/languagetag.hxx> #include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/runtimetooustring.hxx> @@ -71,7 +72,6 @@ #include <com/sun/star/configuration/backend/BackendAccessException.hpp> #include <com/sun/star/task/theJobExecutor.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> -#include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> #include <com/sun/star/office/Quickstart.hpp> @@ -610,9 +610,7 @@ bool Desktop::QueryExit() void Desktop::Shutdown() { - Reference<XDesktop2> xDesktop = css::frame::Desktop::create(::comphelper::getProcessComponentContext()); - Reference<XJob> xDesktopInternal(xDesktop, UNO_QUERY_THROW); - xDesktopInternal->execute({{"shutdown", {}}}); + framework::getDesktop(::comphelper::getProcessComponentContext())->shutdown(); } void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStatus, const OUString& aDiagnosticMessage ) |