diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-11-26 18:40:04 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2019-11-26 23:31:56 +0100 |
| commit | d8feeecfec0753b566183d30d935bd389a9c9515 (patch) | |
| tree | 9938c693474473d3e94a132f13143d212d07072d /stoc | |
| parent | ffa636ba74b04b3258ec9a696bc4eac33581fa24 (diff) | |
Fix for 2 commits related to cppcheck:
1) https://cgit.freedesktop.org/libreoffice/core/commit/?id=4e1ae2a9a0d2d9185b49677fa4ea2a2b1fe8bab2
I had let "size" and "fields" initialized twice instead of initializing only
2) https://cgit.freedesktop.org/libreoffice/core/commit/?id=e6ab01ce532d1db01579b70bd476b2f643522bf9
put back original order for NestedKeyImpl and adjust initialization accordingly
Change-Id: I6ca4e6520558011c359f8ea089b6d431ad79edfe
Reviewed-on: https://gerrit.libreoffice.org/83810
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/defaultregistry/defaultregistry.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 8667ebc9f205..92adf4642938 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -127,8 +127,8 @@ protected: OUString computeName(const OUString& name); OUString m_name; - rtl::Reference<NestedRegistryImpl> m_xRegistry; sal_uInt32 m_state; + rtl::Reference<NestedRegistryImpl> m_xRegistry; Reference<XRegistryKey> m_localKey; Reference<XRegistryKey> m_defaultKey; }; @@ -137,7 +137,7 @@ protected: NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry, Reference<XRegistryKey>& localKey, Reference<XRegistryKey>& defaultKey ) - : m_xRegistry(pDefaultRegistry), m_state(m_xRegistry->m_state), m_localKey(localKey), m_defaultKey(defaultKey) + : m_state(pDefaultRegistry->m_state), m_xRegistry(pDefaultRegistry), m_localKey(localKey), m_defaultKey(defaultKey) { if (m_localKey.is()) { |