[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Michael Meeks]

 sc/source/core/tool/addincol.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 19d9d212615714e1bfbbf2fc83f3c057163bb1d6
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Apr 5 15:21:33 2013 +0100

    fdo#62155 - band-aid crash from poor addin registration on upgrade
    
    For some sadly unknown reason we get an exception traversing the
    calc addins and crashing doesn't seem a great response to that.
    
    Change-Id: I8d1eda7c8bab384817f19a86607c7035e4c3a8ab
    Reviewed-on: https://gerrit.libreoffice.org/3212
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 8f63781..6c92d4c 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -291,6 +291,7 @@ void ScUnoAddInCollection::Initialize()
             {
                 uno::Any aAddInAny = xEnum->nextElement();
 
+                try
                 {
                     uno::Reference<uno::XInterface> xIntFac;
                     aAddInAny >>= xIntFac;
@@ -321,6 +322,8 @@ void ScUnoAddInCollection::Initialize()
                             }
                         }
                     }
+                } catch ( const uno::Exception& ) {
+                    SAL_WARN ( "sc", "Failed to initialize create instance of sheet.AddIn" );
                 }
             }
         }