summaryrefslogtreecommitdiff
path: root/accessibility/source/extended
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-07-19 15:19:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-07-20 08:15:29 +0200
commit0e8b7dd7a013dffe080148baac926a698f36ad85 (patch)
tree940962b117c06943784aa94f1116bf748a2d057c /accessibility/source/extended
parent669d6ed4fa2e7a01c372a6e27dd5468ec8eb3077 (diff)
split GetWindowExtentsRelative asunder
sometimes it returns a relative position, sometimes an absolute position. Rather have two different methods with names that match what they return. Change-Id: Ie1e73c6be1c797fd59934c96866d1fef1f972b35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154653 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility/source/extended')
-rw-r--r--accessibility/source/extended/AccessibleBrowseBox.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControl.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControlHeader.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControlHeaderCell.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControlTable.cxx4
-rw-r--r--accessibility/source/extended/AccessibleGridControlTableCell.cxx4
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx2
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx2
8 files changed, 14 insertions, 14 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 539f10df1cc3..b5d0051ffc1d 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -181,13 +181,13 @@ tools::Rectangle AccessibleBrowseBox::implGetBoundingBox()
{
vcl::Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
- return mpBrowseBox->GetWindowExtentsRelative( pParent );
+ return mpBrowseBox->GetWindowExtentsRelative( *pParent );
}
tools::Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
{
- return mpBrowseBox->GetWindowExtentsRelative( nullptr );
+ return mpBrowseBox->GetWindowExtentsAbsolute();
}
// internal helper methods
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 800ab312d19e..37d5013c8fa6 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -189,13 +189,13 @@ tools::Rectangle AccessibleGridControl::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
- return m_aTable.GetWindowExtentsRelative( pParent );
+ return m_aTable.GetWindowExtentsRelative( *pParent );
}
tools::Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
{
- return m_aTable.GetWindowExtentsRelative( nullptr );
+ return m_aTable.GetWindowExtentsAbsolute();
}
// internal helper methods ----------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 3c6a2edb9a5a..b3651f792790 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -189,7 +189,7 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
tools::Rectangle AccessibleGridControlHeader::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
- tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
+ tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( *pParent ) );
tools::Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
if(isColumnBar())
return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getOpenWidth(),aHeaderRect.getOpenHeight()));
@@ -200,7 +200,7 @@ tools::Rectangle AccessibleGridControlHeader::implGetBoundingBox()
tools::Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen()
{
- tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
+ tools::Rectangle aGridRect( m_aTable.GetWindowExtentsAbsolute() );
tools::Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
if(isColumnBar())
return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getOpenWidth(),aHeaderRect.getOpenHeight()));
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index ba7d4488945c..6e9e6014ee8e 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -125,7 +125,7 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
tools::Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
- tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
+ tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( *pParent ) );
sal_Int32 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect;
if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
@@ -138,7 +138,7 @@ tools::Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
tools::Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
{
- tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
+ tools::Rectangle aGridRect( m_aTable.GetWindowExtentsAbsolute() );
sal_Int32 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect;
if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 2c50501cba56..579826195be2 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -340,7 +340,7 @@ tools::Rectangle AccessibleGridControlTable::implGetBoundingBox()
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
- tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ));
+ tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( *pParent ));
tools::Rectangle aTableRect( m_aTable.calcTableRect() );
tools::Long nX = aGridRect.Left() + aTableRect.Left();
tools::Long nY = aGridRect.Top() + aTableRect.Top();
@@ -352,7 +352,7 @@ tools::Rectangle AccessibleGridControlTable::implGetBoundingBox()
tools::Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
{
- tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ));
+ tools::Rectangle aGridRect( m_aTable.GetWindowExtentsAbsolute());
tools::Rectangle aTableRect( m_aTable.calcTableRect() );
tools::Long nX = aGridRect.Left() + aTableRect.Left();
tools::Long nY = aGridRect.Top() + aTableRect.Top();
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 91d84902bdee..fe59b7eab296 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -327,7 +327,7 @@ namespace accessibility
{
vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
- tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent );
+ tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( *pParent );
sal_Int64 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
tools::Long nX = aGridRect.Left() + aCellRect.Left();
@@ -338,7 +338,7 @@ namespace accessibility
tools::Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen()
{
- tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( nullptr );
+ tools::Rectangle aGridRect = m_aTable.GetWindowExtentsAbsolute();
sal_Int64 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
tools::Long nX = aGridRect.Left() + aCellRect.Left();
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 82e8ba091f22..0edf5535fc12 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -116,7 +116,7 @@ namespace accessibility
{
aRect = m_pIconCtrl->GetBoundingBox( pEntry );
Point aTopLeft = aRect.TopLeft();
- aTopLeft += m_pIconCtrl->GetWindowExtentsRelative( nullptr ).TopLeft();
+ aTopLeft += m_pIconCtrl->GetWindowExtentsAbsolute().TopLeft();
aRect = tools::Rectangle( aTopLeft, aRect.GetSize() );
}
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 013bb940ca80..189cb60d56a8 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -151,7 +151,7 @@ namespace accessibility
{
aRect = m_pTreeListBox->GetBoundingRect( pEntry );
Point aTopLeft = aRect.TopLeft();
- aTopLeft += m_pTreeListBox->GetWindowExtentsRelative( nullptr ).TopLeft();
+ aTopLeft += m_pTreeListBox->GetWindowExtentsAbsolute().TopLeft();
aRect = tools::Rectangle( aTopLeft, aRect.GetSize() );
}