summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-11-24 09:32:05 +0100
committerJulien Nabet <serval2412@yahoo.fr>2019-11-24 11:07:34 +0100
commita2b8286a5c74fbf37dd2d45daf45358e36dd7698 (patch)
tree551a7c42794ff780d9933bb628f83ec67da17954 /stoc
parent4dc85b98d7d84ac0d50f6f64833b667fb48236c7 (diff)
Fix e6ab01ce532d1db01579b70bd476b2f643522bf9
+ fix: /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/connectivity/source/drivers/mork/MStatement.cxx:64:6: error: no need to explicitly init an instance of 'std::unique_ptr<connectivity::OSQLParseNode>' with nullptr, just use default constructor [loplugin:simplifyconstruct] ,m_pParseTree(nullptr) ^~~~~~~~~~~~~~~~~~~~~ from another patch to calm down clang Jenkins Change-Id: Ia8304b7baedbce760a6e01ea154c5ff3cd19cbd4 Reviewed-on: https://gerrit.libreoffice.org/83595 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index aff6a5f1113c..8667ebc9f205 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;
- sal_uInt32 m_state;
rtl::Reference<NestedRegistryImpl> m_xRegistry;
+ sal_uInt32 m_state;
Reference<XRegistryKey> m_localKey;
Reference<XRegistryKey> m_defaultKey;
};
@@ -137,7 +137,7 @@ protected:
NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry,
Reference<XRegistryKey>& localKey,
Reference<XRegistryKey>& defaultKey )
- : m_state(m_xRegistry->m_state), m_xRegistry(pDefaultRegistry), m_localKey(localKey), m_defaultKey(defaultKey)
+ : m_xRegistry(pDefaultRegistry), m_state(m_xRegistry->m_state), m_localKey(localKey), m_defaultKey(defaultKey)
{
if (m_localKey.is())
{