summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-04-15 15:53:09 +0300
committerTor Lillqvist <tml@collabora.com>2019-04-15 15:53:09 +0300
commit6d54ce9155c73b6b97c437234f97f4558166b69d (patch)
tree94951d168c447928f987a5284ee1acc168efc2ea
parente928e5295db7e11d8f8773076cf122b4d16ec9f2 (diff)
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
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx2
1 files changed, 2 insertions, 0 deletions
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)