tdf#96099 Remove trivial container typedefs in stoc, svl, svx, sw

Change-Id: I0b4d18d2120ba2ce7d2526332bec199f52393290
Reviewed-on: https://gerrit.libreoffice.org/56363
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 11 insertions, 13 deletions

diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index f0934c48dd7c..38681286f1f0 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -78,7 +78,6 @@ public:
     basegfx::B2DHomMatrix CreateCoordinateSystem(const Array& rArray, size_t nCol, size_t nRow, bool bExpandMerged) const;
 };
 
-typedef std::vector< long >     LongVec;
 typedef std::vector< Cell >     CellVec;
 
 basegfx::B2DHomMatrix Cell::CreateCoordinateSystem(const Array& rArray, size_t nCol, size_t nRow, bool bExpandMerged) const
@@ -148,11 +147,11 @@ void Cell::MirrorSelfX()
 }
 
 
-void lclRecalcCoordVec( LongVec& rCoords, const LongVec& rSizes )
+void lclRecalcCoordVec( std::vector<long>& rCoords, const std::vector<long>& rSizes )
 {
     DBG_ASSERT( rCoords.size() == rSizes.size() + 1, "lclRecalcCoordVec - inconsistent vectors" );
-    LongVec::iterator aCIt = rCoords.begin();
-    LongVec::const_iterator aSIt = rSizes.begin(), aSEnd = rSizes.end();
+    auto aCIt = rCoords.begin();
+    auto aSIt = rSizes.cbegin(), aSEnd = rSizes.cend();
     for( ; aSIt != aSEnd; ++aCIt, ++aSIt )
         *(aCIt + 1) = *aCIt + *aSIt;
 }
@@ -179,10 +178,10 @@ static const Cell OBJ_CELL_NONE;
 struct ArrayImpl
 {
     CellVec             maCells;
-    LongVec             maWidths;
-    LongVec             maHeights;
-    mutable LongVec     maXCoords;
-    mutable LongVec     maYCoords;
+    std::vector<long>   maWidths;
+    std::vector<long>   maHeights;
+    mutable std::vector<long>     maXCoords;
+    mutable std::vector<long>     maYCoords;
     size_t              mnWidth;
     size_t              mnHeight;
     size_t              mnFirstClipCol;
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 10857ba30b52..49d0cf9dfa65 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -505,7 +505,6 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu
 
 typedef std::vector< CellRef > MergeableCellVector;
 typedef std::vector< MergeableCellVector > MergeVector;
-typedef std::vector< sal_Int32 > Int32Vector;
 
 
 void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
@@ -516,7 +515,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
         return;
 
     MergeVector aMergedCells( nColCount );
-    Int32Vector aOptimalColumns;
+    std::vector<sal_Int32> aOptimalColumns;
 
     const OUString sOptimalSize("OptimalSize");
 
@@ -591,7 +590,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
         sal_Int32 nLeft = rArea.getWidth() - nCurrentWidth;
         sal_Int32 nDistribute = nLeft / aOptimalColumns.size();
 
-        Int32Vector::iterator iter( aOptimalColumns.begin() );
+        auto iter( aOptimalColumns.begin() );
         while( iter != aOptimalColumns.end() )
         {
             sal_Int32 nOptCol = (*iter++);
@@ -670,7 +669,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
     Reference< XTableRows > xRows( mxTable->getRows() );
 
     MergeVector aMergedCells( nRowCount );
-    Int32Vector aOptimalRows;
+    std::vector<sal_Int32> aOptimalRows;
 
     const OUString sOptimalSize("OptimalSize");
 
@@ -751,7 +750,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
         sal_Int32 nLeft = rArea.getHeight() - nCurrentHeight;
         sal_Int32 nDistribute = nLeft / aOptimalRows.size();
 
-        Int32Vector::iterator iter( aOptimalRows.begin() );
+        auto iter( aOptimalRows.begin() );
         while( iter != aOptimalRows.end() )
         {
             sal_Int32 nOptRow = (*iter++);