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

[Tor Lillqvist]

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

New commits:
commit 4bf4895739ea16f0fbc68099fd3372e9d8a389a5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 10 21:38:21 2018 +0300

    Initialise mxMSF in all cases
    
    Change-Id: Ib7fcdbe934b66971995574226f982a6865faab1b

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index fc8457f3129d..0ba804420174 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -311,7 +311,8 @@ public:
                         Reference<XMultiServiceFactory> xMSF);
     void InitForClassItself(Reference<XInterface> xOrigin,
                             const OUString& sImplementationName,
-                            const IID& rIID);
+                            const IID& rIID,
+                            Reference<XMultiServiceFactory> xMSF);
     void InitForOutgoing(Reference<XInterface> xOrigin,
                          const OUString& sInterfaceName,
                          const IID& rIID,
@@ -567,13 +568,15 @@ void CXTypeInfo::InitForCoclass(Reference<XInterface> xOrigin,
 
 void CXTypeInfo::InitForClassItself(Reference<XInterface> xOrigin,
                                     const OUString& sImplementationName,
-                                    const IID& rIID)
+                                    const IID& rIID,
+                                    Reference<XMultiServiceFactory> xMSF)
 {
     SAL_INFO("extensions.olebridge", "CXTypeInfo::InitForClassItself() this=" << this << " for " << rIID << " (" << sImplementationName << ")");
     meKind = Kind::MAIN;
     mxOrigin = xOrigin;
     msImplementationName = sImplementationName;
     maIID = rIID;
+    mxMSF = xMSF;
 }
 
 void CXTypeInfo::InitForOutgoing(Reference<XInterface> xOrigin,
@@ -1092,7 +1095,7 @@ STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(unsigned int iTInfo, LCID, ITypeIn
 
     pTypeInfo->AddRef();
 
-    pTypeInfo->InitForClassItself(m_xOrigin, m_sImplementationName, aIID);
+    pTypeInfo->InitForClassItself(m_xOrigin, m_sImplementationName, aIID, m_smgr);
 
     *ppTInfo = pTypeInfo;