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

[Caolán McNamara (via logerrit)]

 connectivity/source/parse/sqliterator.cxx |    8 ++++----
 include/connectivity/sqliterator.hxx      |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fefc215592ab3e11afb957e59016f1b9d6a00593
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 26 21:03:11 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 27 14:41:50 2021 +0200

    appendColumns is always called with m_aSelectColumns as 1st arg
    
    Change-Id: I791c0eef1fda97d21ba9efb170ef226c9a495eed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122658
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 752caa841473..f20bef933395 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1523,7 +1523,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN
     return aReturnTable;
 }
 
-void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable)
+void OSQLParseTreeIterator::appendColumns(const OUString& _rTableAlias, const OSQLTable& _rTable)
 {
     if (!_rTable.is())
         return;
@@ -1560,7 +1560,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns> const &
 
             pColumn->setTableName(_rTableAlias);
             pColumn->setRealName(*pBegin);
-            _rColumns->push_back(pColumn);
+            m_aSelectColumns->push_back(pColumn);
         }
         else
             impl_appendError( IParseContext::ErrorCode::InvalidColumn, pBegin, &_rTableAlias );
@@ -1572,14 +1572,14 @@ void OSQLParseTreeIterator::setSelectColumnName(const OUString & rColumnName,con
     if(rColumnName.toChar() == '*' && rTableRange.isEmpty())
     {   // SELECT * ...
         for (auto const& table : *m_pImpl->m_pTables)
-            appendColumns(m_aSelectColumns, table.first, table.second);
+            appendColumns(table.first, table.second);
     }
     else if( rColumnName.toChar() == '*' && !rTableRange.isEmpty() )
     {   // SELECT <table>.*
         OSQLTables::const_iterator aFind = m_pImpl->m_pTables->find(rTableRange);
 
         if(aFind != m_pImpl->m_pTables->end())
-            appendColumns(m_aSelectColumns, rTableRange, aFind->second);
+            appendColumns(rTableRange, aFind->second);
     }
     else if ( rTableRange.isEmpty() )
     {   // SELECT <something> ...
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 9cb6ce4e9976..9693192a7a04 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -142,7 +142,7 @@ namespace connectivity
             std::u16string_view rColumnName );
 
         void setSelectColumnName(const OUString& rColumnName, const OUString& rColumnAlias, const OUString& rTableRange, bool bFkt = false, sal_Int32 _nType = css::sdbc::DataType::VARCHAR, bool bAggFkt = false);
-        void appendColumns(::rtl::Reference<OSQLColumns> const & _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable);
+        void appendColumns(const OUString& _rTableAlias, const OSQLTable& _rTable);
         // Other member variables that should be available in the "set" functions
         // can be defined in the derived class. They can be initialized
         // in its constructor and, after the "traverse" routines have been used,