diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-05 14:50:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-05 23:24:08 +0100 |
| commit | 7a7b346a527c4fca52b68281e419e1f876fbac59 (patch) | |
| tree | 147f2f4d71158abff4845d2a87aa607e47bbd250 /sal/textenc/tables.cxx | |
| parent | ce3ffbaec7a23d4e04048def3fd3da53a911043c (diff) | |
Properly assign objects to only those libraries that actually use them.
For that, moved aImplJavaUtf8TextEncodingData from tables.cxx to
textenc.cxx, as it shares code with aImplUTF8TextEncoding (but does
not drag lots of expensive data back into sal from sal_textenc).
Diffstat (limited to 'sal/textenc/tables.cxx')
| -rw-r--r-- | sal/textenc/tables.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index c8d9c19cd11a..096876119a20 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -133,6 +133,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * assert( nEncoding != RTL_TEXTENCODING_ASCII_US && nEncoding != RTL_TEXTENCODING_ISO_8859_1 && + nEncoding != RTL_TEXTENCODING_JAVA_UTF8 && nEncoding != RTL_TEXTENCODING_MS_1252 && nEncoding != RTL_TEXTENCODING_UTF8); // handled by Impl_getTextEncodingData @@ -227,7 +228,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * &aImplTis620TextEncodingData, /* TIS_620 */ &aImplKoi8UTextEncodingData, /* KOI8_U */ &aImplIsciiDevanagariTextEncodingData, /* ISCII_DEVANAGARI */ - &aImplJavaUtf8TextEncodingData, /* JAVA_UTF8 */ + NULL, /* JAVA_UTF8, see above */ &adobeStandardEncodingData, /* ADOBE_STANDARD */ &adobeSymbolEncodingData, /* ADOBE_SYMBOL */ &aImplPT154TextEncodingData }; /* PT154 */ |