convert some tools::Long->sal_Int32

in places where it is obvious we only need a sal_Int32, because
we are dealing with rows and columns, and not even calc needs
more than 32 bits for that.

Change-Id: I114417e639c224d45bfd9fc6838122ab195eefa3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104584
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 6 insertions, 6 deletions

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 5c3131e878fe..e127882e4365 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1604,7 +1604,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
                     // The HTML tables represent a box. So we need to split behind that box
                     nSplitCol = nCol + 1;
 
-                    tools::Long nBoxRowSpan = rCell2.GetRowSpan();
+                    sal_Int32 nBoxRowSpan = rCell2.GetRowSpan();
                     if (!rCell2.GetContents() || rCell2.IsCovered())
                     {
                         if (rCell2.IsCovered())
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 911bed91cc59..6a699d6c0674 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -657,7 +657,7 @@ void SwWriteTable::FillTableRowsCols( tools::Long nStartRPos, sal_uInt16 nStartR
                 sal_uInt16 nRowSpan = nRow - nOldRow + 1;
 
                 // The new table model may have true row span attributes
-                const tools::Long nAttrRowSpan = pBox->getRowSpan();
+                const sal_Int32 nAttrRowSpan = pBox->getRowSpan();
                 if ( 1 < nAttrRowSpan )
                     nRowSpan = static_cast<sal_uInt16>(nAttrRowSpan);
                 else if ( nAttrRowSpan < 1 )
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 98217348baf9..0f9e509b16b7 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -1103,7 +1103,7 @@ void WW8TableCellGrid::addShadowCells()
         bool bBeginningOfCell = true;
         bool bVertMerge = false;
         SwRect aRect = aCellIt->getRect();
-        tools::Long nRowSpan = 1;
+        sal_Int32 nRowSpan = 1;
         while (aCellIt != aCellEndIt)
         {
             WW8TableNodeInfo * pNodeInfo = aCellIt->getTableNodeInfo();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 71ef80c27b52..827b3f4460f8 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2783,7 +2783,7 @@ void WW8TabDesc::FinishSwTable()
                 auto& rRow = groupIt->row(n);
                 for (size_t i = 0; i<rRow.size(); ++i)
                 {
-                    const tools::Long nRowSpanSet = (n == 0) && (i == 0) ?
+                    const sal_Int32 nRowSpanSet = (n == 0) && (i == 0) ?
                         nRowSpan :
                         (-1 * (nRowSpan - n));
                     SwTableBox* pCurrentBox = rRow[i];
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 50528f430448..605845088fa1 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -916,7 +916,7 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             const SwTableBox *pBox = rBoxes[nBox];
 
             // NEW TABLES
-            const tools::Long nRowSpan = pBox->getRowSpan();
+            const sal_Int32 nRowSpan = pBox->getRowSpan();
             if( nRowSpan < 1 )
             {
                 SvXMLElementExport aElem2( *this, rTableInfo.GetPrefix(),
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index b580749c2911..3c10b729e89b 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2252,7 +2252,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                     ( pCell->GetStartNode() || pCell->GetSubTable() ) )
                 {
                     // insert new empty cell for covered cells:
-                    tools::Long nBoxRowSpan = 1;
+                    sal_Int32 nBoxRowSpan = 1;
                     if ( !m_bHasSubTables )
                     {
                         nBoxRowSpan = pCell->GetRowSpan();