extensions/source/ole/unoconversionutilities.hxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6d54ce9155c73b6b97c437234f97f4558166b69d
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Apr 15 15:53:09 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Apr 15 15:53:09 2019 +0300
Turn an incoming VT_NULL when a STRING is wanted into an empty BSTR
Might help in some cases in the customer application.
Change-Id: Icdc13780d4623e9df8bc057760c1295d7d6ffd61
diff --git a/extensions/source/ole/unoconversionutilities.hxx
b/extensions/source/ole/unoconversionutilities.hxx
index 771a15cc48b7..83066f338ea5 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -433,6 +433,8 @@ void UnoConversionUtilities<T>::variantToAny( const
VARIANTARG* pArg, Any& rAny,
bFail = true;
break;
case TypeClass_STRING: // UString
+ if(var.vt == VT_NULL)
+ var = CComBSTR("");
if(SUCCEEDED(hr = VariantChangeType( & var, &var, 0, VT_BSTR)))
variantToAny( & var, rAny);
else if (hr == DISP_E_TYPEMISMATCH)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
