diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-02-06 15:32:31 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-05-31 21:36:26 +0300 |
| commit | 435da4c292abe84e1809ca62fd3a35e57f862fc0 (patch) | |
| tree | 7b2ca78ecfbb79076d299c71ede2a834eaa80bbf /extensions | |
| parent | 91da710c77d90102d71e0550688e314111f99681 (diff) | |
These fields can be const
Change-Id: I379770f93799668e44beab03fb64ceddffabe85a
Reviewed-on: https://gerrit.libreoffice.org/49326
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 72fefd7ab6fd551effcf821e4e257df2756bece1)
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/servprov.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/ole/servprov.hxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 31e03283acd6..0d1e98cd34c5 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -46,10 +46,9 @@ DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50 ProviderOleWrapper::ProviderOleWrapper(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()) @@ -176,11 +175,10 @@ OneInstanceOleWrapper::OneInstanceOleWrapper( const Reference<XMultiServiceFact 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 13c4e370fd10..12360ba9dbae 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -98,7 +98,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; @@ -140,7 +140,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; |