summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-04-25 19:07:12 +0300
committerTor Lillqvist <tml@collabora.com>2018-05-31 21:59:30 +0300
commit80efd3852aedec00c3b94a8bf4c923f35cb22314 (patch)
tree434bdfb81e67321ad6e878b4e20cb5bd5d77e49f /extensions
parente049fb311ad408ccd08f0ca5d45a9f1fba25cb7c (diff)
Need to enter the AutomationInvokedZone here, too
Change-Id: I2723146f2c549c630dfa0e5da330af228cb305a0 (cherry picked from commit bfedeb79937aa5e8bdf01ecf6be25e2bbe8a6db5)
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/ole/servprov.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index ad31b1025ad6..687b2f58465a 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -29,6 +29,7 @@
#include "oleobjw.hxx"
#include <com/sun/star/script/CannotConvertException.hpp>
+#include <comphelper/automationinvokedzone.hxx>
#include <comphelper/windowsdebugoutput.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -139,6 +140,8 @@ STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
REFIID riid,
void FAR* FAR* ppv)
{
+ comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
SAL_INFO("extensions.olebridge", "OneInstanceOleWrapper::CreateInstance(" << riid << ")");
HRESULT ret = ResultFromScode(E_UNEXPECTED);