Extracted convertsimple (used by sal and sal_textenc) from tcvtbyte.

author: Stephan Bergmann <sbergman@redhat.com> 2012-01-06 11:48:13 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2012-01-06 15:00:44 +0100
commit: 5689b61ac9eac4d4be2d6aa378b732a5eae4784a (patch)
tree: 271a107e98f9c04aa296cd18dfad129ab4acddbc /sal
parent: 0c66147a2adeacddb706d789bef42d6177258a87 (diff)
20 files changed, 950 insertions, 798 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index d7e65ad17dbf..c43013c26831 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -120,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/rtl/source/ustring \
 	sal/rtl/source/uuid \
 	sal/textenc/converter \
-	sal/textenc/tcvtbyte \
+	sal/textenc/convertsimple \
 	sal/textenc/tcvtutf8 \
 	sal/textenc/tenchelp \
 	sal/textenc/tencinfo \
diff --git a/sal/textenc/convertbig5hkscs.tab b/sal/textenc/convertbig5hkscs.tab
index bcd4748ddd9f..b3085154d112 100644
--- a/sal/textenc/convertbig5hkscs.tab
+++ b/sal/textenc/convertbig5hkscs.tab
@@ -32,8 +32,8 @@
 
 #include "context.hxx"
 #include "convertbig5hkscs.hxx"
-
 #include "generate/big5hkscs2001.tab"
+#include "tenchelp.hxx"
 
 static ImplBig5HkscsConverterData const aImplBig5HkscsConvertData
     = { aImplBig5Hkscs2001ToUnicodeData,
diff --git a/sal/textenc/convertiscii.tab b/sal/textenc/convertiscii.tab
index 57e5bbdd3707..b6506d789090 100644
--- a/sal/textenc/convertiscii.tab
+++ b/sal/textenc/convertiscii.tab
@@ -32,6 +32,7 @@
 #include "rtl/tencinfo.h"
 #include "sal/types.h"
 
+#include "convertsimple.hxx"
 #include "tenchelp.hxx"
 
 /* Conversion tables for the Devanagari version of ISCII (IS 13194:1991).
@@ -97,8 +98,8 @@ static ImplByteConvertData const aImplIsciiDevanagariConvertData
 
 static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData
     = { { &aImplIsciiDevanagariConvertData,
-          &ImplCharToUnicode,
-          &ImplUnicodeToChar,
+          &sal::detail::textenc::convertCharToUnicode,
+          &sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
new file mode 100644
index 000000000000..24a4ad6b7662
--- /dev/null
+++ b/sal/textenc/convertsimple.cxx
@@ -0,0 +1,688 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ *   (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "sal/config.h"
+
+#include "rtl/textcvt.h"
+#include "sal/types.h"
+
+#include "convertsimple.hxx"
+#include "tenchelp.hxx"
+
+#define IMPL_MAX_REPLACECHAR 5
+
+namespace {
+
+struct ImplReplaceCharData
+{
+    sal_uInt16      mnUniChar;
+    sal_uInt16      mnReplaceChar;
+};
+
+static ImplReplaceCharData const aImplRepCharTab[] =
+{
+  { 0x00A0, 0x0020 },   /* NO-BREAK-SPACE */
+  { 0x00A1, 0x0021 },   /* INVERTED EXCLAMATION MARK */
+  { 0x00B7, 0x0045 },   /* MIDDLE DOT */
+  { 0x00BF, 0x003F },   /* INVERTED QUESTION MARK */
+  { 0x00D7, 0x002A },   /* MULTIPLIKATION SIGN */
+  { 0x00F7, 0x002F },   /* DIVISION SIGN */
+  { 0x2000, 0x0020 },   /* EN QUAD */
+  { 0x2001, 0x0020 },   /* EM QUAD */
+  { 0x2002, 0x0020 },   /* EN SPACE */
+  { 0x2003, 0x0020 },   /* EM SPACE */
+  { 0x2004, 0x0020 },   /* THREE-PER-EM SPACE */
+  { 0x2005, 0x0020 },   /* FOUR-PER-EM SPACE */
+  { 0x2006, 0x0020 },   /* SIX-PER-EM SPACE */
+  { 0x2007, 0x0020 },   /* FIGURE SPACE */
+  { 0x2008, 0x0020 },   /* PUNCTATION SPACE */
+  { 0x2009, 0x0020 },   /* THIN SPACE */
+  { 0x200A, 0x0020 },   /* HAIR SPACE */
+  { 0x2010, 0x002D },   /* HYPHEN */
+  { 0x2011, 0x002D },   /* NON-BREAKING HYPHEN */
+  { 0x2012, 0x002D },   /* FIGURE DASH */
+  { 0x2013, 0x002D },   /* EN DASH */
+  { 0x2014, 0x002D },   /* EM DASH */
+  { 0x2015, 0x002D },   /* HORIZONTAL BAR */
+  { 0x2018, 0x0027 },   /* LEFT SINGLE QUOTATION MARK */
+  { 0x2019, 0x0027 },   /* RIGHT SINGLE QUOTATION MARK */
+  { 0x201A, 0x002C },   /* SINGLE LOW-9 QUOTATION MARK */
+  { 0x201B, 0x0027 },   /* SINGLE HIGH-RESERVED-9 QUOTATION MARK */
+  { 0x201C, 0x0022 },   /* LEFT DOUBLE QUOTATION MARK */
+  { 0x201D, 0x0022 },   /* RIGHT DOUBLE QUOTATION MARK */
+  { 0x201E, 0x0022 },   /* DOUBLE LOW-9 QUOTATION MARK */
+  { 0x201F, 0x0022 },   /* DOUBLE HIGH-RESERVED-9 QUOTATION MARK */
+  { 0x2022, 0x002D },   /* BULLET */
+  { 0x2023, 0x002D },   /* TRIANGULAR BULLET */
+  { 0x2024, 0x002D },   /* ONE DOT LEADER */
+  { 0x2027, 0x002D },   /* HYPHENATION POINT */
+  { 0x2028, 0x000A },   /* LINE SEPARATOR */
+  { 0x2029, 0x000D },   /* PARAGRAPH SEPARATOR */
+  { 0x2032, 0x0027 },   /* PRIME */
+  { 0x2033, 0x0022 },   /* DOUBLE PRIME */
+  { 0x2035, 0x0027 },   /* RESERVED PRIME */
+  { 0x2036, 0x0022 },   /* RESERVED DOUBLE PRIME */
+  { 0x2039, 0x003C },   /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+  { 0x203A, 0x003E },   /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+  { 0x2043, 0x002D },   /* HYPHEN BULLET */
+  { 0x2044, 0x002F },   /* FRACTION SLASH */
+  { 0x2160, 0x0049 },   /* ROMAN NUMERAL ONE */
+  { 0x2164, 0x0056 },   /* ROMAN NUMERAL FIVE */
+  { 0x2169, 0x0058 },   /* ROMAN NUMERAL TEN */
+  { 0x216C, 0x004C },   /* ROMAN NUMERAL FIFTY */
+  { 0x216D, 0x0043 },   /* ROMAN NUMERAL ONE HUNDRED */
+  { 0x216E, 0x0044 },   /* ROMAN NUMERAL FIVE HUNDRED */
+  { 0x216F, 0x004D },   /* ROMAN NUMERAL ONE THOUSAND */
+  { 0x2170, 0x0069 },   /* SMALL ROMAN NUMERAL ONE */
+  { 0x2174, 0x0076 },   /* SMALL ROMAN NUMERAL FIVE */
+  { 0x2179, 0x0078 },   /* SMALL ROMAN NUMERAL TEN */
+  { 0x217C, 0x006C },   /* SMALL ROMAN NUMERAL FIFTY */
+  { 0x217D, 0x0063 },   /* SMALL ROMAN NUMERAL ONE HUNDRED */
+  { 0x217E, 0x0064 },   /* SMALL ROMAN NUMERAL FIVE HUNDRED */
+  { 0x217F, 0x006D },   /* SMALL ROMAN NUMERAL ONE THOUSAND */
+  { 0x2215, 0x002F },   /* DIVISION SLASH */
+  { 0x2217, 0x002A },   /* ASTERIX OPERATOR */
+  { 0xFF00, 0x0020 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF01, 0x0021 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF02, 0x0022 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF03, 0x0023 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF04, 0x0024 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF05, 0x0025 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF06, 0x0026 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF07, 0x0027 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF08, 0x0028 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF09, 0x0029 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF0A, 0x002A },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF0B, 0x002B },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF0C, 0x002C },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF0D, 0x002D },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF0E, 0x002E },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF0F, 0x002F },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF10, 0x0030 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF11, 0x0031 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF12, 0x0032 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF13, 0x0033 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF14, 0x0034 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF15, 0x0035 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF16, 0x0036 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF17, 0x0037 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF18, 0x0038 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF19, 0x0039 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF1A, 0x003A },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF1B, 0x003B },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF1C, 0x003C },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF1D, 0x003D },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF1E, 0x003E },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF1F, 0x003F },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF20, 0x0040 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF21, 0x0041 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF22, 0x0042 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF23, 0x0043 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF24, 0x0044 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF25, 0x0045 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF26, 0x0046 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF27, 0x0047 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF28, 0x0048 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF29, 0x0049 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF2A, 0x004A },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF2B, 0x004B },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF2C, 0x004C },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF2D, 0x004D },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF2E, 0x004E },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF2F, 0x004F },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF30, 0x0050 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF31, 0x0051 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF32, 0x0052 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF33, 0x0053 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF34, 0x0054 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF35, 0x0055 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF36, 0x0056 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF37, 0x0057 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF38, 0x0058 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF39, 0x0059 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF3A, 0x005A },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF3B, 0x005B },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF3C, 0x005C },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF3D, 0x005D },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF3E, 0x005E },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF3F, 0x005F },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF40, 0x0060 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF41, 0x0061 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF42, 0x0062 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF43, 0x0063 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF44, 0x0064 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF45, 0x0065 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF46, 0x0066 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF47, 0x0067 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF48, 0x0068 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF49, 0x0069 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF4A, 0x006A },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF4B, 0x006B },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF4C, 0x006C },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF4D, 0x006D },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF4E, 0x006E },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF4F, 0x006F },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF50, 0x0070 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF51, 0x0071 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF52, 0x0072 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF53, 0x0073 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF54, 0x0074 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF55, 0x0075 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF56, 0x0076 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF57, 0x0077 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF58, 0x0078 },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF59, 0x0079 },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF5A, 0x007A },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF5B, 0x007B },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF5C, 0x007C },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF5D, 0x007D },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF5E, 0x007E },   /* FULLWIDTH ASCII FORMS*/
+  { 0xFF5F, 0x007F },   /* FULLWIDTH ASCII FORMS */
+  { 0xFF61, 0x3002 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF62, 0x300C },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF63, 0x300D },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF64, 0x3001 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF65, 0x30FB },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF66, 0x30F2 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF67, 0x30A1 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF68, 0x30A3 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF69, 0x30A5 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF6A, 0x30A7 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF6B, 0x30A9 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF6C, 0x30E3 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF6D, 0x30E5 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF6E, 0x30E7 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF6F, 0x30C3 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF70, 0x30FC },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF71, 0x30A2 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF72, 0x30A4 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF73, 0x30A6 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF74, 0x30A8 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF75, 0x30AA },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF76, 0x30AB },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF77, 0x30AD },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF78, 0x30AF },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF79, 0x30B1 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF7A, 0x30B3 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF7B, 0x30B5 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF7C, 0x30B7 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF7D, 0x30B9 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF7E, 0x30BB },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF7F, 0x30BD },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF80, 0x30BF },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF81, 0x30C1 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF82, 0x30C4 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF83, 0x30C6 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF84, 0x30C8 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF85, 0x30CA },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF86, 0x30CB },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF87, 0x30CC },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF88, 0x30CD },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF89, 0x30CE },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF8A, 0x30CF },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF8B, 0x30D2 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF8C, 0x30D5 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF8D, 0x30D8 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF8E, 0x30DB },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF8F, 0x30DE },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF90, 0x30DF },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF91, 0x30E0 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF92, 0x30E1 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF93, 0x30E2 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF94, 0x30E4 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF95, 0x30E6 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF96, 0x30E8 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF97, 0x30E9 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF98, 0x30EA },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF99, 0x30EB },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF9A, 0x30EC },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF9B, 0x30ED },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF9C, 0x30EF },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF9D, 0x30F3 },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF9E, 0x309B },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFF9F, 0x309C },   /* HALFWIDTH KATAKANA FORMS */
+  { 0xFFA0, 0x3164 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA1, 0x3131 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA2, 0x3132 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA3, 0x3133 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA4, 0x3134 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA5, 0x3135 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA6, 0x3136 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA7, 0x3137 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA8, 0x3138 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFA9, 0x3139 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFAA, 0x313A },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFAB, 0x313B },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFAC, 0x313C },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFAD, 0x313D },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFAE, 0x313E },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFAF, 0x313F },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB0, 0x3140 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB1, 0x3141 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB2, 0x3142 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB3, 0x3143 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB4, 0x3144 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB5, 0x3145 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB6, 0x3146 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB7, 0x3147 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB8, 0x3148 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFB9, 0x3149 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFBA, 0x314A },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFBB, 0x314B },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFBC, 0x314C },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFBD, 0x314D },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFBE, 0x314E },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFC2, 0x314F },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFC3, 0x3150 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFC4, 0x3151 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFC5, 0x3152 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFC6, 0x3153 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFC7, 0x3154 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFCA, 0x3155 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFCB, 0x3156 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFCC, 0x3157 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFCD, 0x3158 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFCE, 0x3159 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFCF, 0x315A },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFD2, 0x315B },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFD3, 0x315C },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFD4, 0x315D },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFD5, 0x315E },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFD6, 0x315F },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFD7, 0x3160 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFDA, 0x3161 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFDB, 0x3162 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFDC, 0x3163 },   /* HALFWIDTH HANGUL FORMS */
+  { 0xFFE0, 0x00A2 },   /* FULLWIDTH CENT SIGN */
+  { 0xFFE1, 0x00A3 },   /* FULLWIDTH POUND SIGN */
+  { 0xFFE2, 0x00AC },   /* FULLWIDTH NOT SIGN */
+  { 0xFFE3, 0x00AF },   /* FULLWIDTH MACRON */
+  { 0xFFE4, 0x00A6 },   /* FULLWIDTH BROKEN BAR */
+  { 0xFFE5, 0x00A5 },   /* FULLWIDTH YEN SIGN */
+  { 0xFFE6, 0x20A9 },   /* FULLWIDTH WON SIGN */
+  { 0xFFE8, 0x2502 },   /* HALFWIDTH FORMS LIGHT VERTICAL */
+  { 0xFFE9, 0x2190 },   /* HALFWIDTH LEFTWARDS ARROW */
+  { 0xFFEA, 0x2191 },   /* HALFWIDTH UPWARDS ARROW */
+  { 0xFFEB, 0x2192 },   /* HALFWIDTH RIGHTWARDS ARROW */
+  { 0xFFEC, 0x2193 },   /* HALFWIDTH DOWNWARDS ARROW */
+  { 0xFFED, 0x25A0 },   /* HALFWIDTH BLACK SQUARE */
+  { 0xFFEE, 0x25CB },   /* HALFWIDTH WHITE CIRCLE */
+  { 0xFFFD, 0x003F }    /* REPLACEMENT CHARACTER */
+};
+
+sal_uInt16 ImplGetReplaceChar( sal_Unicode c )
+{
+    sal_uInt16                  nLow;
+    sal_uInt16                  nHigh;
+    sal_uInt16                  nMid;
+    sal_uInt16                  nCompareChar;
+    const ImplReplaceCharData*  pCharData;
+
+    nLow = 0;
+    nHigh = (sizeof( aImplRepCharTab )/sizeof( ImplReplaceCharData ))-1;
+    do
+    {
+        nMid = (nLow+nHigh)/2;
+        pCharData = aImplRepCharTab+nMid;
+        nCompareChar = pCharData->mnUniChar;
+        if ( c < nCompareChar )
+        {
+            if ( !nMid )
+                break;
+            nHigh = nMid-1;
+        }
+        else
+        {
+            if ( c > nCompareChar )
+                nLow = nMid+1;
+            else
+                return pCharData->mnReplaceChar;
+        }
+    }
+    while ( nLow <= nHigh );
+
+    return 0;
+}
+
+struct ImplReplaceCharStrData
+{
+    sal_uInt16      mnUniChar;
+    sal_uInt16      maReplaceChars[IMPL_MAX_REPLACECHAR];
+};
+
+static ImplReplaceCharStrData const aImplRepCharStrTab[] =
+{
+  { 0x00A9, { 0x0028, 0x0063, 0x0029, 0x0000, 0x0000  } },  /* COPYRIGHT SIGN */
+  { 0x00AB, { 0x003C, 0x003C, 0x0000, 0x0000, 0x0000  } },  /* LEFT-POINTING-DOUBLE ANGLE QUOTATION MARK */
+  { 0x0AE0, { 0x0028, 0x0072, 0x0029, 0x0000, 0x0000  } },  /* REGISTERED SIGN */
+  { 0x00BB, { 0x003E, 0x003E, 0x0000, 0x0000, 0x0000  } },  /* RIGHT-POINTING-DOUBLE ANGLE QUOTATION MARK */
+  { 0x00BC, { 0x0031, 0x002F, 0x0034, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE QUARTER */
+  { 0x00BD, { 0x0031, 0x002F, 0x0032, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE HALF */
+  { 0x00BE, { 0x0033, 0x002F, 0x0034, 0x0000, 0x0000  } },  /* VULGAR FRACTION THREE QUARTERS */
+  { 0x00C6, { 0x0041, 0x0045, 0x0000, 0x0000, 0x0000  } },  /* LATIN CAPITAL LETTER AE */
+  { 0x00E6, { 0x0061, 0x0065, 0x0000, 0x0000, 0x0000  } },  /* LATIN SMALL LETTER AE */
+  { 0x0152, { 0x004F, 0x0045, 0x0000, 0x0000, 0x0000  } },  /* LATIN CAPITAL LIGATURE OE */
+  { 0x0153, { 0x006F, 0x0065, 0x0000, 0x0000, 0x0000  } },  /* LATIN SMALL LIGATURE OE */
+  { 0x2025, { 0x002E, 0x002E, 0x0000, 0x0000, 0x0000  } },  /* TWO DOT LEADER */
+  { 0x2026, { 0x002E, 0x002E, 0x002E, 0x0000, 0x0000  } },  /* HORIZONTAL ELLIPSES */
+  { 0x2034, { 0x0027, 0x0027, 0x0027, 0x0000, 0x0000  } },  /* TRIPPLE PRIME */
+  { 0x2037, { 0x0027, 0x0027, 0x0027, 0x0000, 0x0000  } },  /* RESERVED TRIPPLE PRIME */
+  { 0x20AC, { 0x0045, 0x0055, 0x0052, 0x0000, 0x0000  } },  /* EURO SIGN */
+  { 0x2122, { 0x0028, 0x0074, 0x006D, 0x0029, 0x0000  } },  /* TRADE MARK SIGN */
+  { 0x2153, { 0x0031, 0x002F, 0x0033, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE THIRD */
+  { 0x2154, { 0x0032, 0x002F, 0x0033, 0x0000, 0x0000  } },  /* VULGAR FRACTION TWO THIRD */
+  { 0x2155, { 0x0031, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE FIFTH */
+  { 0x2156, { 0x0032, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION TWO FIFTH */
+  { 0x2157, { 0x0033, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION THREE FIFTH */
+  { 0x2158, { 0x0034, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION FOUR FIFTH */
+  { 0x2159, { 0x0031, 0x002F, 0x0036, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE SIXTH */
+  { 0x215A, { 0x0035, 0x002F, 0x0036, 0x0000, 0x0000  } },  /* VULGAR FRACTION FIVE SIXTH */
+  { 0x215B, { 0x0031, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE EIGHTH */
+  { 0x215C, { 0x0033, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION THREE EIGHTH */
+  { 0x215D, { 0x0035, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION FIVE EIGHTH */
+  { 0x215E, { 0x0037, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION SEVEN EIGHTH */
+  { 0x215F, { 0x0031, 0x002F, 0x0000, 0x0000, 0x0000  } },  /* FRACTION NUMERATOR ONE */
+  { 0x2161, { 0x0049, 0x0049, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL TWO */
+  { 0x2162, { 0x0049, 0x0049, 0x0049, 0x0000, 0x0000  } },  /* ROMAN NUMERAL THREE */
+  { 0x2163, { 0x0049, 0x0056, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL FOUR */
+  { 0x2165, { 0x0056, 0x0049, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL SIX */
+  { 0x2166, { 0x0056, 0x0049, 0x0049, 0x0000, 0x0000  } },  /* ROMAN NUMERAL SEVEN */
+  { 0x2168, { 0x0056, 0x0049, 0x0049, 0x0049, 0x0000  } },  /* ROMAN NUMERAL EIGHT */
+  { 0x2169, { 0x0049, 0x0058, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL NINE */
+  { 0x216A, { 0x0058, 0x0049, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL ELEVEN */
+  { 0x216B, { 0x0058, 0x0049, 0x0049, 0x0000, 0x0000  } },  /* ROMAN NUMERAL TWELVE */
+  { 0x2171, { 0x0069, 0x0069, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL TWO */
+  { 0x2172, { 0x0069, 0x0069, 0x0069, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL THREE */
+  { 0x2173, { 0x0069, 0x0076, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL FOUR */
+  { 0x2175, { 0x0076, 0x0069, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL SIX */
+  { 0x2176, { 0x0076, 0x0069, 0x0069, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL SEVEN */
+  { 0x2178, { 0x0076, 0x0069, 0x0069, 0x0069, 0x0000  } },  /* SMALL ROMAN NUMERAL EIGHT */
+  { 0x2179, { 0x0069, 0x0078, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL NINE */
+  { 0x217A, { 0x0078, 0x0069, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL ELEVEN */
+  { 0x217B, { 0x0058, 0x0069, 0x0069, 0x0000, 0x0000  } }   /* SMALL ROMAN NUMERAL TWELVE */
+};
+
+const sal_uInt16* ImplGetReplaceString( sal_Unicode c )
+{
+    sal_uInt16                      nLow;
+    sal_uInt16                      nHigh;
+    sal_uInt16                      nMid;
+    sal_uInt16                      nCompareChar;
+    const ImplReplaceCharStrData*   pCharData;
+
+    nLow = 0;
+    nHigh = (sizeof( aImplRepCharStrTab )/sizeof( ImplReplaceCharStrData ))-1;
+    do
+    {
+        nMid = (nLow+nHigh)/2;
+        pCharData = aImplRepCharStrTab+nMid;
+        nCompareChar = pCharData->mnUniChar;
+        if ( c < nCompareChar )
+        {
+            if ( !nMid )
+                break;
+            nHigh = nMid-1;
+        }
+        else
+        {
+            if ( c > nCompareChar )
+                nLow = nMid+1;
+            else
+                return pCharData->maReplaceChars;
+        }
+    }
+    while ( nLow <= nHigh );
+
+    return 0;
+}
+
+// Writes 0--2 characters to dest:
+static int ImplConvertUnicodeCharToChar(
+    const ImplByteConvertData* pConvertData, sal_Unicode c, char * dest )
+{
+    const ImplUniCharTabData*   pToCharExTab;
+
+    if ( c < 0x80 )
+    {
+        dest[0] = static_cast< char >(c);
+        return 1;
+    }
+    if ( (c >= pConvertData->mnToCharStart1) && (c <= pConvertData->mnToCharEnd1) )
+    {
+        dest[0] = static_cast< char >(pConvertData->mpToCharTab1[c-pConvertData->mnToCharStart1]);
+        if ( dest[0] != 0 )
+            return 1;
+    }
+    else if ( (c >= pConvertData->mnToCharStart2) && (c <= pConvertData->mnToCharEnd2) )
+    {
+        dest[0] = static_cast< char >(pConvertData->mpToCharTab2[c-pConvertData->mnToCharStart2]);
+        if ( dest[0] != 0 )
+            return 1;
+    }
+    pToCharExTab = pConvertData->mpToCharExTab;
+    if ( pToCharExTab )
+    {
+        sal_uInt16                  nLow;
+        sal_uInt16                  nHigh;
+        sal_uInt16                  nMid;
+        sal_uInt16                  nCompareChar;
+        const ImplUniCharTabData*   pCharExData;
+
+        nLow = 0;
+        nHigh = pConvertData->mnToCharExCount-1;
+        do
+        {
+            nMid = (nLow+nHigh)/2;
+            pCharExData = pToCharExTab+nMid;
+            nCompareChar = pCharExData->mnUniChar;
+            if ( c < nCompareChar )
+            {
+                if ( !nMid )
+                    break;
+                nHigh = nMid-1;
+            }
+            else
+            {
+                if ( c > nCompareChar )
+                    nLow = nMid+1;
+                else
+                {
+                    dest[0] = static_cast< char >(pCharExData->mnChar);
+                    if ( pCharExData->mnChar2 == 0 )
+                        return 1;
+                    else
+                    {
+                        dest[1] = static_cast< char >(pCharExData->mnChar2);
+                        return 2;
+                    }
+                }
+            }
+        }
+        while ( nLow <= nHigh );
+    }
+    return 0;
+}
+
+}
+
+sal_Size sal::detail::textenc::convertCharToUnicode(
+    void const * pData, void *, char const * pSrcBuf, sal_Size nSrcBytes,
+    sal_Unicode * pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags,
+    sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes)
+{
+    sal_uChar                   c;
+    sal_Unicode                 cConv;
+    const ImplByteConvertData*  pConvertData = (const ImplByteConvertData*)pData;
+    sal_Unicode*                pEndDestBuf;
+    const char*             pEndSrcBuf;
+
+    *pInfo = 0;
+    pEndDestBuf = pDestBuf+nDestChars;
+    pEndSrcBuf  = pSrcBuf+nSrcBytes;
+    while ( pSrcBuf < pEndSrcBuf )
+    {
+        c = (sal_uChar)*pSrcBuf;
+        if ( c < 0x80 )
+            cConv = c;
+        else
+        {
+            if ( (c >= pConvertData->mnToUniStart1) && (c <= pConvertData->mnToUniEnd1) )
+                cConv = pConvertData->mpToUniTab1[c-pConvertData->mnToUniStart1];
+            else if ( (c >= pConvertData->mnToUniStart2) && (c <= pConvertData->mnToUniEnd2) )
+                cConv = pConvertData->mpToUniTab2[c-pConvertData->mnToUniStart2];
+            else
+                cConv = 0;
+            if ( !cConv )
+            {
+                *pInfo |= RTL_TEXTTOUNICODE_INFO_UNDEFINED;
+                if ( (nFlags & RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK) == RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR )
+                {
+                    *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR;
+                    break;
+                }
+                else if ( (nFlags & RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK) == RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_IGNORE )
+                {
+                    pSrcBuf++;
+                    continue;
+                }
+                else
+                    cConv = ImplGetUndefinedUnicodeChar(c, nFlags);
+            }
+        }
+
+        if ( pDestBuf == pEndDestBuf )
+        {
+            *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+            break;
+        }
+
+        *pDestBuf = cConv;
+        pDestBuf++;
+        pSrcBuf++;
+    }
+
+    *pSrcCvtBytes = nSrcBytes - (pEndSrcBuf-pSrcBuf);
+    return (nDestChars - (pEndDestBuf-pDestBuf));
+}
+
+sal_Size sal::detail::textenc::convertUnicodeToChar(
+    void const * pData, void *, sal_Unicode const * pSrcBuf, sal_Size nSrcChars,
+    char * pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32 * pInfo,
+    sal_Size * pSrcCvtChars)
+{
+    sal_Unicode                 c;
+    const ImplByteConvertData*  pConvertData = (const ImplByteConvertData*)pData;
+    char*                   pEndDestBuf;
+    const sal_Unicode*          pEndSrcBuf;
+    int                         i;
+    int                         n;
+    sal_uInt16                  cTemp;
+    char                    aTempBuf[IMPL_MAX_REPLACECHAR+2];
+    const sal_uInt16*           pReplace;
+
+    *pInfo = 0;
+    pEndDestBuf = pDestBuf+nDestBytes;
+    pEndSrcBuf  = pSrcBuf+nSrcChars;
+    while ( pSrcBuf < pEndSrcBuf )
+    {
+        c = *pSrcBuf;
+        if ( c < 0x80 )
+        {
+            aTempBuf[0] = static_cast< char >(c);
+            n = 1;
+        }
+        else
+        {
+            n = ImplConvertUnicodeCharToChar( pConvertData, c, aTempBuf );
+
+            if ( n == 0 )
+            {
+                if ( nFlags & RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE )
+                {
+                    cTemp = ImplGetReplaceChar( c );
+                    if ( cTemp )
+                        n = ImplConvertUnicodeCharToChar(
+                            pConvertData, cTemp, aTempBuf );
+                }
+
+                if ( n == 0 )
+                {
+                    if ( nFlags & RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR )
+                    {
+                        pReplace = ImplGetReplaceString( c );
+                        if ( pReplace )
+                        {
+                            while ( *pReplace && (n < IMPL_MAX_REPLACECHAR) )
+                            {
+                                i = ImplConvertUnicodeCharToChar(
+                                    pConvertData, *pReplace, aTempBuf + n );
+                                if ( i == 0 )
+                                {
+                                    n = 0;
+                                    break;
+                                }
+                                pReplace++;
+                                n += i;
+                            }
+                        }
+                    }
+
+                    /* Handle undefined and surrogates characters */
+                    /* (all surrogates characters are undefined) */
+                    if ( n == 0 )
+                    {
+                        if (ImplHandleUndefinedUnicodeToTextChar(pData,
+                                                                 &pSrcBuf,
+                                                                 pEndSrcBuf,
+                                                                 &pDestBuf,
+                                                                 pEndDestBuf,
+                                                                 nFlags,
+                                                                 pInfo))
+                            continue;
+                        else
+                            break;
+                    }
+                }
+            }
+        }
+
+        if ( pEndDestBuf - pDestBuf < n )
+        {
+            *pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
+            break;
+        }
+
+        for ( i = 0; i < n; ++i )
+            *pDestBuf++ = aTempBuf[i];
+        pSrcBuf++;
+    }
+
+    *pSrcCvtChars = nSrcChars - (pEndSrcBuf-pSrcBuf);
+    return (nDestBytes - (pEndDestBuf-pDestBuf));
+}
diff --git a/sal/textenc/convertsimple.hxx b/sal/textenc/convertsimple.hxx
new file mode 100644
index 000000000000..6fb1042fb445
--- /dev/null
+++ b/sal/textenc/convertsimple.hxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ *   (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX
+#define INCLUDED_SAL_TEXTENC_CONVERTSIMPLE_HXX
+
+#include "sal/config.h"
+
+#include "sal/saldllapi.h"
+#include "sal/types.h"
+
+namespace sal { namespace detail { namespace textenc {
+
+// internal, non-stable ABI
+sal_Size SAL_DLLPUBLIC convertCharToUnicode(
+    void const * pData, void * pContext, char const * pSrcBuf,
+    sal_Size nSrcBytes, sal_Unicode * pDestBuf, sal_Size nDestChars,
+    sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes);
+
+// internal, non-stable ABI
+sal_Size SAL_DLLPUBLIC convertUnicodeToChar(
+    void const * pData, void * pContext, sal_Unicode const * pSrcBuf,
+    sal_Size nSrcChars, char * pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags,
+    sal_uInt32 * pInfo, sal_Size * pSrcCvtChars);
+
+} } }
+
+#endif
diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx
index 01f91905dea1..daef12732aa2 100644
--- a/sal/textenc/tables.cxx
+++ b/sal/textenc/tables.cxx
@@ -34,8 +34,6 @@
 #include "rtl/textenc.h"
 #include "sal/types.h"
 
-#include "tenchelp.hxx"
-
 #define NOTABUNI_START 0xFF
 #define NOTABUNI_END 0x00
 
diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab
index 9d748371a108..0e0a390be51f 100644
--- a/sal/textenc/tcvtarb1.tab
+++ b/sal/textenc/tcvtarb1.tab
@@ -25,6 +25,11 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "convertsimple.hxx"
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the tables for all 1 byte charsets, for the */
@@ -206,8 +211,8 @@ static ImplByteConvertData const aImplIBM862ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM862TextEncodingData
     = { { &aImplIBM862ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -364,8 +369,8 @@ static ImplByteConvertData const aImplIBM864ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM864TextEncodingData
     = { { &aImplIBM864ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -517,8 +522,8 @@ static ImplByteConvertData const aImplMS1255ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1255TextEncodingData
     = { { &aImplMS1255ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -695,8 +700,8 @@ static ImplByteConvertData const aImplMS1256ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1256TextEncodingData
     = { { &aImplMS1256ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -795,8 +800,8 @@ static ImplByteConvertData const aImplISO88596ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88596TextEncodingData
     = { { &aImplISO88596ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -916,8 +921,8 @@ static ImplByteConvertData const aImplISO88598ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88598TextEncodingData
     = { { &aImplISO88598ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/textenc/tcvtbyte.cxx b/sal/textenc/tcvtbyte.cxx
index b1d5b4a92fe3..b8d78c5e757f 100644
--- a/sal/textenc/tcvtbyte.cxx
+++ b/sal/textenc/tcvtbyte.cxx
@@ -30,445 +30,9 @@
 
 #include "rtl/textcvt.h"
 
+#include "tcvtbyte.hxx"
 #include "tenchelp.hxx"
 
-/* ======================================================================= */
-
-#define IMPL_MAX_REPLACECHAR 5
-
-sal_uInt16 ImplGetReplaceChar(sal_Unicode c);
-
-sal_uInt16 const * ImplGetReplaceString(sal_Unicode c);
-
-/* ----------------------------------------------------------------------- */
-
-struct ImplReplaceCharData
-{
-    sal_uInt16      mnUniChar;
-    sal_uInt16      mnReplaceChar;
-};
-
-static ImplReplaceCharData const aImplRepCharTab[] =
-{
-  { 0x00A0, 0x0020 },   /* NO-BREAK-SPACE */
-  { 0x00A1, 0x0021 },   /* INVERTED EXCLAMATION MARK */
-  { 0x00B7, 0x0045 },   /* MIDDLE DOT */
-  { 0x00BF, 0x003F },   /* INVERTED QUESTION MARK */
-  { 0x00D7, 0x002A },   /* MULTIPLIKATION SIGN */
-  { 0x00F7, 0x002F },   /* DIVISION SIGN */
-  { 0x2000, 0x0020 },   /* EN QUAD */
-  { 0x2001, 0x0020 },   /* EM QUAD */
-  { 0x2002, 0x0020 },   /* EN SPACE */
-  { 0x2003, 0x0020 },   /* EM SPACE */
-  { 0x2004, 0x0020 },   /* THREE-PER-EM SPACE */
-  { 0x2005, 0x0020 },   /* FOUR-PER-EM SPACE */
-  { 0x2006, 0x0020 },   /* SIX-PER-EM SPACE */
-  { 0x2007, 0x0020 },   /* FIGURE SPACE */
-  { 0x2008, 0x0020 },   /* PUNCTATION SPACE */
-  { 0x2009, 0x0020 },   /* THIN SPACE */
-  { 0x200A, 0x0020 },   /* HAIR SPACE */
-  { 0x2010, 0x002D },   /* HYPHEN */
-  { 0x2011, 0x002D },   /* NON-BREAKING HYPHEN */
-  { 0x2012, 0x002D },   /* FIGURE DASH */
-  { 0x2013, 0x002D },   /* EN DASH */
-  { 0x2014, 0x002D },   /* EM DASH */
-  { 0x2015, 0x002D },   /* HORIZONTAL BAR */
-  { 0x2018, 0x0027 },   /* LEFT SINGLE QUOTATION MARK */
-  { 0x2019, 0x0027 },   /* RIGHT SINGLE QUOTATION MARK */
-  { 0x201A, 0x002C },   /* SINGLE LOW-9 QUOTATION MARK */
-  { 0x201B, 0x0027 },   /* SINGLE HIGH-RESERVED-9 QUOTATION MARK */
-  { 0x201C, 0x0022 },   /* LEFT DOUBLE QUOTATION MARK */
-  { 0x201D, 0x0022 },   /* RIGHT DOUBLE QUOTATION MARK */
-  { 0x201E, 0x0022 },   /* DOUBLE LOW-9 QUOTATION MARK */
-  { 0x201F, 0x0022 },   /* DOUBLE HIGH-RESERVED-9 QUOTATION MARK */
-  { 0x2022, 0x002D },   /* BULLET */
-  { 0x2023, 0x002D },   /* TRIANGULAR BULLET */
-  { 0x2024, 0x002D },   /* ONE DOT LEADER */
-  { 0x2027, 0x002D },   /* HYPHENATION POINT */
-  { 0x2028, 0x000A },   /* LINE SEPARATOR */
-  { 0x2029, 0x000D },   /* PARAGRAPH SEPARATOR */
-  { 0x2032, 0x0027 },   /* PRIME */
-  { 0x2033, 0x0022 },   /* DOUBLE PRIME */
-  { 0x2035, 0x0027 },   /* RESERVED PRIME */
-  { 0x2036, 0x0022 },   /* RESERVED DOUBLE PRIME */
-  { 0x2039, 0x003C },   /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
-  { 0x203A, 0x003E },   /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
-  { 0x2043, 0x002D },   /* HYPHEN BULLET */
-  { 0x2044, 0x002F },   /* FRACTION SLASH */
-  { 0x2160, 0x0049 },   /* ROMAN NUMERAL ONE */
-  { 0x2164, 0x0056 },   /* ROMAN NUMERAL FIVE */
-  { 0x2169, 0x0058 },   /* ROMAN NUMERAL TEN */
-  { 0x216C, 0x004C },   /* ROMAN NUMERAL FIFTY */
-  { 0x216D, 0x0043 },   /* ROMAN NUMERAL ONE HUNDRED */
-  { 0x216E, 0x0044 },   /* ROMAN NUMERAL FIVE HUNDRED */
-  { 0x216F, 0x004D },   /* ROMAN NUMERAL ONE THOUSAND */
-  { 0x2170, 0x0069 },   /* SMALL ROMAN NUMERAL ONE */
-  { 0x2174, 0x0076 },   /* SMALL ROMAN NUMERAL FIVE */
-  { 0x2179, 0x0078 },   /* SMALL ROMAN NUMERAL TEN */
-  { 0x217C, 0x006C },   /* SMALL ROMAN NUMERAL FIFTY */
-  { 0x217D, 0x0063 },   /* SMALL ROMAN NUMERAL ONE HUNDRED */
-  { 0x217E, 0x0064 },   /* SMALL ROMAN NUMERAL FIVE HUNDRED */
-  { 0x217F, 0x006D },   /* SMALL ROMAN NUMERAL ONE THOUSAND */
-  { 0x2215, 0x002F },   /* DIVISION SLASH */
-  { 0x2217, 0x002A },   /* ASTERIX OPERATOR */
-  { 0xFF00, 0x0020 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF01, 0x0021 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF02, 0x0022 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF03, 0x0023 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF04, 0x0024 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF05, 0x0025 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF06, 0x0026 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF07, 0x0027 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF08, 0x0028 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF09, 0x0029 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF0A, 0x002A },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF0B, 0x002B },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF0C, 0x002C },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF0D, 0x002D },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF0E, 0x002E },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF0F, 0x002F },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF10, 0x0030 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF11, 0x0031 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF12, 0x0032 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF13, 0x0033 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF14, 0x0034 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF15, 0x0035 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF16, 0x0036 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF17, 0x0037 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF18, 0x0038 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF19, 0x0039 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF1A, 0x003A },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF1B, 0x003B },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF1C, 0x003C },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF1D, 0x003D },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF1E, 0x003E },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF1F, 0x003F },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF20, 0x0040 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF21, 0x0041 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF22, 0x0042 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF23, 0x0043 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF24, 0x0044 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF25, 0x0045 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF26, 0x0046 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF27, 0x0047 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF28, 0x0048 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF29, 0x0049 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF2A, 0x004A },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF2B, 0x004B },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF2C, 0x004C },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF2D, 0x004D },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF2E, 0x004E },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF2F, 0x004F },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF30, 0x0050 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF31, 0x0051 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF32, 0x0052 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF33, 0x0053 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF34, 0x0054 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF35, 0x0055 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF36, 0x0056 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF37, 0x0057 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF38, 0x0058 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF39, 0x0059 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF3A, 0x005A },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF3B, 0x005B },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF3C, 0x005C },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF3D, 0x005D },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF3E, 0x005E },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF3F, 0x005F },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF40, 0x0060 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF41, 0x0061 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF42, 0x0062 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF43, 0x0063 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF44, 0x0064 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF45, 0x0065 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF46, 0x0066 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF47, 0x0067 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF48, 0x0068 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF49, 0x0069 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF4A, 0x006A },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF4B, 0x006B },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF4C, 0x006C },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF4D, 0x006D },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF4E, 0x006E },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF4F, 0x006F },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF50, 0x0070 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF51, 0x0071 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF52, 0x0072 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF53, 0x0073 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF54, 0x0074 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF55, 0x0075 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF56, 0x0076 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF57, 0x0077 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF58, 0x0078 },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF59, 0x0079 },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF5A, 0x007A },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF5B, 0x007B },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF5C, 0x007C },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF5D, 0x007D },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF5E, 0x007E },   /* FULLWIDTH ASCII FORMS*/
-  { 0xFF5F, 0x007F },   /* FULLWIDTH ASCII FORMS */
-  { 0xFF61, 0x3002 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF62, 0x300C },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF63, 0x300D },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF64, 0x3001 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF65, 0x30FB },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF66, 0x30F2 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF67, 0x30A1 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF68, 0x30A3 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF69, 0x30A5 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF6A, 0x30A7 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF6B, 0x30A9 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF6C, 0x30E3 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF6D, 0x30E5 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF6E, 0x30E7 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF6F, 0x30C3 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF70, 0x30FC },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF71, 0x30A2 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF72, 0x30A4 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF73, 0x30A6 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF74, 0x30A8 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF75, 0x30AA },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF76, 0x30AB },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF77, 0x30AD },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF78, 0x30AF },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF79, 0x30B1 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF7A, 0x30B3 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF7B, 0x30B5 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF7C, 0x30B7 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF7D, 0x30B9 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF7E, 0x30BB },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF7F, 0x30BD },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF80, 0x30BF },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF81, 0x30C1 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF82, 0x30C4 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF83, 0x30C6 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF84, 0x30C8 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF85, 0x30CA },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF86, 0x30CB },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF87, 0x30CC },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF88, 0x30CD },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF89, 0x30CE },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF8A, 0x30CF },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF8B, 0x30D2 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF8C, 0x30D5 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF8D, 0x30D8 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF8E, 0x30DB },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF8F, 0x30DE },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF90, 0x30DF },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF91, 0x30E0 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF92, 0x30E1 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF93, 0x30E2 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF94, 0x30E4 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF95, 0x30E6 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF96, 0x30E8 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF97, 0x30E9 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF98, 0x30EA },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF99, 0x30EB },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF9A, 0x30EC },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF9B, 0x30ED },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF9C, 0x30EF },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF9D, 0x30F3 },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF9E, 0x309B },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFF9F, 0x309C },   /* HALFWIDTH KATAKANA FORMS */
-  { 0xFFA0, 0x3164 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA1, 0x3131 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA2, 0x3132 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA3, 0x3133 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA4, 0x3134 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA5, 0x3135 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA6, 0x3136 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA7, 0x3137 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA8, 0x3138 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFA9, 0x3139 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFAA, 0x313A },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFAB, 0x313B },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFAC, 0x313C },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFAD, 0x313D },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFAE, 0x313E },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFAF, 0x313F },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB0, 0x3140 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB1, 0x3141 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB2, 0x3142 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB3, 0x3143 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB4, 0x3144 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB5, 0x3145 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB6, 0x3146 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB7, 0x3147 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB8, 0x3148 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFB9, 0x3149 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFBA, 0x314A },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFBB, 0x314B },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFBC, 0x314C },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFBD, 0x314D },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFBE, 0x314E },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFC2, 0x314F },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFC3, 0x3150 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFC4, 0x3151 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFC5, 0x3152 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFC6, 0x3153 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFC7, 0x3154 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFCA, 0x3155 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFCB, 0x3156 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFCC, 0x3157 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFCD, 0x3158 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFCE, 0x3159 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFCF, 0x315A },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFD2, 0x315B },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFD3, 0x315C },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFD4, 0x315D },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFD5, 0x315E },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFD6, 0x315F },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFD7, 0x3160 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFDA, 0x3161 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFDB, 0x3162 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFDC, 0x3163 },   /* HALFWIDTH HANGUL FORMS */
-  { 0xFFE0, 0x00A2 },   /* FULLWIDTH CENT SIGN */
-  { 0xFFE1, 0x00A3 },   /* FULLWIDTH POUND SIGN */
-  { 0xFFE2, 0x00AC },   /* FULLWIDTH NOT SIGN */
-  { 0xFFE3, 0x00AF },   /* FULLWIDTH MACRON */
-  { 0xFFE4, 0x00A6 },   /* FULLWIDTH BROKEN BAR */
-  { 0xFFE5, 0x00A5 },   /* FULLWIDTH YEN SIGN */
-  { 0xFFE6, 0x20A9 },   /* FULLWIDTH WON SIGN */
-  { 0xFFE8, 0x2502 },   /* HALFWIDTH FORMS LIGHT VERTICAL */
-  { 0xFFE9, 0x2190 },   /* HALFWIDTH LEFTWARDS ARROW */
-  { 0xFFEA, 0x2191 },   /* HALFWIDTH UPWARDS ARROW */
-  { 0xFFEB, 0x2192 },   /* HALFWIDTH RIGHTWARDS ARROW */
-  { 0xFFEC, 0x2193 },   /* HALFWIDTH DOWNWARDS ARROW */
-  { 0xFFED, 0x25A0 },   /* HALFWIDTH BLACK SQUARE */
-  { 0xFFEE, 0x25CB },   /* HALFWIDTH WHITE CIRCLE */
-  { 0xFFFD, 0x003F }    /* REPLACEMENT CHARACTER */
-};
-
-sal_uInt16 ImplGetReplaceChar( sal_Unicode c )
-{
-    sal_uInt16                  nLow;
-    sal_uInt16                  nHigh;
-    sal_uInt16                  nMid;
-    sal_uInt16                  nCompareChar;
-    const ImplReplaceCharData*  pCharData;
-
-    nLow = 0;
-    nHigh = (sizeof( aImplRepCharTab )/sizeof( ImplReplaceCharData ))-1;
-    do
-    {
-        nMid = (nLow+nHigh)/2;
-        pCharData = aImplRepCharTab+nMid;
-        nCompareChar = pCharData->mnUniChar;
-        if ( c < nCompareChar )
-        {
-            if ( !nMid )
-                break;
-            nHigh = nMid-1;
-        }
-        else
-        {
-            if ( c > nCompareChar )
-                nLow = nMid+1;
-            else
-                return pCharData->mnReplaceChar;
-        }
-    }
-    while ( nLow <= nHigh );
-
-    return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-struct ImplReplaceCharStrData
-{
-    sal_uInt16      mnUniChar;
-    sal_uInt16      maReplaceChars[IMPL_MAX_REPLACECHAR];
-};
-
-static ImplReplaceCharStrData const aImplRepCharStrTab[] =
-{
-  { 0x00A9, { 0x0028, 0x0063, 0x0029, 0x0000, 0x0000  } },  /* COPYRIGHT SIGN */
-  { 0x00AB, { 0x003C, 0x003C, 0x0000, 0x0000, 0x0000  } },  /* LEFT-POINTING-DOUBLE ANGLE QUOTATION MARK */
-  { 0x0AE0, { 0x0028, 0x0072, 0x0029, 0x0000, 0x0000  } },  /* REGISTERED SIGN */
-  { 0x00BB, { 0x003E, 0x003E, 0x0000, 0x0000, 0x0000  } },  /* RIGHT-POINTING-DOUBLE ANGLE QUOTATION MARK */
-  { 0x00BC, { 0x0031, 0x002F, 0x0034, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE QUARTER */
-  { 0x00BD, { 0x0031, 0x002F, 0x0032, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE HALF */
-  { 0x00BE, { 0x0033, 0x002F, 0x0034, 0x0000, 0x0000  } },  /* VULGAR FRACTION THREE QUARTERS */
-  { 0x00C6, { 0x0041, 0x0045, 0x0000, 0x0000, 0x0000  } },  /* LATIN CAPITAL LETTER AE */
-  { 0x00E6, { 0x0061, 0x0065, 0x0000, 0x0000, 0x0000  } },  /* LATIN SMALL LETTER AE */
-  { 0x0152, { 0x004F, 0x0045, 0x0000, 0x0000, 0x0000  } },  /* LATIN CAPITAL LIGATURE OE */
-  { 0x0153, { 0x006F, 0x0065, 0x0000, 0x0000, 0x0000  } },  /* LATIN SMALL LIGATURE OE */
-  { 0x2025, { 0x002E, 0x002E, 0x0000, 0x0000, 0x0000  } },  /* TWO DOT LEADER */
-  { 0x2026, { 0x002E, 0x002E, 0x002E, 0x0000, 0x0000  } },  /* HORIZONTAL ELLIPSES */
-  { 0x2034, { 0x0027, 0x0027, 0x0027, 0x0000, 0x0000  } },  /* TRIPPLE PRIME */
-  { 0x2037, { 0x0027, 0x0027, 0x0027, 0x0000, 0x0000  } },  /* RESERVED TRIPPLE PRIME */
-  { 0x20AC, { 0x0045, 0x0055, 0x0052, 0x0000, 0x0000  } },  /* EURO SIGN */
-  { 0x2122, { 0x0028, 0x0074, 0x006D, 0x0029, 0x0000  } },  /* TRADE MARK SIGN */
-  { 0x2153, { 0x0031, 0x002F, 0x0033, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE THIRD */
-  { 0x2154, { 0x0032, 0x002F, 0x0033, 0x0000, 0x0000  } },  /* VULGAR FRACTION TWO THIRD */
-  { 0x2155, { 0x0031, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE FIFTH */
-  { 0x2156, { 0x0032, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION TWO FIFTH */
-  { 0x2157, { 0x0033, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION THREE FIFTH */
-  { 0x2158, { 0x0034, 0x002F, 0x0035, 0x0000, 0x0000  } },  /* VULGAR FRACTION FOUR FIFTH */
-  { 0x2159, { 0x0031, 0x002F, 0x0036, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE SIXTH */
-  { 0x215A, { 0x0035, 0x002F, 0x0036, 0x0000, 0x0000  } },  /* VULGAR FRACTION FIVE SIXTH */
-  { 0x215B, { 0x0031, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION ONE EIGHTH */
-  { 0x215C, { 0x0033, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION THREE EIGHTH */
-  { 0x215D, { 0x0035, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION FIVE EIGHTH */
-  { 0x215E, { 0x0037, 0x002F, 0x0038, 0x0000, 0x0000  } },  /* VULGAR FRACTION SEVEN EIGHTH */
-  { 0x215F, { 0x0031, 0x002F, 0x0000, 0x0000, 0x0000  } },  /* FRACTION NUMERATOR ONE */
-  { 0x2161, { 0x0049, 0x0049, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL TWO */
-  { 0x2162, { 0x0049, 0x0049, 0x0049, 0x0000, 0x0000  } },  /* ROMAN NUMERAL THREE */
-  { 0x2163, { 0x0049, 0x0056, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL FOUR */
-  { 0x2165, { 0x0056, 0x0049, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL SIX */
-  { 0x2166, { 0x0056, 0x0049, 0x0049, 0x0000, 0x0000  } },  /* ROMAN NUMERAL SEVEN */
-  { 0x2168, { 0x0056, 0x0049, 0x0049, 0x0049, 0x0000  } },  /* ROMAN NUMERAL EIGHT */
-  { 0x2169, { 0x0049, 0x0058, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL NINE */
-  { 0x216A, { 0x0058, 0x0049, 0x0000, 0x0000, 0x0000  } },  /* ROMAN NUMERAL ELEVEN */
-  { 0x216B, { 0x0058, 0x0049, 0x0049, 0x0000, 0x0000  } },  /* ROMAN NUMERAL TWELVE */
-  { 0x2171, { 0x0069, 0x0069, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL TWO */
-  { 0x2172, { 0x0069, 0x0069, 0x0069, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL THREE */
-  { 0x2173, { 0x0069, 0x0076, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL FOUR */
-  { 0x2175, { 0x0076, 0x0069, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL SIX */
-  { 0x2176, { 0x0076, 0x0069, 0x0069, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL SEVEN */
-  { 0x2178, { 0x0076, 0x0069, 0x0069, 0x0069, 0x0000  } },  /* SMALL ROMAN NUMERAL EIGHT */
-  { 0x2179, { 0x0069, 0x0078, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL NINE */
-  { 0x217A, { 0x0078, 0x0069, 0x0000, 0x0000, 0x0000  } },  /* SMALL ROMAN NUMERAL ELEVEN */
-  { 0x217B, { 0x0058, 0x0069, 0x0069, 0x0000, 0x0000  } }   /* SMALL ROMAN NUMERAL TWELVE */
-};
-
-const sal_uInt16* ImplGetReplaceString( sal_Unicode c )
-{
-    sal_uInt16                      nLow;
-    sal_uInt16                      nHigh;
-    sal_uInt16                      nMid;
-    sal_uInt16                      nCompareChar;
-    const ImplReplaceCharStrData*   pCharData;
-
-    nLow = 0;
-    nHigh = (sizeof( aImplRepCharStrTab )/sizeof( ImplReplaceCharStrData ))-1;
-    do
-    {
-        nMid = (nLow+nHigh)/2;
-        pCharData = aImplRepCharStrTab+nMid;
-        nCompareChar = pCharData->mnUniChar;
-        if ( c < nCompareChar )
-        {
-            if ( !nMid )
-                break;
-            nHigh = nMid-1;
-        }
-        else
-        {
-            if ( c > nCompareChar )
-                nLow = nMid+1;
-            else
-                return pCharData->maReplaceChars;
-        }
-    }
-    while ( nLow <= nHigh );
-
-    return 0;
-}
-
-/* ======================================================================= */
-
 sal_Size ImplSymbolToUnicode( const void*,
                               void*,
                               const char* pSrcBuf, sal_Size nSrcBytes,
@@ -505,8 +69,6 @@ sal_Size ImplSymbolToUnicode( const void*,
     return (nDestChars - (pEndDestBuf-pDestBuf));
 }
 
-/* ----------------------------------------------------------------------- */
-
 sal_Size ImplUnicodeToSymbol( const void* pData,
                               void*,
                               const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
@@ -570,72 +132,6 @@ sal_Size ImplUnicodeToSymbol( const void* pData,
     return (nDestBytes - (pEndDestBuf-pDestBuf));
 }
 
-/* ======================================================================= */
-
-sal_Size ImplCharToUnicode( const void* pData,
-                            void*,
-                            const char* pSrcBuf, sal_Size nSrcBytes,
-                            sal_Unicode* pDestBuf, sal_Size nDestChars,
-                            sal_uInt32 nFlags, sal_uInt32* pInfo,
-                            sal_Size* pSrcCvtBytes )
-{
-    sal_uChar                   c;
-    sal_Unicode                 cConv;
-    const ImplByteConvertData*  pConvertData = (const ImplByteConvertData*)pData;
-    sal_Unicode*                pEndDestBuf;
-    const char*             pEndSrcBuf;
-
-    *pInfo = 0;
-    pEndDestBuf = pDestBuf+nDestChars;
-    pEndSrcBuf  = pSrcBuf+nSrcBytes;
-    while ( pSrcBuf < pEndSrcBuf )
-    {
-        c = (sal_uChar)*pSrcBuf;
-        if ( c < 0x80 )
-            cConv = c;
-        else
-        {
-            if ( (c >= pConvertData->mnToUniStart1) && (c <= pConvertData->mnToUniEnd1) )
-                cConv = pConvertData->mpToUniTab1[c-pConvertData->mnToUniStart1];
-            else if ( (c >= pConvertData->mnToUniStart2) && (c <= pConvertData->mnToUniEnd2) )
-                cConv = pConvertData->mpToUniTab2[c-pConvertData->mnToUniStart2];
-            else
-                cConv = 0;
-            if ( !cConv )
-            {
-                *pInfo |= RTL_TEXTTOUNICODE_INFO_UNDEFINED;
-                if ( (nFlags & RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK) == RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR )
-                {
-                    *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR;
-                    break;
-                }
-                else if ( (nFlags & RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK) == RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_IGNORE )
-                {
-                    pSrcBuf++;
-                    continue;
-                }
-                else
-                    cConv = ImplGetUndefinedUnicodeChar(c, nFlags);
-            }
-        }
-
-        if ( pDestBuf == pEndDestBuf )
-        {
-            *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
-            break;
-        }
-
-        *pDestBuf = cConv;
-        pDestBuf++;
-        pSrcBuf++;
-    }
-
-    *pSrcCvtBytes = nSrcBytes - (pEndSrcBuf-pSrcBuf);
-    return (nDestChars - (pEndDestBuf-pDestBuf));
-}
-
-/* ----------------------------------------------------------------------- */
-
 sal_Size ImplUpperCharToUnicode( const void* pData,
                             void*,
                             const char* pSrcBuf, sal_Size nSrcBytes,
@@ -676,173 +172,4 @@ sal_Size ImplUpperCharToUnicode( const void* pData,
     return (nDestChars - (pEndDestBuf-pDestBuf));
 }
 
-/* ----------------------------------------------------------------------- */
-
-// Writes 0--2 characters to dest:
-static int ImplConvertUnicodeCharToChar(
-    const ImplByteConvertData* pConvertData, sal_Unicode c, char * dest )
-{
-    const ImplUniCharTabData*   pToCharExTab;
-
-    if ( c < 0x80 )
-    {
-        dest[0] = static_cast< char >(c);
-        return 1;
-    }
-    if ( (c >= pConvertData->mnToCharStart1) && (c <= pConvertData->mnToCharEnd1) )
-    {
-        dest[0] = static_cast< char >(pConvertData->mpToCharTab1[c-pConvertData->mnToCharStart1]);
-        if ( dest[0] != 0 )
-            return 1;
-    }
-    else if ( (c >= pConvertData->mnToCharStart2) && (c <= pConvertData->mnToCharEnd2) )
-    {
-        dest[0] = static_cast< char >(pConvertData->mpToCharTab2[c-pConvertData->mnToCharStart2]);
-        if ( dest[0] != 0 )
-            return 1;
-    }
-    pToCharExTab = pConvertData->mpToCharExTab;
-    if ( pToCharExTab )
-    {
-        sal_uInt16                  nLow;
-        sal_uInt16                  nHigh;
-        sal_uInt16                  nMid;
-        sal_uInt16                  nCompareChar;
-        const ImplUniCharTabData*   pCharExData;
-
-        nLow = 0;
-        nHigh = pConvertData->mnToCharExCount-1;
-        do
-        {
-            nMid = (nLow+nHigh)/2;
-            pCharExData = pToCharExTab+nMid;
-            nCompareChar = pCharExData->mnUniChar;
-            if ( c < nCompareChar )
-            {
-                if ( !nMid )
-                    break;
-                nHigh = nMid-1;
-            }
-            else
-            {
-                if ( c > nCompareChar )
-                    nLow = nMid+1;
-                else
-                {
-                    dest[0] = static_cast< char >(pCharExData->mnChar);
-                    if ( pCharExData->mnChar2 == 0 )
-                        return 1;
-                    else
-                    {
-                        dest[1] = static_cast< char >(pCharExData->mnChar2);
-                        return 2;
-                    }
-                }
-            }
-        }
-        while ( nLow <= nHigh );
-    }
-    return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-sal_Size ImplUnicodeToChar( const void* pData,
-                            void*,
-                            const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
-                            char* pDestBuf, sal_Size nDestBytes,
-                            sal_uInt32 nFlags, sal_uInt32* pInfo,
-                            sal_Size* pSrcCvtChars )
-{
-    sal_Unicode                 c;
-    const ImplByteConvertData*  pConvertData = (const ImplByteConvertData*)pData;
-    char*                   pEndDestBuf;
-    const sal_Unicode*          pEndSrcBuf;
-    int                         i;
-    int                         n;
-    sal_uInt16                  cTemp;
-    char                    aTempBuf[IMPL_MAX_REPLACECHAR+2];
-    const sal_uInt16*           pReplace;
-
-    *pInfo = 0;
-    pEndDestBuf = pDestBuf+nDestBytes;
-    pEndSrcBuf  = pSrcBuf+nSrcChars;
-    while ( pSrcBuf < pEndSrcBuf )
-    {
-        c = *pSrcBuf;
-        if ( c < 0x80 )
-        {
-            aTempBuf[0] = static_cast< char >(c);
-            n = 1;
-        }
-        else
-        {
-            n = ImplConvertUnicodeCharToChar( pConvertData, c, aTempBuf );
-
-            if ( n == 0 )
-            {
-                if ( nFlags & RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE )
-                {
-                    cTemp = ImplGetReplaceChar( c );
-                    if ( cTemp )
-                        n = ImplConvertUnicodeCharToChar(
-                            pConvertData, cTemp, aTempBuf );
-                }
-
-                if ( n == 0 )
-                {
-                    if ( nFlags & RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR )
-                    {
-                        pReplace = ImplGetReplaceString( c );
-                        if ( pReplace )
-                        {
-                            while ( *pReplace && (n < IMPL_MAX_REPLACECHAR) )
-                            {
-                                i = ImplConvertUnicodeCharToChar(
-                                    pConvertData, *pReplace, aTempBuf + n );
-                                if ( i == 0 )
-                                {
-                                    n = 0;
-                                    break;
-                                }
-                                pReplace++;
-                                n += i;
-                            }
-                        }
-                    }
-
-                    /* Handle undefined and surrogates characters */
-                    /* (all surrogates characters are undefined) */
-                    if ( n == 0 )
-                    {
-                        if (ImplHandleUndefinedUnicodeToTextChar(pData,
-                                                                 &pSrcBuf,
-                                                                 pEndSrcBuf,
-                                                                 &pDestBuf,
-                                                                 pEndDestBuf,
-                                                                 nFlags,
-                                                                 pInfo))
-                            continue;
-                        else
-                            break;
-                    }
-                }
-            }
-        }
-
-        if ( pEndDestBuf - pDestBuf < n )
-        {
-            *pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
-            break;
-        }
-
-        for ( i = 0; i < n; ++i )
-            *pDestBuf++ = aTempBuf[i];
-        pSrcBuf++;
-    }
-
-    *pSrcCvtChars = nSrcChars - (pEndSrcBuf-pSrcBuf);
-    return (nDestBytes - (pEndDestBuf-pDestBuf));
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tcvtbyte.hxx b/sal/textenc/tcvtbyte.hxx
new file mode 100644
index 000000000000..ce1a572c9a87
--- /dev/null
+++ b/sal/textenc/tcvtbyte.hxx
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2012 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ *   (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_SAL_TEXTENC_TCVTBYTE_HXX
+#define INCLUDED_SAL_TEXTENC_TCVTBYTE_HXX
+
+#include "sal/config.h"
+
+#include "sal/types.h"
+
+sal_Size ImplSymbolToUnicode(
+    void const * pData, void * pContext, char const * pSrcBuf,
+    sal_Size nSrcBytes, sal_Unicode * pDestBuf, sal_Size nDestChars,
+    sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes);
+
+sal_Size ImplUnicodeToSymbol(
+    void const * pData, void * pContext, sal_Unicode const * pSrcBuf,
+    sal_Size nSrcChars, char * pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags,
+    sal_uInt32 * pInfo, sal_Size * pSrcCvtChars);
+
+/** For those encodings only with unicode range of 0x80 to 0xFF. */
+sal_Size ImplUpperCharToUnicode(
+    void const * pData, void * pContext, char const * pSrcBuf,
+    sal_Size nSrcBytes, sal_Unicode * pDestBuf, sal_Size nDestChars,
+    sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab
index 252411b74c08..5d2a94593642 100644
--- a/sal/textenc/tcvteas1.tab
+++ b/sal/textenc/tcvteas1.tab
@@ -25,6 +25,11 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "convertsimple.hxx"
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the tables for all 1 byte charsets, for the */
@@ -123,8 +128,8 @@ static ImplByteConvertData const aImplMS874ByteCvtData =
 
 static ImplTextEncodingData const aImplMS874TextEncodingData
     = { { &aImplMS874ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -175,8 +180,8 @@ static ImplByteConvertData const aImplTis620ByteCvtData =
 
 static ImplTextEncodingData const aImplTis620TextEncodingData
     = { { &aImplTis620ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -418,8 +423,8 @@ static ImplByteConvertData const aImplMS1258ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1258TextEncodingData
     = { { &aImplMS1258ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab
index b8424da74c44..7f0cb35fa9fc 100644
--- a/sal/textenc/tcvtest1.tab
+++ b/sal/textenc/tcvtest1.tab
@@ -25,6 +25,11 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "convertsimple.hxx"
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the tables for all 1 byte charsets, for the */
@@ -172,8 +177,8 @@ static ImplByteConvertData const aImplIBM737ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM737TextEncodingData
     = { { &aImplIBM737ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -378,8 +383,8 @@ static ImplByteConvertData const aImplIBM775ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM775TextEncodingData
     = { { &aImplIBM775ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -584,8 +589,8 @@ static ImplByteConvertData const aImplIBM852ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM852TextEncodingData
     = { { &aImplIBM852ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -720,8 +725,8 @@ static ImplByteConvertData const aImplIBM855ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM855TextEncodingData
     = { { &aImplIBM855ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -855,8 +860,8 @@ static ImplByteConvertData const aImplIBM857ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM857TextEncodingData
     = { { &aImplIBM857ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1011,8 +1016,8 @@ static ImplByteConvertData const aImplIBM866ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM866TextEncodingData
     = { { &aImplIBM866ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1157,8 +1162,8 @@ static ImplByteConvertData const aImplIBM869ByteCvtData =
 
 static ImplTextEncodingData const aImplIBM869TextEncodingData
     = { { &aImplIBM869ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1358,8 +1363,8 @@ static ImplByteConvertData const aImplMS1250ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1250TextEncodingData
     = { { &aImplMS1250ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1493,8 +1498,8 @@ static ImplByteConvertData const aImplMS1251ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1251TextEncodingData
     = { { &aImplMS1251ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1631,8 +1636,8 @@ static ImplByteConvertData const aImplMS1253ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1253TextEncodingData
     = { { &aImplMS1253ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1762,8 +1767,8 @@ static ImplByteConvertData const aImplMS1254ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1254TextEncodingData
     = { { &aImplMS1254ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1898,8 +1903,8 @@ static ImplByteConvertData const aImplMS1257ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1257TextEncodingData
     = { { &aImplMS1257ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2066,8 +2071,8 @@ static ImplByteConvertData const aImplISO88592ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88592TextEncodingData
     = { { &aImplISO88592ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2227,8 +2232,8 @@ static ImplByteConvertData const aImplISO88593ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88593TextEncodingData
     = { { &aImplISO88593ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2395,8 +2400,8 @@ static ImplByteConvertData const aImplISO88594ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88594TextEncodingData
     = { { &aImplISO88594ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2493,8 +2498,8 @@ static ImplByteConvertData const aImplISO88595ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88595TextEncodingData
     = { { &aImplISO88595ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2604,8 +2609,8 @@ static ImplByteConvertData const aImplISO88597ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88597TextEncodingData
     = { { &aImplISO88597ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2704,8 +2709,8 @@ static ImplByteConvertData const aImplISO88599ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88599TextEncodingData
     = { { &aImplISO88599ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -2845,8 +2850,8 @@ static ImplByteConvertData const aImplISO885910ByteCvtData =
 
 static ImplTextEncodingData const aImplISO885910TextEncodingData
     = { { &aImplISO885910ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3013,8 +3018,8 @@ static ImplByteConvertData const aImplISO885913ByteCvtData =
 
 static ImplTextEncodingData const aImplISO885913TextEncodingData
     = { { &aImplISO885913ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3218,8 +3223,8 @@ static ImplByteConvertData const aImplAPPLECENTEUROByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLECENTEUROTextEncodingData
     = { { &aImplAPPLECENTEUROByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3366,8 +3371,8 @@ static ImplByteConvertData const aImplAPPLECROATIANByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLECROATIANTextEncodingData
     = { { &aImplAPPLECROATIANByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3501,8 +3506,8 @@ static ImplByteConvertData const aImplAPPLECYRILLICByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLECYRILLICTextEncodingData
     = { { &aImplAPPLECYRILLICByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3655,8 +3660,8 @@ static ImplByteConvertData const aImplAPPLEGREEKByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLEGREEKTextEncodingData
     = { { &aImplAPPLEGREEKByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3809,8 +3814,8 @@ static ImplByteConvertData const aImplAPPLEROMANIANByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLEROMANIANTextEncodingData
     = { { &aImplAPPLEROMANIANByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -3956,8 +3961,8 @@ static ImplByteConvertData const aImplAPPLETURKISHByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLETURKISHTextEncodingData
     = { { &aImplAPPLETURKISHByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -4091,8 +4096,8 @@ static ImplByteConvertData const aImplAPPLEUKRAINIANByteCvtData =
 
 static ImplTextEncodingData const aImplAPPLEUKRAINIANTextEncodingData
     = { { &aImplAPPLEUKRAINIANByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -4250,8 +4255,8 @@ static ImplByteConvertData const aImplKOI8RByteCvtData =
 
 static ImplTextEncodingData const aImplKOI8RTextEncodingData
     = { { &aImplKOI8RByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -4408,8 +4413,8 @@ static ImplByteConvertData const aImplKOI8UByteCvtData =
 
 static ImplTextEncodingData const aImplKoi8UTextEncodingData
     = { { &aImplKOI8UByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -4566,8 +4571,8 @@ static ImplByteConvertData const aImplPT154ByteCvtData =
 
 static ImplTextEncodingData const aImplPT154TextEncodingData
     = { { &aImplPT154ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab
index 54ac2915d1bf..93f9faf5a70c 100644
--- a/sal/textenc/tcvtjp6.tab
+++ b/sal/textenc/tcvtjp6.tab
@@ -25,6 +25,11 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "convertsimple.hxx"
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the information tables for all japanese charsets: */
@@ -2577,7 +2582,7 @@ static ImplByteConvertData const aImplJISX0201ByteCvtData =
 static ImplTextEncodingData const aImplJISX0201TextEncodingData
     = { { &aImplJISX0201ByteCvtData,
           NULL,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index 3b96647086cc..8a3a1524b0e5 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -25,6 +25,10 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the information tables for all  */
diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab
index 4526063b3b6c..ddbf18b9ce40 100644
--- a/sal/textenc/tcvtlat1.tab
+++ b/sal/textenc/tcvtlat1.tab
@@ -25,6 +25,12 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "convertsimple.hxx"
+#include "tcvtbyte.hxx"
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the tables for all 1 byte charsets, for the */
@@ -189,7 +195,7 @@ static ImplByteConvertData const aImplIBM437ByteCvtData =
 static ImplTextEncodingData const aImplIBM437TextEncodingData
     = { { &aImplIBM437ByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -323,7 +329,7 @@ static ImplByteConvertData const aImplIBM850ByteCvtData =
 static ImplTextEncodingData const aImplIBM850TextEncodingData
     = { { &aImplIBM850ByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -496,7 +502,7 @@ static ImplByteConvertData const aImplIBM860ByteCvtData =
 static ImplTextEncodingData const aImplIBM860TextEncodingData
     = { { &aImplIBM860ByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -671,7 +677,7 @@ static ImplByteConvertData const aImplIBM861ByteCvtData =
 static ImplTextEncodingData const aImplIBM861TextEncodingData
     = { { &aImplIBM861ByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -846,7 +852,7 @@ static ImplByteConvertData const aImplIBM863ByteCvtData =
 static ImplTextEncodingData const aImplIBM863TextEncodingData
     = { { &aImplIBM863ByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1021,7 +1027,7 @@ static ImplByteConvertData const aImplIBM865ByteCvtData =
 static ImplTextEncodingData const aImplIBM865TextEncodingData
     = { { &aImplIBM865ByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1148,8 +1154,8 @@ static ImplByteConvertData const aImplISO885914ByteCvtData =
 
 static ImplTextEncodingData const aImplISO885914TextEncodingData
     = { { &aImplISO885914ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1250,8 +1256,8 @@ static ImplByteConvertData const aImplISO885915ByteCvtData =
 
 static ImplTextEncodingData const aImplISO885915TextEncodingData
     = { { &aImplISO885915ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1391,7 +1397,7 @@ static ImplByteConvertData const aImplAPPLEICELANDByteCvtData =
 static ImplTextEncodingData const aImplAPPLEICELANDTextEncodingData
     = { { &aImplAPPLEICELANDByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -1538,7 +1544,7 @@ static ImplByteConvertData const aImplAPPLEROMANByteCvtData =
 static ImplTextEncodingData const aImplAPPLEROMANTextEncodingData
     = { { &aImplAPPLEROMANByteCvtData,
           ImplUpperCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab
index 8a8cafc725d8..0e2eeac87fec 100644
--- a/sal/textenc/tcvtscn6.tab
+++ b/sal/textenc/tcvtscn6.tab
@@ -25,6 +25,10 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the information tables for all */
diff --git a/sal/textenc/tcvtsym1.tab b/sal/textenc/tcvtsym1.tab
index 6bbeb62ac55a..2cad2f675a5a 100644
--- a/sal/textenc/tcvtsym1.tab
+++ b/sal/textenc/tcvtsym1.tab
@@ -25,6 +25,10 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "tcvtbyte.hxx"
+
 /* Symbol Font Encodings */
 
 static ImplTextEncodingData const aImplSYMBOLTextEncodingData
diff --git a/sal/textenc/tcvttcn6.tab b/sal/textenc/tcvttcn6.tab
index 3fbff168693a..668599280154 100644
--- a/sal/textenc/tcvttcn6.tab
+++ b/sal/textenc/tcvttcn6.tab
@@ -25,6 +25,10 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "tenchelp.hxx"
+
 /* ======================================================================= */
 
 /* This file contain the information tables for all */
diff --git a/sal/textenc/tenchelp.hxx b/sal/textenc/tenchelp.hxx
index 60cd61018a4c..149a5435a8b2 100644
--- a/sal/textenc/tenchelp.hxx
+++ b/sal/textenc/tenchelp.hxx
@@ -215,27 +215,6 @@ ImplHandleUndefinedUnicodeToTextChar(void const * pData,
 /* - TextConverter - Functions - */
 /* ----------------------------- */
 
-sal_Size ImplSymbolToUnicode( const void* pData, void* pContext,
-                              const char* pSrcBuf, sal_Size nSrcBytes,
-                              sal_Unicode* pDestBuf, sal_Size nDestChars,
-                              sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes );
-sal_Size ImplUnicodeToSymbol( const void* pData, void* pContext,
-                              const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
-                              char* pDestBuf, sal_Size nDestBytes,
-                              sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtChars );
-sal_Size ImplCharToUnicode( const void* pData, void* pContext,
-                            const char* pSrcBuf, sal_Size nSrcBytes,
-                            sal_Unicode* pDestBuf, sal_Size nDestChars,
-                            sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes );
-/** For those encodings only with unicode range of 0x80 to 0xFF. */
-sal_Size ImplUpperCharToUnicode( const void* pData, void* pContext,
-                            const char* pSrcBuf, sal_Size nSrcBytes,
-                            sal_Unicode* pDestBuf, sal_Size nDestChars,
-                            sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes );
-sal_Size ImplUnicodeToChar( const void* pData, void* pContext,
-                            const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
-                            char* pDestBuf, sal_Size nDestBytes,
-                            sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtChars );
 sal_Size ImplDBCSToUnicode( const void* pData, void* pContext,
                             const char* pSrcBuf, sal_Size nSrcBytes,
                             sal_Unicode* pDestBuf, sal_Size nDestChars,
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 164aab22f356..8d34920b7e82 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -45,7 +45,9 @@
 #include "sal/macros.h"
 #include "sal/types.h"
 
+#include "convertsimple.hxx"
 #include "gettextencodingdata.hxx"
+#include "tcvtbyte.hxx"
 #include "tcvtutf8.hxx"
 #include "tenchelp.hxx"
 
@@ -183,8 +185,8 @@ static ImplByteConvertData const aImplMS1252ByteCvtData =
 
 static ImplTextEncodingData const aImplMS1252TextEncodingData
     = { { &aImplMS1252ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -248,8 +250,8 @@ static ImplByteConvertData const aImplISO88591ByteCvtData =
 
 static ImplTextEncodingData const aImplISO88591TextEncodingData
     = { { &aImplISO88591ByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
@@ -296,8 +298,8 @@ static ImplByteConvertData const aImplUSASCIIByteCvtData =
 
 static ImplTextEncodingData const aImplUSASCIITextEncodingData
     = { { &aImplUSASCIIByteCvtData,
-          ImplCharToUnicode,
-          ImplUnicodeToChar,
+          sal::detail::textenc::convertCharToUnicode,
+          sal::detail::textenc::convertUnicodeToChar,
           NULL,
           NULL,
           NULL,
diff --git a/sal/util/sal.map b/sal/util/sal.map
index e8a9ab520477..2939433b7961 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -636,6 +636,12 @@ PRIVATE_1.2 { # LibreOffice 3.5
         sal_detail_logFormat;
 } PRIVATE_1.1;
 
+PRIVATE_textenc { # LibreOffice 3.6
+    global:
+        _ZN3sal6detail7textenc20convertCharToUnicodeEPKvPvPKcmPtmjPjPm;
+        _ZN3sal6detail7textenc20convertUnicodeToCharEPKvPvPKtmPcmjPjPm;
+};
+
 # Unique libstdc++ symbols:
 GLIBCXX_3.4 {
     global:
author	Stephan Bergmann <sbergman@redhat.com>	2012-01-06 11:48:13 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2012-01-06 15:00:44 +0100
commit	5689b61ac9eac4d4be2d6aa378b732a5eae4784a (patch)
tree	271a107e98f9c04aa296cd18dfad129ab4acddbc /sal
parent	0c66147a2adeacddb706d789bef42d6177258a87 (diff)