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).

1 files changed, 0 insertions, 27 deletions

diff --git a/sal/textenc/tcvtuni1.tab b/sal/textenc/tcvtuni1.tab
index 83f0a5edc39d..63039c0346c9 100644
--- a/sal/textenc/tcvtuni1.tab
+++ b/sal/textenc/tcvtuni1.tab
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_RTL_TEXTENC_CONTEXT_H
-#include "context.h"
-#endif
-
 /* Unicode Encodings */
 
 static ImplTextEncodingData const aImplUTF7TextEncodingData
@@ -53,26 +49,3 @@ static ImplTextEncodingData const aImplUTF7TextEncodingData
             | RTL_TEXTENCODING_INFO_MULTIBYTE
             | 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 };