svn commit: r1494887 - /openoffice/trunk/main/desktop/source/migration/services/oo3extensionmigration.cxx

[orw]

Author: orw
Date: Thu Jun 20 08:38:57 2013
New Revision: 1494887

URL: http://svn.apache.org/r1494887
Log:
122397: extension migration - catch certain expection occuring during 
deployment of installed extension in order to continue the migration

Modified:
    
openoffice/trunk/main/desktop/source/migration/services/oo3extensionmigration.cxx

Modified: 
openoffice/trunk/main/desktop/source/migration/services/oo3extensionmigration.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/migration/services/oo3extensionmigration.cxx?rev=1494887&r1=1494886&r2=1494887&view=diff
==============================================================================
--- 
openoffice/trunk/main/desktop/source/migration/services/oo3extensionmigration.cxx
 (original)
+++ 
openoffice/trunk/main/desktop/source/migration/services/oo3extensionmigration.cxx
 Thu Jun 20 08:38:57 2013
@@ -48,8 +48,7 @@
 
 #include <com/sun/star/deployment/VersionException.hpp>
 #include <dp_gui_handleversionexception.hxx>
-
-#include "com/sun/star/deployment/VersionException.hpp"
+#include <com/sun/star/deployment/DeploymentException.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -366,6 +365,12 @@ bool OO3ExtensionMigration::migrateExten
         catch ( lang::IllegalArgumentException& )
         {
         }
+        catch ( deployment::DeploymentException& )
+        {
+        }
+        catch ( uno::RuntimeException & )
+        {
+        }
     }
 
     return false;