Skip to content

C
core
Kaydet (Commit) df0b3164 authored tarafından Carsten Driesner's avatar Carsten Driesner
Dosyalara gözat
Seçenekler

removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong in accessibility

üst 2b42b853
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
Dosyayı görüntüle @ df0b3164
......@@ -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
......
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
Dosyayı görüntüle @ df0b3164
......@@ -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);
......
accessibility/source/extended/accessibleiconchoicectrl.cxx
Dosyayı görüntüle @ df0b3164
......@@ -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;
......
accessibility/source/extended/accessibleiconchoicectrlentry.cxx
Dosyayı görüntüle @ df0b3164
......@@ -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 ),
......
accessibility/source/extended/accessibletablistboxtable.cxx
Dosyayı görüntüle @ df0b3164
......@@ -92,7 +92,7 @@ namespace accessibility
{
if ( isAlive() )
{
sal_uIntPtr nEventId = rVclWindowEvent.GetId();
sal_uLong nEventId = rVclWindowEvent.GetId();
switch ( nEventId )
{
case VCLEVENT_OBJECT_DYING :
......
accessibility/source/extended/textwindowaccessibility.cxx
Dosyayı görüntüle @ df0b3164
......@@ -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 );
......
accessibility/source/standard/accessiblemenuitemcomponent.cxx
Dosyayı görüntüle @ df0b3164
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment