diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-14 17:48:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-10-14 22:13:38 +0200 |
| commit | cf0ed4fb4a610a61332a418f12b547648c3a0130 (patch) | |
| tree | 8722973e4ae0f3ca82f6372f50e39863c23d62c1 /connectivity/source | |
| parent | b6d0ca04581eae01817aac18d32a312bc9a2d514 (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 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/ado/Aolevariant.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 7f740e81d7c2..f90a4ecc6ef2 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -378,7 +378,7 @@ void OLEVariant::set(double n) OUString OLEVariant::getString() const { if (V_VT(this) == VT_BSTR) - return o3tl::toU(LPCOLESTR(V_BSTR(this))); + return OUString(o3tl::toU(LPCOLESTR(V_BSTR(this)))); if(isNull()) return OUString(); @@ -387,7 +387,7 @@ OUString OLEVariant::getString() const varDest.ChangeType(VT_BSTR, this); - return o3tl::toU(LPCOLESTR(V_BSTR(&varDest))); + return OUString(o3tl::toU(LPCOLESTR(V_BSTR(&varDest)))); } |