desktop/source/migration/migration.cxx | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 4bbc91d5c50621db2dfed11428c69ca3897270f6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Feb 5 17:31:17 2013 +0100
Better error reporting
Change-Id: Icb083795c9c00a9ca33c2a901b4183b81c98918c
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 62aba3d..6301fdc 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -319,12 +319,13 @@ sal_Bool MigrationImpl::doMigration()
result = sal_True;
}
- catch (...)
+ catch (css::uno::Exception & e)
{
- OString aMsg("An unexpected exception was thrown during migration");
- aMsg += "\nOldVersion: " + OUStringToOString(m_aInfo.productname,
RTL_TEXTENCODING_ASCII_US);
- aMsg += "\nDataPath : " + OUStringToOString(m_aInfo.userdata,
RTL_TEXTENCODING_ASCII_US);
- OSL_FAIL(aMsg.getStr());
+ SAL_WARN(
+ "desktop.migration",
+ "ignored Exception \"" << e.Message
+ << "\" while migrating from version \"" << m_aInfo.productname
+ << "\" data \"" << m_aInfo.userdata << "\"");
}
// prevent running the migration multiple times
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
