diff options
| -rw-r--r-- | starmath/source/document.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/porlay.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/docvw/srcedtw.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/numberingtypelistbox.src | 6 |
6 files changed, 14 insertions, 9 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 6cca4efff8ca..cc89640da0cb 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -340,7 +340,7 @@ void SetEditEngineDefaultFonts( { LANGUAGE_JAPANESE, LANGUAGE_NONE, DEFAULTFONT_CJK_TEXT, EE_CHAR_FONTINFO_CJK }, // info to get CTL font to be used - { LANGUAGE_ARABIC, LANGUAGE_NONE, + { LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE, DEFAULTFONT_CTL_TEXT, EE_CHAR_FONTINFO_CTL } }; aTable[0].nLang = aOpt.nDefaultLanguage; diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 268c30a802e7..33571e9e7d31 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -346,7 +346,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt, /* LanguageType eLang; const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions(); if ( SvtCTLOptions::NUMERALS_HINDI == rCTLOptions.GetCTLTextNumerals() ) - eLang = LANGUAGE_ARABIC; + eLang = LANGUAGE_ARABIC_SAUDI_ARABIA; else if ( SvtCTLOptions::NUMERALS_ARABIC == rCTLOptions.GetCTLTextNumerals() ) eLang = LANGUAGE_ENGLISH; else diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index bcd08a324b61..fcbd4a38a70c 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: porlay.cxx,v $ - * $Revision: 1.67.14.4 $ + * $Revision: 1.67.190.1 $ * * This file is part of OpenOffice.org. * @@ -62,6 +62,7 @@ #include <svx/blnkitem.hxx> #include <tools/multisel.hxx> #include <unotools/charclass.hxx> +#include <i18npool/mslangid.hxx> #include <charfmt.hxx> #include <fchrfmt.hxx> #include <docary.hxx> // SwRedlineTbl @@ -1976,7 +1977,7 @@ sal_Bool SwScriptInfo::IsArabicText( const XubString& rTxt, xub_StrLen nStt, xub } if( nIdx == nEnd ) -{ + { // no regular character found in this portion. Go backward: --nIdx; while ( nIdx >= 0 && !rCC.isLetterNumeric( rTxt, (xub_StrLen)nIdx ) ) diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 3bbbe229551d..2f98968c5c63 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -966,9 +966,9 @@ namespace sw break; case LANGUAGE_PORTUGUESE: case LANGUAGE_PORTUGUESE_BRAZILIAN: - case LANGUAGE_SPANISH: - case LANGUAGE_SPANISH_MEXICAN: case LANGUAGE_SPANISH_MODERN: + case LANGUAGE_SPANISH_DATED: + case LANGUAGE_SPANISH_MEXICAN: case LANGUAGE_SPANISH_GUATEMALA: case LANGUAGE_SPANISH_COSTARICA: case LANGUAGE_SPANISH_PANAMA: diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index cedcefd3604a..9385d5a0ba6e 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: srcedtw.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.252.1 $ * * This file is part of OpenOffice.org. * @@ -1007,7 +1007,7 @@ BOOL lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages case RTL_TEXTENCODING_MS_1256 : case RTL_TEXTENCODING_ISO_8859_6 : case RTL_TEXTENCODING_APPLE_ARABIC : - aLanguages[0] = LANGUAGE_ARABIC; + aLanguages[0] = LANGUAGE_ARABIC_SAUDI_ARABIA; break; case RTL_TEXTENCODING_APPLE_CHINTRAD : diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src index cb7546e69e79..bfc5cebed93f 100644 --- a/sw/source/ui/misc/numberingtypelistbox.src +++ b/sw/source/ui/misc/numberingtypelistbox.src @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: numberingtypelistbox.src,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.252.1 $ * * This file is part of OpenOffice.org. * @@ -56,6 +56,10 @@ Resource STRRES_NUMTYPES < "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ; < "А, Б, .., Аа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ; < "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ; + < "А, Б, .., Аа, Аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ; + < "а, б, .., аа, аб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ; + < "А, Б, .., Аа, Бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ; + < "а, б, .., аа, бб, ... (Serbian)" ; 51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ; }; }; }; |