diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-04-15 15:53:09 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-09-20 13:53:48 +0200 |
| commit | 13dbbd5f46f2c52426decb019783a3b627bc478d (patch) | |
| tree | c4dd9f67d9d24e703b3e342cd52521643c38010a /extensions | |
| parent | Downgrade a SAL_WARN() that shows up a lot but can be ignored to SAL_INFO() (diff) | |
| download | core-13dbbd5f46f2c52426decb019783a3b627bc478d.tar.gz core-13dbbd5f46f2c52426decb019783a3b627bc478d.zip | |
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
(cherry picked from commit 6d54ce9155c73b6b97c437234f97f4558166b69d)
Reviewed-on: https://gerrit.libreoffice.org/79207
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index ec8c46d80016..fc2880805d5a 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) |