Attachment #4919 for issue #9851

View | Details | Raw Unified | Return to issue 9851
Collapse All | Expand All

Lines 174-179 Link Here

(-)OOO_1_1_orig/dtrans/source/X11/X11_selection.cxx (+1 lines)
174	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },	174	{ 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 },
175	// eastern european encodings	175	// eastern european encodings
176	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },	176	{ 0, "text/plain;charset=koi8-r", "KOI8-R", 8 },
		177	{ 0, "text/plain;charset=koi8-u", "KOI8-U", 8 },
177	// String (== iso8859-1)	178	// String (== iso8859-1)
178	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },	179	{ XA_STRING, "text/plain;charset=string", "STRING", 8 },
179	// special for compound text	180	// special for compound text

Lines 149-154 Link Here

(-)OOO_1_1_orig/i18npool/source/localedata/localedata.cxx (+1 lines)
149	{ "pt_BR", lcl_ASCII },	149	{ "pt_BR", lcl_ASCII },
150	{ "pt_PT", lcl_ASCII },	150	{ "pt_PT", lcl_ASCII },
151	{ "ru_RU", lcl_ASCII },	151	{ "ru_RU", lcl_ASCII },
		152	{ "uk_UA", lcl_ASCII },
152	{ "sv_FI", lcl_ASCII },	153	{ "sv_FI", lcl_ASCII },
153	{ "tr_TR", lcl_ASCII },	154	{ "tr_TR", lcl_ASCII },
154		155




#define RTL_TEXTENCODING_MS_1361                (RTL_TEXTENC_CAST( 84 ))
#define RTL_TEXTENCODING_GB_18030               (RTL_TEXTENC_CAST( 85 ))
#define RTL_TEXTENCODING_BIG5_HKSCS             (RTL_TEXTENC_CAST( 86 ))
#define RTL_TEXTENCODING_KOI8_U                 (RTL_TEXTENC_CAST( 87 ))

#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 88 ))

#define RTL_TEXTENCODING_USER_START             (RTL_TEXTENC_CAST( 0x8000 ))
#define RTL_TEXTENCODING_USER_END               (RTL_TEXTENC_CAST( 0xEFFF ))

Cyrillic (DOS/OS2-866/Russian)                  RTL_TEXTENCODING_IBM_866
Cyrillic (ISO-8859-5)                           RTL_TEXTENCODING_ISO_8859_5
Cyrillic (KOI8-R)                               RTL_TEXTENCODING_KOI8_R
Cyrillic (KOI8-U)                               RTL_TEXTENCODING_KOI8_U
Cyrillic (Windows-1251)                         RTL_TEXTENCODING_MS_1251

Greek (Apple Macintosh)                         RTL_TEXTENCODING_APPLE_GREEK




    { "ISO8859-8",      RTL_TEXTENCODING_ISO_8859_8     },
    { "ISO8859-9",      RTL_TEXTENCODING_ISO_8859_9     },
    { "KOI8-R",         RTL_TEXTENCODING_KOI8_R         },
    { "KOI8-U",         RTL_TEXTENCODING_KOI8_U         },
    { "PCK",            RTL_TEXTENCODING_MS_932         },
    { "SUN_EU_GREEK",   RTL_TEXTENCODING_ISO_8859_7     }, /* 8859-7 + Euro */
    { "TIS620.2533",    RTL_TEXTENCODING_MS_874         }, /* th_TH.TIS620 */

    { "JUS_I.B1.003-SERB",          RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-146 SERBIAN */
    { "KOI-8",                      RTL_TEXTENCODING_DONTKNOW },
    { "KOI8-R",                     RTL_TEXTENCODING_KOI8_R },
    { "KOI8-U",                     RTL_TEXTENCODING_KOI8_U },
    { "KSC5636",                    RTL_TEXTENCODING_DONTKNOW },    /* ISO646-KR */
    { "LATIN-GREEK",                RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-19 */
    { "LATIN-GREEK-1",              RTL_TEXTENCODING_DONTKNOW },    /* ISO-IR-27 */

    { "iso8859-8",    RTL_TEXTENCODING_ISO_8859_8  },
    { "iso8859-9",    RTL_TEXTENCODING_ISO_8859_9  },
    { "koi8-r",       RTL_TEXTENCODING_KOI8_R      },
    { "koi8-u",       RTL_TEXTENCODING_KOI8_U      },
    { "pck",          RTL_TEXTENCODING_MS_932      },
#if (0)
    { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW    },




        "koi8-r",
        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
    /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */

/* ======================================================================= */

/* KOI8_U */
/* Standard Charset for Ukrainian Cyrillic */
/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
/* Convert-Tables: typed per hand */
/* Last-Changes from us: */

#define KOI8UUNI_START                  0x80
#define KOI8UUNI_END                    0xFF
static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] =
{
/*       0       1       2       3       4       5       6       7 */
/*       8       9       A       B       C       D       E       F */
    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */
    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */
    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */
    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */
    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */
    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */
    0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */
    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */
    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */
    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */
    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */
    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */
    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */
    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */
    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */
    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A  /* 0xF0 */
};

/* ----------------------------------------------------------------------- */

#define KOI8UCHAR_START                 0x0410
#define KOI8UCHAR_END                   0x044F
static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] =
{
/*     0     1     2     3     4     5     6     7 */
/*     8     9     A     B     C     D     E     F */
    0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */
    0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */
    0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */
    0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */
    0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */
    0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */
    0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */
    0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1  /* 0x0440 */
};

/* ----------------------------------------------------------------------- */

#define KOI8UTOCHARTABEX_COUNT          72
static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] =
{
  { 0x00A0, 0x9A },
  { 0x00A9, 0xBF },
  { 0x00B0, 0x9C },
  { 0x00B2, 0x9D },
  { 0x00B7, 0x9E },
  { 0x00F7, 0x9F },
  { 0x0401, 0xB3 },
  { 0x0404, 0xB4 },
  { 0x0406, 0xB6 },
  { 0x0407, 0xB7 },
  { 0x0451, 0xA3 },
  { 0x0454, 0xA4 },
  { 0x0456, 0xA6 },
  { 0x0457, 0xA7 },
  { 0x0490, 0xBD },
  { 0x0491, 0xAD },
  { 0x2219, 0x95 },
  { 0x221A, 0x96 },
  { 0x2248, 0x97 },
  { 0x2264, 0x98 },
  { 0x2265, 0x99 },
  { 0x2320, 0x93 },
  { 0x2321, 0x9B },
  { 0x2500, 0x80 },
  { 0x2502, 0x81 },
  { 0x250C, 0x82 },
  { 0x2510, 0x83 },
  { 0x2514, 0x84 },
  { 0x2518, 0x85 },
  { 0x251C, 0x86 },
  { 0x2524, 0x87 },
  { 0x252C, 0x88 },
  { 0x2534, 0x89 },
  { 0x253C, 0x8A },
  { 0x2550, 0xA0 },
  { 0x2551, 0xA1 },
  { 0x2552, 0xA2 },
  { 0x2553, 0xA4 },
  { 0x2554, 0xA5 },
  { 0x2555, 0xA6 },
  { 0x2556, 0xA7 },
  { 0x2557, 0xA8 },
  { 0x2558, 0xA9 },
  { 0x2559, 0xAA },
  { 0x255A, 0xAB },
  { 0x255B, 0xAC },
  { 0x255C, 0xAD },
  { 0x255D, 0xAE },
  { 0x255E, 0xAF },
  { 0x255F, 0xB0 },
  { 0x2560, 0xB1 },
  { 0x2561, 0xB2 },
  { 0x2562, 0xB4 },
  { 0x2563, 0xB5 },
  { 0x2564, 0xB6 },
  { 0x2565, 0xB7 },
  { 0x2566, 0xB8 },
  { 0x2567, 0xB9 },
  { 0x2568, 0xBA },
  { 0x2569, 0xBB },
  { 0x256A, 0xBC },
  { 0x256B, 0xBD },
  { 0x256C, 0xBE },
  { 0x2580, 0x8B },
  { 0x2584, 0x8C },
  { 0x2588, 0x8D },
  { 0x258C, 0x8E },
  { 0x2590, 0x8F },
  { 0x2591, 0x90 },
  { 0x2592, 0x91 },
  { 0x2593, 0x92 },
  { 0x25A0, 0x94 }
};

/* ----------------------------------------------------------------------- */

static ImplByteConvertData const aImplKOI8UByteCvtData =
{
    aImplKOI8UToUniTab,
    NULL,
    KOI8UUNI_START, KOI8UUNI_END,
    NOTABUNI_START, NOTABUNI_END,
    aImplKOI8UToCharTab,
    NULL,
    aImplKOI8UToCharTabEx,
    KOI8UCHAR_START, KOI8UCHAR_END,
    NOTABCHAR_START, NOTABCHAR_END,
    KOI8UTOCHARTABEX_COUNT
};

/* ----------------------------------------------------------------------- */

static ImplTextEncodingData const aImplKOI8UTextEncodingData
    = { { &aImplKOI8UByteCvtData,
          ImplCharToUnicode,
          ImplUnicodeToChar,
          NULL,
          NULL,
          NULL,
          NULL,
          NULL,
          NULL },
        RTL_TEXTENCODING_KOI8_U,
        1,
        1,
        1,
        204,
        "koi8-u",
        "koi8-u",
        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME };
    /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */




    static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
    {
        { "r", RTL_TEXTENCODING_KOI8_R },
        { "u", RTL_TEXTENCODING_KOI8_U },
        { NULL, RTL_TEXTENCODING_DONTKNOW }
    };


    static ImplStrCharsetDef aUnixCharsetJISX0208Tab[] =
    {
        { NULL, RTL_TEXTENCODING_JIS_X_0208 }

        { "windows1256", RTL_TEXTENCODING_MS_1256 },
        { "windows1257", RTL_TEXTENCODING_MS_1257 },
        { "windows1258", RTL_TEXTENCODING_MS_1258 },
        { "koi8u", RTL_TEXTENCODING_KOI8_U },
        { NULL, RTL_TEXTENCODING_DONTKNOW }
    };


        { "iso10646us", RTL_TEXTENCODING_ASCII_US },
        { "iso646irv", RTL_TEXTENCODING_ASCII_US },
        { "cskoi8r", RTL_TEXTENCODING_KOI8_R },
        { "cskoi8u", RTL_TEXTENCODING_KOI8_U },
        { "ibm437", RTL_TEXTENCODING_IBM_437 },
        { "cp437", RTL_TEXTENCODING_IBM_437 },
        { "437", RTL_TEXTENCODING_IBM_437 },

Lines 254-260 Link Here

(-)OOO_1_1_orig/sal/textenc/textenc.c (-1 / +2 lines)
254	&aImplJISX0212TextEncodingData, /* JIS_X_0212 */	254	&aImplJISX0212TextEncodingData, /* JIS_X_0212 */
255	&aImplMS1361TextEncodingData, /* MS_1361 */	255	&aImplMS1361TextEncodingData, /* MS_1361 */
256	&aImplGb18030TextEncodingData, /* GB_18030 */	256	&aImplGb18030TextEncodingData, /* GB_18030 */
257	&aImplBig5HkscsTextEncodingData }; /* BIG5_HKSCS */	257	&aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */
		258	&aImplKOI8UTextEncodingData }; /* KOI8_U */
258	OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW	259	OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW
259	&& nEncoding <= RTL_TEXTENCODING_UNICODE,	260	&& nEncoding <= RTL_TEXTENCODING_UNICODE,
260	"specification violation");	261	"specification violation");




pol$(LANG_GUI)=-CHARSET_microsoft-cp1250
slov$(LANG_GUI)=-CHARSET_microsoft-cp1250
russ$(LANG_GUI)=-CHARSET_microsoft-cp1251
ukra$(LANG_GUI)=-CHARSET_microsoft-cp1251
cz$(LANG_GUI)=-CHARSET_microsoft-cp1250
hung$(LANG_GUI)=-CHARSET_microsoft-cp1250
japn$(LANG_GUI)=-CHARSET_UTF8

polOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
slovOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
russOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
ukraOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
czOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
hungOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
japnOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW

polWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
slovWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
russWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
ukraWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
czWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
hungWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
japnOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW

.IF "$(solarlang)" == "russ"
RSCLANG=RUSSIAN $(IBM_PC_852)
LANGEXT=07
.ENDIF
.IF "$(solarlang)" == "ukra"
RSCLANG=UKRAINIAN $(IBM_PC_852)
LANGEXT=38
.ENDIF
.IF "$(solarlang)" == "slov"
RSCLANG=SLOVAK $(IBM_PC_852)




iso_07=ru
.ENDIF

.IF "$(RES_UKRA)"!="" || "$(give_me_all_languages)"!=""
alllangext+=38
ukra$(LANG_GUI)*=$(default$(LANG_GUI))
cmd_ukra:=ukra 38 -lgUKRAINIAN $(IBM_PC_852) $(ukra$(LANG_GUI))
lang_38=ukra
longlang_38=ukrainian
langext_38=38
rsclang_38=-lgUKRAINIAN $(IBM_PC_852)
rescharset_38=$(ukra$(LANG_GUI))
RCLANGFLAGS_38+= -d UKRA
iso_38=uk
.ENDIF

.IF "$(RES_POL)"!="" || "$(give_me_all_languages)"!=""
alllangext+=48
pol$(LANG_GUI)*=$(default$(LANG_GUI))




        < "Japanisch (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
        < "Chinesisch vereinfacht (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
		< "Kyrillisch (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
		< "Kyrillisch (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
		< "Osteuropa (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;

        < "Japanese (ISO-2022-JP)"                          ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
        < "Chinese Simplified (ISO-2022-CN)"                ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
		< "Cyrillic (KOI8-R)"                               ; RTL_TEXTENCODING_KOI8_R			; > ;
		< "Cyrillic (KOI8-U)"                               ; RTL_TEXTENCODING_KOI8_U			; > ;
		< "Unicode (UTF-7)"                                 ; RTL_TEXTENCODING_UTF7				; > ;
		< "Unicode (UTF-8)"                                 ; RTL_TEXTENCODING_UTF8				; > ;
		< "Central European (ISO-8859-10)"                  ; RTL_TEXTENCODING_ISO_8859_10		; > ;

        < "Japanisch (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
        < "Chinesisch vereinfacht (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
		< "Kyrillisch (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
		< "Kyrillisch (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
		< "Osteuropa (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;

        < "Japanese (ISO-2022-JP)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
        < "Chinese simplified (ISO-2022-CN)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;
		< "Cyrillic (KOI8-R)"								; RTL_TEXTENCODING_KOI8_R			; > ;
		< "Cyrillic (KOI8-U)"								; RTL_TEXTENCODING_KOI8_U			; > ;
		< "Unicode (UTF-7)"									; RTL_TEXTENCODING_UTF7				; > ;
		< "Unicode (UTF-8)"									; RTL_TEXTENCODING_UTF8				; > ;
		< "Eastern Europe (ISO-8859-10)"							; RTL_TEXTENCODING_ISO_8859_10		; > ;

		< "Êèòàéñêèé òðàäèöèîííûé (BIG5)"			; RTL_TEXTENCODING_GBK				; > ;
		< "ßïîíñêèé (EUC-JP)"					; RTL_TEXTENCODING_BIG5				; > ;
		< "Êèòàéñêèé óïðîùåííûé (EUC-CN)"								; RTL_TEXTENCODING_EUC_JP			; > ;
		< "Êèðèëëè÷åñêèé (KOI8-R)"					; RTL_TEXTENCODING_KOI8_R			; > ;
		< "Êèðèëëè÷åñêèé (KOI8-U)"					; RTL_TEXTENCODING_KOI8_U			; > ;
        < "Þíèêîä (UTF-7)"                ; RTL_TEXTENCODING_EUC_TW           ; > ;
        < "Þíèêîä (UTF-8)"                         ; RTL_TEXTENCODING_ISO_2022_JP      ; > ;
        < "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)"            ; RTL_TEXTENCODING_ISO_2022_CN      ; > ;




		sToken081[] = "JIS_X_212",
		sToken082[] = "MS_1361",
		sToken083[] = "GB_18030",
		sToken084[] = "KOI8_U",
		sToken085[] = "UNICODE_2"
			;
	struct _Dummy_MAP
	{

		RTL_TEXTENCODING_JIS_X_0212,            sToken081,
		RTL_TEXTENCODING_MS_1361,               sToken082,
		RTL_TEXTENCODING_GB_18030,              sToken083,
		RTL_TEXTENCODING_KOI8_U,                sToken084,
		RTL_TEXTENCODING_UCS2,              	sToken085
	};

	BOOL bFnd = FALSE;

Lines 141-146 Link Here

(-)OOO_1_1_orig/sysui/tools/lngconv/lngconv.cxx (+1 lines)
141	{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },	141	{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },
142	{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },	142	{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },
143	{ "koi8-r", RTL_TEXTENCODING_KOI8_R },	143	{ "koi8-r", RTL_TEXTENCODING_KOI8_R },
		144	{ "koi8-u", RTL_TEXTENCODING_KOI8_U },
144	{ "pck", RTL_TEXTENCODING_MS_932 },	145	{ "pck", RTL_TEXTENCODING_MS_932 },
145	#if (0)	146	#if (0)
146	{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },	147	{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },

Lines 7-12 Link Here

(-)OOO_1_1_orig/sysui/unix/office/cde/locales.tab (+1 lines)
7	locales+=$(assign locale_34 = es es.UTF-8)	7	locales+=$(assign locale_34 = es es.UTF-8)
8	locales+=$(assign locale_35 = fi fi.UTF-8)	8	locales+=$(assign locale_35 = fi fi.UTF-8)
9	locales+=$(assign locale_37 = ca)	9	locales+=$(assign locale_37 = ca)
		10	locales+=$(assign locale_38 = uk)
10	locales+=$(assign locale_39 = it it.UTF-8)	11	locales+=$(assign locale_39 = it it.UTF-8)
11	locales+=$(assign locale_45 = da da.UTF-8)	12	locales+=$(assign locale_45 = da da.UTF-8)
12	locales+=$(assign locale_46 = sv sv.UTF-8)	13	locales+=$(assign locale_46 = sv sv.UTF-8)

Lines 1-11 Link Here

(-)OOO_1_1_orig/sysui/unix/office/gnome/locales.tab (-1 / +2 lines)
1	01 = en	1	01 = en
2	03 = pt	2	03 = pt
3	07 = ru ru.ISO8859-5 ru.ANSI-1251 ru.KOI8-R	3	07 = ru ru.ISO8859-5 ru.ANSI-1251 ru.KOI8-R ru_RU.KOI8-R ru.CP1251 ru_RU.CP1251
4	30 = gr	4	30 = gr
5	31 = nl	5	31 = nl
6	33 = fr	6	33 = fr
7	34 = es	7	34 = es
8	37 = ca	8	37 = ca
		9	38 = uk
9	39 = it	10	39 = it
10	45 = da	11	45 = da
11	46 = sv	12	46 = sv

Lines 1633-1639 Link Here

(-)OOO_1_1_orig/tools/source/inet/inetmime.cxx (-2 / +23 lines)
1633	"ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047	1633	"ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047
1634	"ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047	1634	"ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047
1635	"EUC-KR", // RTL_TEXTENCODING_EUC_KR	1635	"EUC-KR", // RTL_TEXTENCODING_EUC_KR
1636	"ISO-2022-KR" }; // RTL_TEXTENCODING_ISO_2022_KR	1636	"ISO-2022-KR", // RTL_TEXTENCODING_ISO_2022_KR
		1637	"KOI8-U" }; // RTL_TEXTENCODING_KOI8_U
		1638
1637	DBG_ASSERT(aMap[eEncoding],	1639	DBG_ASSERT(aMap[eEncoding],
1638	"INetMIME::getCharsetName(): Unsupported encoding");	1640	"INetMIME::getCharsetName(): Unsupported encoding");
1639	return aMap[eEncoding];	1641	return aMap[eEncoding];
Lines 1841-1847 Link Here
1841	{ "ISO-10646-UCS-4", RTL_TEXTENCODING_UCS4 },	1843	{ "ISO-10646-UCS-4", RTL_TEXTENCODING_UCS4 },
1842	{ "CSUCS4", RTL_TEXTENCODING_UCS4 },	1844	{ "CSUCS4", RTL_TEXTENCODING_UCS4 },
1843	{ "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 },	1845	{ "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 },
1844	{ "CSUNICODE", RTL_TEXTENCODING_UCS2 } };	1846	{ "CSUNICODE", RTL_TEXTENCODING_UCS2 },
		1847	{ "KOI8-U", RTL_TEXTENCODING_KOI8_U } };
1845		1848
1846	//============================================================================	1849	//============================================================================
1847	template< typename T >	1850	template< typename T >
Lines 2012-2017 Link Here
2012	// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>	2015	// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>
2013	// version 1.0 of 18 August 1999	2016	// version 1.0 of 18 August 1999
2014		2017
		2018	static const sal_uInt32 aKOI8URanges[]
		2019	= { 0, 0x7F, 0xA0, 0xA0, 0xA9, 0xA9, 0xB0, 0xB0, 0xB2, 0xB2,
		2020	0xB7, 0xB7, 0xF7, 0xF7, 0x401, 0x401, 0x410, 0x44F, 0x451, 0x451,
		2021	0x2219, 0x221A, 0x2248, 0x2248, 0x2264, 0x2265, 0x2320, 0x2321,
		2022	0x2500, 0x2500, 0x2502, 0x2502, 0x250C, 0x250C, 0x2510, 0x2510,
		2023	0x2514, 0x2514, 0x2518, 0x2518, 0x251C, 0x251C, 0x2524, 0x2524,
		2024	0x252C, 0x252C, 0x2534, 0x2534, 0x253C, 0x253C, 0x2550, 0x256C,
		2025	0x2580, 0x2580, 0x2584, 0x2584, 0x2588, 0x2588, 0x258C, 0x258C,
		2026	0x2590, 0x2593, 0x25A0, 0x25A0, sal_uInt32(-1) };
		2027	// <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT>
		2028	// version 1.0 of 18 August 1999
		2029
2015	static const sal_uInt32 aWindows1252Ranges[]	2030	static const sal_uInt32 aWindows1252Ranges[]
2016	= { 0, 0x7F, 0xA0, 0xFF, 0x152, 0x153, 0x160, 0x161, 0x178, 0x178,	2031	= { 0, 0x7F, 0xA0, 0xFF, 0x152, 0x153, 0x160, 0x161, 0x178, 0x178,
2017	0x17D, 0x17E, 0x192, 0x192, 0x2C6, 0x2C6, 0x2DC, 0x2DC,	2032	0x17D, 0x17E, 0x192, 0x192, 0x2C6, 0x2C6, 0x2DC, 0x2DC,
Lines 2133-2138 Link Here
2133	pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,	2148	pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,
2134	aISO88595Ranges));	2149	aISO88595Ranges));
2135	pList->prepend(Charset(RTL_TEXTENCODING_KOI8_R, aKOI8RRanges));	2150	pList->prepend(Charset(RTL_TEXTENCODING_KOI8_R, aKOI8RRanges));
		2151	break;
		2152
		2153	case RTL_TEXTENCODING_KOI8_U:
		2154	pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5,
		2155	aISO88595Ranges));
		2156	pList->prepend(Charset(RTL_TEXTENCODING_KOI8_U, aKOI8URanges));
2136	break;	2157	break;
2137		2158
2138	default: //@@@ more cases are missing!	2159	default: //@@@ more cases are missing!

Lines 1189-1194 Link Here

(-)OOO_1_1_orig/tools/source/rc/resmgr.cxx (+3 lines)
1189	return "36";	1189	return "36";
1190	case LANGUAGE_RUSSIAN:	1190	case LANGUAGE_RUSSIAN:
1191	return "07";	1191	return "07";
		1192	case LANGUAGE_UKRAINIAN:
		1193	return "38";
1192	case LANGUAGE_SLOVAK:	1194	case LANGUAGE_SLOVAK:
1193	return "04";	1195	return "04";
1194	case LANGUAGE_GREEK:	1196	case LANGUAGE_GREEK:
Lines 1339-1344 Link Here
1339	LANGUAGE_HUNGARIAN,	1341	LANGUAGE_HUNGARIAN,
1340	LANGUAGE_CZECH,	1342	LANGUAGE_CZECH,
1341	LANGUAGE_RUSSIAN,	1343	LANGUAGE_RUSSIAN,
		1344	LANGUAGE_UKRAINIAN,
1342	LANGUAGE_ARABIC,	1345	LANGUAGE_ARABIC,
1343	LANGUAGE_GREEK,	1346	LANGUAGE_GREEK,
1344	LANGUAGE_KOREAN,	1347	LANGUAGE_KOREAN,




#define CATALAN_ISO				"ca"
#define CATALAN_INDEX				28

#define UKRAINIAN				38
#define UKRAINIAN_ISO				"uk"
#define UKRAINIAN_INDEX				29

#define THAI					66
#define THAI_ISO				"th"
#define THAI_INDEX					30

// special language for l10n framework
#define EXTERN					99
#define EXTERN_INDEX				31

#define LANGUAGES					32

#define LANGUAGE_ALLOWED( n )  (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && 													\
							   (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) ||  ( Export::LangId[ n ] == 38 ) || 	\
								( Export::LangId[ n ] == 30 ) || ( Export::LangId[ n ] == 31 ) || ( Export::LangId[ n ] == 33 ) ||   	\
								( Export::LangId[ n ] == 34 ) || ( Export::LangId[ n ] == 35 ) || ( Export::LangId[ n ] == 37 ) || 	\
								( Export::LangId[ n ] == 39 ) || ( Export::LangId[ n ] == 45 ) || ( Export::LangId[ n ] == 46 ) || 	\

Lines 1205-1210 Link Here

(-)OOO_1_1_orig/transex3/source/export.cxx (+2 lines)
1205	return PORTUGUESE_INDEX;	1205	return PORTUGUESE_INDEX;
1206	else if ( sLang == "RUSSIAN" )	1206	else if ( sLang == "RUSSIAN" )
1207	return RUSSIAN_INDEX;	1207	return RUSSIAN_INDEX;
		1208	else if ( sLang == "UKRAINIAN" )
		1209	return UKRAINIAN_INDEX;
1208	else if ( sLang == "GREEK" )	1210	else if ( sLang == "GREEK" )
1209	return GREEK_INDEX;	1211	return GREEK_INDEX;
1210	else if ( sLang == "DUTCH" )	1212	else if ( sLang == "DUTCH" )

Lines 144-149 Link Here

(-)OOO_1_1_orig/transex3/source/export2.cxx (+6 lines)
144	ARABIC,	144	ARABIC,
145	HEBREW,	145	HEBREW,
146	CATALAN,	146	CATALAN,
		147	UKRAINIAN,
147	THAI,	148	THAI,
148	EXTERN	149	EXTERN
149	};	150	};
Lines 192-197 Link Here
192	case ARABIC: return RTL_TEXTENCODING_MS_1256;	193	case ARABIC: return RTL_TEXTENCODING_MS_1256;
193	case HEBREW: return RTL_TEXTENCODING_MS_1255;	194	case HEBREW: return RTL_TEXTENCODING_MS_1255;
194	case CATALAN: return RTL_TEXTENCODING_MS_1252;	195	case CATALAN: return RTL_TEXTENCODING_MS_1252;
		196	case UKRAINIAN: return RTL_TEXTENCODING_MS_1251;
195	case THAI: return RTL_TEXTENCODING_UTF8;	197	case THAI: return RTL_TEXTENCODING_UTF8;
196	case EXTERN: return RTL_TEXTENCODING_UTF8;	198	case EXTERN: return RTL_TEXTENCODING_UTF8;
197	}	199	}
Lines 214-219 Link Here
214	return PORTUGUESE;	216	return PORTUGUESE;
215	else if ( sLang == ByteString( RUSSIAN_ISO ).ToUpperAscii())	217	else if ( sLang == ByteString( RUSSIAN_ISO ).ToUpperAscii())
216	return RUSSIAN;	218	return RUSSIAN;
		219	else if ( sLang == ByteString( UKRAINIAN_ISO ).ToUpperAscii())
		220	return UKRAINIAN;
217	else if ( sLang == ByteString( GREEK_ISO ).ToUpperAscii())	221	else if ( sLang == ByteString( GREEK_ISO ).ToUpperAscii())
218	return GREEK;	222	return GREEK;
219	else if ( sLang == ByteString( DUTCH_ISO ).ToUpperAscii())	223	else if ( sLang == ByteString( DUTCH_ISO ).ToUpperAscii())
Lines 279-284 Link Here
279	case ENGLISH_US_INDEX: return ENGLISH_US_ISO;	283	case ENGLISH_US_INDEX: return ENGLISH_US_ISO;
280	case PORTUGUESE_INDEX: return PORTUGUESE_ISO;	284	case PORTUGUESE_INDEX: return PORTUGUESE_ISO;
281	case RUSSIAN_INDEX: return RUSSIAN_ISO;	285	case RUSSIAN_INDEX: return RUSSIAN_ISO;
		286	case UKRAINIAN: return UKRAINIAN_ISO;
282	case GREEK_INDEX: return GREEK_ISO;	287	case GREEK_INDEX: return GREEK_ISO;
283	case DUTCH_INDEX: return DUTCH_ISO;	288	case DUTCH_INDEX: return DUTCH_ISO;
284	case FRENCH_INDEX: return FRENCH_ISO;	289	case FRENCH_INDEX: return FRENCH_ISO;
Lines 429-434 Link Here
429	"arabic",	434	"arabic",
430	"hebrew",	435	"hebrew",
431	"catalan",	436	"catalan",
		437	"ukrainian",
432	"thai",	438	"thai",
433	"extern"	439	"extern"
434	};	440	};

Lines 210-215 Link Here

(-)OOO_1_1_orig/transex3/source/gsiconv.cxx (+1 lines)
210	fprintf( stdout, " 34 => SPANISH\n" );	210	fprintf( stdout, " 34 => SPANISH\n" );
211	fprintf( stdout, " 35 => FINNISH\n" );	211	fprintf( stdout, " 35 => FINNISH\n" );
212	fprintf( stdout, " 36 => HUNGARIAN\n" );	212	fprintf( stdout, " 36 => HUNGARIAN\n" );
		213	fprintf( stdout, " 38 => UKRAINIAN\n" );
213	fprintf( stdout, " 39 => ITALIAN\n" );	214	fprintf( stdout, " 39 => ITALIAN\n" );
214	fprintf( stdout, " 42 => CZECH\n" );	215	fprintf( stdout, " 42 => CZECH\n" );
215	fprintf( stdout, " 44 => ENGLISH (UK)\n" );	216	fprintf( stdout, " 44 => ENGLISH (UK)\n" );

Lines 388-393 Link Here

(-)OOO_1_1_orig/transex3/source/merge.cxx (+1 lines)
388	case ENGLISH_US: return ENGLISH_US_INDEX;	388	case ENGLISH_US: return ENGLISH_US_INDEX;
389	case PORTUGUESE: return PORTUGUESE_INDEX;	389	case PORTUGUESE: return PORTUGUESE_INDEX;
390	case RUSSIAN: return RUSSIAN_INDEX;	390	case RUSSIAN: return RUSSIAN_INDEX;
		391	case UKRAINIAN: return UKRAINIAN_INDEX;
391	case GREEK: return GREEK_INDEX;	392	case GREEK: return GREEK_INDEX;
392	case DUTCH: return DUTCH_INDEX;	393	case DUTCH: return DUTCH_INDEX;
393	case FRENCH: return FRENCH_INDEX;	394	case FRENCH: return FRENCH_INDEX;




					||	( nChar >= 0x2500 && nChar <= 0x25a0 );
			break;

		case RTL_TEXTENCODING_KOI8_U:
			bMatch = 	( nChar >= 0x0020 && nChar <= 0x007e )
					||	( nChar >= 0x00a0 && nChar <= 0x00b7 )
					||	( nChar == 0x00f7 )
					||	( nChar >= 0x0401 && nChar <= 0x0491 )
					||	( nChar >= 0x2219 && nChar <= 0x221a )
					||	( nChar >= 0x2248 && nChar <= 0x2265 )
					||	( nChar >= 0x2320 && nChar <= 0x2321 )
					||	( nChar >= 0x2500 && nChar <= 0x25a0 );
			break;

		case RTL_TEXTENCODING_UNICODE:
			bMatch = True;
			break;

Lines 205-210 Link Here

(-)OOO_1_1_orig/vcl/unx/source/gdi/xlfd_extd.cxx (+1 lines)
205	case RTL_TEXTENCODING_ISO_8859_15:	205	case RTL_TEXTENCODING_ISO_8859_15:
206	case RTL_TEXTENCODING_MS_1251:	206	case RTL_TEXTENCODING_MS_1251:
207	case RTL_TEXTENCODING_KOI8_R:	207	case RTL_TEXTENCODING_KOI8_R:
		208	case RTL_TEXTENCODING_KOI8_U:
208	case RTL_TEXTENCODING_JIS_X_0201:	209	case RTL_TEXTENCODING_JIS_X_0201:
209	if ( nLargestRange < 0x0080 )	210	if ( nLargestRange < 0x0080 )
210	{	211	{

Return to issue 9851

Lines 4328-4330 Link Here

(-)OOO_1_1_orig/sal/textenc/tcvtest1.tab (+167 lines)
4328	"koi8-r",	4328	"koi8-r",
4329	RTL_TEXTENCODING_INFO_ASCII \| RTL_TEXTENCODING_INFO_MIME };	4329	RTL_TEXTENCODING_INFO_ASCII \| RTL_TEXTENCODING_INFO_MIME };
4330	/* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */	4330	/* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */
		4331
		4332	/* ======================================================================= */
		4333
		4334	/* KOI8_U */
		4335	/* Standard Charset for Ukrainian Cyrillic */
		4336	/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
		4337	/* Convert-Tables: typed per hand */
		4338	/* Last-Changes from us: */
		4339
		4340	#define KOI8UUNI_START 0x80
		4341	#define KOI8UUNI_END 0xFF
		4342	static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] =
		4343	{
		4344	/* 0 1 2 3 4 5 6 7 */
		4345	/* 8 9 A B C D E F */
		4346	0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */
		4347	0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */
		4348	0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */
		4349	0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */
		4350	0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */
		4351	0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */
		4352	0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */
		4353	0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */
		4354	0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */
		4355	0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */
		4356	0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */
		4357	0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */
		4358	0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */
		4359	0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */
		4360	0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */
		4361	0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A /* 0xF0 */
		4362	};
		4363
		4364	/* ----------------------------------------------------------------------- */
		4365
		4366	#define KOI8UCHAR_START 0x0410
		4367	#define KOI8UCHAR_END 0x044F
		4368	static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] =
		4369	{
		4370	/* 0 1 2 3 4 5 6 7 */
		4371	/* 8 9 A B C D E F */
		4372	0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */
		4373	0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */
		4374	0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */
		4375	0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */
		4376	0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */
		4377	0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */
		4378	0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */
		4379	0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1 /* 0x0440 */
		4380	};
		4381
		4382	/* ----------------------------------------------------------------------- */
		4383
		4384	#define KOI8UTOCHARTABEX_COUNT 72
		4385	static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] =
		4386	{
		4387	{ 0x00A0, 0x9A },
		4388	{ 0x00A9, 0xBF },
		4389	{ 0x00B0, 0x9C },
		4390	{ 0x00B2, 0x9D },
		4391	{ 0x00B7, 0x9E },
		4392	{ 0x00F7, 0x9F },
		4393	{ 0x0401, 0xB3 },
		4394	{ 0x0404, 0xB4 },
4395	{ 0x0406, 0xB6 },
4396	{ 0x0407, 0xB7 },
4397	{ 0x0451, 0xA3 },
4398	{ 0x0454, 0xA4 },
4399	{ 0x0456, 0xA6 },
4400	{ 0x0457, 0xA7 },
4401	{ 0x0490, 0xBD },
4402	{ 0x0491, 0xAD },
4403	{ 0x2219, 0x95 },
4404	{ 0x221A, 0x96 },
4405	{ 0x2248, 0x97 },
4406	{ 0x2264, 0x98 },
4407	{ 0x2265, 0x99 },
4408	{ 0x2320, 0x93 },
4409	{ 0x2321, 0x9B },
4410	{ 0x2500, 0x80 },
4411	{ 0x2502, 0x81 },
4412	{ 0x250C, 0x82 },
4413	{ 0x2510, 0x83 },
4414	{ 0x2514, 0x84 },
4415	{ 0x2518, 0x85 },
4416	{ 0x251C, 0x86 },
4417	{ 0x2524, 0x87 },
4418	{ 0x252C, 0x88 },
4419	{ 0x2534, 0x89 },
4420	{ 0x253C, 0x8A },
4421	{ 0x2550, 0xA0 },
4422	{ 0x2551, 0xA1 },
4423	{ 0x2552, 0xA2 },
4424	{ 0x2553, 0xA4 },
4425	{ 0x2554, 0xA5 },
4426	{ 0x2555, 0xA6 },
4427	{ 0x2556, 0xA7 },
4428	{ 0x2557, 0xA8 },
4429	{ 0x2558, 0xA9 },
4430	{ 0x2559, 0xAA },
4431	{ 0x255A, 0xAB },
4432	{ 0x255B, 0xAC },
4433	{ 0x255C, 0xAD },
4434	{ 0x255D, 0xAE },
4435	{ 0x255E, 0xAF },
4436	{ 0x255F, 0xB0 },
4437	{ 0x2560, 0xB1 },
4438	{ 0x2561, 0xB2 },
4439	{ 0x2562, 0xB4 },
4440	{ 0x2563, 0xB5 },
4441	{ 0x2564, 0xB6 },
4442	{ 0x2565, 0xB7 },
4443	{ 0x2566, 0xB8 },
4444	{ 0x2567, 0xB9 },
4445	{ 0x2568, 0xBA },
4446	{ 0x2569, 0xBB },
4447	{ 0x256A, 0xBC },
4448	{ 0x256B, 0xBD },
4449	{ 0x256C, 0xBE },
4450	{ 0x2580, 0x8B },
4451	{ 0x2584, 0x8C },
4452	{ 0x2588, 0x8D },
4453	{ 0x258C, 0x8E },
4454	{ 0x2590, 0x8F },
4455	{ 0x2591, 0x90 },
4456	{ 0x2592, 0x91 },
4457	{ 0x2593, 0x92 },
4458	{ 0x25A0, 0x94 }
4459	};
4460
4461	/* ----------------------------------------------------------------------- */
4462
4463	static ImplByteConvertData const aImplKOI8UByteCvtData =
4464	{
4465	aImplKOI8UToUniTab,
4466	NULL,
4467	KOI8UUNI_START, KOI8UUNI_END,
4468	NOTABUNI_START, NOTABUNI_END,
4469	aImplKOI8UToCharTab,
4470	NULL,
4471	aImplKOI8UToCharTabEx,
4472	KOI8UCHAR_START, KOI8UCHAR_END,
4473	NOTABCHAR_START, NOTABCHAR_END,
4474	KOI8UTOCHARTABEX_COUNT
4475	};
4476
4477	/* ----------------------------------------------------------------------- */
4478
4479	static ImplTextEncodingData const aImplKOI8UTextEncodingData
4480	= { { &aImplKOI8UByteCvtData,
4481	ImplCharToUnicode,
4482	ImplUnicodeToChar,
4483	NULL,
4484	NULL,
4485	NULL,
4486	NULL,
4487	NULL,
4488	NULL },
4489	RTL_TEXTENCODING_KOI8_U,
4490	1,
4491	1,
4492	1,
4493	204,
4494	"koi8-u",
4495	"koi8-u",
4496	RTL_TEXTENCODING_INFO_ASCII \| RTL_TEXTENCODING_INFO_MIME };
4497	/* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */

Lines 1007-1013 Link Here

(-)OOO_1_1_orig/sw/source/filter/basflt/fltini.cxx (-2 / +4 lines)
1007	sToken081[] = "JIS_X_212",	1007	sToken081[] = "JIS_X_212",
1008	sToken082[] = "MS_1361",	1008	sToken082[] = "MS_1361",
1009	sToken083[] = "GB_18030",	1009	sToken083[] = "GB_18030",
1010	sToken084[] = "UNICODE_2"	1010	sToken084[] = "KOI8_U",
		1011	sToken085[] = "UNICODE_2"
1011	;	1012	;
1012	struct _Dummy_MAP	1013	struct _Dummy_MAP
1013	{	1014	{
Lines 1099-1105 Link Here
1099	RTL_TEXTENCODING_JIS_X_0212, sToken081,	1100	RTL_TEXTENCODING_JIS_X_0212, sToken081,
1100	RTL_TEXTENCODING_MS_1361, sToken082,	1101	RTL_TEXTENCODING_MS_1361, sToken082,
1101	RTL_TEXTENCODING_GB_18030, sToken083,	1102	RTL_TEXTENCODING_GB_18030, sToken083,
1102	RTL_TEXTENCODING_UCS2, sToken084	1103	RTL_TEXTENCODING_KOI8_U, sToken084,
		1104	RTL_TEXTENCODING_UCS2, sToken085
1103	};	1105	};
1104		1106
1105	BOOL bFnd = FALSE;	1107	BOOL bFnd = FALSE;

Lines 137-142 Link Here

(-)OOO_1_1_orig/i18npool/source/localedata_ascii/makefile.mk (+2 lines)
137	$(MISC)$/localedata_pt_BR.cxx \	137	$(MISC)$/localedata_pt_BR.cxx \
138	$(MISC)$/localedata_pt_PT.cxx \	138	$(MISC)$/localedata_pt_PT.cxx \
139	$(MISC)$/localedata_ru_RU.cxx \	139	$(MISC)$/localedata_ru_RU.cxx \
		140	$(MISC)$/localedata_uk_UA.cxx \
140	$(MISC)$/localedata_sv_FI.cxx \	141	$(MISC)$/localedata_sv_FI.cxx \
141	$(MISC)$/localedata_tr_TR.cxx \	142	$(MISC)$/localedata_tr_TR.cxx \
142	$(MISC)$/localedata_nb_NO.cxx \	143	$(MISC)$/localedata_nb_NO.cxx \
Lines 205-210 Link Here
205	$(SLO)$/localedata_pt_BR.obj \	206	$(SLO)$/localedata_pt_BR.obj \
206	$(SLO)$/localedata_pt_PT.obj \	207	$(SLO)$/localedata_pt_PT.obj \
207	$(SLO)$/localedata_ru_RU.obj \	208	$(SLO)$/localedata_ru_RU.obj \
		209	$(SLO)$/localedata_uk_UA.obj \
208	$(SLO)$/localedata_sv_FI.obj \	210	$(SLO)$/localedata_sv_FI.obj \
209	$(SLO)$/localedata_tr_TR.obj \	211	$(SLO)$/localedata_tr_TR.obj \
210	$(SLO)$/localedata_nb_NO.obj \	212	$(SLO)$/localedata_nb_NO.obj \

Lines 173-180 Link Here

(-)OOO_1_1_orig/sal/inc/rtl/textenc.h (-1 / +3 lines)
173	#define RTL_TEXTENCODING_MS_1361 (RTL_TEXTENC_CAST( 84 ))	173	#define RTL_TEXTENCODING_MS_1361 (RTL_TEXTENC_CAST( 84 ))
174	#define RTL_TEXTENCODING_GB_18030 (RTL_TEXTENC_CAST( 85 ))	174	#define RTL_TEXTENCODING_GB_18030 (RTL_TEXTENC_CAST( 85 ))
175	#define RTL_TEXTENCODING_BIG5_HKSCS (RTL_TEXTENC_CAST( 86 ))	175	#define RTL_TEXTENCODING_BIG5_HKSCS (RTL_TEXTENC_CAST( 86 ))
		176	#define RTL_TEXTENCODING_KOI8_U (RTL_TEXTENC_CAST( 87 ))
176		177
177	#define RTL_TEXTENCODING_STD_COUNT (RTL_TEXTENC_CAST( 87 ))	178	#define RTL_TEXTENCODING_STD_COUNT (RTL_TEXTENC_CAST( 88 ))
178		179
179	#define RTL_TEXTENCODING_USER_START (RTL_TEXTENC_CAST( 0x8000 ))	180	#define RTL_TEXTENCODING_USER_START (RTL_TEXTENC_CAST( 0x8000 ))
180	#define RTL_TEXTENCODING_USER_END (RTL_TEXTENC_CAST( 0xEFFF ))	181	#define RTL_TEXTENCODING_USER_END (RTL_TEXTENC_CAST( 0xEFFF ))
Lines 223-228 Link Here
223	Cyrillic (DOS/OS2-866/Russian) RTL_TEXTENCODING_IBM_866	224	Cyrillic (DOS/OS2-866/Russian) RTL_TEXTENCODING_IBM_866
224	Cyrillic (ISO-8859-5) RTL_TEXTENCODING_ISO_8859_5	225	Cyrillic (ISO-8859-5) RTL_TEXTENCODING_ISO_8859_5
225	Cyrillic (KOI8-R) RTL_TEXTENCODING_KOI8_R	226	Cyrillic (KOI8-R) RTL_TEXTENCODING_KOI8_R
		227	Cyrillic (KOI8-U) RTL_TEXTENCODING_KOI8_U
226	Cyrillic (Windows-1251) RTL_TEXTENCODING_MS_1251	228	Cyrillic (Windows-1251) RTL_TEXTENCODING_MS_1251
227		229
228	Greek (Apple Macintosh) RTL_TEXTENCODING_APPLE_GREEK	230	Greek (Apple Macintosh) RTL_TEXTENCODING_APPLE_GREEK

Lines 288-293 Link Here

(-)OOO_1_1_orig/sal/osl/unx/nlsupport.c (-1 / +3 lines)
288	{ "ISO8859-8", RTL_TEXTENCODING_ISO_8859_8 },	288	{ "ISO8859-8", RTL_TEXTENCODING_ISO_8859_8 },
289	{ "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 },	289	{ "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 },
290	{ "KOI8-R", RTL_TEXTENCODING_KOI8_R },	290	{ "KOI8-R", RTL_TEXTENCODING_KOI8_R },
		291	{ "KOI8-U", RTL_TEXTENCODING_KOI8_U },
291	{ "PCK", RTL_TEXTENCODING_MS_932 },	292	{ "PCK", RTL_TEXTENCODING_MS_932 },
292	{ "SUN_EU_GREEK", RTL_TEXTENCODING_ISO_8859_7 }, /* 8859-7 + Euro */	293	{ "SUN_EU_GREEK", RTL_TEXTENCODING_ISO_8859_7 }, /* 8859-7 + Euro */
293	{ "TIS620.2533", RTL_TEXTENCODING_MS_874 }, /* th_TH.TIS620 */	294	{ "TIS620.2533", RTL_TEXTENCODING_MS_874 }, /* th_TH.TIS620 */
Lines 464-470 Link Here
464	{ "JUS_I.B1.003-SERB", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-146 SERBIAN */	465	{ "JUS_I.B1.003-SERB", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-146 SERBIAN */
465	{ "KOI-8", RTL_TEXTENCODING_DONTKNOW },	466	{ "KOI-8", RTL_TEXTENCODING_DONTKNOW },
466	{ "KOI8-R", RTL_TEXTENCODING_KOI8_R },	467	{ "KOI8-R", RTL_TEXTENCODING_KOI8_R },
467	{ "KOI8-U", RTL_TEXTENCODING_DONTKNOW },	468	{ "KOI8-U", RTL_TEXTENCODING_KOI8_U },
468	{ "KSC5636", RTL_TEXTENCODING_DONTKNOW }, /* ISO646-KR */	469	{ "KSC5636", RTL_TEXTENCODING_DONTKNOW }, /* ISO646-KR */
469	{ "LATIN-GREEK", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-19 */	470	{ "LATIN-GREEK", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-19 */
470	{ "LATIN-GREEK-1", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-27 */	471	{ "LATIN-GREEK-1", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-27 */
Lines 684-689 Link Here
684	{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },	685	{ "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 },
685	{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },	686	{ "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 },
686	{ "koi8-r", RTL_TEXTENCODING_KOI8_R },	687	{ "koi8-r", RTL_TEXTENCODING_KOI8_R },
		688	{ "koi8-u", RTL_TEXTENCODING_KOI8_U },
687	{ "pck", RTL_TEXTENCODING_MS_932 },	689	{ "pck", RTL_TEXTENCODING_MS_932 },
688	#if (0)	690	#if (0)
689	{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },	691	{ "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW },

Lines 532-540 Link Here

(-)OOO_1_1_orig/sal/textenc/tencinfo.c (+4 lines)
532	static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =	532	static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] =
533	{	533	{
534	{ "r", RTL_TEXTENCODING_KOI8_R },	534	{ "r", RTL_TEXTENCODING_KOI8_R },
		535	{ "u", RTL_TEXTENCODING_KOI8_U },
535	{ NULL, RTL_TEXTENCODING_DONTKNOW }	536	{ NULL, RTL_TEXTENCODING_DONTKNOW }
536	};	537	};
537		538
		539
538	static ImplStrCharsetDef aUnixCharsetJISX0208Tab[] =	540	static ImplStrCharsetDef aUnixCharsetJISX0208Tab[] =
539	{	541	{
540	{ NULL, RTL_TEXTENCODING_JIS_X_0208 }	542	{ NULL, RTL_TEXTENCODING_JIS_X_0208 }
Lines 737-742 Link Here
737	{ "windows1256", RTL_TEXTENCODING_MS_1256 },	739	{ "windows1256", RTL_TEXTENCODING_MS_1256 },
738	{ "windows1257", RTL_TEXTENCODING_MS_1257 },	740	{ "windows1257", RTL_TEXTENCODING_MS_1257 },
739	{ "windows1258", RTL_TEXTENCODING_MS_1258 },	741	{ "windows1258", RTL_TEXTENCODING_MS_1258 },
		742	{ "koi8u", RTL_TEXTENCODING_KOI8_U },
740	{ NULL, RTL_TEXTENCODING_DONTKNOW }	743	{ NULL, RTL_TEXTENCODING_DONTKNOW }
741	};	744	};
742		745
Lines 811-816 Link Here
811	{ "iso10646us", RTL_TEXTENCODING_ASCII_US },	814	{ "iso10646us", RTL_TEXTENCODING_ASCII_US },
812	{ "iso646irv", RTL_TEXTENCODING_ASCII_US },	815	{ "iso646irv", RTL_TEXTENCODING_ASCII_US },
813	{ "cskoi8r", RTL_TEXTENCODING_KOI8_R },	816	{ "cskoi8r", RTL_TEXTENCODING_KOI8_R },
		817	{ "cskoi8u", RTL_TEXTENCODING_KOI8_U },
814	{ "ibm437", RTL_TEXTENCODING_IBM_437 },	818	{ "ibm437", RTL_TEXTENCODING_IBM_437 },
815	{ "cp437", RTL_TEXTENCODING_IBM_437 },	819	{ "cp437", RTL_TEXTENCODING_IBM_437 },
816	{ "437", RTL_TEXTENCODING_IBM_437 },	820	{ "437", RTL_TEXTENCODING_IBM_437 },

Lines 80-85 Link Here

(-)OOO_1_1_orig/solenv/inc/lang.mk (+7 lines)
80	pol$(LANG_GUI)=-CHARSET_microsoft-cp1250	80	pol$(LANG_GUI)=-CHARSET_microsoft-cp1250
81	slov$(LANG_GUI)=-CHARSET_microsoft-cp1250	81	slov$(LANG_GUI)=-CHARSET_microsoft-cp1250
82	russ$(LANG_GUI)=-CHARSET_microsoft-cp1251	82	russ$(LANG_GUI)=-CHARSET_microsoft-cp1251
		83	ukra$(LANG_GUI)=-CHARSET_microsoft-cp1251
83	cz$(LANG_GUI)=-CHARSET_microsoft-cp1250	84	cz$(LANG_GUI)=-CHARSET_microsoft-cp1250
84	hung$(LANG_GUI)=-CHARSET_microsoft-cp1250	85	hung$(LANG_GUI)=-CHARSET_microsoft-cp1250
85	japn$(LANG_GUI)=-CHARSET_UTF8	86	japn$(LANG_GUI)=-CHARSET_UTF8
Lines 99-104 Link Here
99	polOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	100	polOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
100	slovOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	101	slovOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
101	russOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	102	russOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
		103	ukraOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
102	czOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	104	czOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
103	hungOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	105	hungOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
104	japnOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	106	japnOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
Lines 111-116 Link Here
111	polWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	113	polWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
112	slovWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	114	slovWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
113	russWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	115	russWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
		116	ukraWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
114	czWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	117	czWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
115	hungWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	118	hungWIN=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
116	japnOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW	119	japnOS2=-CHARSET_DONTKNOW-SOURCE -CHARSET_DONTKNOW
Lines 244-249 Link Here
244	.IF "$(solarlang)" == "russ"	247	.IF "$(solarlang)" == "russ"
245	RSCLANG=RUSSIAN $(IBM_PC_852)	248	RSCLANG=RUSSIAN $(IBM_PC_852)
246	LANGEXT=07	249	LANGEXT=07
		250	.ENDIF
		251	.IF "$(solarlang)" == "ukra"
		252	RSCLANG=UKRAINIAN $(IBM_PC_852)
		253	LANGEXT=38
247	.ENDIF	254	.ENDIF
248	.IF "$(solarlang)" == "slov"	255	.IF "$(solarlang)" == "slov"
249	RSCLANG=SLOVAK $(IBM_PC_852)	256	RSCLANG=SLOVAK $(IBM_PC_852)

Lines 217-222 Link Here

(-)OOO_1_1_orig/solenv/inc/postset.mk (+13 lines)
217	iso_07=ru	217	iso_07=ru
218	.ENDIF	218	.ENDIF
219		219
		220	.IF "$(RES_UKRA)"!="" \|\| "$(give_me_all_languages)"!=""
		221	alllangext+=38
		222	ukra$(LANG_GUI)*=$(default$(LANG_GUI))
		223	cmd_ukra:=ukra 38 -lgUKRAINIAN $(IBM_PC_852) $(ukra$(LANG_GUI))
		224	lang_38=ukra
		225	longlang_38=ukrainian
		226	langext_38=38
		227	rsclang_38=-lgUKRAINIAN $(IBM_PC_852)
		228	rescharset_38=$(ukra$(LANG_GUI))
		229	RCLANGFLAGS_38+= -d UKRA
		230	iso_38=uk
		231	.ENDIF
		232
220	.IF "$(RES_POL)"!="" \|\| "$(give_me_all_languages)"!=""	233	.IF "$(RES_POL)"!="" \|\| "$(give_me_all_languages)"!=""
221	alllangext+=48	234	alllangext+=48
222	pol$(LANG_GUI)*=$(default$(LANG_GUI))	235	pol$(LANG_GUI)*=$(default$(LANG_GUI))

Lines 147-152 Link Here

(-)OOO_1_1_orig/svx/source/dialog/txenctab.src (-1 / +6 lines)
147	< "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;	147	< "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
148	< "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;	148	< "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
149	< "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;	149	< "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
		150	< "Kyrillisch (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
150	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;	151	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
151	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;	152	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
152	< "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;	153	< "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
Lines 235-240 Link Here
235	< "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;	236	< "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
236	< "Chinese Simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;	237	< "Chinese Simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
237	< "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;	238	< "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
		239	< "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
238	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;	240	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
239	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;	241	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
240	< "Central European (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;	242	< "Central European (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
Lines 308-313 Link Here
308	< "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;	310	< "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
309	< "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;	311	< "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
310	< "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;	312	< "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
		313	< "Kyrillisch (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
311	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;	314	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
312	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;	315	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
313	< "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;	316	< "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
Lines 378-383 Link Here
378	< "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;	381	< "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
379	< "Chinese simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;	382	< "Chinese simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;
380	< "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;	383	< "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
		384	< "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
381	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;	385	< "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ;
382	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;	386	< "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ;
383	< "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;	387	< "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ;
Lines 512-518 Link Here
512	< "Êèòàéñêèé òðàäèöèîííûé (BIG5)" ; RTL_TEXTENCODING_GBK ; > ;	516	< "Êèòàéñêèé òðàäèöèîííûé (BIG5)" ; RTL_TEXTENCODING_GBK ; > ;
513	< "ßïîíñêèé (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;	517	< "ßïîíñêèé (EUC-JP)" ; RTL_TEXTENCODING_BIG5 ; > ;
514	< "Êèòàéñêèé óïðîùåííûé (EUC-CN)" ; RTL_TEXTENCODING_EUC_JP ; > ;	518	< "Êèòàéñêèé óïðîùåííûé (EUC-CN)" ; RTL_TEXTENCODING_EUC_JP ; > ;
515	< "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_EUC_CN ; > ;	519	< "Êèðèëëè÷åñêèé (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ;
		520	< "Êèðèëëè÷åñêèé (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ;
516	< "Þíèêîä (UTF-7)" ; RTL_TEXTENCODING_EUC_TW ; > ;	521	< "Þíèêîä (UTF-7)" ; RTL_TEXTENCODING_EUC_TW ; > ;
517	< "Þíèêîä (UTF-8)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;	522	< "Þíèêîä (UTF-8)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ;
518	< "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;	523	< "Âîñòî÷íîåâðîïåéñêèé (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ;

Lines 187-204 Link Here

(-)OOO_1_1_orig/transex3/inc/export.hxx (-4 / +8 lines)
187	#define CATALAN_ISO "ca"	187	#define CATALAN_ISO "ca"
188	#define CATALAN_INDEX 28	188	#define CATALAN_INDEX 28
189		189
		190	#define UKRAINIAN 38
		191	#define UKRAINIAN_ISO "uk"
		192	#define UKRAINIAN_INDEX 29
		193
190	#define THAI 66	194	#define THAI 66
191	#define THAI_ISO "th"	195	#define THAI_ISO "th"
192	#define THAI_INDEX 29	196	#define THAI_INDEX 30
193		197
194	// special language for l10n framework	198	// special language for l10n framework
195	#define EXTERN 99	199	#define EXTERN 99
196	#define EXTERN_INDEX 30	200	#define EXTERN_INDEX 31
197		201
198	#define LANGUAGES 31	202	#define LANGUAGES 32
199		203
200	#define LANGUAGE_ALLOWED( n ) (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && \	204	#define LANGUAGE_ALLOWED( n ) (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && \
201	(( Export::LangId[ n ] == 01 ) \|\| ( Export::LangId[ n ] == 03 ) \|\| ( Export::LangId[ n ] == 07 ) \|\| \	205	(( Export::LangId[ n ] == 01 ) \|\| ( Export::LangId[ n ] == 03 ) \|\| ( Export::LangId[ n ] == 07 ) \|\| ( Export::LangId[ n ] == 38 ) \|\| \
202	( Export::LangId[ n ] == 30 ) \|\| ( Export::LangId[ n ] == 31 ) \|\| ( Export::LangId[ n ] == 33 ) \|\| \	206	( Export::LangId[ n ] == 30 ) \|\| ( Export::LangId[ n ] == 31 ) \|\| ( Export::LangId[ n ] == 33 ) \|\| \
203	( Export::LangId[ n ] == 34 ) \|\| ( Export::LangId[ n ] == 35 ) \|\| ( Export::LangId[ n ] == 37 ) \|\| \	207	( Export::LangId[ n ] == 34 ) \|\| ( Export::LangId[ n ] == 35 ) \|\| ( Export::LangId[ n ] == 37 ) \|\| \
204	( Export::LangId[ n ] == 39 ) \|\| ( Export::LangId[ n ] == 45 ) \|\| ( Export::LangId[ n ] == 46 ) \|\| \	208	( Export::LangId[ n ] == 39 ) \|\| ( Export::LangId[ n ] == 45 ) \|\| ( Export::LangId[ n ] == 46 ) \|\| \

Lines 261-266 Link Here

(-)OOO_1_1_orig/vcl/unx/source/gdi/salcvt.cxx (+11 lines)
261	\|\| ( nChar >= 0x2500 && nChar <= 0x25a0 );	261	\|\| ( nChar >= 0x2500 && nChar <= 0x25a0 );
262	break;	262	break;
263		263
		264	case RTL_TEXTENCODING_KOI8_U:
		265	bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
		266	\|\| ( nChar >= 0x00a0 && nChar <= 0x00b7 )
		267	\|\| ( nChar == 0x00f7 )
		268	\|\| ( nChar >= 0x0401 && nChar <= 0x0491 )
		269	\|\| ( nChar >= 0x2219 && nChar <= 0x221a )
		270	\|\| ( nChar >= 0x2248 && nChar <= 0x2265 )
		271	\|\| ( nChar >= 0x2320 && nChar <= 0x2321 )
		272	\|\| ( nChar >= 0x2500 && nChar <= 0x25a0 );
		273	break;
		274
264	case RTL_TEXTENCODING_UNICODE:	275	case RTL_TEXTENCODING_UNICODE:
265	bMatch = True;	276	bMatch = True;
266	break;	277	break;