[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - include/comphelper solenv/bin

[Tor Lillqvist (via logerrit)]

 include/comphelper/windowsdebugoutput.hxx |    7 +++++--
 solenv/bin/native-code.py                 |    1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 3ec923efaa10dddadb7b0d01462c94ab3e43e85c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Apr 11 23:23:46 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 13:52:25 2019 +0200

    Don't crash if the BSTR pointer in a VARIANT is (weirdly) null
    
    Change-Id: I8473b1f411a45c7c17e742ca0d69245d77f078f7
    Reviewed-on: https://gerrit.libreoffice.org/79205
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/include/comphelper/windowsdebugoutput.hxx b/include/comphelper/windowsdebugoutput.hxx
index 26c95fea5c22..9355e7d42074 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -295,8 +295,11 @@ inline std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, t
                 stream << *static_cast<double*>(rVariant.byref);
                 break; // FIXME
             case VT_BSTR:
-                stream << std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>().to_bytes(
-                    *static_cast<OLECHAR**>(rVariant.byref));
+                if (rVariant.bstrVal == nullptr)
+                    stream << "(null)";
+                else
+                    stream << std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>().to_bytes(
+                        *static_cast<OLECHAR**>(rVariant.byref));
                 break;
             case VT_DISPATCH:
                 stream << rVariant.byref;
commit 83def533553323fd530e8ed9c5922e22fe39d00b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Apr 5 17:44:04 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 13:51:55 2019 +0200

    tdf#124360: The cui component is needed in the iOS app
    
    Used at least in the Edit > Edit Style... > Area > Color dialog for
    the Pick button..
    
    Change-Id: I864ec5918482a2f8ee5c5d80b79eacd6e8fcd88e
    Reviewed-on: https://gerrit.libreoffice.org/79204
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 56e5fe5b6b3e..581ec3735905 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -65,6 +65,7 @@ core_factory_list = [
     ("libsvgiolo.a", "svgio_component_getFactory"),
     ("libMacOSXSpelllo.a", "MacOSXSpell_component_getFactory", "#ifdef IOS"),
     ("libguesslanglo.a", "guesslang_component_getFactory"),
+    ("libcuilo.a", "cui_component_getFactory"),
     ]
 
 core_constructor_list = [