summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-02-05 17:31:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-02-05 17:31:17 +0100
commit4bbc91d5c50621db2dfed11428c69ca3897270f6 (patch)
tree3a03f1b58ccc9e959ffed8cacc735f1b37920039 /desktop
parent47160402868eddbe876fbb392b35a8eaab1783af (diff)
Better error reporting
Change-Id: Icb083795c9c00a9ca33c2a901b4183b81c98918c
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/migration/migration.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 62aba3d157b9..6301fdc3acba 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