Author: hdu
Date: Wed Sep 11 09:32:49 2013
New Revision: 1521771
URL: http://svn.apache.org/r1521771
Log:
#i123198# catch and ignore uno exceptions in
sfx2::sidebar::TabBar::Item::HandleClick()
Patch by: Herbert Duerr
Scenario found by: Thorsten Wagner
Modified:
openoffice/branches/AOO401/ (props changed)
openoffice/branches/AOO401/main/ (props changed)
openoffice/branches/AOO401/main/sfx2/source/sidebar/TabBar.cxx
Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1521765
Propchange: openoffice/branches/AOO401/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1521765
Modified: openoffice/branches/AOO401/main/sfx2/source/sidebar/TabBar.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/sfx2/source/sidebar/TabBar.cxx?rev=1521771&r1=1521770&r2=1521771&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/sfx2/source/sidebar/TabBar.cxx (original)
+++ openoffice/branches/AOO401/main/sfx2/source/sidebar/TabBar.cxx Wed Sep 11
09:32:49 2013
@@ -309,7 +309,12 @@ Image TabBar::GetItemImage (const DeckDe
IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG)
{
- maDeckActivationFunctor(msDeckId);
+ try
+ {
+ maDeckActivationFunctor(msDeckId);
+ }
+ catch( const ::com::sun::star::uno::Exception&) {} // workaround for
#i123198#
+
return 1;
}