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, 85 insertions, 85 deletions

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index b5c64abed6aa..3bca5dcc4765 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -54,7 +54,7 @@ namespace vcl {
 }
 
 #define BROWSER_INVALIDID           SAL_MAX_UINT16
-#define BROWSER_ENDOFSELECTION      (static_cast<tools::Long>(SFX_ENDOFSELECTION))
+constexpr sal_Int32 BROWSER_ENDOFSELECTION = SFX_ENDOFSELECTION;
 
 enum class BrowserMode
 {
@@ -119,19 +119,19 @@ namespace o3tl
 class BrowseEvent
 {
     VclPtr<vcl::Window>     pWin;
-    tools::Long                    nRow;
+    sal_Int32               nRow;
     tools::Rectangle        aRect;
     sal_uInt16              nCol;
     sal_uInt16              nColId;
 
 public:
                         BrowseEvent( vcl::Window* pWindow,
-                                     tools::Long nAbsRow,
+                                     sal_Int32 nAbsRow,
                                      sal_uInt16 nColumn, sal_uInt16 nColumnId,
                                      const tools::Rectangle& rRect );
 
     vcl::Window*        GetWindow() const { return pWin; }
-    tools::Long                GetRow() const { return nRow; }
+    sal_Int32           GetRow() const { return nRow; }
     sal_uInt16          GetColumn() const { return nCol; }
     sal_uInt16          GetColumnId() const { return nColId; }
     const tools::Rectangle&    GetRect() const { return aRect; }
@@ -225,7 +225,7 @@ class BrowserMouseEvent: public MouseEvent, public BrowseEvent
 public:
     BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt );
     BrowserMouseEvent( vcl::Window* pWin, const MouseEvent& rEvt,
-                       tools::Long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
+                       sal_Int32 nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
                        const tools::Rectangle& rRect );
 };
 
@@ -287,9 +287,9 @@ private:
     bool            bHLines;        // draw lines between rows
     bool            bVLines;        // draw lines between columns
     bool            bBootstrapped;  // child windows resized etc.
-    tools::Long            nTopRow;        // no. of first visible row (0...)
-    tools::Long            nCurRow;        // no. of row with cursor
-    tools::Long            nRowCount;      // total number of rows in model
+    sal_Int32       nTopRow;        // no. of first visible row (0...)
+    sal_Int32       nCurRow;        // no. of row with cursor
+    sal_Int32       nRowCount;      // total number of rows in model
     sal_uInt16      nFirstCol;      // no. of first visible scrollable column
     sal_uInt16      nCurColId;      // column id of cursor
 
@@ -317,17 +317,17 @@ private:
     union
     {
         MultiSelection* pSel;       // selected rows for multi-selection
-        tools::Long            nSel;       // selected row for single-selection
+        sal_Int32       nSel;       // selected row for single-selection
     }               uRow;
     std::unique_ptr<MultiSelection> pColSel; // selected column-ids
 
     // fdo#83943, detect if making the cursor position visible is impossible to achieve
     struct CursorMoveAttempt
     {
-        tools::Long m_nCol;
-        tools::Long m_nRow;
+        sal_Int32 m_nCol;
+        sal_Int32 m_nRow;
         bool m_bScrolledToReachCell;
-        CursorMoveAttempt(tools::Long nCol, tools::Long nRow, bool bScrolledToReachCell)
+        CursorMoveAttempt(sal_Int32 nCol, sal_Int32 nRow, bool bScrolledToReachCell)
             : m_nCol(nCol)
             , m_nRow(nRow)
             , m_bScrolledToReachCell(bScrolledToReachCell)
@@ -359,7 +359,7 @@ private:
     SVT_DLLPRIVATE void            AutoSizeLastColumn();
 
     SVT_DLLPRIVATE tools::Long            ImpGetDataRowHeight() const;
-    SVT_DLLPRIVATE tools::Rectangle       ImplFieldRectPixel( tools::Long nRow, sal_uInt16 nColId ) const;
+    SVT_DLLPRIVATE tools::Rectangle       ImplFieldRectPixel( sal_Int32 nRow, sal_uInt16 nColId ) const;
     SVT_DLLPRIVATE sal_uInt16      FrozenColCount() const;
 
     SVT_DLLPRIVATE void            ColumnInserted( sal_uInt16 nPos );
@@ -371,7 +371,7 @@ private:
 
     SVT_DLLPRIVATE tools::Long GetBarHeight() const;
 
-    bool            GoToRow(tools::Long nRow, bool bRowColMove, bool bDoNotModifySelection = false );
+    bool            GoToRow(sal_Int32 nRow, bool bRowColMove, bool bDoNotModifySelection = false );
 
     bool            GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove = false);
     void            SelectColumnPos( sal_uInt16 nCol, bool _bSelect, bool bMakeVisible);
@@ -395,7 +395,7 @@ protected:
     // (with the help of RowInserted and RowRemoved), so overriding of
     // the method is needless
 public:
-    virtual tools::Long    GetRowCount() const override;
+    virtual sal_Int32  GetRowCount() const override;
 
 protected:
     // for display in VScrollBar set it e.g. on  "?"
@@ -408,7 +408,7 @@ protected:
         @param nRow
             nRow starts at 0
     */
-    virtual bool    SeekRow( tools::Long nRow ) = 0;
+    virtual bool    SeekRow( sal_Int32 nRow ) = 0;
     void            DrawCursor();
     void            PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
     virtual void    PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
@@ -426,11 +426,11 @@ protected:
     //   numbering of the visible scope has changed
     // - Scrolling (and thereof resulting in another first visible row)
     // - Resize the window
-    virtual void    VisibleRowsChanged( tools::Long nNewTopRow, sal_uInt16 nNumRows);
+    virtual void    VisibleRowsChanged( sal_Int32 nNewTopRow, sal_uInt16 nNumRows);
 
     // number of visible rows in the window (incl. "truncated" rows)
     sal_uInt16      GetVisibleRows() const;
-    tools::Long            GetTopRow() const { return nTopRow; }
+    sal_Int32       GetTopRow() const { return nTopRow; }
     sal_uInt16      GetFirstVisibleColNumber() const { return nFirstCol; }
 
     // Focus-Rect enable / disable
@@ -488,7 +488,7 @@ public:
     virtual void    EndScroll();
     virtual void    Select();
     virtual void    DoubleClick( const BrowserMouseEvent& rEvt );
-    virtual bool    IsCursorMoveAllowed( tools::Long nNewRow, sal_uInt16 nNewColId ) const;
+    virtual bool    IsCursorMoveAllowed( sal_Int32 nNewRow, sal_uInt16 nNewColId ) const;
     virtual void    CursorMoved();
     virtual void    ColumnMoved( sal_uInt16 nColId );
     virtual void    ColumnResized( sal_uInt16 nColId );
@@ -533,56 +533,56 @@ public:
     bool            IsFrozen( sal_uInt16 nColumnId ) const;
 
     // movement of visible area
-    tools::Long            ScrollColumns( tools::Long nColumns );
-    tools::Long            ScrollRows( tools::Long nRows );
-    void            MakeFieldVisible( tools::Long nRow, sal_uInt16 nColId );
+    sal_Int32       ScrollColumns( sal_Int32 nColumns );
+    sal_Int32       ScrollRows( sal_Int32 nRows );
+    void            MakeFieldVisible( sal_Int32 nRow, sal_uInt16 nColId );
 
     // access and movement of cursor
-    tools::Long            GetCurRow() const { return nCurRow; }
+    sal_Int32       GetCurRow() const { return nCurRow; }
     sal_uInt16      GetCurColumnId() const { return nCurColId; }
-    bool            GoToRow( tools::Long nRow );
+    bool            GoToRow( sal_Int32 nRow );
     bool            GoToColumnId( sal_uInt16 nColId );
-    bool            GoToRowColumnId( tools::Long nRow, sal_uInt16 nColId );
+    bool            GoToRowColumnId( sal_Int32 nRow, sal_uInt16 nColId );
 
     // selections
     virtual void    SetNoSelection() override;
     virtual void    SelectAll() override;
-    virtual void    SelectRow( tools::Long nRow, bool _bSelect = true, bool bExpand = true ) override;
+    virtual void    SelectRow( sal_Int32 nRow, bool _bSelect = true, bool bExpand = true ) override;
     void            SelectColumnPos( sal_uInt16 nCol, bool _bSelect = true )
                         { SelectColumnPos( nCol, _bSelect, true); }
     void            SelectColumnId( sal_uInt16 nColId )
                         { SelectColumnPos( GetColumnPos(nColId), true, true); }
-    tools::Long            GetSelectRowCount() const;
+    sal_Int32       GetSelectRowCount() const;
     sal_uInt16          GetSelectColumnCount() const;
-    virtual bool    IsRowSelected( tools::Long nRow ) const override;
+    virtual bool    IsRowSelected( sal_Int32 nRow ) const override;
     bool            IsColumnSelected( sal_uInt16 nColumnId ) const;
-    tools::Long            FirstSelectedRow();
-    tools::Long            LastSelectedRow();
-    tools::Long            NextSelectedRow();
+    sal_Int32       FirstSelectedRow();
+    sal_Int32       LastSelectedRow();
+    sal_Int32       NextSelectedRow();
     const MultiSelection* GetColumnSelection() const { return pColSel.get(); }
     const MultiSelection* GetSelection() const
                     { return bMultiSelection ? uRow.pSel : nullptr; }
 
-    tools::Long            FirstSelectedColumn( ) const;
+    sal_Int32       FirstSelectedColumn( ) const;
 
     bool            IsResizing() const { return bResizing; }
 
     // access to positions of fields, column and rows
     BrowserDataWin&        GetDataWindow() const;
-    tools::Rectangle       GetRowRectPixel( tools::Long nRow ) const;
-    tools::Rectangle       GetFieldRectPixel( tools::Long nRow, sal_uInt16 nColId,
+    tools::Rectangle       GetRowRectPixel( sal_Int32 nRow ) const;
+    tools::Rectangle       GetFieldRectPixel( sal_Int32 nRow, sal_uInt16 nColId,
                                        bool bRelToBrowser = true) const;
-    bool            IsFieldVisible( tools::Long nRow, sal_uInt16 nColId,
+    bool            IsFieldVisible( sal_Int32 nRow, sal_uInt16 nColId,
                                     bool bComplete = false ) const;
-    tools::Long            GetRowAtYPosPixel( tools::Long nY,
+    sal_Int32       GetRowAtYPosPixel( tools::Long nY,
                                         bool bRelToBrowser = true  ) const;
     sal_uInt16      GetColumnAtXPosPixel( tools::Long nX ) const;
 
     // invalidations
     void            Clear();
-    void            RowRemoved( tools::Long nRow, tools::Long nNumRows = 1, bool bDoPaint = true );
-    void            RowModified( tools::Long nRow, sal_uInt16 nColId = BROWSER_INVALIDID );
-    void            RowInserted( tools::Long nRow, tools::Long nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false );
+    void            RowRemoved( sal_Int32 nRow, sal_Int32 nNumRows = 1, bool bDoPaint = true );
+    void            RowModified( sal_Int32 nRow, sal_uInt16 nColId = BROWSER_INVALIDID );
+    void            RowInserted( sal_Int32 nRow, sal_Int32 nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false );
 
     // miscellaneous
     bool            ReserveControlArea(sal_uInt16 nWidth = USHRT_MAX);
@@ -624,7 +624,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual OUString  GetCellText(tools::Long _nRow, sal_uInt16 _nColId) const;
+    virtual OUString  GetCellText(sal_Int32 _nRow, sal_uInt16 _nColId) const;
 
     /** @return
             the current column count
@@ -818,13 +818,13 @@ public:
     virtual bool                    HasRowHeader() const override;
     virtual bool                    GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override;
     virtual void                    SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) override;
-    virtual bool                    IsColumnSelected( tools::Long _nColumn ) const override;
+    virtual bool                    IsColumnSelected( sal_Int32 _nColumn ) const override;
     virtual sal_Int32               GetSelectedRowCount() const override;
     virtual sal_Int32               GetSelectedColumnCount() const override;
     virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const override;
     virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const override;
     virtual bool                    IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override;
-    virtual OUString                GetAccessibleCellText(tools::Long _nRow, sal_uInt16 _nColPos) const override;
+    virtual OUString                GetAccessibleCellText(sal_Int32 _nRow, sal_uInt16 _nColPos) const override;
     virtual bool                    GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override;
     virtual tools::Rectangle        GetWindowExtentsRelative(const vcl::Window *pRelativeWindow) const override;
     virtual void                    GrabFocus() override;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 1ba2817a4ed9..9d3f9cea3ee1 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -837,8 +837,8 @@ namespace svt
             // In ActivateCell, we grab the focus asynchronously, but if between requesting activation
             // and the asynchronous event the focus has changed, we won't grab it for ourself.
 
-        tools::Long    nPaintRow;  // row being painted
-        tools::Long    nEditRow;
+        sal_Int32   nPaintRow;  // row being painted
+        sal_Int32   nEditRow;
         sal_uInt16  nEditCol;
 
         bool            bHasFocus : 1;
@@ -867,7 +867,7 @@ namespace svt
         virtual void ColumnResized(sal_uInt16 nColId) override;
         virtual void Resize() override;
         virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY);
-        virtual bool SeekRow(tools::Long nRow) override;
+        virtual bool SeekRow(sal_Int32 nRow) override;
 
         virtual void GetFocus() override;
         virtual void LoseFocus() override;
@@ -886,14 +886,14 @@ namespace svt
         virtual void EndScroll() override;
 
         // should be used instead of GetFieldRectPixel, 'cause this method here takes into account the borders
-        tools::Rectangle GetCellRect(tools::Long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const;
-        virtual sal_uInt32 GetTotalCellWidth(tools::Long nRow, sal_uInt16 nColId);
+        tools::Rectangle GetCellRect(sal_Int32 nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const;
+        virtual sal_uInt32 GetTotalCellWidth(sal_Int32 nRow, sal_uInt16 nColId);
         sal_uInt32 GetAutoColumnWidth(sal_uInt16 nColId);
 
         virtual void PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const;
         virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const = 0;
 
-        virtual RowStatus GetRowStatus(tools::Long nRow) const;
+        virtual RowStatus GetRowStatus(sal_Int32 nRow) const;
 
         virtual void    RowHeightChanged() override;
 
@@ -903,7 +903,7 @@ namespace svt
 
         // when changing a row:
         // CursorMoving:    cursor is being moved, but GetCurRow() still provides the old row
-        virtual bool CursorMoving(tools::Long nNewRow, sal_uInt16 nNewCol);
+        virtual bool CursorMoving(sal_Int32 nNewRow, sal_uInt16 nNewCol);
 
         // cursor has been moved
         virtual void CursorMoved() override;
@@ -915,8 +915,8 @@ namespace svt
 
         virtual bool IsModified() const {return aController.is() && aController->IsValueChangedFromSaved();}
 
-        virtual CellController* GetController(tools::Long nRow, sal_uInt16 nCol);
-        virtual void InitController(CellControllerRef& rController, tools::Long nRow, sal_uInt16 nCol);
+        virtual CellController* GetController(sal_Int32 nRow, sal_uInt16 nCol);
+        virtual void InitController(CellControllerRef& rController, sal_Int32 nRow, sal_uInt16 nCol);
         static void ResizeController(CellControllerRef const & rController, const tools::Rectangle&);
         virtual void DoubleClick(const BrowserMouseEvent&) override;
 
@@ -934,7 +934,7 @@ namespace svt
         // result in traveling to the next or to th previous cell
         virtual bool IsTabAllowed(bool bForward) const;
 
-        virtual bool IsCursorMoveAllowed(tools::Long nNewRow, sal_uInt16 nNewColId) const override;
+        virtual bool IsCursorMoveAllowed(sal_Int32 nNewRow, sal_uInt16 nNewColId) const override;
 
         void    PaintTristate(const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const;
 
@@ -947,7 +947,7 @@ namespace svt
         virtual void dispose() override;
 
         bool IsEditing() const {return aController.is();}
-        void InvalidateStatusCell(tools::Long nRow) {RowModified(nRow, 0);}
+        void InvalidateStatusCell(sal_Int32 nRow) {RowModified(nRow, 0);}
         void InvalidateHandleColumn();
 
         // late construction
@@ -959,7 +959,7 @@ namespace svt
         EditBrowseBoxFlags  GetBrowserFlags() const { return m_nBrowserFlags; }
         void                SetBrowserFlags(EditBrowseBoxFlags nFlags);
 
-        virtual void ActivateCell(tools::Long nRow, sal_uInt16 nCol, bool bSetCellFocus = true);
+        virtual void ActivateCell(sal_Int32 nRow, sal_uInt16 nCol, bool bSetCellFocus = true);
         virtual void DeactivateCell(bool bUpdate = true);
         // Children ---------------------------------------------------------------
 
@@ -982,7 +982,7 @@ namespace svt
 
         virtual bool ProcessKey(const KeyEvent& rEvt) override;
 
-        css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCheckBoxCell(tools::Long _nRow, sal_uInt16 _nColumnPos,const TriState& eState);
+        css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCheckBoxCell(sal_Int32 _nRow, sal_uInt16 _nColumnPos,const TriState& eState);
         bool ControlHasFocus() const;
     protected:
         // creates the accessible which wraps the active cell
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index f2fa49b7759c..1fb6c19951b6 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -295,7 +295,7 @@ private:
                                             // (with respect to the data source capabilities)
                                             // defaults to (insert | update | delete)
     sal_uInt16          m_nLastColId;
-    tools::Long                m_nLastRowId;
+    sal_Int32           m_nLastRowId;
 
     bool                m_bDesignMode : 1;      // default = sal_False
     bool                m_bRecordCountFinal : 1;
@@ -312,14 +312,14 @@ protected:
     bool                m_bUpdating : 1;            // are any updates being executed right now?
 
 protected:
-    virtual bool SeekRow(tools::Long nRow) override;
-    virtual void VisibleRowsChanged( tools::Long nNewTopRow, sal_uInt16 nNumRows) override;
+    virtual bool SeekRow(sal_Int32 nRow) override;
+    virtual void VisibleRowsChanged( sal_Int32 nNewTopRow, sal_uInt16 nNumRows) override;
     virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId) const override;
-    virtual RowStatus GetRowStatus(tools::Long nRow) const override;
-    virtual bool CursorMoving(tools::Long nNewRow, sal_uInt16 nNewCol) override;
+    virtual RowStatus GetRowStatus(sal_Int32 nRow) const override;
+    virtual bool CursorMoving(sal_Int32 nNewRow, sal_uInt16 nNewCol) override;
     virtual void CursorMoved() override;
     virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) override;
-    virtual sal_uInt32 GetTotalCellWidth(tools::Long nRow, sal_uInt16 nColId) override;
+    virtual sal_uInt32 GetTotalCellWidth(sal_Int32 nRow, sal_uInt16 nColId) override;
     virtual void Command(const CommandEvent& rEvt) override;
     virtual bool PreNotify(NotifyEvent& rEvt) override;
     virtual void KeyInput(const KeyEvent& rEvt) override;
@@ -327,7 +327,7 @@ protected:
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual void Select() override;
 
-    virtual ::svt::CellController* GetController(tools::Long nRow, sal_uInt16 nCol) override;
+    virtual ::svt::CellController* GetController(sal_Int32 nRow, sal_uInt16 nCol) override;
 
     virtual void CellModified() override;
     virtual bool SaveModified() override;
@@ -374,7 +374,7 @@ protected:
     // DragSourceHelper overridables
     virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) override;
 
-    void    executeRowContextMenu( tools::Long _nRow, const Point& _rPreferredPos );
+    void    executeRowContextMenu( sal_Int32 _nRow, const Point& _rPreferredPos );
 
 public:
     DbGridControl(
@@ -397,7 +397,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual OUString  GetCellText(tools::Long _nRow, sal_uInt16 _nColId) const override;
+    virtual OUString  GetCellText(sal_Int32 _nRow, sal_uInt16 _nColId) const override;
 
     void RemoveRows(bool bNewCursor);
 
@@ -437,7 +437,7 @@ public:
 
     void SetFilterMode(bool bMode);
     bool IsFilterMode() const {return m_bFilterMode;}
-    bool IsFilterRow(tools::Long nRow) const {return m_bFilterMode && nRow == 0;}
+    bool IsFilterRow(sal_Int32 nRow) const {return m_bFilterMode && nRow == 0;}
 
     void EnableNavigationBar(bool bEnable);
     bool HasNavigationBar() const {return m_bNavigationBar;}
@@ -472,9 +472,9 @@ public:
     // is the current line being updated
     bool IsUpdating() const {return m_bUpdating;}
 
-    void RowRemoved( tools::Long nRow, tools::Long nNumRows = 1, bool bDoPaint = true );
-    void RowInserted( tools::Long nRow, tools::Long nNumRows = 1, bool bDoPaint = true );
-    void RowModified( tools::Long nRow );
+    void RowRemoved( sal_Int32 nRow, sal_Int32 nNumRows = 1, bool bDoPaint = true );
+    void RowInserted( sal_Int32 nRow, sal_Int32 nNumRows = 1, bool bDoPaint = true );
+    void RowModified( sal_Int32 nRow );
 
     void resetCurrentRow();
 
@@ -560,12 +560,12 @@ public:
     CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override;
 
 protected:
-    void RecalcRows(tools::Long nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor);
-    bool SeekCursor(tools::Long nRow, bool bAbsolute = false);
+    void RecalcRows(sal_Int32 nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor);
+    bool SeekCursor(sal_Int32 nRow, bool bAbsolute = false);
     void RemoveColumns();       // cleaning of own structures
     void AdjustRows();
     sal_Int32 AlignSeekCursor();
-    bool SetCurrent(tools::Long nNewRow);
+    bool SetCurrent(sal_Int32 nNewRow);
 
     OUString GetCurrentRowCellText(DbGridColumn const * pCol,const DbGridRowRef& _rRow) const;
     virtual void DeleteSelectedRows();
@@ -575,7 +575,7 @@ protected:
     bool IsCurrentAppending() const;
 
     // empty row for insertion
-    bool IsInsertionRow(tools::Long nRow) const;
+    bool IsInsertionRow(sal_Int32 nRow) const;
 
     void  SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;}
     sal_Int32 GetCurrentPos() const {return m_nCurrentPos;}
diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
index b98080273dae..3e3cd2fcb206 100644
--- a/include/vcl/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -81,8 +81,8 @@ public:
     virtual vcl::Window* GetWindowInstance()= 0;
     virtual sal_Int32 GetAccessibleControlCount() const = 0;
     virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0;
-    virtual tools::Long GetRowCount() const= 0;
-    virtual tools::Long GetColumnCount() const= 0;
+    virtual sal_Int32 GetRowCount() const= 0;
+    virtual sal_Int32 GetColumnCount() const= 0;
     virtual bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0;
     virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar ) = 0;
     virtual tools::Rectangle calcHeaderCellRect( bool _bColHeader, sal_Int32 _nPos ) = 0;
diff --git a/include/vcl/accessibletableprovider.hxx b/include/vcl/accessibletableprovider.hxx
index 637abf236134..253f850da5f8 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -51,7 +51,7 @@ class IAccessibleTableProvider
 {
 public:
     /** @return  The count of the rows. */
-    virtual tools::Long                    GetRowCount() const = 0;
+    virtual sal_Int32               GetRowCount() const = 0;
     /** @return  The count of the columns. */
     virtual sal_uInt16              GetColumnCount() const = 0;
 
@@ -73,19 +73,19 @@ public:
 
     virtual void                    SetNoSelection() = 0;
     virtual void                    SelectAll() = 0;
-    virtual void                    SelectRow( tools::Long _nRow, bool _bSelect = true, bool bExpand = true ) = 0;
+    virtual void                    SelectRow( sal_Int32 _nRow, bool _bSelect = true, bool bExpand = true ) = 0;
     virtual void                    SelectColumn( sal_uInt16 _nColumnPos, bool _bSelect = true ) = 0;
     virtual sal_Int32               GetSelectedRowCount() const = 0;
     virtual sal_Int32               GetSelectedColumnCount() const = 0;
     /** @return  <TRUE/>, if the row is selected. */
-    virtual bool                    IsRowSelected( tools::Long _nRow ) const = 0;
-    virtual bool                    IsColumnSelected( tools::Long _nColumnPos ) const = 0;
+    virtual bool                    IsRowSelected( sal_Int32 _nRow ) const = 0;
+    virtual bool                    IsColumnSelected( sal_Int32 _nColumnPos ) const = 0;
     virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
     virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
 
     /** @return  <TRUE/>, if the cell is visible. */
     virtual bool                    IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
-    virtual OUString                GetAccessibleCellText( tools::Long _nRow, sal_uInt16 _nColumnPos ) const = 0;
+    virtual OUString                GetAccessibleCellText( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
 
     virtual tools::Rectangle               calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) = 0;
     virtual tools::Rectangle               calcTableRect( bool _bOnScreen = true ) = 0;
diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
index c1545c3a7c60..f6e6137c7501 100644
--- a/include/vcl/toolkit/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -133,10 +133,10 @@ public:
 
     // Accessible -------------------------------------------------------------
 
-    bool            IsCellCheckBox( tools::Long _nRow, sal_uInt16 _nColumn, TriState& _rState );
+    bool            IsCellCheckBox( sal_Int32 _nRow, sal_uInt16 _nColumn, TriState& _rState );
 
     /** @return  The count of the rows. */
-    virtual tools::Long                    GetRowCount() const override;
+    virtual sal_Int32               GetRowCount() const override;
     /** @return  The count of the columns. */
     virtual sal_uInt16              GetColumnCount() const override;
 
@@ -160,19 +160,19 @@ public:
     virtual void                    SetNoSelection() override;
     using SvTabListBox::SelectAll;
     virtual void                    SelectAll() override;
-    virtual void                    SelectRow( tools::Long _nRow, bool _bSelect = true, bool bExpand = true ) override;
+    virtual void                    SelectRow( sal_Int32 _nRow, bool _bSelect = true, bool bExpand = true ) override;
     virtual void                    SelectColumn( sal_uInt16 _nColumn, bool _bSelect = true ) override;
     virtual sal_Int32               GetSelectedRowCount() const override;
     virtual sal_Int32               GetSelectedColumnCount() const override;
     /** @return  <TRUE/>, if the row is selected. */
-    virtual bool                    IsRowSelected( tools::Long _nRow ) const override;
-    virtual bool                    IsColumnSelected( tools::Long _nColumn ) const override;
+    virtual bool                    IsRowSelected( sal_Int32 _nRow ) const override;
+    virtual bool                    IsColumnSelected( sal_Int32 _nColumn ) const override;
     virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const override;
     virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const override;
 
     /** @return  <TRUE/>, if the cell is visible. */
     virtual bool                    IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const override;
-    virtual OUString                GetAccessibleCellText( tools::Long _nRow, sal_uInt16 _nColumnPos ) const override;
+    virtual OUString                GetAccessibleCellText( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const override;
 
     virtual tools::Rectangle               calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen = true ) override;
     virtual tools::Rectangle               calcTableRect( bool _bOnScreen = true ) override;