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>

16 files changed, 49 insertions, 49 deletions

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index d878478f8978..d47366da42d8 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -405,7 +405,7 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrameFormat.
 
     std::optional<Color> mxUserColor;
     std::optional<Color> mxNumFormatColor;
-    tools::Long mnRowSpan;
+    sal_Int32 mnRowSpan;
     bool mbDummyFlag;
 
     /// Do we contain any direct formatting?
@@ -484,8 +484,8 @@ public:
     void SetSaveUserColor(std::optional<Color> p ) { mxUserColor = p; }
     void SetSaveNumFormatColor( std::optional<Color> p ) { mxNumFormatColor = p; }
 
-    tools::Long getRowSpan() const;
-    void setRowSpan( tools::Long nNewRowSpan );
+    sal_Int32 getRowSpan() const;
+    void setRowSpan( sal_Int32 nNewRowSpan );
     bool getDummyFlag() const;
     void setDummyFlag( bool bDummy );
 
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 4a1ff7d98656..9564aa7a8f26 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1583,11 +1583,11 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column )
     if( isAccessibleColumnSelected( column ) )
         return true;
 
-    tools::Long lRowCount = getAccessibleRowCount();
+    sal_Int32 lRowCount = getAccessibleRowCount();
 
-    for(tools::Long lRow = 0; lRow < lRowCount; lRow ++)
+    for(sal_Int32 lRow = 0; lRow < lRowCount; lRow ++)
     {
-        tools::Long lChildIndex = getAccessibleIndex(lRow, column);
+        sal_Int32 lChildIndex = getAccessibleIndex(lRow, column);
         selectAccessibleChild(lChildIndex);
     }
     return true;
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 4ea0c5af6366..8a825c15076c 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1648,7 +1648,7 @@ static void lcl_CheckRowSpan( SwTable &rTable )
         SwTableLine* pLine = rTable.GetTabLines()[ nLineCount - nMaxSpan ];
         for( auto pBox : pLine->GetTabBoxes() )
         {
-            tools::Long nRowSpan = pBox->getRowSpan();
+            sal_Int32 nRowSpan = pBox->getRowSpan();
             if( nRowSpan > nMaxSpan )
                 pBox->setRowSpan( nMaxSpan );
             else if( nRowSpan < nMinSpan )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 79b685f32359..d1c07d36246b 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2829,7 +2829,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly,
                             if ( pContent && pContent->IsTextFrame() )
                             {
                                 const SwTableBox* pBox = static_cast<const SwCellFrame*>(pFrame)->GetTabBox();
-                                const tools::Long nRowSpan = pBox->getRowSpan();
+                                const sal_Int32 nRowSpan = pBox->getRowSpan();
                                 if( nRowSpan > 0 ) // Not overlapped
                                     pTextFrame = static_cast<const SwTextFrame*>(pContent);
                                 if( nRowSpan < 2 ) // Not overlapping for row height
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index fdafc10df49c..dbe11ea74942 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -279,8 +279,8 @@ static void lcl_ChangeRowSpan( const SwTable& rTable, const tools::Long nDiff,
         const size_t nBoxCount = pLine->GetTabBoxes().size();
         for( size_t nCurrBox = 0; nCurrBox < nBoxCount; ++nCurrBox )
         {
-            tools::Long nRowSpan = pLine->GetTabBoxes()[nCurrBox]->getRowSpan();
-            tools::Long nAbsSpan = nRowSpan > 0 ? nRowSpan : -nRowSpan;
+            sal_Int32 nRowSpan = pLine->GetTabBoxes()[nCurrBox]->getRowSpan();
+            sal_Int32 nAbsSpan = nRowSpan > 0 ? nRowSpan : -nRowSpan;
             // Check if the last overlapped cell is above or below
             // the critical area
             if( nAbsSpan > nDistance )
@@ -397,7 +397,7 @@ std::unique_ptr<SwBoxSelection> SwTable::CollectBoxSelection( const SwPaM& rPam
             OSL_ENSURE( pBox, "Missing table box" );
             tools::Long nLeft = nRight;
             nRight += pBox->GetFrameFormat()->GetFrameSize().GetWidth();
-            tools::Long nRowSpan = pBox->getRowSpan();
+            sal_Int32 nRowSpan = pBox->getRowSpan();
             if( nRight <= nMin )
             {
                 if( nRight == nMin && nLeftSpanCnt )
@@ -695,7 +695,7 @@ bool SwTable::NewInsertCol( SwDoc& rDoc, const SwSelBoxes& rBoxes,
     SwTableNode* pTableNd = GetTableNode();
     std::vector<SwTableBoxFormat*> aInsFormat( nCnt, nullptr );
     size_t nLastLine = SAL_MAX_SIZE;
-    tools::Long nLastRowSpan = 1;
+    sal_Int32 nLastRowSpan = 1;
 
     for( size_t i = 0; i < m_aLines.size(); ++i )
     {
@@ -707,7 +707,7 @@ bool SwTable::NewInsertCol( SwDoc& rDoc, const SwSelBoxes& rBoxes,
             ++nInsPos;
         SwTableBoxFormat* pBoxFrameFormat = static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat());
         ::InsTableBox( rDoc, pTableNd, pLine, pBoxFrameFormat, pBox, nInsPos, nCnt );
-        tools::Long nRowSpan = pBox->getRowSpan();
+        sal_Int32 nRowSpan = pBox->getRowSpan();
         tools::Long nDiff = i - nLastLine;
         bool bNewSpan = false;
         if( nLastLine != SAL_MAX_SIZE && nDiff <= nLastRowSpan &&
@@ -846,7 +846,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
     // The number of lines in the selection rectangle: nLineCount
     const size_t nLineCount = pSel->maBoxes.size();
     // BTW: nLineCount is the rowspan of the new master cell
-    tools::Long nRowSpan = static_cast<tools::Long>(nLineCount);
+    sal_Int32 nRowSpan = static_cast<tools::Long>(nLineCount);
     // We will need the first and last line of the selection
     // to check if there any superfluous row after merging
     SwTableLine* pFirstLn = nullptr;
@@ -1194,7 +1194,7 @@ void SwTable::InsertSpannedRow( SwDoc& rDoc, sal_uInt16 nRowIdx, sal_uInt16 nCnt
         SwTableLine *pNewLine = GetTabLines()[ nRowIdx + nCnt - n ];
         for( size_t nCurrBox = 0; nCurrBox < nBoxCount; ++nCurrBox )
         {
-            tools::Long nRowSpan = rLine.GetTabBoxes()[nCurrBox]->getRowSpan();
+            sal_Int32 nRowSpan = rLine.GetTabBoxes()[nCurrBox]->getRowSpan();
             if( nRowSpan > 0 )
                 nRowSpan = - nRowSpan;
             pNewLine->GetTabBoxes()[ nCurrBox ]->setRowSpan( nRowSpan - n );
@@ -1386,7 +1386,7 @@ static sal_uInt16 lcl_LineIndex( const SwTable& rTable, const SwSelBoxes& rBoxes
             {
                 if( nPos > nDirect || nDirect == USHRT_MAX )
                     nDirect = nPos;
-                tools::Long nRowSpan = pBox->getRowSpan();
+                sal_Int32 nRowSpan = pBox->getRowSpan();
                 if( nRowSpan < 2 )
                     nSpan = 0;
                 else if( nSpan )
@@ -1517,7 +1517,7 @@ bool SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
                 SwTableLine *pNewLine = GetTabLines()[ nRowIdx+nCnt-n-nOfs];
                 for( size_t nCurrBox = 0; nCurrBox < nBoxCount; ++nCurrBox )
                 {
-                    tools::Long nRowSpan = pLine->GetTabBoxes()[nCurrBox]->getRowSpan();
+                    sal_Int32 nRowSpan = pLine->GetTabBoxes()[nCurrBox]->getRowSpan();
                     if( bBehind )
                     {
                         if( nRowSpan == 1 || nRowSpan == -1 )
@@ -1576,7 +1576,7 @@ void SwTable::PrepareDelBoxes( const SwSelBoxes& rBoxes )
     for (size_t i = 0; i < rBoxes.size(); ++i)
     {
         SwTableBox* pBox = rBoxes[i];
-        tools::Long nRowSpan = pBox->getRowSpan();
+        sal_Int32 nRowSpan = pBox->getRowSpan();
         if( nRowSpan != 1 && pBox->GetFrameFormat()->GetFrameSize().GetWidth() )
         {
             tools::Long nLeft = lcl_Box2LeftBorder( *pBox );
@@ -1647,7 +1647,7 @@ static void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, tools::
                        nRight - nMin > nMin - nLeft;
             else
                 bAdd = nLeft <= nMid || nRight - nMax < nMax - nLeft;
-            tools::Long nRowSpan = pBox->getRowSpan();
+            sal_Int32 nRowSpan = pBox->getRowSpan();
             if( bAdd &&
                 ( !bChkProtected ||
                 !pBox->GetFrameFormat()->GetProtect().IsContentProtected() ) )
@@ -1920,7 +1920,7 @@ void SwTable::ExpandSelection( SwSelBoxes& rBoxes ) const
     for (size_t i = 0; i < rBoxes.size(); ++i)
     {
         SwTableBox *pBox = rBoxes[i];
-        tools::Long nRowSpan = pBox->getRowSpan();
+        sal_Int32 nRowSpan = pBox->getRowSpan();
         if( nRowSpan != 1 )
         {
             SwTableBox *pMasterBox = nRowSpan > 0 ? pBox
@@ -2007,7 +2007,7 @@ SwSaveRowSpan::SwSaveRowSpan( SwTableBoxes& rBoxes, sal_uInt16 nSplitLn )
     {
         SwTableBox* pBox = rBoxes[nCurrCol];
         OSL_ENSURE( pBox, "Missing Table Box" );
-        tools::Long nRowSp = pBox->getRowSpan();
+        sal_Int32 nRowSp = pBox->getRowSpan();
         mnRowSpans[ nCurrCol ] = nRowSp;
         if( nRowSp < 0 )
         {
@@ -2042,7 +2042,7 @@ void SwTable::RestoreRowSpan( const SwSaveRowSpan& rSave )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
         OSL_ENSURE( pBox, "Missing Table Box" );
-        tools::Long nRowSp = pBox->getRowSpan();
+        sal_Int32 nRowSp = pBox->getRowSpan();
         if( nRowSp != rSave.mnRowSpans[ nCurrCol ] )
         {
             OSL_ENSURE( -nRowSp == rSave.mnRowSpans[ nCurrCol ], "Pardon me?!" );
@@ -2098,7 +2098,7 @@ void SwTable::CleanUpBottomRowSpan( sal_uInt16 nDelLines )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
         OSL_ENSURE( pBox, "Missing Table Box" );
-        tools::Long nRowSp = pBox->getRowSpan();
+        sal_Int32 nRowSp = pBox->getRowSpan();
         if( nRowSp < 0 )
             nRowSp = -nRowSp;
         if( nRowSp > 1 )
@@ -2246,8 +2246,8 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox)
                 // -2 -> -(N+1) ; -N .. -2
                 //  1 -> N ; -(N-1) .. -1
                 //  2 -> N+1 ; -N .. -2
-                tools::Long newSourceRowSpan(pSourceBox->getRowSpan());
-                tools::Long newBoxRowSpan;
+                sal_Int32 newSourceRowSpan(pSourceBox->getRowSpan());
+                sal_Int32 newBoxRowSpan;
                 if (newSourceRowSpan < 0)
                 {
                     newSourceRowSpan -= pSubTableBox->GetTabLines().size() - 1;
@@ -2397,7 +2397,7 @@ namespace {
 
 struct RowSpanCheck
 {
-    tools::Long nRowSpan;
+    sal_Int32 nRowSpan;
     SwTwips nLeft;
     SwTwips nRight;
 };
@@ -2431,7 +2431,7 @@ void SwTable::CheckConsistency() const
             index = *index.GetNode().EndOfSectionNode();
             ++index;
             SwTwips nNewWidth = pBox->GetFrameFormat()->GetFrameSize().GetWidth() + nWidth;
-            tools::Long nRowSp = pBox->getRowSpan();
+            sal_Int32 nRowSp = pBox->getRowSpan();
             if( nRowSp < 0 )
             {
                 SAL_WARN_IF( aIter == aRowSpanCells.end(),
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 4dda8e1d85fa..7ef9481598b6 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -71,12 +71,12 @@ using namespace com::sun::star;
 static void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol,
                     bool bChgAlign, sal_uLong nNdPos );
 
-tools::Long SwTableBox::getRowSpan() const
+sal_Int32 SwTableBox::getRowSpan() const
 {
     return mnRowSpan;
 }
 
-void SwTableBox::setRowSpan( tools::Long nNewRowSpan )
+void SwTableBox::setRowSpan( sal_Int32 nNewRowSpan )
 {
     mnRowSpan = nNewRowSpan;
 }
@@ -162,7 +162,7 @@ void InsTableBox( SwDoc& rDoc, SwTableNode* pTableNd,
                 rDoc.GetDfltTextFormatColl(), nullptr,
                 nInsPos, nCnt );
 
-    tools::Long nRowSpan = pBox->getRowSpan();
+    sal_Int32 nRowSpan = pBox->getRowSpan();
     if( nRowSpan != 1 )
     {
         SwTableBoxes& rTableBoxes = pLine->GetTabBoxes();
@@ -1048,7 +1048,7 @@ static void lcl_CalcNewWidths( std::vector<sal_uInt16> &rSpanPos, ChangeList& rC
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
         SwTwips nCurrWidth = pBox->GetFrameFormat()->GetFrameSize().GetWidth();
-        const tools::Long nRowSpan = pBox->getRowSpan();
+        const sal_Int32 nRowSpan = pBox->getRowSpan();
         const bool bCurrRowSpan = bTop ? nRowSpan < 0 :
             ( nRowSpan > 1 || nRowSpan < -1 );
         if( bRowSpan || bCurrRowSpan )
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 6e21b7ca9fc7..21706baa9daa 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -159,7 +159,7 @@ class SaveBox
 
     SaveBox* pNext;
     sal_uLong nSttNode;
-    tools::Long nRowSpan;
+    sal_Int32 nRowSpan;
     sal_uInt16 nItemSet;
     union
     {
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();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index a4d005fb9a64..bcabdc6aabbb 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -142,14 +142,14 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
     ::svt::CellControllerRef    m_xController;
     ::svt::CellControllerRef    m_xCheckController;
 
-    tools::Long    m_nCurrentRow;
+    sal_Int32    m_nCurrentRow;
     bool    m_bModified;
 
 protected:
-    virtual bool                    SeekRow( tools::Long nRow ) override;
+    virtual bool                    SeekRow( sal_Int32 nRow ) override;
     virtual void                    PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const override;
-    virtual void                    InitController(::svt::CellControllerRef& rController, tools::Long nRow, sal_uInt16 nCol) override;
-    virtual ::svt::CellController*  GetController(tools::Long nRow, sal_uInt16 nCol) override;
+    virtual void                    InitController(::svt::CellControllerRef& rController, sal_Int32 nRow, sal_uInt16 nCol) override;
+    virtual ::svt::CellController*  GetController(sal_Int32 nRow, sal_uInt16 nCol) override;
     virtual bool                    SaveModified() override;
 
     std::vector<tools::Long>               GetOptimalColWidths() const;
@@ -163,7 +163,7 @@ public:
 
     bool                            IsModified()const override;
 
-    virtual OUString GetCellText( tools::Long nRow, sal_uInt16 nColumn ) const override;
+    virtual OUString GetCellText( sal_Int32 nRow, sal_uInt16 nColumn ) const override;
     virtual void                    Resize() override;
     virtual Size                    GetOptimalSize() const override;
 };
@@ -3670,13 +3670,13 @@ Size SwEntryBrowseBox::GetOptimalSize() const
     return aSize;
 }
 
-bool SwEntryBrowseBox::SeekRow( tools::Long nRow )
+bool SwEntryBrowseBox::SeekRow( sal_Int32 nRow )
 {
     m_nCurrentRow = nRow;
     return true;
 }
 
-OUString SwEntryBrowseBox::GetCellText(tools::Long nRow, sal_uInt16 nColumn) const
+OUString SwEntryBrowseBox::GetCellText(sal_Int32 nRow, sal_uInt16 nColumn) const
 {
     OUString pRet;
     if (o3tl::make_unsigned(nRow) < m_Entries.size())
@@ -3703,7 +3703,7 @@ void SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
     rDev.DrawText( rRect, GetCellText( m_nCurrentRow, nColumnId ), nStyle );
 }
 
-::svt::CellController* SwEntryBrowseBox::GetController(tools::Long /*nRow*/, sal_uInt16 nCol)
+::svt::CellController* SwEntryBrowseBox::GetController(sal_Int32 /*nRow*/, sal_uInt16 nCol)
 {
     return nCol < ITEM_CASE ? m_xController.get() : m_xCheckController.get();
 }
@@ -3754,7 +3754,7 @@ bool SwEntryBrowseBox::SaveModified()
 }
 
 void SwEntryBrowseBox::InitController(
-                ::svt::CellControllerRef& rController, tools::Long nRow, sal_uInt16 nCol)
+                ::svt::CellControllerRef& rController, sal_Int32 nRow, sal_uInt16 nCol)
 {
     const OUString rText = GetCellText( nRow, nCol );
     if(nCol < ITEM_CASE)
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2026942e90ad..fb6706b0ba82 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1259,7 +1259,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
             static_cast<CreateMonitor*>(xProgressDlg.get())->SetTotalCount(nMaxDocs);
         }
 
-        tools::Long nStartRow, nEndRow;
+        sal_Int32 nStartRow, nEndRow;
         bool bFreezedLayouts = false;
         // to collect temporary email files
         std::vector< OUString> aFilesToRemove;
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 62e30dd67ba7..b058d65d3e43 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -47,7 +47,7 @@ namespace sw::mark { class IMark; }
 struct SwDocMergeInfo
 {
     sw::mark::IMark* startPageInTarget;
-    tools::Long    nDBRow;
+    sal_Int32    nDBRow;
 };
 
 class SW_DLLPUBLIC SwMailMergeConfigItem