summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-10-14 17:48:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-10-14 22:13:38 +0200
commitcf0ed4fb4a610a61332a418f12b547648c3a0130 (patch)
tree8722973e4ae0f3ca82f6372f50e39863c23d62c1 /extensions
parentb6d0ca04581eae01817aac18d32a312bc9a2d514 (diff)
More fixes of uses of now-explicit OUString ctor taking raw sal_Unicode pointer
...in Windows-only code, after c927aab29ebfff1ce3ac0b2f27ae343025a9890c "Make the OUString ctors taking raw sal_Unicode pointer/non-const array explicit". Interestingly, these occurrences were accepted by MSVC and only cause errors with clang-cl, so happened to go unnoticed until now. Change-Id: I33e7653e28a21541ef793b4b0750abb6037752db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104314 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/config/WinUserInfo/WinUserInfoBe.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index 83223d932bb7..7dd5c5463e46 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -185,7 +185,7 @@ private:
if (FAILED((pUser->*func)(&sBstr)))
return "";
BSTRGuard aBstrGuard(sBstr, SysFreeString);
- return o3tl::toU(sBstr);
+ return OUString(o3tl::toU(sBstr));
}
static OUString Str(IADsUser* pUser, const wchar_t* property)
{
@@ -207,7 +207,7 @@ private:
if (FAILED(SafeArrayGetElement(sa, &i, &varItem)))
continue;
if (varItem.vt == VT_BSTR)
- return o3tl::toU(V_BSTR(&varItem));
+ return OUString(o3tl::toU(V_BSTR(&varItem)));
VariantClear(&varItem);
}
return "";