diff options
| -rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 8 | ||||
| -rw-r--r-- | include/connectivity/sqliterator.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
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, |