summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-04-25 16:09:59 +0300
committerTor Lillqvist <tml@collabora.com>2018-05-31 21:58:36 +0300
commit7f4150bc2d2ed28fbe050e851313ac86184b736b (patch)
treee55b9fdaf89b2cc218d10a8fe69a11a0cb8208a3 /comphelper
parentf8addac6dd8ece33ea62c56ca199dcbdc4d3bdb7 (diff)
Introduce comphelper::Automation::AutomationInvokedZone
Enables finding out anywhere whether the thread is processing a call from an Automation client. Not sure how I have managed without this until now. Presumably the Invocation_Impl::mbFromOLE variable in stoc can be replaced by a call of comphelper::Automation::AutomationInvokedZone:: isActive(). Change-Id: Ib79ec5f6dff17af25c8539d2907c7cd5d7b9a62c (cherry picked from commit 08259ed73142e8644f8e254644d2e18487a66855)
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/Library_comphelper.mk1
-rw-r--r--comphelper/source/misc/automationinvokedzone.cxx36
2 files changed, 37 insertions, 0 deletions
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 4a24d65da15c..388e036d64c8 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/automationinvokedzone \
comphelper/source/misc/backupfilehelper \
comphelper/source/misc/base64 \
comphelper/source/misc/comphelper_module \
diff --git a/comphelper/source/misc/automationinvokedzone.cxx b/comphelper/source/misc/automationinvokedzone.cxx
new file mode 100644
index 000000000000..2134217a1eaa
--- /dev/null
+++ b/comphelper/source/misc/automationinvokedzone.cxx
@@ -0,0 +1,36 @@
+/* -*- 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/.
+ */
+
+#include <cassert>
+
+#include <comphelper/automationinvokedzone.hxx>
+
+namespace comphelper
+{
+namespace Automation
+{
+thread_local static int nActiveount = 0;
+
+bool AutomationInvokedZone::isActive() { return nActiveount > 0; }
+
+AutomationInvokedZone::AutomationInvokedZone()
+{
+ assert(nActiveount < 1000);
+ nActiveount++;
+}
+
+AutomationInvokedZone::~AutomationInvokedZone()
+{
+ assert(nActiveount > 0);
+ nActiveount--;
+}
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */