accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 2 +-
accessibility/source/extended/accessiblebrowseboxcell.cxx | 4 ++--
include/svtools/brwbox.hxx | 2 +-
include/vcl/accessibletableprovider.hxx | 2 +-
include/vcl/toolkit/svtabbx.hxx | 2 +-
svtools/source/brwbox/brwbox2.cxx | 2 +-
vcl/source/treelist/svtabbx.cxx | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 175c01e4307ba04883e531fd7899d35f160c2d6b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 26 12:15:55 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 27 09:44:09 2023 +0200
rename GetFieldRectPixelAbs to GetFieldRectPixel
since it can return either absolute or relative values
Change-Id: I23f2403879eded3ec4b3ca20a639ea18b28f5de9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154937
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 619e7780947e..67ffa47a3415 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -123,7 +123,7 @@ namespace
nCol = 0;
}
- tools::Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol,
true, _bOnScreen));
+ tools::Rectangle aRet(_pBrowseBox->GetFieldRectPixel( nRow , nCol,
true, _bOnScreen));
return tools::Rectangle(aRet.TopLeft() -
Point(0,aRet.GetHeight()),aRet.GetSize());
}
}
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx
b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 4996b7eedcd2..a5fbb47bc4f4 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -57,12 +57,12 @@ namespace accessibility
::tools::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
{
- return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false,
false );
+ return mpBrowseBox->GetFieldRectPixel( m_nRowPos, m_nColPos, false,
/*bOnScreen*/false );
}
::tools::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
{
- return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false
);
+ return mpBrowseBox->GetFieldRectPixel( m_nRowPos, m_nColPos, false,
/*bOnScreen*/true );
}
} // namespace accessibility
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 1d106d1ddaf1..b25ce4a7d827 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -703,7 +703,7 @@ public:
@return
the Rectangle
*/
- virtual tools::Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,
sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true) override;
+ virtual tools::Rectangle GetFieldRectPixel(sal_Int32 _nRowId, sal_uInt16
_nColId, bool _bIsHeader, bool _bOnScreen) override;
/// return <TRUE/> if and only if the accessible object for this instance
has been created and is alive
bool isAccessibleAlive( ) const;
diff --git a/include/vcl/accessibletableprovider.hxx
b/include/vcl/accessibletableprovider.hxx
index 4986e2504b9c..67c16e8febfe 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -88,7 +88,7 @@ public:
virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar,
bool _bOnScreen = true ) = 0;
virtual tools::Rectangle calcTableRect( bool _bOnScreen =
true ) = 0;
- virtual tools::Rectangle GetFieldRectPixelAbs( sal_Int32
_nRow, sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen = true ) = 0;
+ virtual tools::Rectangle GetFieldRectPixel( sal_Int32 _nRow,
sal_uInt16 _nColumnPos, bool _bIsHeader, bool _bOnScreen ) = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
index 3039c1aebe8d..b9aed978e3c5 100644
--- a/include/vcl/toolkit/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -166,7 +166,7 @@ public:
virtual tools::Rectangle calcHeaderRect( bool _bIsColumnBar,
bool _bOnScreen = true ) override;
virtual tools::Rectangle calcTableRect( bool _bOnScreen =
true ) override;
- virtual tools::Rectangle GetFieldRectPixelAbs( sal_Int32
_nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen = true ) override;
+ virtual tools::Rectangle GetFieldRectPixel( sal_Int32 _nRow,
sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen ) override;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) override;
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleRowHeader( sal_Int32 _nRow ) override;
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index 6b3105f0515e..5174de54d1ef 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1990,7 +1990,7 @@ tools::Rectangle BrowseBox::calcTableRect(bool _bOnScreen)
return tools::Rectangle(aRowBar.TopRight(), Size(aSize.Width() - nX,
aSize.Height() - nY - GetBarHeight()) );
}
-tools::Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId,
sal_uInt16 _nColId, bool /*_bIsHeader*/, bool _bOnScreen )
+tools::Rectangle BrowseBox::GetFieldRectPixel( sal_Int32 _nRowId, sal_uInt16
_nColId, bool /*_bIsHeader*/, bool _bOnScreen )
{
vcl::Window* pParent = nullptr;
if ( !_bOnScreen )
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 91740daf3fb0..a3ff58dcdd46 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -781,7 +781,7 @@ tools::Rectangle SvHeaderTabListBox::calcTableRect( bool
_bOnScreen )
return GetWindowExtentsRelative( *GetAccessibleParentWindow() );
}
-tools::Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow,
sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen )
+tools::Rectangle SvHeaderTabListBox::GetFieldRectPixel( sal_Int32 _nRow,
sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen )
{
DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" );
tools::Rectangle aRect;
