[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - extensions/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 20 13:20:44 UTC 2019
extensions/source/ole/unoobjw.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit c73da4e98a5cc789573216b9e2bdd1e0a20ffce0
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jun 12 12:27:12 2019 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 15:19:52 2019 +0200
Add some more SAL_INFOs
Change-Id: I5b50df5ea6b99164d150f99ae4fd36cddde22a60
(cherry picked from commit 4fe407485f7c42f27101794594635ecf13d13826)
Reviewed-on: https://gerrit.libreoffice.org/79247
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 9c70af4ad9c5..f868e87bf0c2 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -147,9 +147,11 @@ public:
// XTerminateListener
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)
{
+ SAL_INFO("extensions.olebridge", "TerminationVetoer::queryTermination: Throwing!");
throw css::frame::TerminationVetoException();
}
}
@@ -185,6 +187,7 @@ InterfaceOleWrapper::InterfaceOleWrapper( Reference<XMultiServiceFactory> const
m_defaultValueType( 0)
{
TerminationVetoer::get()->mnCount++;
+ SAL_INFO("extensions.olebridge", "InterfaceOleWrapper CTOR, count=" << TerminationVetoer::get()->mnCount);
}
InterfaceOleWrapper::~InterfaceOleWrapper()
@@ -196,6 +199,7 @@ InterfaceOleWrapper::~InterfaceOleWrapper()
UnoObjToWrapperMap.erase(it);
TerminationVetoer::get()->mnCount--;
+ SAL_INFO("extensions.olebridge", "InterfaceOleWrapper DTOR, count=" << TerminationVetoer::get()->mnCount);
}
STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, LPVOID FAR * ppv)
More information about the Libreoffice-commits
mailing list