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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/clang-format/blacklist | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 6ffd1bb4b3d9..2ffa91497589 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4857,7 +4857,6 @@ framework/inc/classes/actiontriggercontainer.hxx framework/inc/classes/actiontriggerpropertyset.hxx framework/inc/classes/actiontriggerseparatorpropertyset.hxx framework/inc/classes/converter.hxx -framework/inc/classes/framecontainer.hxx framework/inc/classes/imagewrapper.hxx framework/inc/classes/protocolhandlercache.hxx framework/inc/classes/resource.hxx @@ -4873,7 +4872,6 @@ framework/inc/dispatch/popupmenudispatcher.hxx framework/inc/dispatch/servicehandler.hxx framework/inc/dispatch/startmoduledispatcher.hxx framework/inc/dispatch/systemexec.hxx -framework/inc/fwidllapi.h framework/inc/helper/dockingareadefaultacceptor.hxx framework/inc/helper/mischelper.hxx framework/inc/helper/ocomponentaccess.hxx @@ -4909,16 +4907,13 @@ framework/inc/protocols.h framework/inc/recording/dispatchrecorder.hxx framework/inc/recording/dispatchrecordersupplier.hxx framework/inc/services.h -framework/inc/services/desktop.hxx framework/inc/services/layoutmanager.hxx framework/inc/services/mediatypedetectionhelper.hxx framework/inc/services/uriabbreviation.hxx framework/inc/statusbarconfiguration.hxx framework/inc/stdtypes.h framework/inc/targets.h -framework/inc/threadhelp/gate.hxx framework/inc/threadhelp/transactionguard.hxx -framework/inc/threadhelp/transactionmanager.hxx framework/inc/toolboxconfiguration.hxx framework/inc/uiconfiguration/globalsettings.hxx framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -6059,13 +6054,18 @@ include/framework/ContextChangeEventMultiplexerTunnel.hxx include/framework/actiontriggerhelper.hxx include/framework/addonsoptions.hxx include/framework/configimporter.hxx +include/framework/desktop.hxx include/framework/documentundoguard.hxx +include/framework/framecontainer.hxx include/framework/framelistanalyzer.hxx include/framework/fwedllapi.h +include/framework/fwidllapi.h +include/framework/gate.hxx include/framework/imutex.hxx include/framework/interaction.hxx include/framework/sfxhelperfunctions.hxx include/framework/titlehelper.hxx +include/framework/transactionmanager.hxx include/framework/undomanagerhelper.hxx include/helpcompiler/HelpIndexer.hxx include/helpcompiler/HelpSearch.hxx |