mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error reporting

Browse Source 
(The MESSAGE_CORRUPTED_FILTERCONFIG in the exception's Message would not be seen
by end-users anyway, so better put something more useful in there.)

Change-Id: I5c677a894a8b6fcfb61d24c59d45b2cbc53e7a60
This commit is contained in:
Stephan Bergmann
2012-09-12 17:49:42 +02:00
parent 3357115adf
commit 8c8492892b
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
filter/source/config/cache/filtercache.cxx vendored
View File

@@ -67,13 +67,6 @@ namespace filter{
namespace css = ::com::sun::star; namespace css = ::com::sun::star;
// Error message in case filter config seems to be corrupted.
// Note: Dont tell user something about "setup -repair"!
// Its no longer supported by using native installers ...
const char MESSAGE_CORRUPTED_FILTERCONFIG[] =
"The filter configuration appears to be defective. Please install the office suite again.";
FilterCache::FilterCache() FilterCache::FilterCache()
: BaseLock ( ) : BaseLock ( )
, m_xSMGR (::comphelper::getProcessServiceFactory()) , m_xSMGR (::comphelper::getProcessServiceFactory())
@@ -1006,7 +999,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
throw css::document::CorruptedFilterConfigurationException( throw css::document::CorruptedFilterConfigurationException(
rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), "filter configuration, caught: " + ex.Message,
css::uno::Reference< css::uno::XInterface >(), css::uno::Reference< css::uno::XInterface >(),
ex.Message); ex.Message);
} }
@@ -1051,7 +1044,7 @@ void FilterCache::impl_validateAndOptimize()
) )
{ {
throw css::document::CorruptedFilterConfigurationException( throw css::document::CorruptedFilterConfigurationException(
rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), "filter configuration: the list of types or filters is empty",
css::uno::Reference< css::uno::XInterface >(), css::uno::Reference< css::uno::XInterface >(),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." ))); ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." )));
} }
@@ -1315,7 +1308,7 @@ void FilterCache::impl_validateAndOptimize()
OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
if (nErrors>0) if (nErrors>0)
throw css::document::CorruptedFilterConfigurationException( throw css::document::CorruptedFilterConfigurationException(
rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), "filter configuration: " + sLogOut,
css::uno::Reference< css::uno::XInterface >(), css::uno::Reference< css::uno::XInterface >(),
sLogOut); sLogOut);
OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr());
@@ -1566,7 +1559,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
throw css::document::CorruptedFilterConfigurationException( throw css::document::CorruptedFilterConfigurationException(
rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), "filter configuration, caught: " + ex.Message,
css::uno::Reference< css::uno::XInterface >(), css::uno::Reference< css::uno::XInterface >(),
ex.Message); ex.Message);
} }
@@ -1595,7 +1588,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
throw css::document::CorruptedFilterConfigurationException( throw css::document::CorruptedFilterConfigurationException(
rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), "filter configuration, caught: " + ex.Message,
css::uno::Reference< css::uno::XInterface >(), css::uno::Reference< css::uno::XInterface >(),
ex.Message); ex.Message);
} }
@@ -1624,7 +1617,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
catch(const css::uno::Exception& ex) catch(const css::uno::Exception& ex)
{ {
throw css::document::CorruptedFilterConfigurationException( throw css::document::CorruptedFilterConfigurationException(
rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), "filter configuration, caught: " + ex.Message,
css::uno::Reference< css::uno::XInterface >(), css::uno::Reference< css::uno::XInterface >(),
ex.Message); ex.Message);
} }