Kaydet (Commit) df0b3164 authored tarafından Carsten Driesner's avatar Carsten Driesner

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

üst 2b42b853
...@@ -128,7 +128,7 @@ namespace accessibility ...@@ -128,7 +128,7 @@ namespace accessibility
is our parent accessible object is our parent accessible object
*/ */
AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
sal_uIntPtr _nPos, sal_uLong _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent ); const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
// XTypeProvider // XTypeProvider
......
...@@ -624,7 +624,7 @@ private: ...@@ -624,7 +624,7 @@ private:
// Must be called with both the external (Solar) and internal mutex // Must be called with both the external (Solar) and internal mutex
// locked, and after init has been called: // 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, bool bCut, bool bPaste,
::rtl::OUString const & rText); ::rtl::OUString const & rText);
......
...@@ -90,7 +90,7 @@ namespace accessibility ...@@ -90,7 +90,7 @@ namespace accessibility
SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() ); SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
if ( pEntry ) if ( pEntry )
{ {
sal_uIntPtr nPos = pCtrl->GetEntryListPos( pEntry ); sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this ); Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this );
uno::Any aOldValue, aNewValue; uno::Any aOldValue, aNewValue;
aNewValue <<= xChild; aNewValue <<= xChild;
......
...@@ -87,7 +87,7 @@ namespace accessibility ...@@ -87,7 +87,7 @@ namespace accessibility
// Ctor() and Dtor() // Ctor() and Dtor()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
sal_uIntPtr _nPos, sal_uLong _nPos,
const Reference< XAccessible >& _xParent ) : const Reference< XAccessible >& _xParent ) :
AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ), AccessibleIconChoiceCtrlEntry_BASE ( m_aMutex ),
......
...@@ -92,7 +92,7 @@ namespace accessibility ...@@ -92,7 +92,7 @@ namespace accessibility
{ {
if ( isAlive() ) if ( isAlive() )
{ {
sal_uIntPtr nEventId = rVclWindowEvent.GetId(); sal_uLong nEventId = rVclWindowEvent.GetId();
switch ( nEventId ) switch ( nEventId )
{ {
case VCLEVENT_OBJECT_DYING : case VCLEVENT_OBJECT_DYING :
......
...@@ -157,7 +157,7 @@ void OAccessibleMenuItemComponent::Click() ...@@ -157,7 +157,7 @@ void OAccessibleMenuItemComponent::Click()
// that the popup menus are executed synchronously. // that the popup menus are executed synchronously.
AllSettings aSettings = pWindow->GetSettings(); AllSettings aSettings = pWindow->GetSettings();
MouseSettings aMouseSettings = aSettings.GetMouseSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings();
sal_uIntPtr nDelay = aMouseSettings.GetMenuDelay(); sal_uLong nDelay = aMouseSettings.GetMenuDelay();
aMouseSettings.SetMenuDelay( 0 ); aMouseSettings.SetMenuDelay( 0 );
aSettings.SetMouseSettings( aMouseSettings ); aSettings.SetMouseSettings( aMouseSettings );
pWindow->SetSettings( aSettings ); 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