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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |   61 +++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 11 deletions(-)

New commits:
commit 45d6b8484f7903954b08a8f89788d3360a394e7b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 8 18:30:33 2018 +0300

    Start of work on supporting named arguments
    
    In InterfaceOleWrapper::GetIDsOfNames(), look up also the parameter
    names, if present (if cNames > 1, rgszNames entries after the first).
    Return S_OK only if *all* the names were found, i.e. both the first
    (method or property) name, *and* all the parameter names.
    
    Change-Id: Ie04bc0558a7e2044ef527fc18f99230c71985a22
    Reviewed-on: https://gerrit.libreoffice.org/55549
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index cbe7992852df..e81d8027d4be 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1071,10 +1071,15 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
 {
     comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
+    if( ! rgdispid)
+        return E_POINTER;
+
     OUString sNames;
     sNames += "[";
     for (unsigned int i = 0; i < cNames; ++i)
     {
+        // Intialise returned rgdispid values.
+        rgdispid[i] = DISPID_UNKNOWN;
         if (i > 0)
             sNames += ",";
         sNames += "\"" + OUString(o3tl::toU(rgszNames[i])) + "\"";
@@ -1087,8 +1092,6 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
     try
     {
         MutexGuard guard( getBridgeMutex());
-        if( ! rgdispid)
-            return E_POINTER;
 
         // FIXME: Handle the cNames > 1 case? Note that the rest of the names mean the names of *arguments*.
 
@@ -1115,20 +1118,18 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
             OUString name(o3tl::toU(rgszNames[0]));
             NameToIdMap::iterator iter = m_nameToDispIdMap.find(name);
 
+            bool bIsMethod = false;
+
+            OUString exactName = name;
+
             if (iter == m_nameToDispIdMap.end())
             {
-                OUString exactName;
-
                 if (m_xExactName.is())
                 {
                     exactName = m_xExactName->getExactName(name);
                     if (exactName.isEmpty())
                         exactName = name;
                 }
-                else
-                {
-                    exactName = name;
-                }
 
                 MemberInfo d(0, exactName);
 
@@ -1142,6 +1143,7 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
                 if (m_xInvocation->hasMethod(exactName))
                 {
                     d.flags |= DISPATCH_METHOD;
+                    bIsMethod = true;
                 }
 
                 if (d.flags != 0)
@@ -1163,9 +1165,46 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
             }
             else
             {
-                *rgdispid = (*iter).second;
-                SAL_INFO("extensions.olebridge", "  " << name << ": " << *rgdispid);
-                ret = S_OK;
+                rgdispid[0] = (*iter).second;
+                SAL_INFO("extensions.olebridge", "  " << name << ": " << rgdispid[0]);
+
+                if (bIsMethod && cNames > 1)
+                {
+                    Reference<XIdlMethod> xIdlMethod;
+                    Reference<XIntrospectionAccess> xIntrospectionAccess = m_xInvocation->getIntrospection();
+                    try
+                    {
+                        if (xIntrospectionAccess.is())
+                            xIdlMethod = xIntrospectionAccess->getMethod(exactName, MethodConcept::ALL);
+                    }
+                    catch (const NoSuchMethodException&)
+                    {
+                    }
+                    if (xIdlMethod.is())
+                    {
+                        auto aParamInfos = xIdlMethod->getParameterInfos();
+                        for (unsigned int i = 1; i < cNames; ++i)
+                        {
+                            for (int j = 0; j < aParamInfos.getLength(); ++j)
+                            {
+                                if (aParamInfos[j].aName.equalsIgnoreAsciiCase(OUString(o3tl::toU(rgszNames[i]))))
+                                {
+                                    rgdispid[i] = j;
+                                    SAL_INFO("extensions.olebridge", "  " << OUString(o3tl::toU(rgszNames[i])) << ": " << rgdispid[i]);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Return value should be S_OK only if *all* the names were found.
+                unsigned int i;
+                for (i = 0; i < cNames; ++i)
+                    if (rgdispid[i] == DISPID_UNKNOWN)
+                        break;
+                if (i == cNames)
+                    ret = S_OK;
             }
         }
     }