From 33f126b4262d1af9c3f0c2e850f5a13b3c6acfc2 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 10 Oct 2017 21:39:41 +0200 Subject: Replace list by vector "DataPilotSort" from dbfunc3 (sc) Change-Id: Ib8754d7e459d1019ed2d5f49ce593e20af0b7f0c Reviewed-on: https://gerrit.libreoffice.org/43315 Reviewed-by: Noel Grandin Tested-by: Jenkins Reviewed-by: Julien Nabet --- sc/source/ui/view/dbfunc3.cxx | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'sc') diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 186007cae57a..0b65d959edc4 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -84,7 +84,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::sheet::XDimensionsSupplier; -using ::std::list; using ::std::vector; // outliner @@ -1649,7 +1648,7 @@ void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending { typedef ScDPSaveDimension::MemberList MemList; const MemList& rDimMembers = pSaveDim->GetMembers(); - list aMembers; + vector aMembers; std::unordered_set aMemberSet; size_t nMemberCount = 0; for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end(); @@ -1663,7 +1662,7 @@ void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending // Sort the member list in ascending order. ScOUStringCollate aCollate( ScGlobal::GetCollator() ); - aMembers.sort(aCollate); + std::stable_sort(aMembers.begin(), aMembers.end(), aCollate); // Collect and rank those custom sort strings that also exist in the member name list. @@ -1699,12 +1698,10 @@ void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending vector aRankedNames(nMemberCount); sal_uInt16 nCurStrId = 0; - for (list::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); - itr != itrEnd; ++itr) + for (auto const& aMemberName : aMembers) { - OUString aName = *itr; sal_uInt16 nRank = 0; - UserSortMap::const_iterator itrSub = aSubStrs.find(aName); + UserSortMap::const_iterator itrSub = aSubStrs.find(aMemberName); if (itrSub == aSubStrs.end()) nRank = nSubCount + nCurStrId++; else @@ -1713,15 +1710,13 @@ void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending if (!bAscending) nRank = static_cast< sal_uInt16 >( nMemberCount - nRank - 1 ); - aRankedNames[nRank] = aName; + aRankedNames[nRank] = aMemberName; } // Re-order ScDPSaveMember instances with the new ranks. - - for (vector::const_iterator itr = aRankedNames.begin(), itrEnd = aRankedNames.end(); - itr != itrEnd; ++itr) + for (auto const& aRankedName : aRankedNames) { - const ScDPSaveMember* pOldMem = pSaveDim->GetExistingMemberByName(*itr); + const ScDPSaveMember* pOldMem = pSaveDim->GetExistingMemberByName(aRankedName); if (!pOldMem) // All members are supposed to be present. continue; -- cgit