[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source xmlsecurity/source

[Oliver-Rainer Wittmann]

 desktop/source/migration/services/oo3extensionmigration.cxx |    9 +++++++--
 xmlsecurity/source/dialogs/warnings.src                     |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 1da3011189bcf5f79e3212303962937e9dcfe6ea
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Jun 20 08:38:57 2013 +0000

    122397: extension migration - catch certain expection occuring during deployment of installed extension in order to continue the migration

diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 53caeda..03dd9515 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -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::migrateExtension( const ::rtl::OUString& sSourceDir
         catch ( lang::IllegalArgumentException& )
         {
         }
+        catch ( deployment::DeploymentException& )
+        {
+        }
+        catch ( uno::RuntimeException & )
+        {
+        }
     }
 
     return false;
commit 1aedcb86f08affb4265539418d4cde377c4de80c
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Thu Jun 20 08:34:23 2013 +0000

    #122564# correct typo, save -> safe

diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src
index e17a5e8..d6d6b31 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -75,7 +75,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
         Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
         Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
         Wordbreak = TRUE;
-        Text [ en-US ] = "Macros may contain viruses. Disabling macros for a document is always save. If you disable macros you may lose functionality provided by the document macros.";
+        Text [ en-US ] = "Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros.";
     };
     CheckBox CB_ALWAYSTRUST
     {