[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - extensions/source

[Tor Lillqvist (via logerrit)]

 extensions/source/ole/unoobjw.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 278fd7a833c2a8073c04529683cbe04166f74d78
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 7 14:55:57 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 11:49:53 2019 +0200

    Add FIXME
    
    Change-Id: Id8a553ef880c79a1d71b6df9586f75a83f53746a
    (cherry picked from commit e5f241db76f4c02c8070fee9d66c2f355ce452ed)
    Reviewed-on: https://gerrit.libreoffice.org/79179
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 0f00d2c9d06f..402d1e777212 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -892,6 +892,7 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetDocumentation(MEMBERID memid,
         }
         else
         {
+            // FIXME: Shouldn't we be able to know the names of the members of UNO interfaces?
             *pBstrName = SysAllocString(o3tl::toW(OUString(OUString("UnknownNameOfMember#") + OUString::number(memid)).getStr()));
         }
     }
commit 0c33dfa8de7e4d9e08dd2b6f5293adb7ac22bca8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 7 14:41:55 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 11:49:16 2019 +0200

    Generate more specific names for unknown members than just "Unknown"
    
    Include the numeric member id in the name. Hopefully makes it a bit
    easier to interpret log files produced by LibreOffice or by the COLEAT
    tool.
    
    Change-Id: I7270b9538cf1a75db8972fb91eb57b931fe8e320
    (cherry picked from commit 29dab3f605c52e583d23b065499a3a3b72bd6490)
    Reviewed-on: https://gerrit.libreoffice.org/79178
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 03314e44f506..0f00d2c9d06f 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -892,7 +892,7 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetDocumentation(MEMBERID memid,
         }
         else
         {
-            *pBstrName = SysAllocString(L"Unknown");
+            *pBstrName = SysAllocString(o3tl::toW(OUString(OUString("UnknownNameOfMember#") + OUString::number(memid)).getStr()));
         }
     }
     if (pBstrDocString)