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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit a4bc1364e2fda875b2c7d91b21625039f3bc38ec
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 7 15:53:06 2018 +0300

    Fix glitch in SAL_INFO logging
    
    Change-Id: I421d3980c50706f927a0611e48c33a43267dd01b

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index cbbef90f7d42..14020457e5bd 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2108,12 +2108,13 @@ public:
         return S_OK;
     }
 
-    virtual HRESULT STDMETHODCALLTYPE STDMETHODCALLTYPE Skip(ULONG celt) override
+    virtual HRESULT STDMETHODCALLTYPE STDMETHODCALLTYPE Skip(ULONG const celt) override
     {
         comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
+        ULONG nLeft = celt;
         ULONG nSkipped = 0;
-        while (celt > 0)
+        while (nLeft > 0)
         {
             if (mnIndex > mxCollection->getCount())
             {
@@ -2121,7 +2122,7 @@ public:
                 return S_FALSE;
             }
             mnIndex++;
-            celt--;
+            nLeft--;
         }
         SAL_INFO("extensions.olebridge", this << "@CXEnumVariant::Skip(" << celt << "): S_OK");
         return S_OK;
commit fe57da646d0f458eee20071a0565169f5f4ee3e7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 8 16:08:29 2018 +0300

    Log all the names being looked up in GetIDsOfNames()
    
    Change-Id: Ia116021ecc9f20c82622a4bc8ee40e7a9a1508fa

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index df8932374896..cbbef90f7d42 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1074,9 +1074,17 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
 {
     comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
-    SAL_INFO("extensions.olebridge", this << "@InterfaceOleWrapper::GetIDsOfNames("
-             << OUString(o3tl::toU(rgszNames[0]))
-             << (cNames > 1 ? "...!" : "") << "," << cNames << ")");
+    OUString sNames;
+    sNames += "[";
+    for (unsigned int i = 0; i < cNames; ++i)
+    {
+        if (i > 0)
+            sNames += ",";
+        sNames += "\"" + OUString(o3tl::toU(rgszNames[i])) + "\"";
+    }
+    sNames += "]";
+
+    SAL_INFO("extensions.olebridge", this << "@InterfaceOleWrapper::GetIDsOfNames(" << sNames);
 
     HRESULT ret = DISP_E_UNKNOWNNAME;
     try