[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - comphelper/Library_comphelper.mk comphelper/source extensions/source include/comphelper vbahelper/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 21 15:31:16 UTC 2019
comphelper/Library_comphelper.mk | 1
comphelper/source/misc/asyncquithandler.cxx | 50 ++++++++++++++++++++++
extensions/source/ole/unoobjw.cxx | 6 +-
include/comphelper/asyncquithandler.hxx | 32 +++++---------
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4 +
5 files changed, 71 insertions(+), 22 deletions(-)
New commits:
commit 6d55c969e58714382e6ccd2cedcabceb1bd43c0a
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Aug 21 15:24:53 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Aug 21 18:27:53 2019 +0300
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
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 388e036d64c8..7b8a6f208fc2 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/accimplaccess \
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..c79fdaf7c2ee
--- /dev/null
+++ b/comphelper/source/misc/asyncquithandler.cxx
@@ -0,0 +1,50 @@
+/* -*- 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>
+
+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: */
commit 9c50273a9f3a15d1ff7ea4880638ca833570e0bd
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Aug 21 11:57:28 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Aug 21 18:27:53 2019 +0300
More hacks for quit requests from an OLE Automation client
Actually I am now not so sure whether the TerminationVetoer thing is
needed or not. Will have to experiment later with the customer use
case what happens if I remove all that. Maybe adding it was a mistake,
as misinterpretation of what was going on.
Change-Id: I252e1233cae1622099bc3310814132dae58b2aed
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index bdd527cb1ecf..42a5abbff3fe 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -87,6 +87,7 @@
#include <osl/interlck.h>
#include <com/sun/star/uno/genfunc.h>
#include <comphelper/automationinvokedzone.hxx>
+#include <comphelper/asyncquithandler.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/profilezone.hxx>
#include <comphelper/windowsdebugoutput.hxx>
@@ -150,8 +151,9 @@ public:
void SAL_CALL queryTermination( const EventObject& ) override
{
SAL_INFO("extensions.olebridge", "TerminationVetoer::queryTermination: count=" << mnCount);
- // Always veto termination while an OLE object is active
- if (mnCount > 0)
+ // Always veto termination while an OLE object is active, except if it is an OLE object that
+ // has asked us to quit.
+ if (!AsyncQuitHandler::instance().IsForceQuit() && mnCount > 0)
{
SAL_INFO("extensions.olebridge", "TerminationVetoer::queryTermination: Throwing!");
throw css::frame::TerminationVetoException();
diff --git a/include/comphelper/asyncquithandler.hxx b/include/comphelper/asyncquithandler.hxx
index 9c7a3c1a6289..a20ac99da64f 100644
--- a/include/comphelper/asyncquithandler.hxx
+++ b/include/comphelper/asyncquithandler.hxx
@@ -31,7 +31,12 @@
class AsyncQuitHandler
{
- AsyncQuitHandler() {}
+ AsyncQuitHandler()
+ : mbForceQuit(false)
+ {
+ }
+
+ bool mbForceQuit;
public:
AsyncQuitHandler(const AsyncQuitHandler&) = delete;
@@ -50,6 +55,13 @@ public:
xDesktop->terminate();
}
+ // 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; }
+
DECL_STATIC_LINK(AsyncQuitHandler, OnAsyncQuit, void*, void);
};
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 1a9d3383af9c..d21eb5b0dae1 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -492,9 +492,13 @@ void VbaApplicationBase::Quit()
{
// This is the case of a call from an (OLE) Automation client.
+ // When an Automation client itself asks the proces to quit, it should obey it.
+ AsyncQuitHandler::instance().SetForceQuit();
+
// TODO: Probably we should just close any document windows open by the "application"
// (Writer or Calc) the call being handled is for. And only then, if no document windows
// are left open, quit the actual LibreOffice application.
+
Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), AsyncQuitHandler, OnAsyncQuit ) );
}
}
More information about the Libreoffice-commits
mailing list