extensions/source/ole/servprov.cxx | 6 ++---- extensions/source/ole/servprov.hxx | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 72fefd7ab6fd551effcf821e4e257df2756bece1 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Feb 6 15:32:31 2018 +0200 These fields can be const Change-Id: I379770f93799668e44beab03fb64ceddffabe85a Reviewed-on: https://gerrit.libreoffice.org/49326 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index fc1841951762..3bdd595f8197 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -56,10 +56,9 @@ DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50 ProviderOleWrapper_Impl::ProviderOleWrapper_Impl(const Reference<XMultiServiceFactory>& smgr, const Reference<XSingleServiceFactory>& xSFact, GUID const * pGuid) : m_xSingleServiceFactory(xSFact), + m_guid(*pGuid), m_smgr( smgr) { - m_guid = *pGuid; - Reference<XInterface> xInt = smgr->createInstance("com.sun.star.bridge.oleautomation.BridgeSupplier"); if (xInt.is()) @@ -192,11 +191,10 @@ OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl( const Reference<XMultiS GUID const * pGuid ) : m_refCount(0) , m_xInst(xInst) + , m_guid(*pGuid) , m_factoryHandle(0) , m_smgr(smgr) { - m_guid = *pGuid; - Reference<XInterface> xInt = m_smgr->createInstance("com.sun.star.bridge.oleautomation.BridgeSupplier"); if (xInt.is()) diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index b7f46f980fdf..2c31d2e11419 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -100,7 +100,7 @@ protected: oslInterlockedCount m_refCount; Reference<XSingleServiceFactory> m_xSingleServiceFactory; - GUID m_guid; + const GUID m_guid; DWORD m_factoryHandle; Reference<XBridgeSupplier2> m_bridgeSupplier; Reference<XMultiServiceFactory> m_smgr; @@ -142,7 +142,7 @@ protected: oslInterlockedCount m_refCount; Reference<XInterface> m_xInst; - GUID m_guid; + const GUID m_guid; DWORD m_factoryHandle; Reference<XBridgeSupplier2> m_bridgeSupplier; Reference<XMultiServiceFactory> m_smgr; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits