use tools::Long in svtools

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

7 files changed, 156 insertions, 156 deletions

diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 943e888385e8..5eac20c1514e 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -141,7 +141,7 @@ public:
     }
 };
 
-long BrowseBox::GetBarHeight() const
+tools::Long BrowseBox::GetBarHeight() const
 {
     // tdf#115941 because some platforms have things like overlay scrollbars, take a max
     // of a statusbar height and a scrollbar height as the control area height
@@ -289,7 +289,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
 
 
 void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
-        long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos )
+        tools::Long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos )
 {
 
     OSL_ENSURE( nItemId != HandleColumnId, "BrowseBox::InsertDataColumn: nItemId is HandleColumnId" );
@@ -332,8 +332,8 @@ sal_uInt16 BrowseBox::ToggleSelectedColumn()
     {
         DoHideCursor( "ToggleSelectedColumn" );
         ToggleSelection();
-        long nSelected = pColSel->FirstSelected();
-        if (nSelected != static_cast<long>(SFX_ENDOFSELECTION))
+        tools::Long nSelected = pColSel->FirstSelected();
+        if (nSelected != static_cast<tools::Long>(SFX_ENDOFSELECTION))
             nSelectedColId = mvCols[nSelected]->GetId();
         pColSel->SelectAll(false);
     }
@@ -444,11 +444,11 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
     // do scroll, let redraw
     if( pDataWin->GetBackground().IsScrollable() )
     {
-        long nScroll = -aFromRect.GetWidth();
+        tools::Long nScroll = -aFromRect.GetWidth();
         tools::Rectangle aScrollArea;
         if ( nOldPos > nPos )
         {
-            long nFrozenWidth = GetFrozenWidth();
+            tools::Long nFrozenWidth = GetFrozenWidth();
             if ( aToRect.Left() < nFrozenWidth )
                 aToRect.SetLeft( nFrozenWidth );
             aScrollArea = tools::Rectangle(Point(aToRect.Left(),0),
@@ -565,12 +565,12 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
     if ( nWidth < LONG_MAX && mvCols[ nItemPos ]->Width() == nWidth )
         return;
 
-    long nOldWidth = mvCols[ nItemPos ]->Width();
+    tools::Long nOldWidth = mvCols[ nItemPos ]->Width();
 
     // adjust last column, if necessary
     if ( IsVisible() && nItemPos == mvCols.size() - 1 )
     {
-        long nMaxWidth = pDataWin->GetSizePixel().Width();
+        tools::Long nMaxWidth = pDataWin->GetSizePixel().Width();
         nMaxWidth -= pDataWin->bAutoSizeLastCol
                 ? GetFieldRect(nItemId).Left()
                 : GetFrozenWidth();
@@ -606,7 +606,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
     if ( bUpdate )
     {
         // get X-Pos of the column changed
-        long nX = 0;
+        tools::Long nX = 0;
         for ( size_t nCol = 0; nCol < nItemPos; ++nCol )
         {
             BrowserColumn *pCol = mvCols[ nCol ].get();
@@ -824,7 +824,7 @@ OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
     return mvCols[ nItemPos ]->Title();
 }
 
-long BrowseBox::GetRowCount() const
+tools::Long BrowseBox::GetRowCount() const
 {
     return nRowCount;
 }
@@ -834,7 +834,7 @@ sal_uInt16 BrowseBox::ColCount() const
     return static_cast<sal_uInt16>(mvCols.size());
 }
 
-long BrowseBox::ImpGetDataRowHeight() const
+tools::Long BrowseBox::ImpGetDataRowHeight() const
 {
     BrowseBox *pThis = const_cast<BrowseBox*>(this);
     pThis->nDataRowHeight = pThis->CalcReverseZoom(pDataWin->GetTextHeight() + 4);
@@ -843,7 +843,7 @@ long BrowseBox::ImpGetDataRowHeight() const
     return nDataRowHeight;
 }
 
-void BrowseBox::SetDataRowHeight( long nPixel )
+void BrowseBox::SetDataRowHeight( tools::Long nPixel )
 {
 
     nDataRowHeight = CalcReverseZoom(nPixel);
@@ -857,11 +857,11 @@ void BrowseBox::SetTitleLines( sal_uInt16 nLines )
     nTitleLines = nLines;
 }
 
-long BrowseBox::ScrollColumns( long nCols )
+tools::Long BrowseBox::ScrollColumns( tools::Long nCols )
 {
 
     if ( nFirstCol + nCols < 0 ||
-         nFirstCol + nCols >= static_cast<long>(mvCols.size()) )
+         nFirstCol + nCols >= static_cast<tools::Long>(mvCols.size()) )
         return 0;
 
     // implicitly hides cursor while scrolling
@@ -883,8 +883,8 @@ long BrowseBox::ScrollColumns( long nCols )
         }
         else
         {
-            long nDelta = mvCols[ nFirstCol-1 ]->Width();
-            long nFrozenWidth = GetFrozenWidth();
+            tools::Long nDelta = mvCols[ nFirstCol-1 ]->Width();
+            tools::Long nFrozenWidth = GetFrozenWidth();
 
             tools::Rectangle aScrollRect(  Point( nFrozenWidth + nDelta, 0 ),
                                     Size ( GetOutputSizePixel().Width() - nFrozenWidth - nDelta,
@@ -929,8 +929,8 @@ long BrowseBox::ScrollColumns( long nCols )
         }
         else
         {
-            long nDelta = mvCols[ nFirstCol ]->Width();
-            long nFrozenWidth = GetFrozenWidth();
+            tools::Long nDelta = mvCols[ nFirstCol ]->Width();
+            tools::Long nFrozenWidth = GetFrozenWidth();
 
             tools::Rectangle aScrollRect(  Point(  nFrozenWidth, 0 ),
                                     Size (  GetOutputSizePixel().Width() - nFrozenWidth,
@@ -967,7 +967,7 @@ long BrowseBox::ScrollColumns( long nCols )
     // adjust external headerbar, if necessary
     if ( pDataWin->pHeaderBar )
     {
-        long nWidth = 0;
+        tools::Long nWidth = 0;
         for ( size_t nCol = 0;
               nCol < mvCols.size() && nCol < nFirstCol;
               ++nCol )
@@ -999,12 +999,12 @@ long BrowseBox::ScrollColumns( long nCols )
 }
 
 
-long BrowseBox::ScrollRows( long nRows )
+tools::Long BrowseBox::ScrollRows( tools::Long nRows )
 {
     // compute new top row
-    long nTmpMin = std::min( static_cast<long>(nTopRow + nRows), static_cast<long>(nRowCount - 1) );
+    tools::Long nTmpMin = std::min( static_cast<tools::Long>(nTopRow + nRows), static_cast<tools::Long>(nRowCount - 1) );
 
-    long nNewTopRow = std::max<long>( nTmpMin, 0 );
+    tools::Long nNewTopRow = std::max<long>( nTmpMin, 0 );
 
     if ( nNewTopRow == nTopRow )
         return 0;
@@ -1015,15 +1015,15 @@ long BrowseBox::ScrollRows( long nRows )
     VisibleRowsChanged(nNewTopRow, nVisibleRows);
 
     // compute new top row again (nTopRow might have changed!)
-    nTmpMin = std::min( static_cast<long>(nTopRow + nRows), static_cast<long>(nRowCount - 1) );
+    nTmpMin = std::min( static_cast<tools::Long>(nTopRow + nRows), static_cast<tools::Long>(nRowCount - 1) );
 
     nNewTopRow = std::max<long>( nTmpMin, 0 );
 
     StartScroll();
 
     // scroll area on screen and/or repaint
-    long nDeltaY = GetDataRowHeight() * ( nNewTopRow - nTopRow );
-    long nOldTopRow = nTopRow;
+    tools::Long nDeltaY = GetDataRowHeight() * ( nNewTopRow - nTopRow );
+    tools::Long nOldTopRow = nTopRow;
     nTopRow = nNewTopRow;
 
     if ( GetUpdateMode() )
@@ -1050,7 +1050,7 @@ long BrowseBox::ScrollRows( long nRows )
 }
 
 
-void BrowseBox::RowModified( long nRow, sal_uInt16 nColId )
+void BrowseBox::RowModified( tools::Long nRow, sal_uInt16 nColId )
 {
 
     if ( !GetUpdateMode() )
@@ -1075,7 +1075,7 @@ void BrowseBox::Clear()
 
     // adjust the total number of rows
     DoHideCursor( "Clear" );
-    long nOldRowCount = nRowCount;
+    tools::Long nOldRowCount = nRowCount;
     nRowCount = 0;
     if(bMultiSelection)
     {
@@ -1134,7 +1134,7 @@ void BrowseBox::Clear()
     );
 }
 
-void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeepSelection )
+void BrowseBox::RowInserted( tools::Long nRow, tools::Long nNumRows, bool bDoPaint, bool bKeepSelection )
 {
 
     if (nRow < 0)
@@ -1152,12 +1152,12 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep
     DoHideCursor( "RowInserted" );
 
     // must we paint the new rows?
-    long nOldCurRow = nCurRow;
+    tools::Long nOldCurRow = nCurRow;
     Size aSz = pDataWin->GetOutputSizePixel();
     if ( bDoPaint && nRow >= nTopRow &&
          nRow <= nTopRow + aSz.Height() / GetDataRowHeight() )
     {
-        long nY = (nRow-nTopRow) * GetDataRowHeight();
+        tools::Long nY = (nRow-nTopRow) * GetDataRowHeight();
         if ( !bLastRow )
         {
             // scroll down the rows behind the new row
@@ -1221,7 +1221,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep
             Any()
         );
 
-        for (long i = nRow+1 ; i <= nRowCount ; ++i)
+        for (tools::Long i = nRow+1 ; i <= nRowCount ; ++i)
         {
             commitHeaderBarEvent(
                 CHILD,
@@ -1241,7 +1241,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep
 }
 
 
-void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
+void BrowseBox::RowRemoved( tools::Long nRow, tools::Long nNumRows, bool bDoPaint )
 {
 
     if ( nRow < 0 )
@@ -1266,12 +1266,12 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
     // adjust total row count
     nRowCount -= nNumRows;
     if (nRowCount < 0) nRowCount = 0;
-    long nOldCurRow = nCurRow;
+    tools::Long nOldCurRow = nCurRow;
 
     // adjust the selection
     if ( bMultiSelection )
         // uRow.pSel->Remove( nRow, nNumRows );
-        for ( long i = 0; i < nNumRows; i++ )
+        for ( tools::Long i = 0; i < nNumRows; i++ )
             uRow.pSel->Remove( nRow );
     else if ( nRow < uRow.nSel && uRow.nSel >= nNumRows )
         uRow.nSel -= nNumRows;
@@ -1306,7 +1306,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
             // if there are Rows behind
             if (nRow < nRowCount)
             {
-                long nY = (nRow-nTopRow) * GetDataRowHeight();
+                tools::Long nY = (nRow-nTopRow) * GetDataRowHeight();
                 pDataWin->SetClipRegion();
                 if( pDataWin->GetBackground().IsScrollable() )
                 {
@@ -1391,7 +1391,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
                 Any()
             );
 
-            for (long i = nRow+1 ; i <= (nRow+nNumRows) ; ++i)
+            for (tools::Long i = nRow+1 ; i <= (nRow+nNumRows) ; ++i)
             {
                 commitHeaderBarEvent(
                     CHILD,
@@ -1412,16 +1412,16 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
 }
 
 
-bool BrowseBox::GoToRow( long nRow)
+bool BrowseBox::GoToRow( tools::Long nRow)
 {
     return GoToRow(nRow, false);
 }
 
 
-bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection )
+bool BrowseBox::GoToRow( tools::Long nRow, bool bRowColMove, bool bKeepSelection )
 {
 
-    long nOldCurRow = nCurRow;
+    tools::Long nOldCurRow = nCurRow;
 
     // nothing to do?
     if ( nRow == nCurRow && ( bMultiSelection || uRow.nSel == nRow ) )
@@ -1438,7 +1438,7 @@ bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection )
     // compute the last visible row
     Size aSz( pDataWin->GetSizePixel() );
     sal_uInt16 nVisibleRows = sal_uInt16( aSz.Height() / GetDataRowHeight() - 1 );
-    long nLastRow = nTopRow + nVisibleRows;
+    tools::Long nLastRow = nTopRow + nVisibleRows;
 
     // suspend Updates
     pDataWin->EnterUpdateLock();
@@ -1566,7 +1566,7 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol
 }
 
 
-bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
+bool BrowseBox::GoToRowColumnId( tools::Long nRow, sal_uInt16 nColId )
 {
 
     // out of range?
@@ -1651,7 +1651,7 @@ void BrowseBox::SelectAll()
 
     // don't highlight handle column
     BrowserColumn *pFirstCol = mvCols[ 0 ].get();
-    long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
+    tools::Long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
 
     // highlight the row selection
     if ( !bHideSelect )
@@ -1659,7 +1659,7 @@ void BrowseBox::SelectAll()
         tools::Rectangle aHighlightRect;
         sal_uInt16 nVisibleRows =
             static_cast<sal_uInt16>(pDataWin->GetOutputSizePixel().Height() / GetDataRowHeight() + 1);
-        for ( long nRow = std::max<long>( nTopRow, uRow.pSel->FirstSelected() );
+        for ( tools::Long nRow = std::max<long>( nTopRow, uRow.pSel->FirstSelected() );
               nRow != BROWSER_ENDOFSELECTION && nRow < nTopRow + nVisibleRows;
               nRow = uRow.pSel->NextSelected() )
             aHighlightRect.Union( tools::Rectangle(
@@ -1700,7 +1700,7 @@ void BrowseBox::SelectAll()
 }
 
 
-void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
+void BrowseBox::SelectRow( tools::Long nRow, bool _bSelect, bool bExpand )
 {
 
     if ( !bMultiSelection )
@@ -1738,7 +1738,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
     {
         // don't highlight handle column
         BrowserColumn *pFirstCol = mvCols[ 0 ].get();
-        long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
+        tools::Long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
 
         // highlight only newly selected part
         tools::Rectangle aRect(
@@ -1772,7 +1772,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
 }
 
 
-long BrowseBox::GetSelectRowCount() const
+tools::Long BrowseBox::GetSelectRowCount() const
 {
 
     return bMultiSelection ? uRow.pSel->GetSelectCount() :
@@ -1853,34 +1853,34 @@ sal_uInt16 BrowseBox::GetSelectColumnCount() const
 }
 
 
-long BrowseBox::FirstSelectedColumn( ) const
+tools::Long BrowseBox::FirstSelectedColumn( ) const
 {
     return pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION;
 }
 
 
-long BrowseBox::FirstSelectedRow()
+tools::Long BrowseBox::FirstSelectedRow()
 {
 
     return bMultiSelection ? uRow.pSel->FirstSelected() : uRow.nSel;
 }
 
 
-long BrowseBox::NextSelectedRow()
+tools::Long BrowseBox::NextSelectedRow()
 {
 
     return bMultiSelection ? uRow.pSel->NextSelected() : BROWSER_ENDOFSELECTION;
 }
 
 
-long BrowseBox::LastSelectedRow()
+tools::Long BrowseBox::LastSelectedRow()
 {
 
     return bMultiSelection ? uRow.pSel->LastSelected() : uRow.nSel;
 }
 
 
-bool BrowseBox::IsRowSelected( long nRow ) const
+bool BrowseBox::IsRowSelected( tools::Long nRow ) const
 {
 
     return bMultiSelection ? uRow.pSel->IsSelected(nRow) : nRow == uRow.nSel;
@@ -1897,7 +1897,7 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const
 
 void BrowseBox::MakeFieldVisible
 (
-    long    nRow,       // line number of the field (starting with 0)
+    tools::Long    nRow,       // line number of the field (starting with 0)
     sal_uInt16  nColId     // column ID of the field
 )
 
@@ -1948,7 +1948,7 @@ void BrowseBox::MakeFieldVisible
         ScrollRows( nRow - nTopRow );
 
     // positioned outside below?
-    long nBottomRow = nTopRow + GetVisibleRows();
+    tools::Long nBottomRow = nTopRow + GetVisibleRows();
     // decrement nBottomRow to make it the number of the last visible line
     // (count starts with 0!).
     // Example: BrowseBox contains exactly one entry. nBottomRow := 0 + 1 - 1
@@ -1961,7 +1961,7 @@ void BrowseBox::MakeFieldVisible
 }
 
 
-bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
+bool BrowseBox::IsFieldVisible( tools::Long nRow, sal_uInt16 nColumnId,
                                 bool bCompletely ) const
 {
 
@@ -1986,7 +1986,7 @@ bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
 }
 
 
-tools::Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
+tools::Rectangle BrowseBox::GetFieldRectPixel( tools::Long nRow, sal_uInt16 nColumnId,
                                         bool bRelToBrowser) const
 {
 
@@ -2007,7 +2007,7 @@ tools::Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
 }
 
 
-tools::Rectangle BrowseBox::GetRowRectPixel( long nRow  ) const
+tools::Rectangle BrowseBox::GetRowRectPixel( tools::Long nRow  ) const
 {
 
     // get the rectangle relative to DataWin
@@ -2031,11 +2031,11 @@ tools::Rectangle BrowseBox::GetRowRectPixel( long nRow  ) const
 }
 
 
-tools::Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
+tools::Rectangle BrowseBox::ImplFieldRectPixel( tools::Long nRow, sal_uInt16 nColumnId ) const
 {
 
     // compute the X-coordinate relative to DataWin by accumulation
-    long nColX = 0;
+    tools::Long nColX = 0;
     sal_uInt16 nFrozenCols = FrozenColCount();
     size_t nCol;
     for ( nCol = 0;
@@ -2048,7 +2048,7 @@ tools::Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId
         return tools::Rectangle();
 
     // compute the Y-coordinate relative to DataWin
-    long nRowY = GetDataRowHeight();
+    tools::Long nRowY = GetDataRowHeight();
     if ( nRow != BROWSER_ENDOFSELECTION ) // #105497# OJ
         nRowY = ( nRow - nTopRow ) * GetDataRowHeight();
 
@@ -2061,7 +2061,7 @@ tools::Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId
 }
 
 
-long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const
+tools::Long BrowseBox::GetRowAtYPosPixel( tools::Long nY, bool bRelToBrowser ) const
 {
 
     // compute the Y-coordinate
@@ -2087,11 +2087,11 @@ tools::Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
 }
 
 
-sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX ) const
+sal_uInt16 BrowseBox::GetColumnAtXPosPixel( tools::Long nX ) const
 {
 
     // accumulate the widths of the visible columns
-    long nColX = 0;
+    tools::Long nColX = 0;
     for ( size_t nCol = 0; nCol < mvCols.size(); ++nCol )
     {
         BrowserColumn *pCol = mvCols[ nCol ].get();
@@ -2149,7 +2149,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
 
     nControlAreaWidth = USHRT_MAX;
 
-    long nOldRowSel = bMultiSelection ? uRow.pSel->FirstSelected() : uRow.nSel;
+    tools::Long nOldRowSel = bMultiSelection ? uRow.pSel->FirstSelected() : uRow.nSel;
     MultiSelection *pOldRowSel = bMultiSelection ? uRow.pSel : nullptr;
 
     pVScroll.disposeAndClear();
@@ -2238,7 +2238,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
 }
 
 
-void BrowseBox::VisibleRowsChanged( long, sal_uInt16 )
+void BrowseBox::VisibleRowsChanged( tools::Long, sal_uInt16 )
 {
 
     // old behavior: automatically correct NumRows:
@@ -2253,7 +2253,7 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 )
 }
 
 
-bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
+bool BrowseBox::IsCursorMoveAllowed( tools::Long, sal_uInt16 ) const
 
 /*  [Description]
 
@@ -2272,7 +2272,7 @@ bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
 }
 
 
-long BrowseBox::GetDataRowHeight() const
+tools::Long BrowseBox::GetDataRowHeight() const
 {
     return CalcZoom(nDataRowHeight ? nDataRowHeight : ImpGetDataRowHeight());
 }
@@ -2292,9 +2292,9 @@ void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar )
     pDataWin->pHeaderBar->SetStartDragHdl( LINK( this, BrowseBox, StartDragHdl ) );
 }
 
-long BrowseBox::GetTitleHeight() const
+tools::Long BrowseBox::GetTitleHeight() const
 {
-    long nHeight;
+    tools::Long nHeight;
     // ask the header bar for the text height (if possible), as the header bar's font is adjusted with
     // our (and the header's) zoom factor
     HeaderBar* pHeaderBar = pDataWin->pHeaderBar;
@@ -2306,7 +2306,7 @@ long BrowseBox::GetTitleHeight() const
     return nTitleLines ? nTitleLines * nHeight + 4 : 0;
 }
 
-long BrowseBox::CalcReverseZoom(long nVal)
+tools::Long BrowseBox::CalcReverseZoom(tools::Long nVal)
 {
     if (IsZoom())
     {
@@ -2316,7 +2316,7 @@ long BrowseBox::CalcReverseZoom(long nVal)
         if (!rZoom.GetNumerator())
             throw o3tl::divide_by_zero();
         n /= static_cast<double>(rZoom.GetNumerator());
-        nVal = n>0 ? static_cast<long>(n + 0.5) : -static_cast<long>(-n + 0.5);
+        nVal = n>0 ? static_cast<tools::Long>(n + 0.5) : -static_cast<tools::Long>(-n + 0.5);
     }
 
     return nVal;
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 298a61a31c80..268bfb262ca3 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -183,7 +183,7 @@ void BrowseBox::DoubleClick( const BrowserMouseEvent & )
 }
 
 
-long BrowseBox::QueryMinimumRowHeight()
+tools::Long BrowseBox::QueryMinimumRowHeight()
 {
     return CalcZoom( 5 );
 }
@@ -242,18 +242,18 @@ void BrowseBox::ToggleSelection()
 
     // accumulate areas of rows to highlight
     std::vector<tools::Rectangle> aHighlightList;
-    long nLastRowInRect = 0; // for the CFront
+    tools::Long nLastRowInRect = 0; // for the CFront
 
     // don't highlight handle column
     BrowserColumn *pFirstCol = mvCols.empty() ? nullptr : mvCols[ 0 ].get();
-    long nOfsX = (!pFirstCol || pFirstCol->GetId()) ? 0 : pFirstCol->Width();
+    tools::Long nOfsX = (!pFirstCol || pFirstCol->GetId()) ? 0 : pFirstCol->Width();
 
     // accumulate old row selection
-    long nBottomRow = nTopRow +
+    tools::Long nBottomRow = nTopRow +
         pDataWin->GetOutputSizePixel().Height() / GetDataRowHeight();
     if ( nBottomRow > GetRowCount() && GetRowCount() )
         nBottomRow = GetRowCount();
-    for ( long nRow = bMultiSelection ? uRow.pSel->FirstSelected() : uRow.nSel;
+    for ( tools::Long nRow = bMultiSelection ? uRow.pSel->FirstSelected() : uRow.nSel;
           nRow != BROWSER_ENDOFSELECTION && nRow <= nBottomRow;
           nRow = bMultiSelection ? uRow.pSel->NextSelected() : BROWSER_ENDOFSELECTION )
     {
@@ -278,7 +278,7 @@ void BrowseBox::ToggleSelection()
     }
 
     // unhighlight old column selection (if any)
-    for ( long nColId = pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION;
+    for ( tools::Long nColId = pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION;
           nColId != BROWSER_ENDOFSELECTION;
           nColId = pColSel->NextSelected() )
     {
@@ -496,11 +496,11 @@ void BrowseBox::Resize()
         aHScroll->Hide();
 
     // calculate the size of the data window
-    long nDataHeight = GetOutputSizePixel().Height() - GetTitleHeight();
+    tools::Long nDataHeight = GetOutputSizePixel().Height() - GetTitleHeight();
     if ( aHScroll->IsVisible() || ( nControlAreaWidth != USHRT_MAX ) )
         nDataHeight -= nSBSize;
 
-    long nDataWidth = GetOutputSizePixel().Width();
+    tools::Long nDataWidth = GetOutputSizePixel().Width();
     if ( pVScroll->IsVisible() )
         nDataWidth -= nSBSize;
 
@@ -532,7 +532,7 @@ void BrowseBox::Resize()
     {
         // take the handle column into account
         BrowserColumn *pFirstCol = mvCols[ 0 ].get();
-        long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
+        tools::Long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
         pHeaderBar->SetPosSizePixel( Point( nOfsX, 0 ), Size( GetOutputSizePixel().Width() - nOfsX, GetTitleHeight() ) );
     }
 
@@ -581,7 +581,7 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
         return;
 
     // iterate through columns to redraw
-    long nX = 0;
+    tools::Long nX = 0;
     size_t nCol;
     for (nCol = 0; nCol < mvCols.size() && nX < rRect.Right(); ++nCol)
     {
@@ -668,10 +668,10 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags )
     // (as it is based on the settings of our data window, not the foreign device)
     if (!nDataRowHeight)
         ImpGetDataRowHeight();
-    long nHeightLogic = PixelToLogic(Size(0, nDataRowHeight), MapMode(MapUnit::Map10thMM)).Height();
-    long nForeignHeightPixel = pDev->LogicToPixel(Size(0, nHeightLogic), MapMode(MapUnit::Map10thMM)).Height();
+    tools::Long nHeightLogic = PixelToLogic(Size(0, nDataRowHeight), MapMode(MapUnit::Map10thMM)).Height();
+    tools::Long nForeignHeightPixel = pDev->LogicToPixel(Size(0, nHeightLogic), MapMode(MapUnit::Map10thMM)).Height();
 
-    long nOriginalHeight = nDataRowHeight;
+    tools::Long nOriginalHeight = nDataRowHeight;
     nDataRowHeight = nForeignHeightPixel;
 
     // this counts for the column widths, too
@@ -680,8 +680,8 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags )
     {
         BrowserColumn* pCurrent = mvCols[ nPos ].get();
 
-        long nWidthLogic = PixelToLogic(Size(pCurrent->Width(), 0), MapMode(MapUnit::Map10thMM)).Width();
-        long nForeignWidthPixel = pDev->LogicToPixel(Size(nWidthLogic, 0), MapMode(MapUnit::Map10thMM)).Width();
+        tools::Long nWidthLogic = PixelToLogic(Size(pCurrent->Width(), 0), MapMode(MapUnit::Map10thMM)).Width();
+        tools::Long nForeignWidthPixel = pDev->LogicToPixel(Size(nWidthLogic, 0), MapMode(MapUnit::Map10thMM)).Width();
 
         pCurrent->SetWidth(nForeignWidthPixel, GetZoom());
         if ( pBar )
@@ -698,7 +698,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags )
     if ( pBar )
     {
         // the title height with respect to the font set for the given device
-        long nTitleHeight = PixelToLogic(Size(0, GetTitleHeight()), MapMode(MapUnit::Map10thMM)).Height();
+        tools::Long nTitleHeight = PixelToLogic(Size(0, GetTitleHeight()), MapMode(MapUnit::Map10thMM)).Height();
         nTitleHeight = pDev->LogicToPixel(Size(0, nTitleHeight), MapMode(MapUnit::Map10thMM)).Height();
 
         BrowserColumn* pFirstCol = !mvCols.empty() ? mvCols[ 0 ].get() : nullptr;
@@ -761,8 +761,8 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags )
     {
         BrowserColumn* pCurrent = mvCols[ nPos ].get();
 
-        long nForeignWidthLogic = pDev->PixelToLogic(Size(pCurrent->Width(), 0), MapMode(MapUnit::Map10thMM)).Width();
-        long nWidthPixel = LogicToPixel(Size(nForeignWidthLogic, 0), MapMode(MapUnit::Map10thMM)).Width();
+        tools::Long nForeignWidthLogic = pDev->PixelToLogic(Size(pCurrent->Width(), 0), MapMode(MapUnit::Map10thMM)).Width();
+        tools::Long nWidthPixel = LogicToPixel(Size(nForeignWidthLogic, 0), MapMode(MapUnit::Map10thMM)).Width();
 
         pCurrent->SetWidth(nWidthPixel, GetZoom());
         if ( pBar )
@@ -778,7 +778,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
     Size aOverallAreaSize = _bForeignDevice ? _rRect.GetSize() : pDataWin->GetOutputSizePixel();
     Point aOverallAreaBRPos = _bForeignDevice ? _rRect.BottomRight() : Point( aOverallAreaSize.Width(), aOverallAreaSize.Height() );
 
-    long nDataRowHeigt = GetDataRowHeight();
+    tools::Long nDataRowHeigt = GetDataRowHeight();
 
     // compute relative rows to redraw
     sal_uLong nRelTopRow = 0;
@@ -799,7 +799,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
     Color aOldTextColor = _rOut.GetTextColor();
     Color aOldFillColor = _rOut.GetFillColor();
     Color aOldLineColor = _rOut.GetLineColor();
-    long nHLineX = 0 == mvCols[ 0 ]->GetId() ? mvCols[ 0 ]->Width() : 0;
+    tools::Long nHLineX = 0 == mvCols[ 0 ]->GetId() ? mvCols[ 0 ]->Width() : 0;
     nHLineX += aOverallAreaPos.X();
 
     Color aDelimiterLineColor( ::svtools::ColorConfig().GetColorValue( ::svtools::CALCGRID ).nColor );
@@ -812,7 +812,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
         // get row
         // check valid area, to be on the safe side:
         DBG_ASSERT( static_cast<sal_uInt16>(nTopRow+nRelRow) < nRowCount, "BrowseBox::ImplPaintData: invalid seek" );
-        if ( (nTopRow+long(nRelRow)) < 0 || static_cast<sal_uInt16>(nTopRow+nRelRow) >= nRowCount )
+        if ( (nTopRow+tools::Long(nRelRow)) < 0 || static_cast<sal_uInt16>(nTopRow+nRelRow) >= nRowCount )
             continue;
 
         // prepare row
@@ -935,11 +935,11 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
             _rOut.SetClipRegion();
             _rOut.Push( PushFlags::LINECOLOR );
             _rOut.SetLineColor( aDelimiterLineColor );
-            long nY = aPos.Y() + nDataRowHeigt - 1;
+            tools::Long nY = aPos.Y() + nDataRowHeigt - 1;
             if (nY <= aOverallAreaBRPos.Y())
                 _rOut.DrawLine( Point( nHLineX, nY ),
                                 Point( bVLines
-                                        ? std::min(long(aPos.X() - 1), aOverallAreaBRPos.X())
+                                        ? std::min(tools::Long(aPos.X() - 1), aOverallAreaBRPos.X())
                                         : aOverallAreaBRPos.X(),
                                       nY ) );
             _rOut.Pop();
@@ -969,7 +969,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
 
     // draw vertical delimitational line between frozen and scrollable cols
     _rOut.SetLineColor( COL_BLACK );
-    long nFrozenWidth = GetFrozenWidth()-1;
+    tools::Long nFrozenWidth = GetFrozenWidth()-1;
     _rOut.DrawLine( Point( aOverallAreaPos.X() + nFrozenWidth, aPos.Y() ),
                    Point( aOverallAreaPos.X() + nFrozenWidth, bHLines
                             ? aPos.Y() - 1
@@ -980,7 +980,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
     {
         _rOut.SetLineColor( aDelimiterLineColor );
         Point aVertPos( aOverallAreaPos.X() - 1, aOverallAreaPos.Y() );
-        long nDeltaY = aOverallAreaBRPos.Y();
+        tools::Long nDeltaY = aOverallAreaBRPos.Y();
         for ( size_t nCol = 0; nCol < mvCols.size(); ++nCol )
         {
             // get column
@@ -1049,7 +1049,7 @@ void BrowseBox::UpdateScrollbars()
         nCornerSize = static_cast<sal_uLong>(nCornerSize * static_cast<double>(GetZoom()));
 
     bool bNeedsVScroll = false;
-    long nMaxRows = 0;
+    tools::Long nMaxRows = 0;
     if (GetDataRowHeight())
     {
         // needs VScroll?
@@ -1134,14 +1134,14 @@ void BrowseBox::UpdateScrollbars()
 
     if ( pVScroll->GetThumbPos() != nTopRow )
         pVScroll->SetThumbPos( nTopRow );
-    long nVisibleSize = std::min( std::min( nRowCount, nMaxRows ), long(nRowCount-nTopRow) );
+    tools::Long nVisibleSize = std::min( std::min( nRowCount, nMaxRows ), tools::Long(nRowCount-nTopRow) );
     pVScroll->SetVisibleSize( nVisibleSize ? nVisibleSize : 1 );
     pVScroll->SetRange( Range( 0, nRowCount ) );
     pVScroll->SetPosSizePixel(
         Point( aDataWinSize.Width(), GetTitleHeight() ),
         Size( nCornerSize, aDataWinSize.Height()) );
-    long nLclDataRowHeight = GetDataRowHeight();
-    if ( nLclDataRowHeight > 0 && nRowCount < long( aDataWinSize.Height() / nLclDataRowHeight ) )
+    tools::Long nLclDataRowHeight = GetDataRowHeight();
+    if ( nLclDataRowHeight > 0 && nRowCount < tools::Long( aDataWinSize.Height() / nLclDataRowHeight ) )
         ScrollRows( -nTopRow );
     if ( bNeedsVScroll && !pVScroll->IsVisible() )
         pVScroll->Show();
@@ -1179,7 +1179,7 @@ void BrowseBox::UpdateScrollbars()
     // scroll headerbar, if necessary
     if ( pDataWin->pHeaderBar )
     {
-        long nWidth = 0;
+        tools::Long nWidth = 0;
         for ( size_t nCol = 0;
               nCol < mvCols.size() && nCol < nFirstCol;
               ++nCol )
@@ -1237,10 +1237,10 @@ bool BrowseBox::GetUpdateMode() const
 }
 
 
-long BrowseBox::GetFrozenWidth() const
+tools::Long BrowseBox::GetFrozenWidth() const
 {
 
-    long nWidth = 0;
+    tools::Long nWidth = 0;
     for ( size_t nCol = 0;
           nCol < mvCols.size() && mvCols[ nCol ]->IsFrozen();
           ++nCol )
@@ -1298,8 +1298,8 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
     if ( rEvtPos.Y() >= GetTitleHeight() )
         return;
 
-    long nX = 0;
-    long nWidth = GetOutputSizePixel().Width();
+    tools::Long nX = 0;
+    tools::Long nWidth = GetOutputSizePixel().Width();
     for ( size_t nCol = 0; nCol < mvCols.size() && nX < nWidth; ++nCol )
     {
         // is this column visible?
@@ -1307,7 +1307,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
         if ( pCol->IsFrozen() || nCol >= nFirstCol )
         {
             // compute right end of column
-            long nR = nX + pCol->Width() - 1;
+            tools::Long nR = nX + pCol->Width() - 1;
 
             // at the end of a column (and not handle column)?
             if ( pCol->GetId() && std::abs( nR - rEvtPos.X() ) < 2 )
@@ -1362,7 +1362,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt )
 
             // show resize-pointer?
             if ( bResizing || ( pCol->GetId() &&
-                 std::abs( static_cast<long>(nR) - rEvt.GetPosPixel().X() ) < MIN_COLUMNWIDTH ) )
+                 std::abs( static_cast<tools::Long>(nR) - rEvt.GetPosPixel().X() ) < MIN_COLUMNWIDTH ) )
             {
                 aNewPointer = PointerStyle::HSplit;
                 if ( bResizing )
@@ -1372,7 +1372,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt )
 
                     // check allowed width and new delta
                     nDragX = std::max( rEvt.GetPosPixel().X(), nMinResizeX );
-                    long nDeltaX = nDragX - nResizeX;
+                    tools::Long nDeltaX = nDragX - nResizeX;
                     sal_uInt16 nId = GetColumnId(nResizeCol);
                     sal_uLong nOldWidth = GetColumnWidth(nId);
                     nDragX = nOldWidth + nDeltaX + nResizeX - nOldWidth;
@@ -1402,12 +1402,12 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
 
         // width changed?
         nDragX = std::max( rEvt.GetPosPixel().X(), nMinResizeX );
-        if ( (nDragX - nResizeX) != static_cast<long>(mvCols[ nResizeCol ]->Width()) )
+        if ( (nDragX - nResizeX) != static_cast<tools::Long>(mvCols[ nResizeCol ]->Width()) )
         {
             // resize column
-            long nMaxX = pDataWin->GetSizePixel().Width();
+            tools::Long nMaxX = pDataWin->GetSizePixel().Width();
             nDragX = std::min( nDragX, nMaxX );
-            long nDeltaX = nDragX - nResizeX;
+            tools::Long nDeltaX = nDragX - nResizeX;
             sal_uInt16 nId = GetColumnId(nResizeCol);
             SetColumnWidth( GetColumnId(nResizeCol), GetColumnWidth(nId) + nDeltaX );
             ColumnResized( nId );
@@ -1691,7 +1691,7 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
 void BrowseBox::Dispatch( sal_uInt16 nId )
 {
 
-    long nRowsOnPage = pDataWin->GetSizePixel().Height() / GetDataRowHeight();
+    tools::Long nRowsOnPage = pDataWin->GetSizePixel().Height() / GetDataRowHeight();
 
     switch ( nId )
     {
@@ -1712,7 +1712,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
             if ( GetRowCount() )
             {
                 DoHideCursor( "BROWSER_SELECTHOME" );
-                for ( long nRow = GetCurRow(); nRow >= 0; --nRow )
+                for ( tools::Long nRow = GetCurRow(); nRow >= 0; --nRow )
                     SelectRow( nRow );
                 GoToRow( 0, true );
                 DoShowCursor( "BROWSER_SELECTHOME" );
@@ -1722,8 +1722,8 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
             if ( GetRowCount() )
             {
                 DoHideCursor( "BROWSER_SELECTEND" );
-                long nRows = GetRowCount();
-                for ( long nRow = GetCurRow(); nRow < nRows; ++nRow )
+                tools::Long nRows = GetRowCount();
+                for ( tools::Long nRow = GetCurRow(); nRow < nRows; ++nRow )
                     SelectRow( nRow );
                 GoToRow( GetRowCount() - 1, true );
                 DoShowCursor( "BROWSER_SELECTEND" );
@@ -1735,7 +1735,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
             {
                 // deselect the current row, if it isn't the first
                 // and there is no other selected row above
-                long nRow = GetCurRow();
+                tools::Long nRow = GetCurRow();
                 bool bLocalSelect = ( !IsRowSelected( nRow ) ||
                                  GetSelectRowCount() == 1 || IsRowSelected( nRow - 1 ) );
                 SelectRow( nRow, bLocalSelect );
@@ -1752,7 +1752,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
             {
                 // deselect the current row, if it isn't the first
                 // and there is no other selected row under
-                long nRow = GetCurRow();
+                tools::Long nRow = GetCurRow();
                 bool bLocalSelect = ( !IsRowSelected( nRow ) ||
                                  GetSelectRowCount() == 1 || IsRowSelected( nRow + 1 ) );
                 SelectRow( nCurRow, bLocalSelect );
@@ -1909,8 +1909,8 @@ tools::Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen)
         pParent = GetAccessibleParentWindow();
 
     Point aTopLeft;
-    long nWidth;
-    long nHeight;
+    tools::Long nWidth;
+    tools::Long nHeight;
     if ( _bIsColumnBar )
     {
         nWidth = pDataWin->GetOutputSizePixel().Width();
@@ -1935,8 +1935,8 @@ tools::Rectangle BrowseBox::calcTableRect(bool _bOnScreen)
     tools::Rectangle aRect( GetWindowExtentsRelative( pParent ) );
     tools::Rectangle aRowBar = calcHeaderRect(false, pParent == nullptr);
 
-    long nX = aRowBar.Right() - aRect.Left();
-    long nY = aRowBar.Top() - aRect.Top();
+    tools::Long nX = aRowBar.Right() - aRect.Left();
+    tools::Long nY = aRowBar.Top() - aRect.Top();
     Size aSize(aRect.GetSize());
 
     return tools::Rectangle(aRowBar.TopRight(), Size(aSize.Width() - nX, aSize.Height() - nY - GetBarHeight()) );
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index e6148aa217ce..9227c0f8570a 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -395,7 +395,7 @@ void BrowseBox::GrabTableFocus()
     GrabFocus();
 }
 
-OUString BrowseBox::GetCellText(long, sal_uInt16 ) const
+OUString BrowseBox::GetCellText(tools::Long, sal_uInt16 ) const
 {
     SAL_WARN("svtools", "This method has to be implemented by the derived classes! BUG!!");
     return OUString();
@@ -459,7 +459,7 @@ void BrowseBox::SelectColumn( sal_uInt16 _nColumn, bool _bSelect )
     SelectColumnPos( _nColumn, _bSelect );
 }
 
-bool BrowseBox::IsColumnSelected( long _nColumn ) const
+bool BrowseBox::IsColumnSelected( tools::Long _nColumn ) const
 {
     return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) &&
         pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) );
@@ -520,7 +520,7 @@ bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const
     return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) );
 }
 
-OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const
+OUString BrowseBox::GetAccessibleCellText(tools::Long _nRow, sal_uInt16 _nColPos) const
 {
     return GetCellText( _nRow, GetColumnId( _nColPos ) );
 }
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index fa42bfe293c3..86ed55d0dfce 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -27,7 +27,7 @@ BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits )
  :HeaderBar( pParent, nWinBits )
  ,_pBrowseBox( pParent )
 {
-    long nHeight = pParent->IsZoom() ? pParent->CalcZoom(pParent->GetTitleHeight()) : pParent->GetTitleHeight();
+    tools::Long nHeight = pParent->IsZoom() ? pParent->CalcZoom(pParent->GetTitleHeight()) : pParent->GetTitleHeight();
 
     SetPosSizePixel( Point( 0, 0),
                      Size( pParent->GetOutputSizePixel().Width(),
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 80350e4a31cb..f4cc3a7ce65c 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -99,7 +99,7 @@ BrowserColumn::BrowserColumn( sal_uInt16 nItemId,
     if (!rCurrentZoom.GetNumerator())
         throw o3tl::divide_by_zero();
     n /= static_cast<double>(rCurrentZoom.GetNumerator());
-    _nOriginalWidth = n>0 ? static_cast<long>(n+0.5) : -static_cast<long>(-n+0.5);
+    _nOriginalWidth = n>0 ? static_cast<tools::Long>(n+0.5) : -static_cast<tools::Long>(-n+0.5);
 }
 
 BrowserColumn::~BrowserColumn()
@@ -122,7 +122,7 @@ void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZ
         if (!rCurrentZoom.GetNumerator())
             throw o3tl::divide_by_zero();
         n /= static_cast<double>(rCurrentZoom.GetNumerator());
-        _nOriginalWidth = n>0 ? static_cast<long>(n+0.5) : -static_cast<long>(-n+0.5);
+        _nOriginalWidth = n>0 ? static_cast<tools::Long>(n+0.5) : -static_cast<tools::Long>(-n+0.5);
     }
 }
 
@@ -153,7 +153,7 @@ void BrowserColumn::Draw( BrowseBox const & rBox, OutputDevice& rDev, const Poin
     else
     {
         // paint data column
-        long nWidth = Width() == LONG_MAX ? rBox.GetDataWindow().GetSizePixel().Width() : Width();
+        tools::Long nWidth = Width() == LONG_MAX ? rBox.GetDataWindow().GetSizePixel().Width() : Width();
 
         rBox.DoPaintField( rDev,
             tools::Rectangle(
@@ -168,7 +168,7 @@ void BrowserColumn::Draw( BrowseBox const & rBox, OutputDevice& rDev, const Poin
 void BrowserColumn::ZoomChanged(const Fraction& rNewZoom)
 {
     double n(_nOriginalWidth * rNewZoom);
-    _nWidth = n>0 ? static_cast<long>(n+0.5) : -static_cast<long>(-n+0.5);
+    _nWidth = n>0 ? static_cast<tools::Long>(n+0.5) : -static_cast<tools::Long>(-n+0.5);
 }
 
 
@@ -298,14 +298,14 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel )
     BrowseBox *pBox = GetParent();
 
     // seek to row under mouse
-    long nRelRow = rPosPixel.Y() < 0
+    tools::Long nRelRow = rPosPixel.Y() < 0
             ? -1
             : rPosPixel.Y() / pBox->GetDataRowHeight();
-    long nRow = nRelRow < 0 ? -1 : nRelRow + pBox->nTopRow;
+    tools::Long nRow = nRelRow < 0 ? -1 : nRelRow + pBox->nTopRow;
 
     // find column under mouse
-    long nMouseX = rPosPixel.X();
-    long nColX = 0;
+    tools::Long nMouseX = rPosPixel.X();
+    tools::Long nColX = 0;
     size_t nCol;
     for ( nCol = 0;
           nCol < pBox->mvCols.size() && nColX < GetSizePixel().Width();
@@ -376,7 +376,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt )
       return;
 
     Point aEventPos( rEvt.GetMousePosPixel() );
-    long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), false);
+    tools::Long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), false);
     MouseEvent aMouseEvt( aEventPos, 1, MouseEventModifiers::SELECT, MOUSE_LEFT );
     if ( CommandEventId::ContextMenu == rEvt.GetCommand() && rEvt.IsMouseEvent() &&
          nRow < pBox->GetRowCount() && !pBox->IsRowSelected(nRow) )
@@ -417,7 +417,7 @@ bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent )
        )
        return false;
 
-    long nDividerDistance = GetParent()->GetDataRowHeight() - ( _rEvent.GetPosPixel().Y() % GetParent()->GetDataRowHeight() );
+    tools::Long nDividerDistance = GetParent()->GetDataRowHeight() - ( _rEvent.GetPosPixel().Y() % GetParent()->GetDataRowHeight() );
     return ( nDividerDistance <= 4 );
 }
 
@@ -495,9 +495,9 @@ void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt )
 
 void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos )
 {
-    long nDataRowHeight = GetParent()->GetDataRowHeight();
+    tools::Long nDataRowHeight = GetParent()->GetDataRowHeight();
     // the exact separation pos of the two rows
-    long nDragRowDividerCurrentPos = _rStartPos.Y();
+    tools::Long nDragRowDividerCurrentPos = _rStartPos.Y();
     if ( ( nDragRowDividerCurrentPos % nDataRowHeight ) > nDataRowHeight / 2 )
         nDragRowDividerCurrentPos += nDataRowHeight;
     nDragRowDividerCurrentPos /= nDataRowHeight;
@@ -535,7 +535,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt )
 
         if ( !rTEvt.IsTrackingCanceled() )
         {
-            long nNewRowHeight = aMousePos.Y() + m_nDragRowDividerOffset - m_nDragRowDividerLimit;
+            tools::Long nNewRowHeight = aMousePos.Y() + m_nDragRowDividerOffset - m_nDragRowDividerLimit;
 
             // care for minimum row height
             if ( nNewRowHeight < GetParent()->QueryMinimumRowHeight() )
@@ -547,7 +547,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt )
     }
     else
     {
-        long nDragRowDividerCurrentPos = aMousePos.Y() + m_nDragRowDividerOffset;
+        tools::Long nDragRowDividerCurrentPos = aMousePos.Y() + m_nDragRowDividerOffset;
 
         // care for minimum row height
         if ( nDragRowDividerCurrentPos < m_nDragRowDividerLimit + GetParent()->QueryMinimumRowHeight() )
@@ -574,7 +574,7 @@ void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt )
 
 
 BrowseEvent::BrowseEvent( vcl::Window* pWindow,
-                          long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
+                          tools::Long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
                           const tools::Rectangle& rRect ):
     pWin(pWindow),
     nRow(nAbsRow),
@@ -594,7 +594,7 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow,
 
 
 BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rEvt,
-                          long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
+                          tools::Long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
                           const tools::Rectangle& rRect ):
     MouseEvent(rEvt),
     BrowseEvent( pWindow, nAbsRow, nColumn, nColumnId, rRect )
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 996b68b4b194..1c451fa95943 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -196,7 +196,7 @@ namespace svt
     }
 
 
-    bool EditBrowseBox::SeekRow(long nRow)
+    bool EditBrowseBox::SeekRow(tools::Long nRow)
     {
         nPaintRow = nRow;
         return true;
@@ -364,7 +364,7 @@ namespace svt
     }
 
 
-    EditBrowseBox::RowStatus EditBrowseBox::GetRowStatus(long) const
+    EditBrowseBox::RowStatus EditBrowseBox::GetRowStatus(tools::Long) const
     {
         return CLEAN;
     }
@@ -770,7 +770,7 @@ namespace svt
     }
 
 
-    bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const
+    bool EditBrowseBox::IsCursorMoveAllowed(tools::Long nNewRow, sal_uInt16 nNewColId) const
     {
         sal_uInt16 nInfo = 0;
 
@@ -874,7 +874,7 @@ namespace svt
     }
 
 
-    bool EditBrowseBox::CursorMoving(long, sal_uInt16)
+    bool EditBrowseBox::CursorMoving(tools::Long, sal_uInt16)
     {
         DeactivateCell(false);
         return true;
@@ -883,7 +883,7 @@ namespace svt
 
     void EditBrowseBox::CursorMoved()
     {
-        long nNewRow = GetCurRow();
+        tools::Long nNewRow = GetCurRow();
         if (nEditRow != nNewRow)
         {
             if (!(GetBrowserFlags() & EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT))
@@ -909,7 +909,7 @@ namespace svt
     }
 
 
-    void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, bool bCellFocus)
+    void EditBrowseBox::ActivateCell(tools::Long nRow, sal_uInt16 nCol, bool bCellFocus)
     {
         if (IsEditing())
             return;
@@ -992,7 +992,7 @@ namespace svt
     }
 
 
-    tools::Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, bool bRel) const
+    tools::Rectangle EditBrowseBox::GetCellRect(tools::Long nRow, sal_uInt16 nColId, bool bRel) const
     {
         tools::Rectangle aRect( GetFieldRectPixel(nRow, nColId, bRel));
         if ((GetMode()  & BrowserMode::CURSOR_WO_FOCUS) == BrowserMode::CURSOR_WO_FOCUS)
@@ -1060,7 +1060,7 @@ namespace svt
 
         DBG_ASSERT(nId, "EditBrowseBox::AppendColumn: invalid id!");
 
-        long w = nWidth;
+        tools::Long w = nWidth;
         if (!w)
             w = GetDefaultColumnWidth(rName);
 
@@ -1102,7 +1102,7 @@ namespace svt
     {
     }
 
-    CellController* EditBrowseBox::GetController(long, sal_uInt16)
+    CellController* EditBrowseBox::GetController(tools::Long, sal_uInt16)
     {
         return nullptr;
     }
@@ -1122,7 +1122,7 @@ namespace svt
         rControl.SetPosSizePixel(aPoint, aSize);
     }
 
-    void EditBrowseBox::InitController(CellControllerRef&, long, sal_uInt16)
+    void EditBrowseBox::InitController(CellControllerRef&, tools::Long, sal_uInt16)
     {
     }
 
@@ -1152,12 +1152,12 @@ namespace svt
         sal_uInt32 nCurColWidth  = GetColumnWidth(nColId);
         sal_uInt32 nMinColWidth = CalcZoom(20); // minimum
         sal_uInt32 nNewColWidth = nMinColWidth;
-        long nMaxRows      = std::min(long(GetVisibleRows()), GetRowCount());
-        long nLastVisRow   = GetTopRow() + nMaxRows - 1;
+        tools::Long nMaxRows      = std::min(tools::Long(GetVisibleRows()), GetRowCount());
+        tools::Long nLastVisRow   = GetTopRow() + nMaxRows - 1;
 
         if (GetTopRow() <= nLastVisRow) // calc the column with using the cell contents
         {
-            for (long i = GetTopRow(); i <= nLastVisRow; ++i)
+            for (tools::Long i = GetTopRow(); i <= nLastVisRow; ++i)
                 nNewColWidth = std::max(nNewColWidth,GetTotalCellWidth(i,nColId) + 12);
 
             if (nNewColWidth == nCurColWidth)   // size has not changed
@@ -1168,7 +1168,7 @@ namespace svt
         return nNewColWidth;
     }
 
-    sal_uInt32 EditBrowseBox::GetTotalCellWidth(long, sal_uInt16)
+    sal_uInt32 EditBrowseBox::GetTotalCellWidth(tools::Long, sal_uInt16)
     {
         return 0;
     }
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 51f58e320703..fece6c6dc0a0 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -35,7 +35,7 @@ namespace svt
     using namespace ::com::sun::star::accessibility::AccessibleEventId;
 
 
-Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState)
+Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(tools::Long _nRow, sal_uInt16 _nColumnPos,const TriState& eState)
 {
     Reference< XAccessible > xAccessible( GetAccessible() );
     Reference< XAccessibleContext > xAccContext;
@@ -143,7 +143,7 @@ void EditBrowseBox::DetermineFocus( const GetFocusFlags _nGetFocusFlags )
         )
         return;
 
-    long nRows = GetRowCount();
+    tools::Long nRows = GetRowCount();
     sal_uInt16 nCols = ColCount();
 
     if (( nRows <= 0 ) || ( nCols <= 0 ))