diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-08-21 15:24:53 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-08-22 12:39:02 +0200 |
| commit | fe3d97b94b7ec9f366bf13ac40633284f354a5b3 (patch) | |
| tree | e03593cedfc6c2d2e2daeba49817a152b7ae13be /include/comphelper | |
| parent | 05e03911cd1f8a355b6410d3997cffc2c794a1e9 (diff) | |
The AsyncQuitHandler class needs to be implemented in the comphelper DLL
Otherwise each file that uses it will get a separate copy of the
object that the instance() function returns. I think. Silly me for
trying to cut corners.
Change-Id: Id9df7d60926e57491fe749dfc50cea8e1de643c3
(cherry picked from commit 6d55c969e58714382e6ccd2cedcabceb1bd43c0a)
(cherry picked from commit 057cdd6eb480c19b1b8988ac2ae6de610691c593)
Reviewed-on: https://gerrit.libreoffice.org/77949
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/asyncquithandler.hxx | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/include/comphelper/asyncquithandler.hxx b/include/comphelper/asyncquithandler.hxx index a20ac99da64f..5e4f073e4b61 100644 --- a/include/comphelper/asyncquithandler.hxx +++ b/include/comphelper/asyncquithandler.hxx @@ -20,21 +20,14 @@ #ifndef INCLUDED_COMPHELPER_ASYNCQUITHANDLER_HXX #define INCLUDED_COMPHELPER_ASYNCQUITHANDLER_HXX -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XDesktop2.hpp> -#include <com/sun/star/uno/Reference.hxx> - -#include <comphelper/processfactory.hxx> +#include <comphelper/comphelperdllapi.h> #include <tools/link.hxx> // Use: Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), AsyncQuitHandler, OnAsyncQuit ) ); -class AsyncQuitHandler +class COMPHELPER_DLLPUBLIC AsyncQuitHandler { - AsyncQuitHandler() - : mbForceQuit(false) - { - } + AsyncQuitHandler(); bool mbForceQuit; @@ -42,31 +35,18 @@ public: AsyncQuitHandler(const AsyncQuitHandler&) = delete; const AsyncQuitHandler& operator=(const AsyncQuitHandler&) = delete; - static AsyncQuitHandler& instance() - { - static AsyncQuitHandler aInst; - return aInst; - } - - static void QuitApplication() - { - css::uno::Reference<css::frame::XDesktop2> xDesktop - = css::frame::Desktop::create(comphelper::getProcessComponentContext()); - xDesktop->terminate(); - } + 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() { mbForceQuit = true; } - - bool IsForceQuit() { return mbForceQuit; } + void SetForceQuit(); + bool IsForceQuit(); DECL_STATIC_LINK(AsyncQuitHandler, OnAsyncQuit, void*, void); }; -IMPL_STATIC_LINK_NOARG(AsyncQuitHandler, OnAsyncQuit, void*, void) { QuitApplication(); } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |