diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-28 22:19:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 12:44:23 +0100 |
| commit | 9ce98add53128716524ec06dd1f90548326adce0 (patch) | |
| tree | 5b5eba190310fa1f25b84af3f3af30b7894ae629 /filter | |
| parent | 37d6ff0691f7be9fa4d742779fa59883de3586d9 (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index ca1af31203e8..716655e977ff 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -77,9 +77,8 @@ 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 ... -static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG( RTL_CONSTASCII_USTRINGPARAM( "The filter configuration appears to be defective. Please install the office suite again." )); - - +const char MESSAGE_CORRUPTED_FILTERCONFIG[] = + "The filter configuration appears to be defective. Please install the office suite again."; FilterCache::FilterCache() : BaseLock ( ) @@ -998,7 +997,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess catch(const css::uno::Exception& ex) { throw css::document::CorruptedFilterConfigurationException( - MESSAGE_CORRUPTED_FILTERCONFIG, + rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), css::uno::Reference< css::uno::XInterface >(), ex.Message); } @@ -1043,7 +1042,7 @@ void FilterCache::impl_validateAndOptimize() ) { throw css::document::CorruptedFilterConfigurationException( - MESSAGE_CORRUPTED_FILTERCONFIG, + rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), css::uno::Reference< css::uno::XInterface >(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." ))); } @@ -1307,7 +1306,7 @@ void FilterCache::impl_validateAndOptimize() OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); if (nErrors>0) throw css::document::CorruptedFilterConfigurationException( - MESSAGE_CORRUPTED_FILTERCONFIG, + rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), css::uno::Reference< css::uno::XInterface >(), sLogOut); OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); @@ -1558,7 +1557,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA catch(const css::uno::Exception& ex) { throw css::document::CorruptedFilterConfigurationException( - MESSAGE_CORRUPTED_FILTERCONFIG, + rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), css::uno::Reference< css::uno::XInterface >(), ex.Message); } @@ -1587,7 +1586,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA catch(const css::uno::Exception& ex) { throw css::document::CorruptedFilterConfigurationException( - MESSAGE_CORRUPTED_FILTERCONFIG, + rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), css::uno::Reference< css::uno::XInterface >(), ex.Message); } @@ -1616,7 +1615,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA catch(const css::uno::Exception& ex) { throw css::document::CorruptedFilterConfigurationException( - MESSAGE_CORRUPTED_FILTERCONFIG, + rtl::OUString(MESSAGE_CORRUPTED_FILTERCONFIG), css::uno::Reference< css::uno::XInterface >(), ex.Message); } |