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/commontools/TSortIndex.cxx | 4 ++-- connectivity/source/commontools/dbtools.cxx | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'connectivity/source/commontools') diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 76bbafaeb13a..6b94216a3719 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -85,10 +85,10 @@ struct TKeyValueFunc Freeze(); ::rtl::Reference pKeySet = new OKeySet(); - pKeySet->get().reserve(m_aKeyValues.size()); + pKeySet->reserve(m_aKeyValues.size()); std::transform(m_aKeyValues.begin() ,m_aKeyValues.end() - ,std::back_inserter(pKeySet->get()) + ,std::back_inserter(*pKeySet) ,::o3tl::select1st()); pKeySet->setFrozen(); return pKeySet; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 9398a50a7bc0..c0b88f1c7ba1 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1965,8 +1965,8 @@ void checkDisposed(bool _bThrow) } -OSQLColumns::Vector::const_iterator find(const OSQLColumns::Vector::const_iterator& first, - const OSQLColumns::Vector::const_iterator& last, +OSQLColumns::const_iterator find(const OSQLColumns::const_iterator& first, + const OSQLColumns::const_iterator& last, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { @@ -1974,8 +1974,8 @@ OSQLColumns::Vector::const_iterator find(const OSQLColumns::Vector::const_iterat return find(first,last,sName,_rVal,_rCase); } -OSQLColumns::Vector::const_iterator findRealName(const OSQLColumns::Vector::const_iterator& first, - const OSQLColumns::Vector::const_iterator& last, +OSQLColumns::const_iterator findRealName(const OSQLColumns::const_iterator& first, + const OSQLColumns::const_iterator& last, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { @@ -1983,8 +1983,8 @@ OSQLColumns::Vector::const_iterator findRealName(const OSQLColumns::Vector::cons return find(first,last,sRealName,_rVal,_rCase); } -OSQLColumns::Vector::const_iterator find(OSQLColumns::Vector::const_iterator first, - const OSQLColumns::Vector::const_iterator& last, +OSQLColumns::const_iterator find(OSQLColumns::const_iterator first, + const OSQLColumns::const_iterator& last, const OUString& _rProp, const OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) -- cgit v1.2.3