From e5230535877e30c3b874495e8794faa3a42d8017 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 17 Mar 2020 21:34:21 +0200 Subject: simplify ORefVector code by making it extend std::vector - it wants to be a ref-counted vector, so let it be, and we can simplify the usage sites Change-Id: I93ff6ee1522da965e16223dca171401d36fd67b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90664 Tested-by: Jenkins Reviewed-by: Noel Grandin --- connectivity/source/inc/file/FResultSet.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'connectivity/source/inc/file') diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 71f3d3b95ff5..6cb42da8e5e8 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -81,8 +81,8 @@ namespace connectivity // to compare with the restrictions OSkipDeletedSet m_aSkipDeletedSet; - ::rtl::Reference m_pFileSet; - OKeySet::Vector::iterator m_aFileSetIter; + ::rtl::Reference m_pFileSet; + OKeySet::iterator m_aFileSetIter; std::unique_ptr m_pSortIndex; @@ -266,7 +266,7 @@ namespace connectivity void setSelectRow(const OValueRefRow& _rRow) { m_aSelectRow = _rRow; - m_nColumnCount = m_aSelectRow->get().size(); + m_nColumnCount = m_aSelectRow->size(); } void setColumnMapping(const std::vector& _aColumnMapping) { m_aColMapping = _aColumnMapping; } void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } -- cgit