summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-13 11:41:05 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-13 11:41:05 +0100
commitdf0b31641237470028437efd959c355dc0f32953 (patch)
treed8b5b0e8e33b30fcf5bba8a9e2e4f1a6ec7a9121 /accessibility
parent2b42b8533640fc34709c8d702d0b0448489ed73f (diff)
removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in accessibility
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx2
-rw-r--r--accessibility/inc/accessibility/extended/textwindowaccessibility.hxx2
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrl.cxx2
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx2
-rw-r--r--accessibility/source/extended/accessibletablistboxtable.cxx2
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx48
-rw-r--r--accessibility/source/standard/accessiblemenuitemcomponent.cxx2
7 files changed, 30 insertions, 30 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index 06dbd20f665a..ccea420a1cff 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -128,7 +128,7 @@ namespace accessibility
is our parent accessible object
*/
AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
- sal_uIntPtr _nPos,
+ sal_uLong _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
// XTypeProvider
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index f8da1321586a..be6cffc22e8b 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -624,7 +624,7 @@ private:
// Must be called with both the external (Solar) and internal mutex
// locked, and after init has been called:
- void changeParagraphText(::sal_uIntPtr nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
+ void changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
bool bCut, bool bPaste,
::rtl::OUString const & rText);
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index d59383365c5a..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 )
{
- sal_uIntPtr 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 40183eb7feb4..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,
- sal_uIntPtr _nPos,
+ sal_uLong _nPos,
const Reference< XAccessible >& _xParent ) :
AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ),
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 77f2e74b4f89..a87ba9586098 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -92,7 +92,7 @@ namespace accessibility
{
if ( isAlive() )
{
- sal_uIntPtr nEventId = rVclWindowEvent.GetId();
+ sal_uLong nEventId = rVclWindowEvent.GetId();
switch ( nEventId )
{
case VCLEVENT_OBJECT_DYING :
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index e46412cf2310..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< ::sal_uIntPtr >(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< ::sal_uIntPtr >(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());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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)
@@ -1006,7 +1006,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
::osl::MutexGuard aInternalGuard(GetMutex());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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,7 +1098,7 @@ void Document::retrieveRunAttributesImpl(
const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
tPropValMap& rRunAttrSeq)
{
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >( pParagraph->getNumber() );
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
::TextPaM aPaM( nNumber, static_cast< ::sal_uInt16 >( Index ) );
// XXX numeric overflow
// FIXME TEXTATTR_HYPERLINK ignored:
@@ -1155,7 +1155,7 @@ Document::retrieveRunAttributes(
{
::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
::osl::MutexGuard aInternalGuard( GetMutex() );
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >( 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());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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())
@@ -1213,7 +1213,7 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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())
@@ -1237,7 +1237,7 @@ void Document::changeParagraphAttributes(
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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())
@@ -1275,7 +1275,7 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
{
::osl::MutexGuard aInternalGuard(GetMutex());
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >(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())
@@ -1302,7 +1302,7 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
{
::osl::MutexGuard aInternalGuard( GetMutex() );
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >( 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(
@@ -1344,7 +1344,7 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
{
::osl::MutexGuard aInternalGuard( GetMutex() );
- ::sal_uIntPtr nNumber = static_cast< ::sal_uIntPtr >( pParagraph->getNumber() );
+ ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) )
throw ::css::lang::IndexOutOfBoundsException(
::rtl::OUString(
@@ -1675,11 +1675,11 @@ void Document::init()
{
if (m_xParagraphs.get() == 0)
{
- ::sal_uIntPtr 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 (::sal_uIntPtr 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(::sal_uIntPtr nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 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:
{
- ::sal_uIntPtr 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:
{
- ::sal_uIntPtr 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:
{
- ::sal_uIntPtr 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< sal_uIntPtr >( m_nSelectionFirstPara ), static_cast< sal_uInt16 >( m_nSelectionFirstPos ) );
- TextPaM aOldTextEnd( static_cast< sal_uIntPtr >( m_nSelectionLastPara ), static_cast< sal_uInt16 >( m_nSelectionLastPos ) );
- TextPaM aNewTextStart( static_cast< sal_uIntPtr >( nNewFirstPara ), static_cast< sal_uInt16 >( nNewFirstPos ) );
- TextPaM aNewTextEnd( static_cast< sal_uIntPtr >( nNewLastPara ), static_cast< sal_uInt16 >( 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/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 2270086f6eee..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();
- sal_uIntPtr nDelay = aMouseSettings.GetMenuDelay();
+ sal_uLong nDelay = aMouseSettings.GetMenuDelay();
aMouseSettings.SetMenuDelay( 0 );
aSettings.SetMouseSettings( aMouseSettings );
pWindow->SetSettings( aSettings );