summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/inc/helper/IComboListBoxHelper.hxx2
-rw-r--r--accessibility/inc/helper/listboxhelper.hxx6
-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
-rw-r--r--accessibility/source/standard/accessiblemenucomponent.cxx4
-rw-r--r--accessibility/source/standard/accessiblemenuitemcomponent.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblelistitem.cxx2
13 files changed, 22 insertions, 22 deletions
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
index eed2a757c1e4..749a0c7b6f7c 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -41,7 +41,7 @@ namespace accessibility
virtual OUString GetEntry( sal_Int32 nPos ) const = 0;
virtual tools::Rectangle GetDropDownPosSizePixel( ) const = 0;
virtual tools::Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
- virtual tools::Rectangle GetWindowExtentsRelative() = 0;
+ virtual tools::Rectangle GetWindowExtentsAbsolute() = 0;
virtual bool IsEnabled() const = 0;
virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0;
virtual sal_uInt16 GetDisplayLineCount() const = 0;
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index dfadf37aa015..98b6d9ee2f51 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -49,7 +49,7 @@ public:
virtual tools::Rectangle GetDropDownPosSizePixel() const override
{
- tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr);
+ tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsAbsolute();
tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
aRet.Move(aTemp.Left(), aTemp.Top());
return aRet;
@@ -74,9 +74,9 @@ public:
return aRect;
}
- virtual tools::Rectangle GetWindowExtentsRelative() override
+ virtual tools::Rectangle GetWindowExtentsAbsolute() override
{
- return m_aComboListBox.GetWindowExtentsRelative( nullptr );
+ return m_aComboListBox.GetWindowExtentsAbsolute();
}
virtual bool IsEnabled() const override
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() );
}
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 997abc9817ae..02c67944960e 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -97,7 +97,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds()
if ( pWindow )
{
// get bounding rectangle of the window in screen coordinates
- tools::Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
+ tools::Rectangle aRect = pWindow->GetWindowExtentsAbsolute();
aBounds = AWTRectangle( aRect );
// get position of the accessible parent in screen coordinates
@@ -234,7 +234,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( )
vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
- tools::Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
+ tools::Rectangle aRect = pWindow->GetWindowExtentsAbsolute();
aPos = AWTPoint( aRect.TopLeft() );
}
}
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index a69b1f12f652..6561ff12d1cf 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -248,7 +248,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds()
vcl::Window* pWindow = m_pParent->GetWindow();
if ( pWindow )
{
- tools::Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
+ tools::Rectangle aRect = pWindow->GetWindowExtentsAbsolute();
awt::Point aWindowScreenLoc = AWTPoint( aRect.TopLeft() );
// get position of accessible parent in screen coordinates
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 55fd0693718d..7f9aa7d109e3 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -342,7 +342,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( )
{
tools::Rectangle aRect = pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent));
aPoint = aRect.TopLeft();
- aPoint += pListBoxHelper->GetWindowExtentsRelative().TopLeft();
+ aPoint += pListBoxHelper->GetWindowExtentsAbsolute().TopLeft();
}
return AWTPoint( aPoint );
}