mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i124970# fix DocumentFocusListener::notifyEvent's...

Browse Source 
handling of IndexOutOfBoundsException

the DocumentFocusListener::notifyEvent() throw list only allows a RuntimeException to
propagate. The methods called in notifyEvent() allow IndexOutOfBoundsException though,
so it must be handled in all cases to prevent C++ from invoking its unexpected() abort
mechanisms. Ceterum censeo, non-empty throw lists should be removed altogether...

(cherry picked from commit 4da0e442f0fd4838e93e7316c24cfeef9289207d)

Conflicts:
	vcl/osx/documentfocuslistener.cxx
	vcl/unx/gtk/a11y/atkutil.cxx

Change-Id: Ie0b783832314ee5ec376a0c3c2cd67e4a70e218b
This commit is contained in:
Herbert Dürr
2014-06-23 07:55:44 +00:00
committed by Caolán McNamara
parent 94b2fe9b00
commit 5232d01ee5
2 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
vcl/osx/documentfocuslistener.cxx
View File

@@ -48,10 +48,10 @@ void SAL_CALL
DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
throw( RuntimeException, std::exception ) throw( RuntimeException, std::exception )
{ {
switch( aEvent.EventId ) try {
{ switch( aEvent.EventId )
case AccessibleEventId::STATE_CHANGED: {
try case AccessibleEventId::STATE_CHANGED:
{ {
sal_Int16 nState = AccessibleStateType::INVALID; sal_Int16 nState = AccessibleStateType::INVALID;
aEvent.NewValue >>= nState; aEvent.NewValue >>= nState;
@@ -59,34 +59,35 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
if( AccessibleStateType::FOCUSED == nState ) if( AccessibleStateType::FOCUSED == nState )
m_aFocusTracker.setFocusedObject( getAccessible(aEvent) ); m_aFocusTracker.setFocusedObject( getAccessible(aEvent) );
} }
catch(const IndexOutOfBoundsException &) break;
case AccessibleEventId::CHILD:
{ {
OSL_TRACE("Focused object has invalid index in parent"); Reference< XAccessible > xChild;
if( (aEvent.OldValue >>= xChild) && xChild.is() )
detachRecursive(xChild);
if( (aEvent.NewValue >>= xChild) && xChild.is() )
attachRecursive(xChild);
} }
break; break;
case AccessibleEventId::CHILD: case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
{ {
Reference< XAccessible > xChild; Reference< XAccessible > xAccessible( getAccessible(aEvent) );
if( (aEvent.OldValue >>= xChild) && xChild.is() ) detachRecursive(xAccessible);
detachRecursive(xChild); attachRecursive(xAccessible);
}
OSL_TRACE( "Invalidate all children called\n" );
break;
if( (aEvent.NewValue >>= xChild) && xChild.is() ) default:
attachRecursive(xChild); break;
} }
break; }
catch (const IndexOutOfBoundsException&)
case AccessibleEventId::INVALIDATE_ALL_CHILDREN: {
{ OSL_TRACE("Focused object has invalid index in parent");
Reference< XAccessible > xAccessible( getAccessible(aEvent) );
detachRecursive(xAccessible);
attachRecursive(xAccessible);
}
OSL_TRACE( "Invalidate all children called" );
break;
default:
break;
} }
} }

42
vcl/unx/gtk/a11y/atkutil.cxx
View File

@@ -204,10 +204,10 @@ void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent )
throw( uno::RuntimeException, std::exception ) throw( uno::RuntimeException, std::exception )
{ {
switch( aEvent.EventId ) try {
{ switch( aEvent.EventId )
case accessibility::AccessibleEventId::STATE_CHANGED: {
try case accessibility::AccessibleEventId::STATE_CHANGED:
{ {
sal_Int16 nState = accessibility::AccessibleStateType::INVALID; sal_Int16 nState = accessibility::AccessibleStateType::INVALID;
aEvent.NewValue >>= nState; aEvent.NewValue >>= nState;
@@ -215,28 +215,30 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
if( accessibility::AccessibleStateType::FOCUSED == nState ) if( accessibility::AccessibleStateType::FOCUSED == nState )
atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) ); atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
} }
catch (const lang::IndexOutOfBoundsException&) break;
case accessibility::AccessibleEventId::CHILD:
{ {
g_warning("Focused object has invalid index in parent"); uno::Reference< accessibility::XAccessible > xChild;
if( (aEvent.OldValue >>= xChild) && xChild.is() )
detachRecursive(xChild);
if( (aEvent.NewValue >>= xChild) && xChild.is() )
attachRecursive(xChild);
} }
break; break;
case accessibility::AccessibleEventId::CHILD: case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
{
uno::Reference< accessibility::XAccessible > xChild;
if( (aEvent.OldValue >>= xChild) && xChild.is() )
detachRecursive(xChild);
if( (aEvent.NewValue >>= xChild) && xChild.is() )
attachRecursive(xChild);
}
break;
case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
g_warning( "Invalidate all children called\n" ); g_warning( "Invalidate all children called\n" );
break; break;
default:
break; default:
break;
}
}
catch( const lang::IndexOutOfBoundsException& e )
{
g_warning("Focused object has invalid index in parent");
} }
} }