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 /framework/inc/helper | |
| 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 'framework/inc/helper')
| -rw-r--r-- | framework/inc/helper/mischelper.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/helper/oframes.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/helper/shareablemutex.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 00f8689487e6..5605eff87ebe 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -34,7 +34,7 @@ #include <i18nlangtag/lang.h> #include <svl/languageoptions.hxx> #include <rtl/ustring.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> #include <functional> #include <set> diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 1da482c4e86f..773685876a57 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX -#include <classes/framecontainer.hxx> +#include <framework/framecontainer.hxx> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx index 9470983fb41d..c05bffb47145 100644 --- a/framework/inc/helper/shareablemutex.hxx +++ b/framework/inc/helper/shareablemutex.hxx @@ -22,7 +22,7 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> -#include <fwidllapi.h> +#include <framework/fwidllapi.h> namespace framework { |