[Libreoffice-commits] core.git: extensions/source

[Tor Lillqvist (via logerrit)]

 extensions/source/ole/unoconversionutilities.hxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6fdd0e22fd87b9ac3345e9356129e55c6a393fd5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Apr 15 15:53:09 2019 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jul 25 14:07:22 2019 +0200

    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
    Reviewed-on: https://gerrit.libreoffice.org/76294
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins

diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 8948de229205..dc023c55c8bb 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)