From 7a7b346a527c4fca52b68281e419e1f876fbac59 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 5 Jan 2012 14:50:44 +0100
Subject: 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).
---
 sal/textenc/textenc.cxx | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'sal/textenc/textenc.cxx')

diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 9b3e25623073..05550a505365 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -339,6 +339,29 @@ static ImplTextEncodingData const aImplUTF8TextEncodingData
             | RTL_TEXTENCODING_INFO_MIME };
     /* SCRIPT_UNICODE, pc code page 850 */
 
+static char aImplJavaUtf8TextConverterTag;
+    /* The value of this tag is irrelevant.  Only its address != NULL is used to
+       distinguish between RTL_TEXTENCODING_UTF8 and
+       RTL_TEXTENCODING_JAVA_UTF8. */
+
+static ImplTextEncodingData const aImplJavaUtf8TextEncodingData
+    = { { &aImplJavaUtf8TextConverterTag,
+          &ImplConvertUtf8ToUnicode,
+          &ImplConvertUnicodeToUtf8,
+          &ImplCreateUtf8ToUnicodeContext,
+          &ImplDestroyContext,
+          &ImplResetUtf8ToUnicodeContext,
+          &ImplCreateUnicodeToUtf8Context,
+          &ImplDestroyContext,
+          &ImplResetUnicodeToUtf8Context },
+        1,
+        3,
+        1,
+        0,
+        NULL,
+        NULL,
+        RTL_TEXTENCODING_INFO_UNICODE | RTL_TEXTENCODING_INFO_MULTIBYTE };
+
 namespace {
 
 #if defined IOS
@@ -408,6 +431,8 @@ Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C()
             return &aImplMS1252TextEncodingData; break;
         case RTL_TEXTENCODING_UTF8:
             return &aImplUTF8TextEncodingData; break;
+        case RTL_TEXTENCODING_JAVA_UTF8:
+            return &aImplJavaUtf8TextEncodingData; break;
         case RTL_TEXTENCODING_ISO_8859_1:
             return &aImplISO88591TextEncodingData; break;
         default:
-- 
cgit