diff -urN ooo_SRC680_m100_src.orig/tools/source/intntl/intntab.cxx ooo_SRC680_m100_src/tools/source/intntl/intntab.cxx --- ooo_SRC680_m100_src.orig/tools/source/intntl/intntab.cxx 2005-05-04 22:57:03.000000000 +0300 +++ ooo_SRC680_m100_src/tools/source/intntl/intntab.cxx 2005-05-05 00:58:08.000000000 +0300 @@ -107,6 +107,7 @@ static char const aKc[] = "K" SCCE; +static char const aLv[] = "\xEA\xE2."; // ======================================================================= @@ -128,6 +129,7 @@ static char const alunedi[] = "lunedi"; static char const asegunda_feira[] = "segunda-feira"; static char const aPondeli[] = "Pond" ECE "l" IAC; +static char const aponedelnik[] = "\xEF\xEE\xED\xE5\xE4\xE5\xEB\xED\xE8\xEA"; static char const aMon[] = "Mon"; static char const aMo[] = "Mo"; static char const amaa[] = "maa"; @@ -138,6 +140,7 @@ static char const asegPT[] = "seg."; static char const aLUN[] = "LUN"; static char const aPo[] = "Po"; +static char const apn[] = "\xEF\xED"; // Dienstag @@ -153,6 +156,7 @@ static char const amartedi[] = "martedi"; static char const atercCEa_feira[] = "ter" CCE "a-feira"; static char const aUtery[] = UDI "ter" YDI; +static char const avtornik[] = "\xE2\xF2\xEE\xF0\xED\xE8\xEA"; static char const aTue[] = "Tue"; static char const aDi[] = "Di"; static char const adin[] = "din"; @@ -161,6 +165,7 @@ static char const aterPT[] = "ter."; static char const aMAR[] = "MAR"; static char const aUt[] = UDI "t"; +static char const avt[] = "\xE2\xF2"; // Mittwoch @@ -175,6 +180,7 @@ static char const amieACrcoles[] = "mi" EAC "rcoles"; static char const aquarta_feira[] = "quarta-feira"; static char const aStreda[] = "St" OSL "eda"; +static char const asriada[] = "\xF1\xF0\xFF\xE4\xE0"; static char const aWed[] = "Wed"; static char const aMi[] = "Mi"; static char const awoe[] = "woe"; @@ -187,6 +193,7 @@ static char const aMER[] = "MER"; static char const aMIECAC[] = "MI" ECAC; static char const aSt[] = "St"; +static char const asr[] = "\xF1\xF0"; // Donnerstag @@ -201,6 +208,7 @@ static char const agiovedi[] = "giovedi"; static char const aquinta_feira[] = "quinta-feira"; static char const aCtvrtek[] = CCAC "tvrtek"; +static char const achetvartak[] = "\xF7\xE5\xF2\xE2\xFA\xF0\xF2\xFA\xEA"; static char const aThu[] = "Thu"; static char const aDo[] = "Do"; static char const adon[] = "don"; @@ -211,6 +219,7 @@ static char const aGIO[] = "GIO"; static char const aJUE[] = "JUE"; static char const aCt[] = CCAC "t"; +static char const act[] = "\xF7\xF2"; // Freitag @@ -225,6 +234,7 @@ static char const aviernes[] = "viernes"; static char const asexta_feira[] = "sexta-feira"; static char const aPatek[] = "P" AAC "tek"; +static char const apetak[] = "\xEF\xE5\xF2\xFA\xEA"; static char const aFri[] = "Fri"; static char const aFr[] = "Fr"; static char const avri[] = "vri"; @@ -237,6 +247,7 @@ static char const aVEN[] = "VEN"; static char const aVIE[] = "VIE"; static char const aPa[] = "P" AAC; +static char const apt[] = "\xEF\xF2"; // Samstag @@ -250,6 +261,7 @@ static char const asamedi[] = "samedi"; static char const asabato[] = "sabato"; static char const asaACbado[] = "s" AAC "bado"; +static char const asabota[] = "\xF1\xFA\xE1\xEE\xF2\xE0"; static char const aSobota[] = "Sobota"; static char const aSat[] = "Sat"; static char const aSa[] = "Sa"; @@ -264,6 +276,7 @@ static char const aSAB[] = "SAB"; static char const aSACACB[] = "S" ACAC "B"; static char const aSob[] = "So"; +static char const asb[] = "\xF1\xE1"; // Sonntag @@ -278,6 +291,7 @@ static char const adomenica[] = "domenica"; static char const azondag[] = "zondag"; static char const aNedele[] = "Ned" ECE "le"; +static char const anedelia[] = "\xED\xE5\xE4\xE5\xEB\xFF"; static char const aSun[] = "Sun"; static char const aSo[] = "So"; static char const azon[] = "zon"; @@ -290,6 +304,7 @@ static char const adomPT[] = "dom."; static char const aDOM[] = "DOM"; static char const aNe[] = "Ne"; +static char const andl[] = "\xED\xE4"; @@ -305,6 +320,7 @@ static char const aenero[] = "enero"; static char const atammikuu[] = "tammikuu"; static char const aLeden[] = "leden"; +static char const ajanuariB[] = "\xFF\xED\xF3\xE0\xF0\xE8"; static char const aJan[] = "Jan"; static char const ajan[] = "jan"; static char const ajanvPT[] = "janv."; @@ -313,6 +329,7 @@ static char const aGEN[] = "GEN"; static char const aENE[] = "ENE"; static char const aLed[] = "led"; +static char const ajanB[] = "\xFF\xED\xF3"; // Februar @@ -327,6 +344,7 @@ static char const afevereiro[] = "fevereiro"; static char const ahelmikuu[] = "helmikuu"; static char const aUnor[] = USI "nor"; +static char const afevruari[] = "\xF4\xE5\xE2\xF0\xF3\xE0\xF0\xE8"; static char const aFeb[] = "Feb"; static char const afeb[] = "feb"; static char const ahelmi[] = "helmi"; @@ -335,6 +353,7 @@ static char const aFEB[] = "FEB"; static char const aFEV[] = "FEV"; static char const aUno[] = USI "no"; +static char const afevB[] = "\xF4\xE5\xE2"; // Maerz @@ -348,11 +367,13 @@ static char const amarcCEo[] = "mar" CCE "o"; static char const amaaliskuu[] = "maaliskuu"; static char const aBrezen[] = "b" OSL "ezen"; +static char const amart[] = "\xEC\xE0\xF0\xF2"; static char const aMar[] = "Mar"; static char const aMrz[] = "Mrz"; static char const amrt[] = "mrt"; static char const amaalis[] = "maalis"; static char const aBre[] = "bre"; +static char const amarB[] = "\xEC\xE0\xF0"; // April @@ -364,6 +385,7 @@ static char const aabril[] = "abril"; static char const ahuhtikuu[] = "huhtikuu"; static char const aDuben[] = "duben"; +static char const aaprilB[] = "\xE0\xEF\xF0\xE8\xEB"; static char const aApr[] = "Apr"; static char const aapr[] = "apr"; static char const aavr[] = "avr"; @@ -372,6 +394,7 @@ static char const aABR[] = "ABR"; static char const ahuhti[] = "huhti"; static char const aDub[] = "dub"; +static char const aaprB[] = "\xE0\xEF\xF0"; // Mai @@ -384,6 +407,7 @@ static char const amaio[] = "maio"; static char const amayo[] = "mayo"; static char const aKveten[] = "kv" ECE "ten"; +static char const amajBB[] = "\xEC\xE0\xE9"; static char const amaggio[] = "maggio"; static char const atoukokuu[] = "toukokuu"; static char const aMAG[] = "MAG"; @@ -391,6 +415,7 @@ static char const aMAY[] = "MAY"; static char const atouko[] = "touko"; static char const aKve[] = "kv" ECE; +static char const amajB[] = "\xEC\xE0\xE9"; // Juni @@ -404,12 +429,14 @@ static char const agiugno[] = "giugno"; static char const akesaDIkuu[] = "kes" ADI "kuu"; static char const aCerven[] = SCCE "erven"; +static char const ajuniB[] = "\xFE\xED\xE8"; static char const aJun[] = "Jun"; static char const ajun[] = "jun"; static char const aGIU[] = "GIU"; static char const aJUN[] = "JUN"; static char const akesaDI[] = "kes" ADI; static char const aCrn[] = "crn"; +static char const ajunB[] = "\xFE\xED\xE8"; // Juli @@ -427,9 +454,11 @@ static char const ajuilPT[] = "juil."; static char const aheinaDI[] = "hein" ADI; static char const aCervenec[] = SCCE "ervenec"; +static char const ajuliB[] = "\xFE\xEB\xE8"; static char const aLUG[] = "LUG"; static char const aJUL[] = "JUL"; static char const aCvc[] = "cvc"; +static char const ajulB[] = "\xFE\xEB\xE8"; // August @@ -442,12 +471,14 @@ static char const aagosto[] = "agosto"; static char const aelokuu[] = "elokuu"; static char const aSrpen[] = "srpen"; +static char const aavgust[] = "\xE0\xE2\xE3\xF3\xF1\xF2"; static char const aAug[] = "Aug"; static char const aaug[] = "aug"; static char const aaouCI[] = "ao" UCI; static char const aelo[] = "elo"; static char const aAGO[] = "AGO"; static char const aSrp[] = "srp"; +static char const aavgB[] = "\xE0\xE2\xE3"; // September @@ -460,6 +491,7 @@ static char const aseptiembre[] = "septiembre"; static char const asyyskuu[] = "syyskuu"; static char const aZari[] = "z" AAC OSL IAC; +static char const aseptemvri[] = "\xF1\xE5\xEF\xF2\xE5\xEC\xE2\xF0\xE8"; static char const aSep[] = "Sep"; static char const asep[] = "sep"; static char const aseptPT[] = "sept."; @@ -467,6 +499,7 @@ static char const aSET[] = "SET"; static char const aSEP[] = "SEP"; static char const aZar[] = "zar"; +static char const asepB[] = "\xF1\xE5\xEF"; // Oktober @@ -480,6 +513,7 @@ static char const aoutubro[] = "outubro"; static char const alokakuu[] = "lokakuu"; static char const aRijen[] = OSL IAC "jen"; +static char const aoktomvri[] = "\xEE\xEA\xF2\xEE\xEC\xE2\xF0\xE8"; static char const aOct[] = "Oct"; static char const aOkt[] = "Okt"; static char const aokt[] = "okt"; @@ -490,6 +524,7 @@ static char const aOCT[] = "OCT"; static char const aloka[] = "loka"; static char const aRij[] = OSL IAC "j"; +static char const aoktB[] = "\xEE\xEA\xF2"; // November @@ -501,12 +536,14 @@ static char const anovembro[] = "novembro"; static char const amarraskuu[] = "marraskuu"; static char const aListopad[] = "listopad"; +static char const anoemvri[] = "\xED\xEE\xE5\xEC\xE2\xF0\xE8"; static char const aNov[] = "Nov"; static char const anov[] = "nov"; static char const anovPT[] = "nov."; static char const amarras[] = "marras"; static char const aNOV[] = "NOV"; static char const aLis[] = "lis"; +static char const anoeB[] = "\xED\xEE\xE5"; // Dezember @@ -520,6 +557,7 @@ static char const adiciembre[] = "diciembre"; static char const ajoulukuu[] = "joulukuu"; static char const aProsinec[] = "prosinec"; +static char const adekemvri[] = "\xE4\E5x\xEA\xE5\xEC\xE2\xF0\xE8"; static char const aDec[] = "Dec"; static char const aDez[] = "Dez"; static char const adec[] = "dec"; @@ -529,7 +567,8 @@ static char const aDIC[] = "DIC"; static char const aDEZ[] = "DEZ"; static char const aPro[] = "pro"; - +static char const adekB[] = "\xE4\xE5\xEA"; + // Following @@ -543,6 +582,7 @@ static char const asegg[] = "segg."; static char const asuivante[] = "suivante"; static char const asuivantes[] = "suivantes"; +static char const astr[] = "\xF1\xF2\xF0."; @@ -553,6 +593,8 @@ static char const ade[] = " de "; static char const aAM[] = " AM"; static char const aPM[] = " PM"; +static char const aprob[] = " \xEF\xF0.\xEE\xE1."; +static char const aslob[] = " \xF1\xEB.\xEE\xE1."; // ======================================================================= @@ -1025,6 +1067,65 @@ // ----------------------------------------------------------------------- +static void ImplUpdateLanguageBulgarian( LanguageTable* pTable ) +{ + pTable->pCompareProc = ImplStdLanguageCompare; + + *(pTable->pFollowingText[ 0]) = (xub_Unicode)'f'; + ImplAssignText( *(pTable->pFollowingText[ 1]), astr, RTL_TEXTENCODING_MS_1251 ); + + ImplAssignText( *(pTable->pDayText[0]), aponedelnik, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pDayText[1]), avtornik, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pDayText[2]), asriada, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pDayText[3]), achetvartak, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pDayText[4]), apetak, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pDayText[5]), asabota, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pDayText[6]), anedelia, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[0]), apn, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[1]), avt, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[2]), asr, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[3]), act, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[4]), apt, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[5]), asb, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevDayText[6]), andl, RTL_TEXTENCODING_MS_1251 ); + + ImplAssignText( *(pTable->pMonthText[ 0]), ajanuariB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 1]), afevruari, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 2]), amart, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 3]), aaprilB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 4]), amajBB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 5]), ajuniB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 6]), ajuliB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 7]), aavgust, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 8]), aseptemvri, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[ 9]), aoktomvri, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[10]), anoemvri, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pMonthText[11]), adekemvri, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 0]), ajanB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 1]), afevB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 2]), amarB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 3]), aaprB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 4]), amajB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 5]), ajunB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 6]), ajulB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 7]), aavgB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 8]), asepB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[ 9]), aoktB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[10]), anoeB, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( *(pTable->pAbbrevMonthText[11]), adekB, RTL_TEXTENCODING_MS_1251 ); + + pTable->meQuotationMarkStart = LOW_SINGLE_COMMA_QUOTATION_MARK; + pTable->meQuotationMarkEnd = SINGLE_TURNED_COMMA_QUOTATION_MARK; + pTable->meQuotationMarkStart2 = APOSTOPHE_QUOTE; + pTable->meQuotationMarkEnd2 = APOSTOPHE_QUOTE; + pTable->meDoubleQuotationMarkStart = LOW_DOUBLE_COMMA_QUOTATION_MARK; + pTable->meDoubleQuotationMarkEnd = DOUBLE_TURNED_COMMA_QUOTATION_MARK; + pTable->meDoubleQuotationMarkStart2 = RIGHT_POINTING_GUILLEMET; + pTable->meDoubleQuotationMarkEnd2 = LEFT_POINTING_GUILLEMET; +} + +// ----------------------------------------------------------------------- + static void ImplUpdateLanguageItalian( LanguageTable* pTable ) { // !!! pTable->pCompareProc = ImplStdLanguageCompare; @@ -1349,6 +1450,9 @@ case LANGUAGE_CZECH: ImplUpdateLanguageCzech( pTable ); break; + case LANGUAGE_BULGARIAN: + ImplUpdateLanguageBulgarian( pTable ); + break; } } @@ -1642,6 +1746,30 @@ // ----------------------------------------------------------------------- +static void ImplUpdateFormatBulgarian( FormatTable* pTable ) +{ + pTable->cDateSep = '.'; + pTable->bDateDayLeadingZero = FALSE; + pTable->bDateMonthLeadingZero = FALSE; + pTable->bDateCentury = TRUE; + pTable->bLongDateDayLeadingZero = FALSE; + pTable->aLongDateDaySep = '.'; + pTable->eLongDateMonthFormat = MONTH_LONG; + ImplAssignText( pTable->aLongDateMonthSep, aDateSep, RTL_TEXTENCODING_MS_1251 ); + pTable->bTimeLeadingZero = TRUE; + ImplAssignText( pTable->aTimeAM, aprob, RTL_TEXTENCODING_MS_1251 ); + ImplAssignText( pTable->aTimePM, aslob, RTL_TEXTENCODING_MS_1251 ); + pTable->cNumThousandSep = ' '; + pTable->cNumDecimalSep = ','; + pTable->nCurrPositiveFormat = 3; + pTable->nCurrNegativeFormat = 8; + ImplAssignText( pTable->aCurrSymbol, aLv, RTL_TEXTENCODING_MS_1251 ); + pTable->aCurrBankSymbol.AssignAscii( "BGN" ); +} + +// ----------------------------------------------------------------------- + + static void ImplUpdateFormatDanish( FormatTable* pTable ) { pTable->eWeekCountStart = WEEKCOUNT_FIRST4DAYWEEK; @@ -2270,6 +2398,10 @@ ImplUpdateFormatColombia( pTable ); break; + case LANGUAGE_BULGARIAN: + ImplUpdateFormatBulgarian( pTable ); + break; + case LANGUAGE_CZECH: ImplUpdateFormatCzech( pTable ); break; diff -urN ooo_SRC680_m143_src.orig/tools/inc/intntab.hxx ooo_SRC680_m143_src/tools/inc/intntab.hxx --- ooo_SRC680_m143_src.orig/tools/inc/intntab.hxx 2005-12-02 13:11:57.000000000 +0200 +++ ooo_SRC680_m143_src/tools/inc/intntab.hxx 2005-12-19 10:14:00.000000000 +0200 @@ -94,7 +94,7 @@ // - Language-Tabellen - // --------------------- -#define STD_LANGUAGE 34 +#define STD_LANGUAGE 35 USHORT ImplGetSystemLanguageCount(); void ImplUpdateSystemLanguage( LanguageType eLanguage, LanguageTable* pTable ); @@ -104,7 +104,7 @@ // - Format-Tabellen - // ------------------- -#define STD_FORMAT 52 +#define STD_FORMAT 53 USHORT ImplGetSystemFormatCount(); void ImplUpdateSystemFormat( LanguageType eLanguage, FormatTable* pTable ); diff -urN ooo_SRC680_m143_src.orig/tools/source/intntl/intn.cxx ooo_SRC680_m143_src/tools/source/intntl/intn.cxx --- ooo_SRC680_m143_src.orig/tools/source/intntl/intn.cxx 2005-12-02 13:11:57.000000000 +0200 +++ ooo_SRC680_m143_src/tools/source/intntl/intn.cxx 2005-12-19 10:15:04.000000000 +0200 @@ -1149,7 +1149,8 @@ LANGUAGE_SPANISH, LANGUAGE_SPANISH_MODERN, LANGUAGE_SWEDISH, - LANGUAGE_CZECH + LANGUAGE_CZECH, + LANGUAGE_BULGARIAN }; #endif @@ -1347,7 +1348,8 @@ LANGUAGE_ENGLISH_US, LANGUAGE_SPANISH_URUGUAY, LANGUAGE_SPANISH_VENEZUELA, - LANGUAGE_CZECH + LANGUAGE_CZECH, + LANGUAGE_BULGARIAN }; #endif