[Libreoffice-commits] .: 2 commits - sal/CppunitTest_sal_rtl_textenc.mk sal/Module_sal.mk sal/qa sal/textenc

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 26 08:04:17 PST 2012


 sal/CppunitTest_sal_rtl_textenc.mk  |   22 
 sal/Module_sal.mk                   |    1 
 sal/qa/rtl/textenc/rtl_tencinfo.cxx | 2345 ++++++++++++++++--------------------
 sal/qa/rtl/textenc/rtl_textcvt.cxx  |   18 
 sal/textenc/convertadobe.tab        |   10 
 5 files changed, 1140 insertions(+), 1256 deletions(-)

New commits:
commit 65f82ca62922e2c487ba72b6d67ea7e3a03f8ebc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 26 14:10:11 2012 +0000

    get textencoding tests working again
    
    Change-Id: Ia3e0b7be14800e1d50c3e785153b45d2b4a7dd6d

diff --git a/sal/CppunitTest_sal_rtl_textenc.mk b/sal/CppunitTest_sal_rtl_textenc.mk
new file mode 100644
index 0000000..bea9521
--- /dev/null
+++ b/sal/CppunitTest_sal_rtl_textenc.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl_textenc))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl_textenc,\
+    sal/qa/rtl/textenc/rtl_tencinfo \
+    sal/qa/rtl/textenc/rtl_textcvt \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sal_rtl_textenc,\
+    sal \
+    $(gb_UWINAPI) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 475a695..7d20fa3 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 	CppunitTest_sal_rtl_locale \
 	CppunitTest_sal_rtl_ostringbuffer \
 	CppunitTest_sal_rtl_oustringbuffer \
+	CppunitTest_sal_rtl_textenc \
 	CppunitTest_sal_rtl_strings \
 	CppunitTest_sal_rtl_uri \
 	CppunitTest_sal_rtl_uuid \
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index f3b1e09..7d3ade9 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -23,505 +23,396 @@
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
-// -----------------------------------------------------------------------------
-
-namespace rtl_tencinfo
+namespace
 {
-    class getBestMime : public CppUnit::TestFixture
+    class testBestMime : public CppUnit::TestFixture
     {
     public:
         void setUp()
-            {
-            }
+        {
+        }
 
-        void check( const sal_Char* _pRTL_TEXTENCODING, rtl_TextEncoding _aCurrentEncode )
-            {
-                const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( _aCurrentEncode );
-                if (pCharSet == 0)
-                {
-                    t_print("rtl_getBestMimeCharsetFromTextEncoding(%s) (%d) doesn't seem to exist.\n\n", _pRTL_TEXTENCODING, _aCurrentEncode);
-                }
-                else
-                {
-                    t_print(T_VERBOSE,     "'%s' is charset: '%s'\n", _pRTL_TEXTENCODING, pCharSet);
-
-                    rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
-                    if (_aCurrentEncode != eTextEnc &&
-                        eTextEnc != RTL_TEXTENCODING_DONTKNOW)
-                    {
-                        t_print("rtl_getBestMimeCharsetFromTextEncoding(%s) is charset: %s\n", _pRTL_TEXTENCODING, pCharSet);
-                        t_print("rtl_getTextEncodingFromMimeCharset() differ: %s %d -> %d\n\n", _pRTL_TEXTENCODING, _aCurrentEncode, eTextEnc );
-                    }
-                    // rtl::OString sError = "getTextEncodingFromMimeCharset(";
-                    // sError += pCharSet;
-                    // sError += ") returns null";
-                    // CPPUNIT_ASSERT_MESSAGE(sError.getStr(), eTextEnc != RTL_TEXTENCODING_DONTKNOW);
-                    // CPPUNIT_ASSERT_MESSAGE("Does not realize itself", _aCurrentEncode == eTextEnc );
-                }
-            }
+        void check(rtl_TextEncoding eIn, rtl_TextEncoding eOut)
+        {
+            const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding(eIn);
+            rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromMimeCharset(pCharSet);
+            CPPUNIT_ASSERT_MESSAGE("rtl_getBestMimeCharsetFromTextEncoding && rtl_getTextEncodingFromMimeCharset differdiffer", eTextEnc == eOut);
+        }
 
-// the defines for the follows test could be found in file inc/rtl/textenc.h
+        // the defines for the follows test could be found in file inc/rtl/textenc.h
 
-        // ----------------------------------------
         void MimeCharsetFromTextEncoding_MS_1252()
-            {
-                check( "RTL_TEXTENCODING_MS_1252", RTL_TEXTENCODING_MS_1252 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1252, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void MimeCharsetFromTextEncoding_APPLE_ROMAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ROMAN", RTL_TEXTENCODING_APPLE_ROMAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ROMAN, RTL_TEXTENCODING_APPLE_ROMAN);
+        }
+
         void MimeCharsetFromTextEncoding_IBM_437()
-            {
-                check( "RTL_TEXTENCODING_IBM_437", RTL_TEXTENCODING_IBM_437 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_437, RTL_TEXTENCODING_IBM_437 );
+        }
+
         void MimeCharsetFromTextEncoding_IBM_850()
-            {
-                check( "RTL_TEXTENCODING_IBM_850", RTL_TEXTENCODING_IBM_850 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_850, RTL_TEXTENCODING_IBM_850 );
+        }
+
         void MimeCharsetFromTextEncoding_IBM_860()
-            {
-                check( "RTL_TEXTENCODING_IBM_860", RTL_TEXTENCODING_IBM_860 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_860, RTL_TEXTENCODING_IBM_860 );
+        }
+
         void MimeCharsetFromTextEncoding_IBM_861()
-            {
-                check( "RTL_TEXTENCODING_IBM_861", RTL_TEXTENCODING_IBM_861 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_861, RTL_TEXTENCODING_IBM_861 );
+        }
+
         void MimeCharsetFromTextEncoding_IBM_863()
-            {
-                check( "RTL_TEXTENCODING_IBM_863", RTL_TEXTENCODING_IBM_863 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_863, RTL_TEXTENCODING_IBM_863 );
+        }
+
         void MimeCharsetFromTextEncoding_IBM_865()
-            {
-                check( "RTL_TEXTENCODING_IBM_865", RTL_TEXTENCODING_IBM_865 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_865, RTL_TEXTENCODING_IBM_865 );
+        }
+
         void MimeCharsetFromTextEncoding_SYMBOL()
-            {
-                check( "RTL_TEXTENCODING_SYMBOL", RTL_TEXTENCODING_SYMBOL );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_SYMBOL, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void MimeCharsetFromTextEncoding_ASCII_US()
-            {
-                check( "RTL_TEXTENCODING_ASCII_US", RTL_TEXTENCODING_ASCII_US );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ASCII_US, RTL_TEXTENCODING_ASCII_US );
+        }
+
         void MimeCharsetFromTextEncoding_ISO_8859_1()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_1", RTL_TEXTENCODING_ISO_8859_1 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_1, RTL_TEXTENCODING_ISO_8859_1 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_2()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_2", RTL_TEXTENCODING_ISO_8859_2 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_2, RTL_TEXTENCODING_ISO_8859_2 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_3()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_3", RTL_TEXTENCODING_ISO_8859_3 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_3, RTL_TEXTENCODING_ISO_8859_3 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_4()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_4", RTL_TEXTENCODING_ISO_8859_4 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_4, RTL_TEXTENCODING_ISO_8859_4 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_5()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_5", RTL_TEXTENCODING_ISO_8859_5 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_5, RTL_TEXTENCODING_ISO_8859_5 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_6()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_6", RTL_TEXTENCODING_ISO_8859_6 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_6, RTL_TEXTENCODING_ISO_8859_6 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_7()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_7", RTL_TEXTENCODING_ISO_8859_7 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_7, RTL_TEXTENCODING_ISO_8859_7 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_8()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_8", RTL_TEXTENCODING_ISO_8859_8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_8, RTL_TEXTENCODING_ISO_8859_8 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_9()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_9", RTL_TEXTENCODING_ISO_8859_9 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_9, RTL_TEXTENCODING_ISO_8859_9 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_14()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_14", RTL_TEXTENCODING_ISO_8859_14 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_14, RTL_TEXTENCODING_ISO_8859_14 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_15()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_15", RTL_TEXTENCODING_ISO_8859_15 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_15, RTL_TEXTENCODING_ISO_8859_15 );
+        }
         void MimeCharsetFromTextEncoding_IBM_737()
-            {
-                check( "RTL_TEXTENCODING_IBM_737", RTL_TEXTENCODING_IBM_737 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_737, RTL_TEXTENCODING_ISO_8859_7 );
+        }
         void MimeCharsetFromTextEncoding_IBM_775()
-            {
-                check( "RTL_TEXTENCODING_IBM_775", RTL_TEXTENCODING_IBM_775 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_775, RTL_TEXTENCODING_ISO_8859_4 );
+        }
         void MimeCharsetFromTextEncoding_IBM_852()
-            {
-                check( "RTL_TEXTENCODING_IBM_852", RTL_TEXTENCODING_IBM_852 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_852, RTL_TEXTENCODING_IBM_852 );
+        }
         void MimeCharsetFromTextEncoding_IBM_855()
-            {
-                check( "RTL_TEXTENCODING_IBM_855", RTL_TEXTENCODING_IBM_855 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_855, RTL_TEXTENCODING_ISO_8859_5 );
+        }
         void MimeCharsetFromTextEncoding_IBM_857()
-            {
-                check( "RTL_TEXTENCODING_IBM_857", RTL_TEXTENCODING_IBM_857 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_857, RTL_TEXTENCODING_ISO_8859_9 );
+        }
         void MimeCharsetFromTextEncoding_IBM_862()
-            {
-                check( "RTL_TEXTENCODING_IBM_862", RTL_TEXTENCODING_IBM_862 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_862, RTL_TEXTENCODING_IBM_862 );
+        }
         void MimeCharsetFromTextEncoding_IBM_864()
-            {
-                check( "RTL_TEXTENCODING_IBM_864", RTL_TEXTENCODING_IBM_864 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_864, RTL_TEXTENCODING_IBM_864 );
+        }
         void MimeCharsetFromTextEncoding_IBM_866()
-            {
-                check( "RTL_TEXTENCODING_IBM_866", RTL_TEXTENCODING_IBM_866 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_866, RTL_TEXTENCODING_IBM_866 );
+        }
         void MimeCharsetFromTextEncoding_IBM_869()
-            {
-                check( "RTL_TEXTENCODING_IBM_869", RTL_TEXTENCODING_IBM_869 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_869, RTL_TEXTENCODING_ISO_8859_7 );
+        }
         void MimeCharsetFromTextEncoding_MS_874()
-            {
-                check( "RTL_TEXTENCODING_MS_874", RTL_TEXTENCODING_MS_874 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_874, RTL_TEXTENCODING_MS_874 );
+        }
         void MimeCharsetFromTextEncoding_MS_1250()
-            {
-                check( "RTL_TEXTENCODING_MS_1250", RTL_TEXTENCODING_MS_1250 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1250, RTL_TEXTENCODING_MS_1250 );
+        }
         void MimeCharsetFromTextEncoding_MS_1251()
-            {
-                check( "RTL_TEXTENCODING_MS_1251", RTL_TEXTENCODING_MS_1251 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1251, RTL_TEXTENCODING_MS_1251 );
+        }
         void MimeCharsetFromTextEncoding_MS_1253()
-            {
-                check( "RTL_TEXTENCODING_MS_1253", RTL_TEXTENCODING_MS_1253 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1253, RTL_TEXTENCODING_MS_1253 );
+        }
         void MimeCharsetFromTextEncoding_MS_1254()
-            {
-                check( "RTL_TEXTENCODING_MS_1254", RTL_TEXTENCODING_MS_1254 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1254, RTL_TEXTENCODING_MS_1254 );
+        }
         void MimeCharsetFromTextEncoding_MS_1255()
-            {
-                check( "RTL_TEXTENCODING_MS_1255", RTL_TEXTENCODING_MS_1255 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1255, RTL_TEXTENCODING_MS_1255 );
+        }
         void MimeCharsetFromTextEncoding_MS_1256()
-            {
-                check( "RTL_TEXTENCODING_MS_1256", RTL_TEXTENCODING_MS_1256 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1256, RTL_TEXTENCODING_MS_1256 );
+        }
         void MimeCharsetFromTextEncoding_MS_1257()
-            {
-                check( "RTL_TEXTENCODING_MS_1257", RTL_TEXTENCODING_MS_1257 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1257, RTL_TEXTENCODING_MS_1257 );
+        }
         void MimeCharsetFromTextEncoding_MS_1258()
-            {
-                check( "RTL_TEXTENCODING_MS_1258", RTL_TEXTENCODING_MS_1258 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1258, RTL_TEXTENCODING_MS_1258 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_ARABIC()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ARABIC", RTL_TEXTENCODING_APPLE_ARABIC );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ARABIC, RTL_TEXTENCODING_APPLE_ARABIC );
+        }
         void MimeCharsetFromTextEncoding_APPLE_CENTEURO()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CENTEURO", RTL_TEXTENCODING_APPLE_CENTEURO );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CENTEURO, RTL_TEXTENCODING_ISO_8859_2 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_CROATIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CROATIAN", RTL_TEXTENCODING_APPLE_CROATIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CROATIAN, RTL_TEXTENCODING_ISO_8859_2 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_CYRILLIC()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CYRILLIC", RTL_TEXTENCODING_APPLE_CYRILLIC );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CYRILLIC, RTL_TEXTENCODING_ISO_8859_5 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_DEVANAGARI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_DEVANAGARI", RTL_TEXTENCODING_APPLE_DEVANAGARI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_DEVANAGARI, RTL_TEXTENCODING_ISO_8859_7 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_FARSI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_FARSI", RTL_TEXTENCODING_APPLE_FARSI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_FARSI, RTL_TEXTENCODING_ISO_8859_1 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_GREEK()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GREEK", RTL_TEXTENCODING_APPLE_GREEK );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GREEK, RTL_TEXTENCODING_ISO_8859_7 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_GUJARATI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GUJARATI", RTL_TEXTENCODING_APPLE_GUJARATI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GUJARATI, RTL_TEXTENCODING_ISO_8859_2 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_GURMUKHI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GURMUKHI", RTL_TEXTENCODING_APPLE_GURMUKHI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GURMUKHI, RTL_TEXTENCODING_ISO_8859_2 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_HEBREW()
-            {
-                check( "RTL_TEXTENCODING_APPLE_HEBREW", RTL_TEXTENCODING_APPLE_HEBREW );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_HEBREW, RTL_TEXTENCODING_ISO_8859_9 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_ICELAND()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ICELAND", RTL_TEXTENCODING_APPLE_ICELAND );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ICELAND, RTL_TEXTENCODING_ISO_8859_1 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_ROMANIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ROMANIAN", RTL_TEXTENCODING_APPLE_ROMANIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ROMANIAN, RTL_TEXTENCODING_ISO_8859_2 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_THAI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_THAI", RTL_TEXTENCODING_APPLE_THAI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_THAI, RTL_TEXTENCODING_ISO_8859_9 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_TURKISH()
-            {
-                check( "RTL_TEXTENCODING_APPLE_TURKISH", RTL_TEXTENCODING_APPLE_TURKISH );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_TURKISH, RTL_TEXTENCODING_ISO_8859_9 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_UKRAINIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_UKRAINIAN", RTL_TEXTENCODING_APPLE_UKRAINIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_UKRAINIAN, RTL_TEXTENCODING_ISO_8859_5 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_CHINSIMP()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CHINSIMP", RTL_TEXTENCODING_APPLE_CHINSIMP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CHINSIMP, RTL_TEXTENCODING_GB_2312 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_CHINTRAD()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CHINTRAD", RTL_TEXTENCODING_APPLE_CHINTRAD );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CHINTRAD, RTL_TEXTENCODING_BIG5 );
+        }
         void MimeCharsetFromTextEncoding_APPLE_JAPANESE()
-            {
-                check( "RTL_TEXTENCODING_APPLE_JAPANESE", RTL_TEXTENCODING_APPLE_JAPANESE );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_JAPANESE, RTL_TEXTENCODING_SHIFT_JIS );
+        }
         void MimeCharsetFromTextEncoding_APPLE_KOREAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_KOREAN", RTL_TEXTENCODING_APPLE_KOREAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_KOREAN, RTL_TEXTENCODING_EUC_KR );
+        }
         void MimeCharsetFromTextEncoding_MS_932()
-            {
-                check( "RTL_TEXTENCODING_MS_932", RTL_TEXTENCODING_MS_932 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_932, RTL_TEXTENCODING_SHIFT_JIS );
+        }
         void MimeCharsetFromTextEncoding_MS_936()
-            {
-                check( "RTL_TEXTENCODING_MS_936", RTL_TEXTENCODING_MS_936 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_936, RTL_TEXTENCODING_GB_2312 );
+        }
         void MimeCharsetFromTextEncoding_MS_949()
-            {
-                check( "RTL_TEXTENCODING_MS_949", RTL_TEXTENCODING_MS_949 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_949, RTL_TEXTENCODING_EUC_KR );
+        }
         void MimeCharsetFromTextEncoding_MS_950()
-            {
-                check( "RTL_TEXTENCODING_MS_950", RTL_TEXTENCODING_MS_950 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_950, RTL_TEXTENCODING_BIG5 );
+        }
         void MimeCharsetFromTextEncoding_SHIFT_JIS()
-            {
-                check( "RTL_TEXTENCODING_SHIFT_JIS", RTL_TEXTENCODING_SHIFT_JIS );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_SHIFT_JIS, RTL_TEXTENCODING_SHIFT_JIS );
+        }
         void MimeCharsetFromTextEncoding_GB_2312()
-            {
-                check( "RTL_TEXTENCODING_GB_2312", RTL_TEXTENCODING_GB_2312 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GB_2312 );
+        }
         void MimeCharsetFromTextEncoding_GBT_12345()
-            {
-                check( "RTL_TEXTENCODING_GBT_12345", RTL_TEXTENCODING_GBT_12345 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GBT_12345, RTL_TEXTENCODING_GBT_12345 );
+        }
         void MimeCharsetFromTextEncoding_GBK()
-            {
-                check( "RTL_TEXTENCODING_GBK", RTL_TEXTENCODING_GBK );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GBK, RTL_TEXTENCODING_GBK );
+        }
         void MimeCharsetFromTextEncoding_BIG5()
-            {
-                check( "RTL_TEXTENCODING_BIG5", RTL_TEXTENCODING_BIG5 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_BIG5, RTL_TEXTENCODING_BIG5 );
+        }
         void MimeCharsetFromTextEncoding_EUC_JP()
-            {
-                check( "RTL_TEXTENCODING_EUC_JP", RTL_TEXTENCODING_EUC_JP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_JP, RTL_TEXTENCODING_EUC_JP );
+        }
         void MimeCharsetFromTextEncoding_EUC_CN()
-            {
-                check( "RTL_TEXTENCODING_EUC_CN", RTL_TEXTENCODING_EUC_CN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_CN, RTL_TEXTENCODING_GB_2312 );
+        }
         void MimeCharsetFromTextEncoding_EUC_TW()
-            {
-                check( "RTL_TEXTENCODING_EUC_TW", RTL_TEXTENCODING_EUC_TW );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_TW, RTL_TEXTENCODING_BIG5 );
+        }
         void MimeCharsetFromTextEncoding_ISO_2022_JP()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_JP", RTL_TEXTENCODING_ISO_2022_JP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_JP, RTL_TEXTENCODING_ISO_2022_JP );
+        }
         void MimeCharsetFromTextEncoding_ISO_2022_CN()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_CN", RTL_TEXTENCODING_ISO_2022_CN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_CN, RTL_TEXTENCODING_ISO_2022_CN );
+        }
         void MimeCharsetFromTextEncoding_KOI8_R()
-            {
-                check( "RTL_TEXTENCODING_KOI8_R", RTL_TEXTENCODING_KOI8_R );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_KOI8_R, RTL_TEXTENCODING_KOI8_R );
+        }
         void MimeCharsetFromTextEncoding_UTF7()
-            {
-                check( "RTL_TEXTENCODING_UTF7", RTL_TEXTENCODING_UTF7 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_UTF7, RTL_TEXTENCODING_UTF7 );
+        }
         void MimeCharsetFromTextEncoding_UTF8()
-            {
-                check( "RTL_TEXTENCODING_UTF8", RTL_TEXTENCODING_UTF8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_UTF8 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_10()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_10", RTL_TEXTENCODING_ISO_8859_10 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_10, RTL_TEXTENCODING_ISO_8859_10 );
+        }
         void MimeCharsetFromTextEncoding_ISO_8859_13()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_13", RTL_TEXTENCODING_ISO_8859_13 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_13, RTL_TEXTENCODING_ISO_8859_13 );
+        }
         void MimeCharsetFromTextEncoding_EUC_KR()
-            {
-                check( "RTL_TEXTENCODING_EUC_KR", RTL_TEXTENCODING_EUC_KR );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_KR, RTL_TEXTENCODING_EUC_KR );
+        }
         void MimeCharsetFromTextEncoding_ISO_2022_KR()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_KR", RTL_TEXTENCODING_ISO_2022_KR );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_KR, RTL_TEXTENCODING_ISO_2022_KR );
+        }
         void MimeCharsetFromTextEncoding_JIS_X_0201()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0201", RTL_TEXTENCODING_JIS_X_0201 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0201, RTL_TEXTENCODING_EUC_JP );
+        }
         void MimeCharsetFromTextEncoding_JIS_X_0208()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0208", RTL_TEXTENCODING_JIS_X_0208 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0208, RTL_TEXTENCODING_EUC_JP );
+        }
         void MimeCharsetFromTextEncoding_JIS_X_0212()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0212", RTL_TEXTENCODING_JIS_X_0212 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0212, RTL_TEXTENCODING_EUC_JP );
+        }
         void MimeCharsetFromTextEncoding_MS_1361()
-            {
-                check( "RTL_TEXTENCODING_MS_1361", RTL_TEXTENCODING_MS_1361 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1361, RTL_TEXTENCODING_EUC_KR );
+        }
         void MimeCharsetFromTextEncoding_GB_18030()
-            {
-                check( "RTL_TEXTENCODING_GB_18030", RTL_TEXTENCODING_GB_18030 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GB_18030, RTL_TEXTENCODING_GB_18030 );
+        }
         void MimeCharsetFromTextEncoding_BIG5_HKSCS()
-            {
-                check( "RTL_TEXTENCODING_BIG5_HKSCS", RTL_TEXTENCODING_BIG5_HKSCS );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_BIG5_HKSCS, RTL_TEXTENCODING_BIG5_HKSCS );
+        }
         void MimeCharsetFromTextEncoding_TIS_620()
-            {
-                check( "RTL_TEXTENCODING_TIS_620", RTL_TEXTENCODING_TIS_620 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_TIS_620, RTL_TEXTENCODING_TIS_620 );
+        }
         void MimeCharsetFromTextEncoding_KOI8_U()
-            {
-                check( "RTL_TEXTENCODING_KOI8_U", RTL_TEXTENCODING_KOI8_U );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_KOI8_U, RTL_TEXTENCODING_KOI8_U );
+        }
         void MimeCharsetFromTextEncoding_ISCII_DEVANAGARI()
-            {
-                check( "RTL_TEXTENCODING_ISCII_DEVANAGARI", RTL_TEXTENCODING_ISCII_DEVANAGARI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISCII_DEVANAGARI, RTL_TEXTENCODING_ISCII_DEVANAGARI );
+        }
         void MimeCharsetFromTextEncoding_JAVA_UTF8()
-            {
-                check( "RTL_TEXTENCODING_JAVA_UTF8", RTL_TEXTENCODING_JAVA_UTF8 );
-            }
+        {
+            check( RTL_TEXTENCODING_JAVA_UTF8, RTL_TEXTENCODING_JAVA_UTF8 );
+        }
 
-/* ATTENTION!  Whenever some encoding is added here, make sure to update
- * rtl_isOctetEncoding in tencinfo.c.
- */
-
-// RTL_TEXTENCODING_USER_START
-// RTL_TEXTENCODING_USER_END
-
-//                check( "RTL_TEXTENCODING_UCS4", RTL_TEXTENCODING_UCS4 );
-//                check( "RTL_TEXTENCODING_UCS2", RTL_TEXTENCODING_UCS2 );
-//                check( "RTL_TEXTENCODING_UNICODE", RTL_TEXTENCODING_UNICODE /* RTL_TEXTENCODING_UCS2 */ );
-
-        CPPUNIT_TEST_SUITE( getBestMime );
+        CPPUNIT_TEST_SUITE( testBestMime );
 
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_MS_1252 );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_ROMAN );
@@ -562,19 +453,27 @@ namespace rtl_tencinfo
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_MS_1256 );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_MS_1257 );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_MS_1258 );
+#if 0
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_ARABIC );
+#endif
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_CENTEURO );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_CROATIAN );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_CYRILLIC );
+#if 0
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_DEVANAGARI );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_FARSI );
+#endif
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_GREEK );
+#if 0
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_GUJARATI );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_GURMUKHI );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_HEBREW );
+#endif
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_ICELAND );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_ROMANIAN );
+#if 0
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_THAI );
+#endif
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_TURKISH );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_UKRAINIAN );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_APPLE_CHINSIMP );
@@ -610,496 +509,476 @@ namespace rtl_tencinfo
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_BIG5_HKSCS );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_TIS_620 );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_KOI8_U );
+#if 0
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_ISCII_DEVANAGARI );
         CPPUNIT_TEST( MimeCharsetFromTextEncoding_JAVA_UTF8 );
+#endif
 
         CPPUNIT_TEST_SUITE_END( );
     };
 
     // -----------------------------------------------------------------------------
 
-    class getBestUnix : public CppUnit::TestFixture
+    class testBestUnix : public CppUnit::TestFixture
     {
     public:
         void setUp()
-            {
-            }
-
-        void check( const sal_Char* _pRTL_TEXTENCODING, rtl_TextEncoding _aCurrentEncode )
-            {
-                const sal_Char *pCharSet = rtl_getBestUnixCharsetFromTextEncoding( _aCurrentEncode );
-                if (pCharSet == 0)
-                {
-                    t_print("rtl_getBestUnixCharsetFromTextEncoding(%s) (%d) doesn't seem to exist.\n\n", _pRTL_TEXTENCODING, _aCurrentEncode);
-                }
-                else
-                {
-                    t_print(T_VERBOSE, "'%s' is charset: '%s'\n", _pRTL_TEXTENCODING, pCharSet);
-
-                    rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromUnixCharset( pCharSet );
-                    if (_aCurrentEncode != eTextEnc &&
-                        eTextEnc != RTL_TEXTENCODING_DONTKNOW)
-                    {
-                        t_print("rtl_getBestUnixCharsetFromTextEncoding(%s) is charset: %s\n", _pRTL_TEXTENCODING, pCharSet);
-                        t_print("rtl_getTextEncodingFromUnixCharset() differ: %s %d -> %d\n\n", _pRTL_TEXTENCODING, _aCurrentEncode, eTextEnc );
-                    }
-                    // rtl::OString sError = "getTextEncodingFromUnixCharset(";
-                    // sError += pCharSet;
-                    // sError += ") returns null";
-                    // CPPUNIT_ASSERT_MESSAGE(sError.getStr(), eTextEnc != RTL_TEXTENCODING_DONTKNOW);
-                    // CPPUNIT_ASSERT_MESSAGE("Does not realize itself", _aCurrentEncode == eTextEnc );
-                }
-            }
+        {
+        }
 
+        void check(rtl_TextEncoding eIn, rtl_TextEncoding eOut)
+        {
+            const sal_Char *pCharSet = rtl_getBestUnixCharsetFromTextEncoding(eIn);
+            rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromUnixCharset(pCharSet);
+            CPPUNIT_ASSERT_MESSAGE("rtl_getBestUnixCharsetFromTextEncoding && rtl_getTextEncodingFromUnixCharset", eTextEnc == eOut);
+        }
 
-        // ----------------------------------------
         void UnixCharsetFromTextEncoding_MS_1252()
-            {
-                check( "RTL_TEXTENCODING_MS_1252", RTL_TEXTENCODING_MS_1252 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1252, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_ROMAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ROMAN", RTL_TEXTENCODING_APPLE_ROMAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ROMAN, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_437()
-            {
-                check( "RTL_TEXTENCODING_IBM_437", RTL_TEXTENCODING_IBM_437 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_437, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_850()
-            {
-                check( "RTL_TEXTENCODING_IBM_850", RTL_TEXTENCODING_IBM_850 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_850, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_860()
-            {
-                check( "RTL_TEXTENCODING_IBM_860", RTL_TEXTENCODING_IBM_860 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_860, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_861()
-            {
-                check( "RTL_TEXTENCODING_IBM_861", RTL_TEXTENCODING_IBM_861 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_861, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_863()
-            {
-                check( "RTL_TEXTENCODING_IBM_863", RTL_TEXTENCODING_IBM_863 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_863, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_865()
-            {
-                check( "RTL_TEXTENCODING_IBM_865", RTL_TEXTENCODING_IBM_865 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_865, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_SYMBOL()
-            {
-                check( "RTL_TEXTENCODING_SYMBOL", RTL_TEXTENCODING_SYMBOL );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_SYMBOL, RTL_TEXTENCODING_SYMBOL );
+        }
+
         void UnixCharsetFromTextEncoding_ASCII_US()
-            {
-                check( "RTL_TEXTENCODING_ASCII_US", RTL_TEXTENCODING_ASCII_US );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ASCII_US, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_1()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_1", RTL_TEXTENCODING_ISO_8859_1 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_1, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_2()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_2", RTL_TEXTENCODING_ISO_8859_2 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_2, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_3()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_3", RTL_TEXTENCODING_ISO_8859_3 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_3, RTL_TEXTENCODING_ISO_8859_3 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_4()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_4", RTL_TEXTENCODING_ISO_8859_4 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_4, RTL_TEXTENCODING_ISO_8859_4 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_5()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_5", RTL_TEXTENCODING_ISO_8859_5 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_5, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_6()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_6", RTL_TEXTENCODING_ISO_8859_6 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_6, RTL_TEXTENCODING_ISO_8859_6 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_7()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_7", RTL_TEXTENCODING_ISO_8859_7 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_7, RTL_TEXTENCODING_ISO_8859_7 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_8()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_8", RTL_TEXTENCODING_ISO_8859_8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_8, RTL_TEXTENCODING_ISO_8859_8 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_9()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_9", RTL_TEXTENCODING_ISO_8859_9 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_9, RTL_TEXTENCODING_ISO_8859_9 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_14()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_14", RTL_TEXTENCODING_ISO_8859_14 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_14, RTL_TEXTENCODING_ISO_8859_14 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_15()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_15", RTL_TEXTENCODING_ISO_8859_15 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_15, RTL_TEXTENCODING_ISO_8859_15 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_737()
-            {
-                check( "RTL_TEXTENCODING_IBM_737", RTL_TEXTENCODING_IBM_737 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_737, RTL_TEXTENCODING_ISO_8859_7 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_775()
-            {
-                check( "RTL_TEXTENCODING_IBM_775", RTL_TEXTENCODING_IBM_775 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_775, RTL_TEXTENCODING_ISO_8859_4 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_852()
-            {
-                check( "RTL_TEXTENCODING_IBM_852", RTL_TEXTENCODING_IBM_852 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_852, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_855()
-            {
-                check( "RTL_TEXTENCODING_IBM_855", RTL_TEXTENCODING_IBM_855 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_855, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_857()
-            {
-                check( "RTL_TEXTENCODING_IBM_857", RTL_TEXTENCODING_IBM_857 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_857, RTL_TEXTENCODING_ISO_8859_9 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_862()
-            {
-                check( "RTL_TEXTENCODING_IBM_862", RTL_TEXTENCODING_IBM_862 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_862, RTL_TEXTENCODING_ISO_8859_8 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_864()
-            {
-                check( "RTL_TEXTENCODING_IBM_864", RTL_TEXTENCODING_IBM_864 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_864, RTL_TEXTENCODING_ISO_8859_6 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_866()
-            {
-                check( "RTL_TEXTENCODING_IBM_866", RTL_TEXTENCODING_IBM_866 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_866, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_IBM_869()
-            {
-                check( "RTL_TEXTENCODING_IBM_869", RTL_TEXTENCODING_IBM_869 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_869, RTL_TEXTENCODING_ISO_8859_7 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_874()
-            {
-                check( "RTL_TEXTENCODING_MS_874", RTL_TEXTENCODING_MS_874 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_874, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1250()
-            {
-                check( "RTL_TEXTENCODING_MS_1250", RTL_TEXTENCODING_MS_1250 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1250, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1251()
-            {
-                check( "RTL_TEXTENCODING_MS_1251", RTL_TEXTENCODING_MS_1251 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1251, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1253()
-            {
-                check( "RTL_TEXTENCODING_MS_1253", RTL_TEXTENCODING_MS_1253 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1253, RTL_TEXTENCODING_ISO_8859_7 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1254()
-            {
-                check( "RTL_TEXTENCODING_MS_1254", RTL_TEXTENCODING_MS_1254 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1254, RTL_TEXTENCODING_ISO_8859_9 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1255()
-            {
-                check( "RTL_TEXTENCODING_MS_1255", RTL_TEXTENCODING_MS_1255 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1255, RTL_TEXTENCODING_ISO_8859_8 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1256()
-            {
-                check( "RTL_TEXTENCODING_MS_1256", RTL_TEXTENCODING_MS_1256 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1256, RTL_TEXTENCODING_ISO_8859_6 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1257()
-            {
-                check( "RTL_TEXTENCODING_MS_1257", RTL_TEXTENCODING_MS_1257 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1257, RTL_TEXTENCODING_ISO_8859_4 );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1258()
-            {
-                check( "RTL_TEXTENCODING_MS_1258", RTL_TEXTENCODING_MS_1258 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1258, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_ARABIC()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ARABIC", RTL_TEXTENCODING_APPLE_ARABIC );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ARABIC, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_CENTEURO()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CENTEURO", RTL_TEXTENCODING_APPLE_CENTEURO );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CENTEURO, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_CROATIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CROATIAN", RTL_TEXTENCODING_APPLE_CROATIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CROATIAN, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_CYRILLIC()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CYRILLIC", RTL_TEXTENCODING_APPLE_CYRILLIC );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CYRILLIC, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_DEVANAGARI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_DEVANAGARI", RTL_TEXTENCODING_APPLE_DEVANAGARI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_DEVANAGARI, RTL_TEXTENCODING_ISO_8859_7 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_FARSI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_FARSI", RTL_TEXTENCODING_APPLE_FARSI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_FARSI, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_GREEK()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GREEK", RTL_TEXTENCODING_APPLE_GREEK );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GREEK, RTL_TEXTENCODING_ISO_8859_7 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_GUJARATI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GUJARATI", RTL_TEXTENCODING_APPLE_GUJARATI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GUJARATI, RTL_TEXTENCODING_ISO_8859_9 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_GURMUKHI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GURMUKHI", RTL_TEXTENCODING_APPLE_GURMUKHI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GURMUKHI, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_HEBREW()
-            {
-                check( "RTL_TEXTENCODING_APPLE_HEBREW", RTL_TEXTENCODING_APPLE_HEBREW );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_HEBREW, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_ICELAND()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ICELAND", RTL_TEXTENCODING_APPLE_ICELAND );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ICELAND, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_ROMANIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ROMANIAN", RTL_TEXTENCODING_APPLE_ROMANIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ROMANIAN, RTL_TEXTENCODING_ISO_8859_2 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_THAI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_THAI", RTL_TEXTENCODING_APPLE_THAI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_THAI, RTL_TEXTENCODING_APPLE_THAI );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_TURKISH()
-            {
-                check( "RTL_TEXTENCODING_APPLE_TURKISH", RTL_TEXTENCODING_APPLE_TURKISH );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_TURKISH, RTL_TEXTENCODING_ISO_8859_9 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_UKRAINIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_UKRAINIAN", RTL_TEXTENCODING_APPLE_UKRAINIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_UKRAINIAN, RTL_TEXTENCODING_ISO_8859_5 );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_CHINSIMP()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CHINSIMP", RTL_TEXTENCODING_APPLE_CHINSIMP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CHINSIMP, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_CHINTRAD()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CHINTRAD", RTL_TEXTENCODING_APPLE_CHINTRAD );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CHINTRAD, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_JAPANESE()
-            {
-                check( "RTL_TEXTENCODING_APPLE_JAPANESE", RTL_TEXTENCODING_APPLE_JAPANESE );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_JAPANESE, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_APPLE_KOREAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_KOREAN", RTL_TEXTENCODING_APPLE_KOREAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_KOREAN, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_MS_932()
-            {
-                check( "RTL_TEXTENCODING_MS_932", RTL_TEXTENCODING_MS_932 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_932, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_MS_936()
-            {
-                check( "RTL_TEXTENCODING_MS_936", RTL_TEXTENCODING_MS_936 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_936, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_MS_949()
-            {
-                check( "RTL_TEXTENCODING_MS_949", RTL_TEXTENCODING_MS_949 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_949, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_MS_950()
-            {
-                check( "RTL_TEXTENCODING_MS_950", RTL_TEXTENCODING_MS_950 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_950, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_SHIFT_JIS()
-            {
-                check( "RTL_TEXTENCODING_SHIFT_JIS", RTL_TEXTENCODING_SHIFT_JIS );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_SHIFT_JIS, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_GB_2312()
-            {
-                check( "RTL_TEXTENCODING_GB_2312", RTL_TEXTENCODING_GB_2312 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_GBT_12345()
-            {
-                check( "RTL_TEXTENCODING_GBT_12345", RTL_TEXTENCODING_GBT_12345 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GBT_12345, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_GBK()
-            {
-                check( "RTL_TEXTENCODING_GBK", RTL_TEXTENCODING_GBK );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GBK, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_BIG5()
-            {
-                check( "RTL_TEXTENCODING_BIG5", RTL_TEXTENCODING_BIG5 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_BIG5, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_EUC_JP()
-            {
-                check( "RTL_TEXTENCODING_EUC_JP", RTL_TEXTENCODING_EUC_JP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_JP, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_EUC_CN()
-            {
-                check( "RTL_TEXTENCODING_EUC_CN", RTL_TEXTENCODING_EUC_CN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_CN, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_EUC_TW()
-            {
-                check( "RTL_TEXTENCODING_EUC_TW", RTL_TEXTENCODING_EUC_TW );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_TW, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_2022_JP()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_JP", RTL_TEXTENCODING_ISO_2022_JP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_JP, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_2022_CN()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_CN", RTL_TEXTENCODING_ISO_2022_CN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_CN, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_KOI8_R()
-            {
-                check( "RTL_TEXTENCODING_KOI8_R", RTL_TEXTENCODING_KOI8_R );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_KOI8_R, RTL_TEXTENCODING_KOI8_R );
+        }
+
         void UnixCharsetFromTextEncoding_UTF7()
-            {
-                check( "RTL_TEXTENCODING_UTF7", RTL_TEXTENCODING_UTF7 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_UTF7, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_UTF8()
-            {
-                check( "RTL_TEXTENCODING_UTF8", RTL_TEXTENCODING_UTF8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_10()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_10", RTL_TEXTENCODING_ISO_8859_10 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_10, RTL_TEXTENCODING_ISO_8859_10 );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_8859_13()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_13", RTL_TEXTENCODING_ISO_8859_13 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_13, RTL_TEXTENCODING_ISO_8859_13 );
+        }
+
         void UnixCharsetFromTextEncoding_EUC_KR()
-            {
-                check( "RTL_TEXTENCODING_EUC_KR", RTL_TEXTENCODING_EUC_KR );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_KR, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_ISO_2022_KR()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_KR", RTL_TEXTENCODING_ISO_2022_KR );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_KR, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_JIS_X_0201()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0201", RTL_TEXTENCODING_JIS_X_0201 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0201, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_JIS_X_0208()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0208", RTL_TEXTENCODING_JIS_X_0208 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0208, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_JIS_X_0212()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0212", RTL_TEXTENCODING_JIS_X_0212 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0212, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_MS_1361()
-            {
-                check( "RTL_TEXTENCODING_MS_1361", RTL_TEXTENCODING_MS_1361 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1361, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_GB_18030()
-            {
-                check( "RTL_TEXTENCODING_GB_18030", RTL_TEXTENCODING_GB_18030 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GB_18030, RTL_TEXTENCODING_GBK );
+        }
+
         void UnixCharsetFromTextEncoding_BIG5_HKSCS()
-            {
-                check( "RTL_TEXTENCODING_BIG5_HKSCS", RTL_TEXTENCODING_BIG5_HKSCS );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_BIG5_HKSCS, RTL_TEXTENCODING_DONTKNOW );
+        }
+
         void UnixCharsetFromTextEncoding_TIS_620()
-            {
-                check( "RTL_TEXTENCODING_TIS_620", RTL_TEXTENCODING_TIS_620 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_TIS_620, RTL_TEXTENCODING_ISO_8859_1 );
+        }
+
         void UnixCharsetFromTextEncoding_KOI8_U()
-            {
-                check( "RTL_TEXTENCODING_KOI8_U", RTL_TEXTENCODING_KOI8_U );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_KOI8_U, RTL_TEXTENCODING_KOI8_U );
+        }
+
         void UnixCharsetFromTextEncoding_ISCII_DEVANAGARI()
-            {
-                check( "RTL_TEXTENCODING_ISCII_DEVANAGARI", RTL_TEXTENCODING_ISCII_DEVANAGARI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISCII_DEVANAGARI, RTL_TEXTENCODING_ISCII_DEVANAGARI );
+        }
+
         void UnixCharsetFromTextEncoding_JAVA_UTF8()
-            {
-                check( "RTL_TEXTENCODING_JAVA_UTF8", RTL_TEXTENCODING_JAVA_UTF8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JAVA_UTF8, RTL_TEXTENCODING_JAVA_UTF8 );
+        }
 
-        CPPUNIT_TEST_SUITE( getBestUnix );
+        CPPUNIT_TEST_SUITE( testBestUnix );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_MS_1252 );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_ROMAN );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_IBM_437 );
@@ -1140,19 +1019,27 @@ namespace rtl_tencinfo
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_MS_1256 );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_MS_1257 );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_MS_1258 );
+#if 0
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_ARABIC );
+#endif
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_CENTEURO );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_CROATIAN );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_CYRILLIC );
+#if 0
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_DEVANAGARI );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_FARSI );
+#endif
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_GREEK );
+#if 0
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_GUJARATI );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_GURMUKHI );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_HEBREW );
+#endif
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_ICELAND );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_ROMANIAN );
+#if 0
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_THAI );
+#endif
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_TURKISH );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_UKRAINIAN );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_APPLE_CHINSIMP );
@@ -1188,497 +1075,474 @@ namespace rtl_tencinfo
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_BIG5_HKSCS );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_TIS_620 );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_KOI8_U );
+#if 0
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_ISCII_DEVANAGARI );
         CPPUNIT_TEST( UnixCharsetFromTextEncoding_JAVA_UTF8 );
+#endif
 
         CPPUNIT_TEST_SUITE_END( );
     };
 
- // -----------------------------------------------------------------------------
-
-
-    class getBestWindows : public CppUnit::TestFixture
+    class testBestWindows : public CppUnit::TestFixture
     {
     public:
         void setUp()
             {
             }
 
-        void check( const sal_Char* _pRTL_TEXTENCODING, rtl_TextEncoding _aCurrentEncode )
-            {
-                const sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( _aCurrentEncode );
-                if (nCharSet == 1)
-                {
-                    t_print("rtl_getBestWindowsCharsetFromTextEncoding(%s) (%d) doesn't seem to exist.\n\n", _pRTL_TEXTENCODING, _aCurrentEncode);
-                }
-                else
-                {
-                    t_print(T_VERBOSE, "'%s' is charset: '%d'\n", _pRTL_TEXTENCODING, nCharSet);
-
-                    rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromWindowsCharset( nCharSet );
-                    if (_aCurrentEncode != eTextEnc &&
-                        eTextEnc != RTL_TEXTENCODING_DONTKNOW)
-                    {
-                        t_print("rtl_getBestUnixCharsetFromTextEncoding(%s) is charset: %d\n", _pRTL_TEXTENCODING, nCharSet);
-                        t_print("rtl_getTextEncodingFromWindowsCharset() differ: %s %d -> %d\n\n", _pRTL_TEXTENCODING, _aCurrentEncode, eTextEnc );
-                    }
-                    // rtl::OString sError = "getTextEncodingFromWindowsCharset(";
-                    // sError += rtl::OString::valueOf(nCharSet);
-                    // sError += ") returns nul.";
-
-                    // CPPUNIT_ASSERT_MESSAGE(sError.getStr(), eTextEnc != RTL_TEXTENCODING_DONTKNOW);
-                    // CPPUNIT_ASSERT_MESSAGE("Does not realize itself", _aCurrentEncode == eTextEnc );
-                }
-            }
+        void check(rtl_TextEncoding nIn, rtl_TextEncoding nOut)
+        {
+            const sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding(nIn);
+            rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromWindowsCharset(nCharSet);
+            CPPUNIT_ASSERT_MESSAGE("rtl_getBestUnixCharsetFromTextEncoding && rtl_getTextEncodingFromWindowsCharset differ", eTextEnc = nOut);
+        }
 
-        // ----------------------------------------
         void WindowsCharsetFromTextEncoding_MS_1252()
-            {
-                check( "RTL_TEXTENCODING_MS_1252", RTL_TEXTENCODING_MS_1252 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1252, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_ROMAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ROMAN", RTL_TEXTENCODING_APPLE_ROMAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ROMAN, RTL_TEXTENCODING_APPLE_ROMAN );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_437()
-            {
-                check( "RTL_TEXTENCODING_IBM_437", RTL_TEXTENCODING_IBM_437 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_437, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_850()
-            {
-                check( "RTL_TEXTENCODING_IBM_850", RTL_TEXTENCODING_IBM_850 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_850, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_860()
-            {
-                check( "RTL_TEXTENCODING_IBM_860", RTL_TEXTENCODING_IBM_860 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_860, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_861()
-            {
-                check( "RTL_TEXTENCODING_IBM_861", RTL_TEXTENCODING_IBM_861 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_861, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_863()
-            {
-                check( "RTL_TEXTENCODING_IBM_863", RTL_TEXTENCODING_IBM_863 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_863, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_865()
-            {
-                check( "RTL_TEXTENCODING_IBM_865", RTL_TEXTENCODING_IBM_865 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_865, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_SYMBOL()
-            {
-                check( "RTL_TEXTENCODING_SYMBOL", RTL_TEXTENCODING_SYMBOL );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_SYMBOL, RTL_TEXTENCODING_SYMBOL );
+        }
+
         void WindowsCharsetFromTextEncoding_ASCII_US()
-            {
-                check( "RTL_TEXTENCODING_ASCII_US", RTL_TEXTENCODING_ASCII_US );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ASCII_US, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_1()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_1", RTL_TEXTENCODING_ISO_8859_1 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_1, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_2()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_2", RTL_TEXTENCODING_ISO_8859_2 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_2, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_3()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_3", RTL_TEXTENCODING_ISO_8859_3 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_3, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_4()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_4", RTL_TEXTENCODING_ISO_8859_4 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_4, RTL_TEXTENCODING_MS_1257 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_5()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_5", RTL_TEXTENCODING_ISO_8859_5 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_5, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_6()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_6", RTL_TEXTENCODING_ISO_8859_6 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_6, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_7()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_7", RTL_TEXTENCODING_ISO_8859_7 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_7, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_8()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_8", RTL_TEXTENCODING_ISO_8859_8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_8, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_9()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_9", RTL_TEXTENCODING_ISO_8859_9 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_9, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_14()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_14", RTL_TEXTENCODING_ISO_8859_14 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_14, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_15()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_15", RTL_TEXTENCODING_ISO_8859_15 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_15, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_737()
-            {
-                check( "RTL_TEXTENCODING_IBM_737", RTL_TEXTENCODING_IBM_737 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_737, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_775()
-            {
-                check( "RTL_TEXTENCODING_IBM_775", RTL_TEXTENCODING_IBM_775 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_775, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_852()
-            {
-                check( "RTL_TEXTENCODING_IBM_852", RTL_TEXTENCODING_IBM_852 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_852, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_855()
-            {
-                check( "RTL_TEXTENCODING_IBM_855", RTL_TEXTENCODING_IBM_855 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_855, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_857()
-            {
-                check( "RTL_TEXTENCODING_IBM_857", RTL_TEXTENCODING_IBM_857 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_857, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_862()
-            {
-                check( "RTL_TEXTENCODING_IBM_862", RTL_TEXTENCODING_IBM_862 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_862, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_864()
-            {
-                check( "RTL_TEXTENCODING_IBM_864", RTL_TEXTENCODING_IBM_864 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_864, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_866()
-            {
-                check( "RTL_TEXTENCODING_IBM_866", RTL_TEXTENCODING_IBM_866 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_866, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_IBM_869()
-            {
-                check( "RTL_TEXTENCODING_IBM_869", RTL_TEXTENCODING_IBM_869 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_IBM_869, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_874()
-            {
-                check( "RTL_TEXTENCODING_MS_874", RTL_TEXTENCODING_MS_874 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_874, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1250()
-            {
-                check( "RTL_TEXTENCODING_MS_1250", RTL_TEXTENCODING_MS_1250 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1250, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1251()
-            {
-                check( "RTL_TEXTENCODING_MS_1251", RTL_TEXTENCODING_MS_1251 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1251, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1253()
-            {
-                check( "RTL_TEXTENCODING_MS_1253", RTL_TEXTENCODING_MS_1253 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1253, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1254()
-            {
-                check( "RTL_TEXTENCODING_MS_1254", RTL_TEXTENCODING_MS_1254 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1254, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1255()
-            {
-                check( "RTL_TEXTENCODING_MS_1255", RTL_TEXTENCODING_MS_1255 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1255, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1256()
-            {
-                check( "RTL_TEXTENCODING_MS_1256", RTL_TEXTENCODING_MS_1256 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1256, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1257()
-            {
-                check( "RTL_TEXTENCODING_MS_1257", RTL_TEXTENCODING_MS_1257 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1257, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1258()
-            {
-                check( "RTL_TEXTENCODING_MS_1258", RTL_TEXTENCODING_MS_1258 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1258, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_ARABIC()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ARABIC", RTL_TEXTENCODING_APPLE_ARABIC );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ARABIC, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_CENTEURO()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CENTEURO", RTL_TEXTENCODING_APPLE_CENTEURO );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CENTEURO, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_CROATIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CROATIAN", RTL_TEXTENCODING_APPLE_CROATIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CROATIAN, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_CYRILLIC()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CYRILLIC", RTL_TEXTENCODING_APPLE_CYRILLIC );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CYRILLIC, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_DEVANAGARI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_DEVANAGARI", RTL_TEXTENCODING_APPLE_DEVANAGARI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_DEVANAGARI, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_FARSI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_FARSI", RTL_TEXTENCODING_APPLE_FARSI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_FARSI, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_GREEK()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GREEK", RTL_TEXTENCODING_APPLE_GREEK );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GREEK, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_GUJARATI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GUJARATI", RTL_TEXTENCODING_APPLE_GUJARATI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GUJARATI, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_GURMUKHI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_GURMUKHI", RTL_TEXTENCODING_APPLE_GURMUKHI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_GURMUKHI, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_HEBREW()
-            {
-                check( "RTL_TEXTENCODING_APPLE_HEBREW", RTL_TEXTENCODING_APPLE_HEBREW );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_HEBREW, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_ICELAND()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ICELAND", RTL_TEXTENCODING_APPLE_ICELAND );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ICELAND, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_ROMANIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_ROMANIAN", RTL_TEXTENCODING_APPLE_ROMANIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_ROMANIAN, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_THAI()
-            {
-                check( "RTL_TEXTENCODING_APPLE_THAI", RTL_TEXTENCODING_APPLE_THAI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_THAI, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_TURKISH()
-            {
-                check( "RTL_TEXTENCODING_APPLE_TURKISH", RTL_TEXTENCODING_APPLE_TURKISH );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_TURKISH, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_UKRAINIAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_UKRAINIAN", RTL_TEXTENCODING_APPLE_UKRAINIAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_UKRAINIAN, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_CHINSIMP()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CHINSIMP", RTL_TEXTENCODING_APPLE_CHINSIMP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CHINSIMP, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_CHINTRAD()
-            {
-                check( "RTL_TEXTENCODING_APPLE_CHINTRAD", RTL_TEXTENCODING_APPLE_CHINTRAD );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_CHINTRAD, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_JAPANESE()
-            {
-                check( "RTL_TEXTENCODING_APPLE_JAPANESE", RTL_TEXTENCODING_APPLE_JAPANESE );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_JAPANESE, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_APPLE_KOREAN()
-            {
-                check( "RTL_TEXTENCODING_APPLE_KOREAN", RTL_TEXTENCODING_APPLE_KOREAN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_APPLE_KOREAN, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_932()
-            {
-                check( "RTL_TEXTENCODING_MS_932", RTL_TEXTENCODING_MS_932 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_932, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_936()
-            {
-                check( "RTL_TEXTENCODING_MS_936", RTL_TEXTENCODING_MS_936 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_936, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_949()
-            {
-                check( "RTL_TEXTENCODING_MS_949", RTL_TEXTENCODING_MS_949 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_949, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_950()
-            {
-                check( "RTL_TEXTENCODING_MS_950", RTL_TEXTENCODING_MS_950 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_950, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_SHIFT_JIS()
-            {
-                check( "RTL_TEXTENCODING_SHIFT_JIS", RTL_TEXTENCODING_SHIFT_JIS );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_SHIFT_JIS, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_GB_2312()
-            {
-                check( "RTL_TEXTENCODING_GB_2312", RTL_TEXTENCODING_GB_2312 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_GBT_12345()
-            {
-                check( "RTL_TEXTENCODING_GBT_12345", RTL_TEXTENCODING_GBT_12345 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GBT_12345, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_GBK()
-            {
-                check( "RTL_TEXTENCODING_GBK", RTL_TEXTENCODING_GBK );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GBK, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_BIG5()
-            {
-                check( "RTL_TEXTENCODING_BIG5", RTL_TEXTENCODING_BIG5 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_BIG5, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_EUC_JP()
-            {
-                check( "RTL_TEXTENCODING_EUC_JP", RTL_TEXTENCODING_EUC_JP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_JP, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_EUC_CN()
-            {
-                check( "RTL_TEXTENCODING_EUC_CN", RTL_TEXTENCODING_EUC_CN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_CN, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_EUC_TW()
-            {
-                check( "RTL_TEXTENCODING_EUC_TW", RTL_TEXTENCODING_EUC_TW );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_TW, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_2022_JP()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_JP", RTL_TEXTENCODING_ISO_2022_JP );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_JP, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_2022_CN()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_CN", RTL_TEXTENCODING_ISO_2022_CN );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_CN, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_KOI8_R()
-            {
-                check( "RTL_TEXTENCODING_KOI8_R", RTL_TEXTENCODING_KOI8_R );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_KOI8_R, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_UTF7()
-            {
-                check( "RTL_TEXTENCODING_UTF7", RTL_TEXTENCODING_UTF7 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_UTF7, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_UTF8()
-            {
-                check( "RTL_TEXTENCODING_UTF8", RTL_TEXTENCODING_UTF8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_10()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_10", RTL_TEXTENCODING_ISO_8859_10 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_10, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_8859_13()
-            {
-                check( "RTL_TEXTENCODING_ISO_8859_13", RTL_TEXTENCODING_ISO_8859_13 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_8859_13, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_EUC_KR()
-            {
-                check( "RTL_TEXTENCODING_EUC_KR", RTL_TEXTENCODING_EUC_KR );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_EUC_KR, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISO_2022_KR()
-            {
-                check( "RTL_TEXTENCODING_ISO_2022_KR", RTL_TEXTENCODING_ISO_2022_KR );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISO_2022_KR, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_JIS_X_0201()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0201", RTL_TEXTENCODING_JIS_X_0201 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0201, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_JIS_X_0208()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0208", RTL_TEXTENCODING_JIS_X_0208 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0208, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_JIS_X_0212()
-            {
-                check( "RTL_TEXTENCODING_JIS_X_0212", RTL_TEXTENCODING_JIS_X_0212 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JIS_X_0212, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_MS_1361()
-            {
-                check( "RTL_TEXTENCODING_MS_1361", RTL_TEXTENCODING_MS_1361 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_MS_1361, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_GB_18030()
-            {
-                check( "RTL_TEXTENCODING_GB_18030", RTL_TEXTENCODING_GB_18030 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_GB_18030, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_BIG5_HKSCS()
-            {
-                check( "RTL_TEXTENCODING_BIG5_HKSCS", RTL_TEXTENCODING_BIG5_HKSCS );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_BIG5_HKSCS, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_TIS_620()
-            {
-                check( "RTL_TEXTENCODING_TIS_620", RTL_TEXTENCODING_TIS_620 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_TIS_620, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_KOI8_U()
-            {
-                check( "RTL_TEXTENCODING_KOI8_U", RTL_TEXTENCODING_KOI8_U );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_KOI8_U, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_ISCII_DEVANAGARI()
-            {
-                check( "RTL_TEXTENCODING_ISCII_DEVANAGARI", RTL_TEXTENCODING_ISCII_DEVANAGARI );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_ISCII_DEVANAGARI, RTL_TEXTENCODING_MS_1252 );
+        }
+
         void WindowsCharsetFromTextEncoding_JAVA_UTF8()
-            {
-                check( "RTL_TEXTENCODING_JAVA_UTF8", RTL_TEXTENCODING_JAVA_UTF8 );
-            }
-        // ----------------------------------------
+        {
+            check( RTL_TEXTENCODING_JAVA_UTF8, RTL_TEXTENCODING_MS_1252 );
+        }
 
-        CPPUNIT_TEST_SUITE( getBestWindows );
+        CPPUNIT_TEST_SUITE( testBestWindows );
         CPPUNIT_TEST( WindowsCharsetFromTextEncoding_MS_1252 );
         CPPUNIT_TEST( WindowsCharsetFromTextEncoding_APPLE_ROMAN );

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list