summaryrefslogtreecommitdiff
path: root/accessibility/source
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-10-21 09:28:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-10-21 14:34:01 +0200
commit915c7529e9b041879e8c63f15306028a6f649f48 (patch)
tree3072539a7649359d9ddbf1496ef7e4ee7c8ff0d2 /accessibility/source
parent5e43e888f6b9bc32fc5d3361be5a7962796726ea (diff)
use tools::Long in accessibility..basctl
Change-Id: I67087c7a281e5bdecbaf227bd3147e7c12828791 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104587 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility/source')
-rw-r--r--accessibility/source/extended/AccessibleGridControlTable.cxx18
-rw-r--r--accessibility/source/extended/AccessibleGridControlTableCell.cxx8
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx4
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx4
4 files changed, 17 insertions, 17 deletions
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index cf9aa221a5a1..75b96f4a825d 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -243,7 +243,7 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
ensureIsAlive();
Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
- for(long i=0; i<m_aTable.GetRowCount(); i++)
+ for(tools::Long i=0; i<m_aTable.GetRowCount(); i++)
selectedRows[i]=i;
}
sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
@@ -307,10 +307,10 @@ tools::Rectangle AccessibleGridControlTable::implGetBoundingBox()
DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ));
tools::Rectangle aTableRect( m_aTable.calcTableRect() );
- long nX = aGridRect.Left() + aTableRect.Left();
- long nY = aGridRect.Top() + aTableRect.Top();
- long nWidth = aGridRect.GetSize().Width()-aTableRect.Left();
- long nHeight = aGridRect.GetSize().Height()-aTableRect.Top();
+ tools::Long nX = aGridRect.Left() + aTableRect.Left();
+ tools::Long nY = aGridRect.Top() + aTableRect.Top();
+ tools::Long nWidth = aGridRect.GetSize().Width()-aTableRect.Left();
+ tools::Long nHeight = aGridRect.GetSize().Height()-aTableRect.Top();
tools::Rectangle aTable( Point( nX, nY ), Size( nWidth, nHeight ));
return aTable;
}
@@ -319,10 +319,10 @@ tools::Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
{
tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ));
tools::Rectangle aTableRect( m_aTable.calcTableRect() );
- long nX = aGridRect.Left() + aTableRect.Left();
- long nY = aGridRect.Top() + aTableRect.Top();
- long nWidth = aGridRect.GetSize().Width()-aTableRect.Left();
- long nHeight = aGridRect.GetSize().Height()-aTableRect.Top();
+ tools::Long nX = aGridRect.Left() + aTableRect.Left();
+ tools::Long nY = aGridRect.Top() + aTableRect.Top();
+ tools::Long nWidth = aGridRect.GetSize().Width()-aTableRect.Left();
+ tools::Long nHeight = aGridRect.GetSize().Height()-aTableRect.Top();
tools::Rectangle aTable( Point( nX, nY ), Size( nWidth, nHeight ));
return aTable;
}
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 7254f695a31b..545df2f00d94 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -332,8 +332,8 @@ namespace accessibility
tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent );
sal_Int32 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
- long nX = aGridRect.Left() + aCellRect.Left();
- long nY = aGridRect.Top() + aCellRect.Top();
+ tools::Long nX = aGridRect.Left() + aCellRect.Left();
+ tools::Long nY = aGridRect.Top() + aCellRect.Top();
tools::Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
return aCell;
}
@@ -343,8 +343,8 @@ namespace accessibility
tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( nullptr );
sal_Int32 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
- long nX = aGridRect.Left() + aCellRect.Left();
- long nY = aGridRect.Top() + aCellRect.Top();
+ tools::Long nX = aGridRect.Left() + aCellRect.Left();
+ tools::Long nY = aGridRect.Top() + aCellRect.Top();
tools::Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
return aCell;
}
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index f52c0afa3565..09a14fe4b7c7 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -443,8 +443,8 @@ namespace accessibility
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );
- long nLen = aLayoutData.m_aUnicodeBoundRects.size();
- for ( long i = 0; i < nLen; ++i )
+ tools::Long nLen = aLayoutData.m_aUnicodeBoundRects.size();
+ for ( tools::Long i = 0; i < nLen; ++i )
{
tools::Rectangle aRect = aLayoutData.GetCharacterBounds(i);
bool bInside = aRect.IsInside( aPnt );
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 83866419abc4..e975b62688b3 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -913,8 +913,8 @@ Document::retrieveCharacterBounds(Paragraph const * pParagraph,
::osl::MutexGuard aInternalGuard(GetMutex());
::sal_uInt32 nNumber = static_cast< ::sal_uInt32 >(pParagraph->getNumber());
// XXX numeric overflow
- ::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoint.X),
- static_cast< long >(rPoint.Y))));
+ ::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< tools::Long >(rPoint.X),
+ static_cast< tools::Long >(rPoint.Y))));
// XXX numeric overflow (2x)
return aPaM.GetPara() == nNumber ? aPaM.GetIndex() : -1;
// XXX numeric overflow