diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-04-10 21:38:21 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-05-31 14:11:44 +0300 |
| commit | 4bf4895739ea16f0fbc68099fd3372e9d8a389a5 (patch) | |
| tree | 05ecc2373d930e47781e35d63b4f3fa980f4249e /extensions | |
| parent | 552b62f24a8804b6875cfcf1191093af80af2923 (diff) | |
Initialise mxMSF in all cases
Change-Id: Ib7fcdbe934b66971995574226f982a6865faab1b
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/unoobjw.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
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; |