summaryrefslogtreecommitdiff
path: root/accessibility/source
diff options
context:
space:
mode:
authorMalte Timmermann [mt] <malte.timmermann@oracle.com>2011-02-15 17:14:59 +0100
committerMalte Timmermann [mt] <malte.timmermann@oracle.com>2011-02-15 17:14:59 +0100
commitf42f3b496a1d956f72fad8aaf37da790e89ed803 (patch)
treeb6f9cea18fda9b1c8a0af9642958a9671de6f713 /accessibility/source
parentde539c71865e6eec7b1db38031f661d7d8ad0714 (diff)
parent16680c16eb84b5315dbbeeb61b3693c4d567640a (diff)
accfixes: merged to m100
Diffstat (limited to 'accessibility/source')
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx4
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx8
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxTable.cxx2
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx2
-rw-r--r--accessibility/source/extended/accessiblebrowseboxcell.cxx4
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrl.cxx2
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx6
-rw-r--r--accessibility/source/extended/accessiblelistbox.cxx8
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx10
-rw-r--r--accessibility/source/extended/accessibletabbar.cxx4
-rw-r--r--accessibility/source/extended/accessibletabbarpagelist.cxx6
-rw-r--r--accessibility/source/extended/accessibletablistboxtable.cxx8
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx82
-rw-r--r--accessibility/source/standard/accessiblemenubasecomponent.cxx8
-rw-r--r--accessibility/source/standard/accessiblemenuitemcomponent.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblebutton.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessibleedit.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblelist.cxx56
-rw-r--r--accessibility/source/standard/vclxaccessiblelistitem.cxx20
-rw-r--r--accessibility/source/standard/vclxaccessiblemenubar.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessiblestatusbar.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessibletabcontrol.cxx8
-rw-r--r--accessibility/source/standard/vclxaccessibletoolbox.cxx34
-rw-r--r--accessibility/source/standard/vclxaccessibletoolboxitem.cxx8
24 files changed, 145 insertions, 145 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index e801a6cf2c20..43d016b86588 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -356,12 +356,12 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId(
Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBox()
{
- return mpBrowseBox->calcHeaderRect(isColumnBar(),FALSE);
+ return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_False);
}
Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBoxOnScreen()
{
- return mpBrowseBox->calcHeaderRect(isColumnBar(),TRUE);
+ return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_True);
}
sal_Int32 AccessibleBrowseBoxHeaderBar::implGetRowCount() const
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 9e9f63ec72c8..44d547f8fd5b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -130,7 +130,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
// -----------------------------------------------------------------------------
namespace
{
- Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, BOOL _bOnScreen,BOOL _bRowBar)
+ Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, sal_Bool _bOnScreen,sal_Bool _bRowBar)
{
sal_Int32 nRow = 0;
sal_uInt16 nCol = (sal_uInt16)_nRowColIndex;
@@ -140,20 +140,20 @@ namespace
nCol = 0;
}
- Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, TRUE, _bOnScreen));
+ Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, sal_True, _bOnScreen));
return Rectangle(aRet.TopLeft() - Point(0,aRet.GetHeight()),aRet.GetSize());
}
}
Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox()
{
- return getRectangle(mpBrowseBox,m_nColumnRowId,FALSE,isRowBarCell());
+ return getRectangle(mpBrowseBox,m_nColumnRowId,sal_False,isRowBarCell());
}
// -----------------------------------------------------------------------------
Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
{
- return getRectangle(mpBrowseBox,m_nColumnRowId,TRUE,isRowBarCell());
+ return getRectangle(mpBrowseBox,m_nColumnRowId,sal_True,isRowBarCell());
}
// -----------------------------------------------------------------------------
sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 00a095a104d7..1ac635ec6230 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -239,7 +239,7 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName()
Rectangle AccessibleBrowseBoxTable::implGetBoundingBox()
{
- return mpBrowseBox->calcTableRect(FALSE);
+ return mpBrowseBox->calcTableRect(sal_False);
}
Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index fe79593e5613..a7392ff46e4a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -65,7 +65,7 @@ namespace accessibility
::rtl::OUString AccessibleBrowseBoxTableCell::implGetText()
{
ensureIsAlive();
- return mpBrowseBox->GetAccessibleCellText( getRowPos(), static_cast< USHORT >( getColumnPos() ) );
+ return mpBrowseBox->GetAccessibleCellText( getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) );
}
::com::sun::star::lang::Locale AccessibleBrowseBoxTableCell::implGetLocale()
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 1c7aca77e603..87e47d83c600 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -76,13 +76,13 @@ namespace accessibility
// -----------------------------------------------------------------------------
::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
{
- return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, FALSE, FALSE );
+ return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False, sal_False );
}
// -----------------------------------------------------------------------------
::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
{
- return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, FALSE );
+ return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False );
}
// .................................................................................
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 397161fd6ac0..3a98169c620a 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -90,7 +90,7 @@ namespace accessibility
SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
- ULONG nPos = pCtrl->GetEntryListPos( pEntry );
+ sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this );
uno::Any aOldValue, aNewValue;
aNewValue <<= xChild;
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 19e809bcc6ea..e910b503ad1c 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -87,7 +87,7 @@ namespace accessibility
// Ctor() and Dtor()
// -----------------------------------------------------------------------------
AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
- ULONG _nPos,
+ sal_uLong _nPos,
const Reference< XAccessible >& _xParent ) :
AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ),
@@ -527,7 +527,7 @@ throw(RuntimeException)
for ( long i = 0; i < nLen; ++i )
{
Rectangle aRect = aLayoutData.GetCharacterBounds(i);
- BOOL bInside = aRect.IsInside( aPnt );
+ sal_Bool bInside = aRect.IsInside( aPnt );
if ( bInside )
break;
@@ -548,7 +548,7 @@ throw(RuntimeException)
throw IndexOutOfBoundsException();
sal_Int32 nLen = nEndIndex - nStartIndex + 1;
- ::svt::OStringTransfer::CopyString( sText.Copy( (USHORT)nStartIndex, (USHORT)nLen ), m_pIconCtrl );
+ ::svt::OStringTransfer::CopyString( sText.Copy( (sal_uInt16)nStartIndex, (sal_uInt16)nLen ), m_pIconCtrl );
return sal_True;
}
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 0468cce97d94..b95643670985 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -306,7 +306,7 @@ namespace accessibility
if ( !pEntry )
throw IndexOutOfBoundsException();
- getListBox()->Select( pEntry, TRUE );
+ getListBox()->Select( pEntry, sal_True );
}
// -----------------------------------------------------------------------------
sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
@@ -334,7 +334,7 @@ namespace accessibility
{
SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
if ( getListBox()->IsSelected( pEntry ) )
- getListBox()->Select( pEntry, FALSE );
+ getListBox()->Select( pEntry, sal_False );
}
}
// -----------------------------------------------------------------------------
@@ -350,7 +350,7 @@ namespace accessibility
{
SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
if ( !getListBox()->IsSelected( pEntry ) )
- getListBox()->Select( pEntry, TRUE );
+ getListBox()->Select( pEntry, sal_True );
}
}
// -----------------------------------------------------------------------------
@@ -410,7 +410,7 @@ namespace accessibility
if ( !pEntry )
throw IndexOutOfBoundsException();
- getListBox()->Select( pEntry, FALSE );
+ getListBox()->Select( pEntry, sal_False );
}
// -----------------------------------------------------------------------------
void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 5ce10cbc81b3..939e99b10fbb 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -618,7 +618,7 @@ namespace accessibility
throw IndexOutOfBoundsException();
sal_Int32 nLen = nEndIndex - nStartIndex + 1;
- ::svt::OStringTransfer::CopyString( sText.Copy( (USHORT)nStartIndex, (USHORT)nLen ), getListBox() );
+ ::svt::OStringTransfer::CopyString( sText.Copy( (sal_uInt16)nStartIndex, (sal_uInt16)nLen ), getListBox() );
return sal_True;
}
@@ -725,7 +725,7 @@ namespace accessibility
if ( !pEntry )
throw IndexOutOfBoundsException();
- getListBox()->Select( pEntry, TRUE );
+ getListBox()->Select( pEntry, sal_True );
}
// -----------------------------------------------------------------------------
sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
@@ -759,7 +759,7 @@ namespace accessibility
{
SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( getListBox()->IsSelected( pEntry ) )
- getListBox()->Select( pEntry, FALSE );
+ getListBox()->Select( pEntry, sal_False );
}
}
// -----------------------------------------------------------------------------
@@ -779,7 +779,7 @@ namespace accessibility
{
SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
if ( !getListBox()->IsSelected( pEntry ) )
- getListBox()->Select( pEntry, TRUE );
+ getListBox()->Select( pEntry, sal_True );
}
}
// -----------------------------------------------------------------------------
@@ -851,7 +851,7 @@ namespace accessibility
if ( !pEntry )
throw IndexOutOfBoundsException();
- getListBox()->Select( pEntry, FALSE );
+ getListBox()->Select( pEntry, sal_False );
}
sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException)
{
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index fc1fb578bd21..34fd7ef88d1f 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -272,7 +272,7 @@ namespace accessibility
if ( i < nCount )
{
- Window* pChild = m_pTabBar->GetAccessibleChildWindow( (USHORT)i );
+ Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
if ( pChild )
xChild = pChild->GetAccessible();
}
@@ -318,7 +318,7 @@ namespace accessibility
Window* pParent = m_pTabBar->GetAccessibleParentWindow();
if ( pParent )
{
- for ( USHORT i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
+ for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
{
Window* pChild = pParent->GetAccessibleChildWindow( i );
if ( pChild == static_cast< Window* >( m_pTabBar ) )
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 51c86003b0c2..a8fce05dcff0 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -488,7 +488,7 @@ namespace accessibility
{
if ( m_pTabBar )
{
- sal_uInt16 nPageId = m_pTabBar->GetPageId( (USHORT)i );
+ sal_uInt16 nPageId = m_pTabBar->GetPageId( (sal_uInt16)i );
xChild = new AccessibleTabBarPage( m_pTabBar, nPageId, this );
@@ -715,7 +715,7 @@ namespace accessibility
if ( m_pTabBar )
{
- m_pTabBar->SetCurPageId( m_pTabBar->GetPageId( (USHORT)nChildIndex ) );
+ m_pTabBar->SetCurPageId( m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) );
m_pTabBar->Update();
m_pTabBar->ActivatePage();
m_pTabBar->Select();
@@ -732,7 +732,7 @@ namespace accessibility
throw IndexOutOfBoundsException();
sal_Bool bSelected = sal_False;
- if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId( (USHORT)nChildIndex ) )
+ if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) )
bSelected = sal_True;
return bSelected;
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 59408a31fe84..a87ba9586098 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -92,7 +92,7 @@ namespace accessibility
{
if ( isAlive() )
{
- ULONG nEventId = rVclWindowEvent.GetId();
+ sal_uLong nEventId = rVclWindowEvent.GetId();
switch ( nEventId )
{
case VCLEVENT_OBJECT_DYING :
@@ -127,7 +127,7 @@ namespace accessibility
if ( pEntry )
{
sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
- USHORT nCol = m_pTabListBox->GetCurrColumn();
+ sal_uInt16 nCol = m_pTabListBox->GetCurrColumn();
Reference< XAccessible > xChild =
m_pTabListBox->CreateAccessibleCell( nRow, nCol );
uno::Any aOldValue, aNewValue;
@@ -167,7 +167,7 @@ namespace accessibility
if ( pEntry )
{
sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
- USHORT nCol = m_pTabListBox->GetCurrColumn();
+ sal_uInt16 nCol = m_pTabListBox->GetCurrColumn();
TriState eState = STATE_DONTKNOW;
if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) )
{
@@ -192,7 +192,7 @@ namespace accessibility
if ( pEntry )
{
sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
- USHORT nCol = pData->m_nColumn;
+ sal_uInt16 nCol = pData->m_nColumn;
Reference< XAccessible > xChild =
m_pTabListBox->CreateAccessibleCell( nRow, nCol );
uno::Any aOldValue, aNewValue;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 8af1b240343e..5b669033fcfd 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -898,7 +898,7 @@ Document::retrieveParagraphText(ParagraphImpl const * pParagraph)
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
::osl::MutexGuard aInternalGuard(GetMutex());
- return m_rEngine.GetText(static_cast< ::ULONG >(pParagraph->getNumber()));
+ return m_rEngine.GetText(static_cast< ::sal_uLong >(pParagraph->getNumber()));
// numeric overflow cannot happen here
}
@@ -922,7 +922,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph,
: static_cast< ::sal_Int32 >( aMinPaM.GetIndex() );
// XXX numeric overflow
*pEnd = nNumber < aMaxPaM.GetPara()
- ? static_cast< ::sal_Int32 >( m_rEngine.GetText(static_cast< ::ULONG >(nNumber)).Len() )
+ ? static_cast< ::sal_Int32 >( m_rEngine.GetText(static_cast< ::sal_uLong >(nNumber)).Len() )
: static_cast< ::sal_Int32 >( aMaxPaM.GetIndex() );
// XXX numeric overflow (3x)
@@ -954,7 +954,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
sal_Int32 nLength = m_rEngine.GetText(nNumber).Len();
// XXX numeric overflow
if (nIndex < 0 || nIndex > nLength)
@@ -969,17 +969,17 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
{
aBounds = AWTRectangle(
m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
- static_cast< ::USHORT >(nIndex))));
+ static_cast< ::sal_uInt16 >(nIndex))));
}
else
{
::Rectangle aLeft(
m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
- static_cast< ::USHORT >(nIndex))));
+ static_cast< ::sal_uInt16 >(nIndex))));
// XXX numeric overflow
::Rectangle aRight(
m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
- static_cast< ::USHORT >(nIndex)
+ static_cast< ::sal_uInt16 >(nIndex)
+ 1)));
// XXX numeric overflow (2x)
// FIXME If the vertical extends of the two cursors do not match, assume
@@ -1006,7 +1006,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoint.X),
static_cast< long >(rPoint.Y))));
@@ -1023,7 +1023,7 @@ Document::retrieveCharacterAttributes(
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
if (nIndex < 0 || nIndex >= m_rEngine.GetText(nNumber).Len())
throw ::css::lang::IndexOutOfBoundsException(
@@ -1098,8 +1098,8 @@ void Document::retrieveRunAttributesImpl(
const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
tPropValMap& rRunAttrSeq)
{
- ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
- ::TextPaM aPaM( nNumber, static_cast< ::USHORT >( Index ) );
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
+ ::TextPaM aPaM( nNumber, static_cast< ::sal_uInt16 >( Index ) );
// XXX numeric overflow
// FIXME TEXTATTR_HYPERLINK ignored:
::TextAttribFontColor const * pColor
@@ -1155,7 +1155,7 @@ Document::retrieveRunAttributes(
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
::osl::MutexGuard aInternalGuard( GetMutex() );
- ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
// XXX numeric overflow
if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).Len() )
throw ::css::lang::IndexOutOfBoundsException(
@@ -1176,7 +1176,7 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
changeParagraphText(nNumber, 0, m_rEngine.GetTextLen(nNumber), false,
false, rText);
@@ -1191,7 +1191,7 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
if (nBegin < 0 || nBegin > nEnd
|| nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1201,8 +1201,8 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
"textwindowaccessibility.cxx:"
" Document::changeParagraphText")),
static_cast< ::css::uno::XWeak * >(this));
- changeParagraphText(nNumber, static_cast< ::USHORT >(nBegin),
- static_cast< ::USHORT >(nEnd), bCut, bPaste, rText);
+ changeParagraphText(nNumber, static_cast< ::sal_uInt16 >(nBegin),
+ static_cast< ::sal_uInt16 >(nEnd), bCut, bPaste, rText);
// XXX numeric overflow (2x)
}
}
@@ -1213,7 +1213,7 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
if (nBegin < 0 || nBegin > nEnd
|| nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1223,8 +1223,8 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph,
" Document::copyParagraphText")),
static_cast< ::css::uno::XWeak * >(this));
m_rView.SetSelection(
- ::TextSelection(::TextPaM(nNumber, static_cast< ::USHORT >(nBegin)),
- ::TextPaM(nNumber, static_cast< ::USHORT >(nEnd))));
+ ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
+ ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
// XXX numeric overflow (2x)
m_rView.Copy();
}
@@ -1237,7 +1237,7 @@ void Document::changeParagraphAttributes(
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
if (nBegin < 0 || nBegin > nEnd
|| nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1256,15 +1256,15 @@ void Document::changeParagraphAttributes(
RTL_CONSTASCII_STRINGPARAM("CharColor")))
m_rEngine.SetAttrib(::TextAttribFontColor(
mapFontColor(rAttributeSet[i].Value)),
- nNumber, static_cast< ::USHORT >(nBegin),
- static_cast< ::USHORT >(nEnd));
+ nNumber, static_cast< ::sal_uInt16 >(nBegin),
+ static_cast< ::sal_uInt16 >(nEnd));
// XXX numeric overflow (2x)
else if (rAttributeSet[i].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("CharWeight")))
m_rEngine.SetAttrib(::TextAttribFontWeight(
mapFontWeight(rAttributeSet[i].Value)),
- nNumber, static_cast< ::USHORT >(nBegin),
- static_cast< ::USHORT >(nEnd));
+ nNumber, static_cast< ::sal_uInt16 >(nBegin),
+ static_cast< ::sal_uInt16 >(nEnd));
// XXX numeric overflow (2x)
}
}
@@ -1275,7 +1275,7 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
// XXX numeric overflow
if (nBegin < 0 || nBegin > nEnd
|| nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1285,8 +1285,8 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
" Document::changeParagraphSelection")),
static_cast< ::css::uno::XWeak * >(this));
m_rView.SetSelection(
- ::TextSelection(::TextPaM(nNumber, static_cast< ::USHORT >(nBegin)),
- ::TextPaM(nNumber, static_cast< ::USHORT >(nEnd))));
+ ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
+ ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
// XXX numeric overflow (2x)
}
}
@@ -1302,7 +1302,7 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
{
::osl::MutexGuard aInternalGuard( GetMutex() );
- ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
if ( nIndex < 0 || nIndex > m_rEngine.GetText( nNumber ).Len() )
throw ::css::lang::IndexOutOfBoundsException(
::rtl::OUString(
@@ -1312,8 +1312,8 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
static_cast< ::css::uno::XWeak * >( this ) );
::sal_Int32 nLineStart = 0;
::sal_Int32 nLineEnd = 0;
- ::USHORT nLineCount = m_rEngine.GetLineCount( nNumber );
- for ( ::USHORT nLine = 0; nLine < nLineCount; ++nLine )
+ ::sal_uInt16 nLineCount = m_rEngine.GetLineCount( nNumber );
+ for ( ::sal_uInt16 nLine = 0; nLine < nLineCount; ++nLine )
{
::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
m_rEngine.GetLineLen( nNumber, nLine ) );
@@ -1344,7 +1344,7 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
{
::osl::MutexGuard aInternalGuard( GetMutex() );
- ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) )
throw ::css::lang::IndexOutOfBoundsException(
::rtl::OUString(
@@ -1354,7 +1354,7 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
static_cast< ::css::uno::XWeak * >( this ) );
::sal_Int32 nLineStart = 0;
::sal_Int32 nLineEnd = 0;
- for ( ::USHORT nLine = 0; nLine <= nLineNo; ++nLine )
+ for ( ::sal_uInt16 nLine = 0; nLine <= nLineNo; ++nLine )
{
::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
m_rEngine.GetLineLen( nNumber, nLine ) );
@@ -1675,11 +1675,11 @@ void Document::init()
{
if (m_xParagraphs.get() == 0)
{
- ::ULONG nCount = m_rEngine.GetParagraphCount();
+ ::sal_uLong nCount = m_rEngine.GetParagraphCount();
::std::auto_ptr< Paragraphs > p(new Paragraphs);
p->reserve(static_cast< Paragraphs::size_type >(nCount));
// numeric overflow is harmless here
- for (::ULONG i = 0; i < nCount; ++i)
+ for (::sal_uLong i = 0; i < nCount; ++i)
p->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
m_rEngine.GetTextHeight(i))));
// XXX numeric overflow
@@ -1783,7 +1783,7 @@ void Document::notifyVisibleRangeChanges(
}
void
-Document::changeParagraphText(::ULONG nNumber, ::USHORT nBegin, ::USHORT nEnd,
+Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
bool bCut, bool bPaste,
::rtl::OUString const & rText)
{
@@ -1809,7 +1809,7 @@ void Document::handleParagraphNotifications()
{
case TEXT_HINT_PARAINSERTED:
{
- ::ULONG n = aHint.GetValue();
+ ::sal_uLong n = aHint.GetValue();
OSL_ENSURE(n <= m_xParagraphs->size(),
"bad TEXT_HINT_PARAINSERTED event");
@@ -1861,7 +1861,7 @@ void Document::handleParagraphNotifications()
}
case TEXT_HINT_PARAREMOVED:
{
- ::ULONG n = aHint.GetValue();
+ ::sal_uLong n = aHint.GetValue();
if (n == TEXT_PARA_ALL)
{
{for (Paragraphs::iterator aIt(m_aVisibleBegin);
@@ -1976,7 +1976,7 @@ void Document::handleParagraphNotifications()
}
case TEXT_HINT_FORMATPARA:
{
- ::ULONG n = aHint.GetValue();
+ ::sal_uLong n = aHint.GetValue();
OSL_ENSURE(n < m_xParagraphs->size(),
"Bad TEXT_HINT_FORMATPARA event");
@@ -2077,10 +2077,10 @@ void Document::handleSelectionChangeNotification()
// overlap---the overlap and/or the range to the right of it possibly being
// empty. Only for these two ranges notifications have to be sent.)
- TextPaM aOldTextStart( static_cast< ULONG >( m_nSelectionFirstPara ), static_cast< USHORT >( m_nSelectionFirstPos ) );
- TextPaM aOldTextEnd( static_cast< ULONG >( m_nSelectionLastPara ), static_cast< USHORT >( m_nSelectionLastPos ) );
- TextPaM aNewTextStart( static_cast< ULONG >( nNewFirstPara ), static_cast< USHORT >( nNewFirstPos ) );
- TextPaM aNewTextEnd( static_cast< ULONG >( nNewLastPara ), static_cast< USHORT >( nNewLastPos ) );
+ TextPaM aOldTextStart( static_cast< sal_uLong >( m_nSelectionFirstPara ), static_cast< sal_uInt16 >( m_nSelectionFirstPos ) );
+ TextPaM aOldTextEnd( static_cast< sal_uLong >( m_nSelectionLastPara ), static_cast< sal_uInt16 >( m_nSelectionLastPos ) );
+ TextPaM aNewTextStart( static_cast< sal_uLong >( nNewFirstPara ), static_cast< sal_uInt16 >( nNewFirstPos ) );
+ TextPaM aNewTextEnd( static_cast< sal_uLong >( nNewLastPara ), static_cast< sal_uInt16 >( nNewLastPos ) );
// justify selections
justifySelection( aOldTextStart, aOldTextEnd );
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index cb1f425b08cf..5ebb06dc9db1 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -353,13 +353,13 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i )
// create a new child
OAccessibleMenuBaseComponent* pChild;
- if ( m_pMenu->GetItemType( (USHORT)i ) == MENUITEM_SEPARATOR )
+ if ( m_pMenu->GetItemType( (sal_uInt16)i ) == MENUITEM_SEPARATOR )
{
pChild = new VCLXAccessibleMenuSeparator( m_pMenu, (sal_uInt16)i );
}
else
{
- PopupMenu* pPopupMenu = m_pMenu->GetPopupMenu( m_pMenu->GetItemId( (USHORT)i ) );
+ PopupMenu* pPopupMenu = m_pMenu->GetPopupMenu( m_pMenu->GetItemId( (sal_uInt16)i ) );
if ( pPopupMenu )
{
pChild = new VCLXAccessibleMenu( m_pMenu, (sal_uInt16)i, pPopupMenu );
@@ -524,7 +524,7 @@ void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i )
// highlight the child
if ( m_pMenu )
- m_pMenu->HighlightItem( (USHORT)i );
+ m_pMenu->HighlightItem( (sal_uInt16)i );
}
// -----------------------------------------------------------------------------
@@ -541,7 +541,7 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i )
{
sal_Bool bSelected = sal_False;
- if ( m_pMenu && m_pMenu->IsHighlighted( (USHORT)i ) )
+ if ( m_pMenu && m_pMenu->IsHighlighted( (sal_uInt16)i ) )
bSelected = sal_True;
return bSelected;
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 6bc7f59b75d9..9ac93cedd299 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -157,7 +157,7 @@ void OAccessibleMenuItemComponent::Click()
// that the popup menus are executed synchronously.
AllSettings aSettings = pWindow->GetSettings();
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
- ULONG nDelay = aMouseSettings.GetMenuDelay();
+ sal_uLong nDelay = aMouseSettings.GetMenuDelay();
aMouseSettings.SetMenuDelay( 0 );
aSettings.SetMouseSettings( aMouseSettings );
pWindow->SetSettings( aSettings );
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 690babdf5c41..e133579922b3 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -292,7 +292,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt
else if ( nValue > 1 )
nValue = 1;
- pButton->SetPressed( (BOOL) nValue );
+ pButton->SetPressed( (sal_Bool) nValue );
bReturn = sal_True;
}
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 07378c0ea42f..b806e308bc28 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -158,7 +158,7 @@ void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper&
if ( !cEchoChar )
cEchoChar = '*';
XubString sTmp;
- aText = sTmp.Fill( (USHORT)aText.getLength(), cEchoChar );
+ aText = sTmp.Fill( (sal_uInt16)aText.getLength(), cEchoChar );
}
}
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 6d287a02f0e9..03fde2b0dc28 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -94,7 +94,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
}
UpdateVisibleLineCount();
- USHORT nCount = static_cast<USHORT>(getAccessibleChildCount());
+ sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
m_aAccessibleChildren.reserve(nCount);
}
// -----------------------------------------------------------------------------
@@ -181,10 +181,10 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew )
VCLXAccessibleListItem* pItem = static_cast<VCLXAccessibleListItem*>(xHold.get());
if ( pItem )
{
- USHORT nTopEntry = 0;
+ sal_uInt16 nTopEntry = 0;
if ( m_pListBoxHelper )
nTopEntry = m_pListBoxHelper->GetTopEntry();
- USHORT nPos = (USHORT)(aIter - m_aAccessibleChildren.begin());
+ sal_uInt16 nPos = (sal_uInt16)(aIter - m_aAccessibleChildren.begin());
sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
pItem->SetVisible( m_bVisible && bVisible );
}
@@ -245,7 +245,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
{
uno::Any aOldValue,
aNewValue;
- USHORT nPos = m_pListBoxHelper->GetSelectEntryPos();
+ sal_uInt16 nPos = m_pListBoxHelper->GetSelectEntryPos();
if ( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos = m_pListBoxHelper->GetTopEntry();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -275,7 +275,7 @@ void VCLXAccessibleList::UpdateSelection (::rtl::OUString sTextOfSelectedItem)
if ( pBox != NULL )
{
// Find the index of the selected item inside the VCL control...
- USHORT nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem));
+ sal_uInt16 nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem));
// ...and then find the associated accessibility object.
if ( nIndex == LISTBOX_ENTRY_NOTFOUND )
nIndex = 0;
@@ -304,7 +304,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
{
Reference<XAccessible> xChild;
- USHORT nPos = static_cast<USHORT>(i);
+ sal_uInt16 nPos = static_cast<sal_uInt16>(i);
if ( nPos >= m_aAccessibleChildren.size() )
{
m_aAccessibleChildren.resize(nPos + 1);
@@ -333,15 +333,15 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
if ( xChild.is() )
{
// Just add the SELECTED state.
- BOOL bNowSelected = FALSE;
+ sal_Bool bNowSelected = sal_False;
if ( m_pListBoxHelper )
- bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((USHORT)i);
+ bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i);
VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get());
pItem->SetSelected( bNowSelected );
// Set the child's VISIBLE state.
UpdateVisibleLineCount();
- USHORT nTopEntry = 0;
+ sal_uInt16 nTopEntry = 0;
if ( m_pListBoxHelper )
nTopEntry = m_pListBoxHelper->GetTopEntry();
sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
@@ -362,7 +362,7 @@ void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nI
}
else
{
- if ( nIndex >= 0 && static_cast<USHORT>(nIndex) < m_aAccessibleChildren.size() )
+ if ( nIndex >= 0 && static_cast<sal_uInt16>(nIndex) < m_aAccessibleChildren.size() )
{
ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex);
::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent);
@@ -419,7 +419,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3
Reference< XAccessible > xChild;
// search for the child
- if ( static_cast<USHORT>(i) >= m_aAccessibleChildren.size() )
+ if ( static_cast<sal_uInt16>(i) >= m_aAccessibleChildren.size() )
xChild = CreateChild (i);
else
{
@@ -491,8 +491,8 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt
if ( contains( rPoint ) && m_nVisibleLineCount > 0 )
{
Point aPos = VCLPoint( rPoint );
- USHORT nEndPos = m_pListBoxHelper->GetTopEntry() + (USHORT)m_nVisibleLineCount;
- for ( USHORT i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i )
+ sal_uInt16 nEndPos = m_pListBoxHelper->GetTopEntry() + (sal_uInt16)m_nVisibleLineCount;
+ for ( sal_uInt16 i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i )
{
if ( m_pListBoxHelper->GetBoundingRectangle(i).IsInside( aPos ) )
{
@@ -535,7 +535,7 @@ void VCLXAccessibleList::UpdateVisibleLineCount()
m_nVisibleLineCount = m_pListBoxHelper->GetDisplayLineCount();
else
{
- USHORT nCols = 0,
+ sal_uInt16 nCols = 0,
nLines = 0;
m_pListBoxHelper->GetMaxVisColumnsAndLines (nCols, nLines);
m_nVisibleLineCount = nLines;
@@ -558,7 +558,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl()
UpdateVisibleLineCount();
sal_Int32 nBegin = Min( m_nLastTopEntry, nTop );
sal_Int32 nEnd = Max( m_nLastTopEntry + m_nVisibleLineCount, nTop + m_nVisibleLineCount );
- for (USHORT i = static_cast<USHORT>(nBegin); (i <= static_cast<USHORT>(nEnd)); ++i)
+ for (sal_uInt16 i = static_cast<sal_uInt16>(nBegin); (i <= static_cast<sal_uInt16>(nEnd)); ++i)
{
sal_Bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) );
Reference< XAccessible > xHold;
@@ -575,10 +575,10 @@ void VCLXAccessibleList::UpdateEntryRange_Impl()
m_nLastTopEntry = nTop;
}
// -----------------------------------------------------------------------------
-BOOL VCLXAccessibleList::checkEntrySelected(USHORT _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc)
+sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc)
{
OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!");
- BOOL bNowSelected = FALSE;
+ sal_Bool bNowSelected = sal_False;
if ( m_pListBoxHelper )
{
bNowSelected = m_pListBoxHelper->IsEntryPosSelected (_nPos);
@@ -592,7 +592,7 @@ BOOL VCLXAccessibleList::checkEntrySelected(USHORT _nPos,Any& _rNewValue,Referen
}
// -----------------------------------------------------------------------------
-void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
+void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16)
{
uno::Any aOldValue, aNewValue;
@@ -603,7 +603,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
if ( m_pListBoxHelper )
{
- USHORT i=0;
+ sal_uInt16 i=0;
for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter,++i)
{
@@ -612,7 +612,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
{
VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() );
// Retrieve the item's index from the list entry.
- BOOL bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
+ sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
if ( bNowSelected && !pItem->IsSelected() )
{
@@ -629,7 +629,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
checkEntrySelected(i,aNewValue,xNewAcc);
}
}
- USHORT nCount = m_pListBoxHelper->GetEntryCount();
+ sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
if ( i < nCount ) // here we have to check the if any other listbox entry is selected
{
for (; i < nCount && !checkEntrySelected(i,aNewValue,xNewAcc) ;++i )
@@ -668,7 +668,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex )
{
checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False);
- m_pListBoxHelper->SelectEntryPos( (USHORT)nChildIndex, TRUE );
+ m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nChildIndex, sal_True );
// call the select handler, don't handle events in this time
m_bDisableProcessEvent = true;
m_pListBoxHelper->Select();
@@ -691,7 +691,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil
{
checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False);
- bRet = m_pListBoxHelper->IsEntryPosSelected( (USHORT)nChildIndex );
+ bRet = m_pListBoxHelper->IsEntryPosSelected( (sal_uInt16)nChildIndex );
}
return bRet;
}
@@ -725,9 +725,9 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime
if ( m_pListBoxHelper )
{
- USHORT nCount = m_pListBoxHelper->GetEntryCount();
- for ( USHORT i = 0; i < nCount; ++i )
- m_pListBoxHelper->SelectEntryPos( i, TRUE );
+ sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
+ m_pListBoxHelper->SelectEntryPos( i, sal_True );
// call the select handler, don't handle events in this time
m_bDisableProcessEvent = true;
m_pListBoxHelper->Select();
@@ -759,7 +759,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
if ( m_pListBoxHelper )
{
checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_True);
- return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (USHORT)nSelectedChildIndex ) );
+ return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) );
}
return NULL;
@@ -777,7 +777,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh
{
checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_False);
- m_pListBoxHelper->SelectEntryPos( (USHORT)nSelectedChildIndex, FALSE );
+ m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nSelectedChildIndex, sal_False );
// call the select handler, don't handle events in this time
m_bDisableProcessEvent = true;
m_pListBoxHelper->Select();
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 56bcf14f1980..66a819bdf036 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -90,7 +90,7 @@ VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHe
m_xParentContext = m_xParent->getAccessibleContext();
if ( m_pListBoxHelper )
- m_sEntryText = m_pListBoxHelper->GetEntry( (USHORT)_nIndexInParent );
+ m_sEntryText = m_pListBoxHelper->GetEntry( (sal_uInt16)_nIndexInParent );
}
// -----------------------------------------------------------------------------
VCLXAccessibleListItem::~VCLXAccessibleListItem()
@@ -356,7 +356,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
sal_Bool bInside = sal_False;
if ( m_pListBoxHelper )
{
- Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent ) );
+ Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) );
aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y());
bInside = aRect.IsInside( VCLPoint( _aPoint ) );
}
@@ -375,7 +375,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeExce
awt::Rectangle aRect;
if ( m_pListBoxHelper )
- aRect = AWTRectangle( m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent ) );
+ aRect = AWTRectangle( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) );
return aRect;
}
@@ -388,7 +388,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeExcept
Point aPoint(0,0);
if ( m_pListBoxHelper )
{
- Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+ Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
aPoint = aRect.TopLeft();
}
return AWTPoint( aPoint );
@@ -402,7 +402,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti
Point aPoint(0,0);
if ( m_pListBoxHelper )
{
- Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+ Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
aPoint = aRect.TopLeft();
aPoint += m_pListBoxHelper->GetWindowExtentsRelative( NULL ).TopLeft();
}
@@ -416,7 +416,7 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException)
Size aSize;
if ( m_pListBoxHelper )
- aSize = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent ).GetSize();
+ aSize = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ).GetSize();
return AWTSize( aSize );
}
@@ -477,7 +477,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
if ( m_pListBoxHelper )
{
Rectangle aCharRect = m_pListBoxHelper->GetEntryCharacterBounds( m_nIndexInParent, nIndex );
- Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+ Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
aBounds = AWTRectangle( aCharRect );
}
@@ -501,12 +501,12 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
sal_Int32 nIndex = -1;
if ( m_pListBoxHelper )
{
- USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
- Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+ sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
+ Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
Point aPnt( VCLPoint( aPoint ) );
aPnt += aItemRect.TopLeft();
sal_Int32 nI = m_pListBoxHelper->GetIndexForPoint( aPnt, nPos );
- if ( nI != -1 && (USHORT)m_nIndexInParent == nPos )
+ if ( nI != -1 && (sal_uInt16)m_nIndexInParent == nPos )
nIndex = nI;
}
return nIndex;
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 825e5990e783..a3e2f8cd6ae4 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -172,7 +172,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx
Window* pParent = pWindow->GetAccessibleParentWindow();
if ( pParent )
{
- for ( USHORT n = pParent->GetAccessibleChildWindowCount(); n; )
+ for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; )
{
Window* pChild = pParent->GetAccessibleChildWindow( --n );
if ( pChild == pWindow )
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 5dd35a699b27..1e1d7b0ef640 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -331,7 +331,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32
{
if ( m_pStatusBar )
{
- sal_uInt16 nItemId = m_pStatusBar->GetItemId( (USHORT)i );
+ sal_uInt16 nItemId = m_pStatusBar->GetItemId( (sal_uInt16)i );
xChild = new VCLXAccessibleStatusBarItem( m_pStatusBar, nItemId );
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index ac6aca77dda0..e23580b05280 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -288,7 +288,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
{
for ( sal_Int32 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i )
{
- sal_uInt16 nPageId = m_pTabControl->GetPageId( (USHORT)i );
+ sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
TabPage* pTabPage = m_pTabControl->GetTabPage( nPageId );
if ( pTabPage == (TabPage*) pChild )
UpdateTabPage( i, rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
@@ -391,7 +391,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
{
if ( m_pTabControl )
{
- sal_uInt16 nPageId = m_pTabControl->GetPageId( (USHORT)i );
+ sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
xChild = new VCLXAccessibleTabPage( m_pTabControl, nPageId );
@@ -433,7 +433,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th
throw IndexOutOfBoundsException();
if ( m_pTabControl )
- m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (USHORT)nChildIndex ) );
+ m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) );
}
// -----------------------------------------------------------------------------
@@ -446,7 +446,7 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn
throw IndexOutOfBoundsException();
sal_Bool bSelected = sal_False;
- if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (USHORT)nChildIndex ) )
+ if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) )
bSelected = sal_True;
return bSelected;
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index ce796af77ab4..a11e1d52c7e3 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -227,26 +227,26 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl()
return;
// submit events only if toolbox has the focus to avoid sending events due to mouse move
- BOOL bHasFocus = FALSE;
+ sal_Bool bHasFocus = sal_False;
if ( pToolBox->HasFocus() )
- bHasFocus = TRUE;
+ bHasFocus = sal_True;
else
{
// check for subtoolbar, i.e. check if our parent is a toolbar
ToolBox* pToolBoxParent = dynamic_cast< ToolBox* >( pToolBox->GetParent() );
// subtoolbars never get the focus as key input is just forwarded, so check if the parent toolbar has it
if ( pToolBoxParent && pToolBoxParent->HasFocus() )
- bHasFocus = TRUE;
+ bHasFocus = sal_True;
}
if ( bHasFocus )
{
- USHORT nHighlightItemId = pToolBox->GetHighlightItemId();
- USHORT nFocusCount = 0;
+ sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+ sal_uInt16 nFocusCount = 0;
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
- USHORT nItemId = pToolBox->GetItemId( (USHORT)aIter->first );
+ sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first );
if ( aIter->second.is() )
{
@@ -296,7 +296,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 )
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
- USHORT nItemId = pToolBox->GetItemId( (USHORT)aIter->first );
+ sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first );
VCLXAccessibleToolBoxItem* pItem =
static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
@@ -310,7 +310,7 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos )
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if ( pToolBox )
{
- USHORT nItemId = pToolBox->GetItemId( (USHORT)_nPos );
+ sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)_nPos );
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
if ( aIter != m_aAccessibleChildren.end() && aIter->second.is() )
@@ -432,7 +432,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
m_aAccessibleChildren.clear();
// register the new items
- USHORT i, nCount = pToolBox->GetItemCount();
+ sal_uInt16 i, nCount = pToolBox->GetItemCount();
for ( i = 0; i < nCount; ++i )
{
Any aNewValue;
@@ -726,8 +726,8 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find(i);
if ( m_aAccessibleChildren.end() == aIter )
{
- USHORT nItemId = pToolBox->GetItemId( (USHORT)i );
- USHORT nHighlightItemId = pToolBox->GetHighlightItemId();
+ sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)i );
+ sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
// not found -> create a new child
VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i );
@@ -766,7 +766,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if ( pToolBox )
{
- USHORT nItemPos = pToolBox->GetItemPos( VCLPoint( _rPoint ) );
+ sal_uInt16 nItemPos = pToolBox->GetItemPos( VCLPoint( _rPoint ) );
if ( nItemPos != TOOLBOX_ITEM_NOTFOUND )
xAccessible = getAccessibleChild( nItemPos );
}
@@ -781,10 +781,10 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if ( pChildWindow && pToolBox )
{
- USHORT nCount = pToolBox->GetItemCount();
- for (USHORT i = 0 ; i < nCount && !xReturn.is() ; ++i)
+ sal_uInt16 nCount = pToolBox->GetItemCount();
+ for (sal_uInt16 i = 0 ; i < nCount && !xReturn.is() ; ++i)
{
- USHORT nItemId = pToolBox->GetItemId( i );
+ sal_uInt16 nItemId = pToolBox->GetItemId( i );
Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
if ( pItemWindow == pChildWindow )
xReturn = getAccessibleChild(i);
@@ -810,7 +810,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw
if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
throw IndexOutOfBoundsException();
ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
- USHORT nPos = static_cast < USHORT > (nChildIndex);
+ sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
pToolBox->ChangeHighlight( nPos );
}
// -----------------------------------------------------------------------------
@@ -820,7 +820,7 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex
if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
throw IndexOutOfBoundsException();
ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
- USHORT nPos = static_cast < USHORT > (nChildIndex);
+ sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
if ( pToolBox != NULL && pToolBox->GetHighlightItemId() == pToolBox->GetItemId( nPos ) )
return sal_True;
else
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 7580d1a3ae2c..d4ad29a27bef 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -86,11 +86,11 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) );
DBG_ASSERT( m_pToolBox, "invalid toolbox" );
- m_nItemId = m_pToolBox->GetItemId( (USHORT)m_nIndexInParent );
+ m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent );
m_sOldName = GetText( true );
m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) == STATE_DONTKNOW );
- ToolBoxItemType eType = m_pToolBox->GetItemType( (USHORT)m_nIndexInParent );
+ ToolBoxItemType eType = m_pToolBox->GetItemType( (sal_uInt16)m_nIndexInParent );
switch ( eType )
{
case TOOLBOXITEM_BUTTON :
@@ -244,7 +244,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds( ) throw (Runt
{
awt::Rectangle aRect;
if ( m_pToolBox )
- aRect = AWTRectangle( m_pToolBox->GetItemPosRect( (USHORT)m_nIndexInParent ) );
+ aRect = AWTRectangle( m_pToolBox->GetItemPosRect( (sal_uInt16)m_nIndexInParent ) );
return aRect;
}
@@ -697,7 +697,7 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw
else if ( nValue > 1 )
nValue = 1;
- m_pToolBox->CheckItem( m_nItemId, (BOOL) nValue );
+ m_pToolBox->CheckItem( m_nItemId, (sal_Bool) nValue );
bReturn = sal_True;
}