extensions/source/ole/olethread.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 7938b495947e4311924bea7724a24c10e363de42
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Nov 9 12:55:34 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Nov 9 12:31:28 2023 +0100
Downgrade expected failures in CoInitializeEx to SAL_INFO
Change-Id: Ia4c72f9651b46314241543cd27767e6f1a23a321
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159207
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/extensions/source/ole/olethread.cxx
b/extensions/source/ole/olethread.cxx
index 1580c0b7d44a..503f8bc096c1 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -34,14 +34,17 @@ void o2u_attachCurrentThread()
{ // FIXME: is it a problem that this ends up in STA currently?
assert(RPC_E_CHANGED_MODE == hr);
// Let's find out explicitly what apartment mode we are in.
- SAL_WARN("extensions.olebridge", "CoInitializeEx failed"
- << (hr == RPC_E_CHANGED_MODE ? " (expectedly)" : "")
- << ": " << WindowsErrorStringFromHRESULT(hr));
+ if (hr == RPC_E_CHANGED_MODE)
+ SAL_INFO("extensions.olebridge", "CoInitializeEx failed
(expectedly): "
+ <<
WindowsErrorStringFromHRESULT(hr));
+ else
+ SAL_WARN("extensions.olebridge",
+ "CoInitializeEx failed: " <<
WindowsErrorStringFromHRESULT(hr));
APTTYPE nAptType;
APTTYPEQUALIFIER nAptTypeQualifier;
if (SUCCEEDED(CoGetApartmentType(&nAptType, &nAptTypeQualifier)))
{
- SAL_WARN("extensions.olebridge",
+ SAL_INFO("extensions.olebridge",
" Thread is in a "
<< (nAptType == APTTYPE_STA ?
OUString("single-threaded") :
(nAptType == APTTYPE_MTA ?
OUString("multi-threaded") :
