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 | |
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>
-rw-r--r-- | comphelper/Library_comphelper.mk | 1 | ||||
-rw-r--r-- | comphelper/source/misc/asyncquithandler.cxx | 51 | ||||
-rw-r--r-- | include/comphelper/asyncquithandler.hxx | 34 |
3 files changed, 59 insertions, 27 deletions
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 727766a1ec0c..5ed44c9cb358 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -92,6 +92,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/AccessibleImplementationHelper \ comphelper/source/misc/anytostring \ comphelper/source/misc/asyncnotification \ + comphelper/source/misc/asyncquithandler \ comphelper/source/misc/automationinvokedzone \ comphelper/source/misc/backupfilehelper \ comphelper/source/misc/base64 \ diff --git a/comphelper/source/misc/asyncquithandler.cxx b/comphelper/source/misc/asyncquithandler.cxx new file mode 100644 index 000000000000..282bbaea427e --- /dev/null +++ b/comphelper/source/misc/asyncquithandler.cxx @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/XDesktop2.hpp> +#include <com/sun/star/uno/Reference.hxx> + +#include <comphelper/asyncquithandler.hxx> +#include <comphelper/processfactory.hxx> + +AsyncQuitHandler::AsyncQuitHandler() + : mbForceQuit(false) +{ +} + +AsyncQuitHandler& AsyncQuitHandler::instance() +{ + static AsyncQuitHandler aInst; + return aInst; +} + +void AsyncQuitHandler::QuitApplication() +{ + css::uno::Reference<css::frame::XDesktop2> xDesktop + = css::frame::Desktop::create(comphelper::getProcessComponentContext()); + xDesktop->terminate(); +} + +void AsyncQuitHandler::SetForceQuit() { mbForceQuit = true; } + +bool AsyncQuitHandler::IsForceQuit() { return mbForceQuit; } + +IMPL_STATIC_LINK_NOARG(AsyncQuitHandler, OnAsyncQuit, void*, void) { QuitApplication(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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: */ |