strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gridsort: element*: don't let non-runtime exceptions slip, this will crash on non-Windows platforms

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2011-01-27 12:56:33 +01:00
parent b5707b50ee
commit 25a7a5fec7
1 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
toolkit/source/controls/dialogcontrol.cxx
View file

@ -1684,7 +1684,16 @@ void UnoDialogControl::elementInserted( const ContainerEvent& Event ) throw(Runt
Event.Accessor >>= aName; Event.Accessor >>= aName;
Event.Element >>= xModel; Event.Element >>= xModel;
ImplInsertControl( xModel, aName ); ENSURE_OR_RETURN_VOID( xModel.is(), "UnoDialogControl::elementInserted: illegal element!" );
try
{
ImplInsertControl( xModel, aName );
}
catch ( const RuntimeException& e ) { throw; }
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
} }
void UnoDialogControl::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException) void UnoDialogControl::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException)
@ -1693,8 +1702,16 @@ void UnoDialogControl::elementRemoved( const ContainerEvent& Event ) throw(Runti
Reference< XControlModel > xModel; Reference< XControlModel > xModel;
Event.Element >>= xModel; Event.Element >>= xModel;
if ( xModel.is() ) ENSURE_OR_RETURN_VOID( xModel.is(), "UnoDialogControl::elementRemoved: illegal element!" );
try
{
ImplRemoveControl( xModel ); ImplRemoveControl( xModel );
}
catch ( const RuntimeException& e ) { throw; }
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
} }
void UnoDialogControl::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException) void UnoDialogControl::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException)
@ -1703,13 +1720,31 @@ void UnoDialogControl::elementReplaced( const ContainerEvent& Event ) throw(Runt
Reference< XControlModel > xModel; Reference< XControlModel > xModel;
Event.ReplacedElement >>= xModel; Event.ReplacedElement >>= xModel;
if ( xModel.is() ) try
ImplRemoveControl( xModel ); {
OSL_ENSURE( xModel.is(), "UnoDialogControl::elementReplaced: invalid ReplacedElement!" );
if ( xModel.is() )
ImplRemoveControl( xModel );
}
catch ( const RuntimeException& e ) { throw; }
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
::rtl::OUString aName; ::rtl::OUString aName;
Event.Accessor >>= aName; Event.Accessor >>= aName;
Event.Element >>= xModel; Event.Element >>= xModel;
ImplInsertControl( xModel, aName ); ENSURE_OR_RETURN_VOID( xModel.is(), "UnoDialogControl::elementReplaced: invalid new element!" );
try
{
ImplInsertControl( xModel, aName );
}
catch ( const RuntimeException& e ) { throw; }
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
} }
void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException) void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException)