diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-27 10:06:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-27 10:10:55 +0200 |
| commit | 193715bbf0e59256fd8da7ebd8dc5eb937615281 (patch) | |
| tree | e268a2f2623b7ebd1ac03e71d763d9ab84952167 /sal/textenc | |
| parent | 04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (diff) | |
FullTextEncodingDataSingleton must not call itself recursively.
Happened on non-standard locales (like hu_HU on Linux) when osl_loadModuleRelative
wanted to access non-standard text encodings.
For Windows, the fix is still only a "TODO: FIXME" dummy.
Diffstat (limited to 'sal/textenc')
| -rw-r--r-- | sal/textenc/textenc.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 7c71284f3f64..c3f3bdc00768 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -129,20 +129,12 @@ void SAL_CALL thisModule() {} class FullTextEncodingData: private boost::noncopyable { public: FullTextEncodingData() { - if (!module_.loadRelative( - &thisModule, - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - SAL_MODULENAME("sal_textenc"))))) - { + if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenc"))) { OSL_TRACE("Loading sal_textenc library failed"); std::abort(); } function_ = reinterpret_cast< TextEncodingFunction * >( - module_.getFunctionSymbol( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "sal_getFullTextEncodingData")))); + module_.getFunctionSymbol("sal_getFullTextEncodingData")); if (function_ == 0) { OSL_TRACE( "Obtaining sal_getFullTextEncodingData fuction from sal_textenc" |