diff options
| author | Michael Warner <michael.warner.ut+libreoffice@gmail.com> | 2021-07-07 21:12:28 -0400 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-25 15:57:54 +0200 |
| commit | 1e3f7a0370b13ba0da69385103f6419d55ff487b (patch) | |
| tree | e063aeb406fdbb2d59086a183215eeba0d780fce /include | |
| parent | 7c2d2f8fbc8b5751121c7c69dbc0f764ec4cc35e (diff) | |
tdf#141097 Revert "Veto process exit while an OLE client is connected"
This reverts changes that were made to prevent process exit when an
OLE client is connected. These commits had the side effect of preventing
the use case of creating a document via OLE, and then allowing
the user to view/edit and ultimately quit from the GUI.
Revert "More hacks for quit requests from an OLE Automation client"
This reverts commit 05e03911cd1f8a355b6410d3997cffc2c794a1e9.
Revert "Veto process exit while an OLE client is connected"
This reverts commit 89f883bd90a50587868a57397b6350ed9559a20f.
Change-Id: I29a1e42a830815bc8d1ff0056c22d86b8f98cc1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118596
(cherry picked from commit 080e4550257a90597c241f83fd766b99c83ba6e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120877
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/asyncquithandler.hxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/comphelper/asyncquithandler.hxx b/include/comphelper/asyncquithandler.hxx index 9d994d177592..ce3db23a147a 100644 --- a/include/comphelper/asyncquithandler.hxx +++ b/include/comphelper/asyncquithandler.hxx @@ -29,8 +29,6 @@ class COMPHELPER_DLLPUBLIC AsyncQuitHandler { AsyncQuitHandler(); - bool mbForceQuit; - public: AsyncQuitHandler(const AsyncQuitHandler&) = delete; const AsyncQuitHandler& operator=(const AsyncQuitHandler&) = delete; @@ -38,12 +36,6 @@ public: static AsyncQuitHandler& instance(); static void QuitApplication(); - // Hack for the TerminationVetoer in extensions/source/ole/unoobjw.cxx. When it is an Automation - // client itself that explicitly requests a quit (see VbaApplicationBase::Quit()), we do quit. - // The flag can only be set to true, not back to false. - void SetForceQuit(); - bool IsForceQuit() const; - DECL_STATIC_LINK(AsyncQuitHandler, OnAsyncQuit, void*, void); }; |