[Libreoffice-commits] core.git: connectivity/source stoc/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mork/MStatement.cxx |    1 -
 stoc/source/defaultregistry/defaultregistry.cxx |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a2b8286a5c74fbf37dd2d45daf45358e36dd7698
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Nov 24 09:32:05 2019 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Nov 24 11:07:34 2019 +0100

    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 at collabora.co.uk>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 5df8a0e3a9ec..3c5e392d2b7b 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -61,7 +61,6 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
     ,m_pConnection(_pConnection)
     ,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) )
     ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser ) )
-    ,m_pParseTree(nullptr)
 {
 }
 
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())
     {