diff options
Diffstat (limited to 'accessibility/source/extended')
15 files changed, 79 insertions, 78 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 77a59ef99fc1..b40253c2e100 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -357,12 +357,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 4f778f5b8df8..8fa50319f5db 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -131,7 +131,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; @@ -141,20 +141,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 fabe25d079f5..1e10f902cf2a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -240,7 +240,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 6cdd7e22c4ab..40ca8ef9fbe4 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -66,7 +66,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/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 4fdadbec97f4..4c2c5d130582 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -246,8 +246,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil ensureIsValidIndex( nChildIndex ); sal_Int32 nColumns = m_aTable.GetColumnCount(); sal_Int32 nRow = (nChildIndex / nColumns); - std::vector< sal_Int32 > selectedRows = m_aTable.GetSelectedRows(); - selectedRows.push_back(nRow); + m_aTable.SelectRow( nRow, sal_True ); } sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) @@ -266,8 +265,7 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); - for(unsigned int i=0;i<m_aTable.GetSelectedRows().size();i++) - m_aTable.RemoveSelectedRow((sal_Int32)i); + m_aTable.SelectAllRows( false ); } void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() throw ( uno::RuntimeException ) diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 211f2a29d03f..5dc6032eab7a 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -246,7 +246,10 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex( void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq ) { - rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows()); + sal_Int32 const selectionCount( m_aTable.GetSelectedRowCount() ); + rSeq.realloc( selectionCount ); + for ( sal_Int32 i=0; i<selectionCount; ++i ) + rSeq[i] = m_aTable.GetSelectedRowIndex(i); } void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow ) diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index addbcaaa7cf8..708d7bb0aabc 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -77,13 +77,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 dddb38fcbea1..ec970a5db414 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -91,7 +91,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 2e91908ce36a..117975bcd6f4 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -79,7 +79,7 @@ namespace accessibility // Ctor() and Dtor() // ----------------------------------------------------------------------------- AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, - ULONG _nPos, + sal_uLong _nPos, const Reference< XAccessible >& _xParent ) : AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ), @@ -504,7 +504,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; @@ -525,7 +525,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 95e52056e1da..5ad861d9da12 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -307,7 +307,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) @@ -335,7 +335,7 @@ namespace accessibility { SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); if ( getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, FALSE ); + getListBox()->Select( pEntry, sal_False ); } } // ----------------------------------------------------------------------------- @@ -351,7 +351,7 @@ namespace accessibility { SvLBoxEntry* pEntry = getListBox()->GetEntry( i ); if ( !getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, TRUE ); + getListBox()->Select( pEntry, sal_True ); } } // ----------------------------------------------------------------------------- @@ -411,7 +411,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 71c52a90b1db..27390c51ce1c 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -609,7 +609,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; } @@ -716,7 +716,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) @@ -750,7 +750,7 @@ namespace accessibility { SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, FALSE ); + getListBox()->Select( pEntry, sal_False ); } } // ----------------------------------------------------------------------------- @@ -770,7 +770,7 @@ namespace accessibility { SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( !getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, TRUE ); + getListBox()->Select( pEntry, sal_True ); } } // ----------------------------------------------------------------------------- @@ -842,7 +842,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 db46d1862b9d..61bd754c8d6a 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -273,7 +273,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(); } @@ -319,7 +319,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 ebbf07949e26..1f0adda0bc32 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -489,7 +489,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 ); @@ -716,7 +716,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(); @@ -733,7 +733,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 746963c9fe7a..7374cc020cf6 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -82,7 +82,7 @@ namespace accessibility { if ( isAlive() ) { - ULONG nEventId = rVclWindowEvent.GetId(); + sal_uLong nEventId = rVclWindowEvent.GetId(); switch ( nEventId ) { case VCLEVENT_OBJECT_DYING : @@ -117,7 +117,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; @@ -157,7 +157,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 ) ) { @@ -182,7 +182,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 2d0b0b5d20fe..3dbe462c227a 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -896,7 +896,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 } @@ -920,7 +920,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) @@ -952,7 +952,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) @@ -967,17 +967,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 @@ -1004,7 +1004,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)))); @@ -1021,7 +1021,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( @@ -1096,8 +1096,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 @@ -1153,7 +1153,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( @@ -1174,7 +1174,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); @@ -1189,7 +1189,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()) @@ -1199,8 +1199,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) } } @@ -1211,7 +1211,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()) @@ -1221,8 +1221,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(); } @@ -1235,7 +1235,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()) @@ -1254,15 +1254,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) } } @@ -1273,7 +1273,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()) @@ -1283,8 +1283,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) } } @@ -1300,7 +1300,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( @@ -1310,8 +1310,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 ) ); @@ -1342,7 +1342,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( @@ -1352,7 +1352,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 ) ); @@ -1673,11 +1673,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 @@ -1786,7 +1786,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) { @@ -1812,7 +1812,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"); @@ -1864,7 +1864,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); @@ -1979,7 +1979,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"); @@ -2080,10 +2080,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 ); |