[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/table/swtable.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit d52674ad92172ce67c94b5970668aeb00d1c6ac5
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Sep 12 08:15:30 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 12 13:35:16 2020 +0200

    std::list->vector in SwTable
    
    Change-Id: I4bd23ef011e002133c01dcfcab13b5a100926e04
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102507
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 0584de2c4164..9742427740c5 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <float.h>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <editeng/lrspitem.hxx>
@@ -1039,7 +1038,7 @@ static void lcl_AdjustWidthsInLine( SwTableLine* pLine, ChangeList& rOldNew,
     }
 }
 
-static void lcl_CalcNewWidths( std::list<sal_uInt16> &rSpanPos, ChangeList& rChanges,
+static void lcl_CalcNewWidths( std::vector<sal_uInt16> &rSpanPos, ChangeList& rChanges,
     SwTableLine* pLine, long nWish, long nWidth, bool bTop )
 {
     if( rChanges.empty() )
@@ -1052,11 +1051,11 @@ static void lcl_CalcNewWidths( std::list<sal_uInt16> &rSpanPos, ChangeList& rCha
         rChanges.clear();
         return;
     }
-    std::list<sal_uInt16> aNewSpanPos;
+    std::vector<sal_uInt16> aNewSpanPos;
     ChangeList aNewChanges;
     ChangeList::iterator pCurr = rChanges.begin();
     aNewChanges.push_back( *pCurr ); // Nullposition
-    std::list<sal_uInt16>::iterator pSpan = rSpanPos.begin();
+    std::vector<sal_uInt16>::iterator pSpan = rSpanPos.begin();
     sal_uInt16 nCurr = 0;
     SwTwips nOrgSum = 0;
     bool bRowSpan = false;
@@ -1212,7 +1211,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
 
         ColChange aChg( 0, 0 );
         aOldNew.push_front( aChg );
-        std::list<sal_uInt16> aRowSpanPos;
+        std::vector<sal_uInt16> aRowSpanPos;
         if( nCurr )
         {
             ChangeList aCopy;