[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source

[Herbert Dürr]

 sfx2/source/sidebar/TabBar.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9538dd8a2b2f08b9920486cb4340fc2aae191fd4
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Sep 11 09:02:57 2013 +0000

    #i123198# catch and ignore uno exceptions in sfx2::sidebar::TabBar::Item::HandleClick()
    
    Patch by: Herbert Duerr
    Scenario found by: Thorsten Wagner
    
    (cherry picked from commit 1a078f3584e8a288c0ec33f176638406423ade63)
    (cherry picked from commit fe2a249257a9fb4a994514bce5f49268f7bfd770)

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 1cbd18b..52e0675 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -287,7 +287,12 @@ Image TabBar::GetItemImage (const DeckDescriptor& rDeckDescriptor) const
 
 IMPL_LINK(TabBar::Item, HandleClick, Button*, EMPTYARG)
 {
-    maDeckActivationFunctor(msDeckId);
+    try
+    {
+        maDeckActivationFunctor(msDeckId);
+    }
+    catch( const ::com::sun::star::uno::Exception&) {} // workaround for #i123198#
+
     return 1;
 }