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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 5afbfd215a108a6bd3b3a8379d789663e1022789
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 8 13:38:25 2018 +0200

    Implement InterfaceOleWrapper::GetTypeInfoCount()
    
    It is just supposed to return 1, after all. And we do try to implement
    the GetTypeInfo().
    
    (Sure, the testing I am doing that turned out to require GetTypeInfo()
    to work then immediately after this runs into much harder problems to
    solve, but that is another issue.)
    
    Change-Id: If7e0707d7b404d6a46b24e642c2146b3bfff03f0
    Reviewed-on: https://gerrit.libreoffice.org/55070
    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 50cb5bae638e..8e499b8b2dd2 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -184,10 +184,16 @@ STDMETHODIMP  InterfaceOleWrapper::getOriginalUnoStruct( Any * pStruct)
     return ret;
 }
 
-STDMETHODIMP InterfaceOleWrapper::GetTypeInfoCount( unsigned int * /*pctinfo*/ )
+STDMETHODIMP InterfaceOleWrapper::GetTypeInfoCount( unsigned int *pctinfo )
 {
-    SAL_WARN("extensions.olebridge", "InterfaceOleWrapper@" << this << "::GetTypeInfoCount: NOTIMPL");
-    return E_NOTIMPL;
+    SAL_INFO("extensions.olebridge", "InterfaceOleWrapper@" << this << "::GetTypeInfoCount()");
+
+    if (!pctinfo)
+        return E_POINTER;
+
+    *pctinfo = 1;
+
+    return S_OK;
 }
 
 class CXTypeInfo : public ITypeInfo,