rpms/openoffice.org/F-8 workspace.locales24.patch, NONE, 1.1 openoffice.org.spec, 1.1334, 1.1335
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Sun Dec 16 12:38:33 UTC 2007
- Previous message (by thread): rpms/mfiler2/devel .cvsignore, 1.3, 1.4 mfiler2.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/openoffice.org/devel workspace.locales24.patch, NONE, 1.1 openoffice.org.spec, 1.1361, 1.1362
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5430
Modified Files:
openoffice.org.spec
Added Files:
workspace.locales24.patch
Log Message:
Resolves: rhbz#425701 add workspace.locales24.patch
workspace.locales24.patch:
--- NEW FILE workspace.locales24.patch ---
Index: api/offapi/com/sun/star/style/NumberingType.idl
diff -u api/offapi/com/sun/star/style/NumberingType.idl:1.16 api/offapi/com/sun/star/style/NumberingType.idl:1.16.196.1
--- api/offapi/com/sun/star/style/NumberingType.idl:1.16 Tue Dec 19 10:02:32 2006
+++ api/offapi/com/sun/star/style/NumberingType.idl Mon Oct 29 09:35:50 2007
@@ -394,6 +394,13 @@
CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
*/
const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Persian alphabet letters (aa, be, pe, te, ...)
+
+ @since OOo 2.4
+ */
+ const short CHARS_PERSIAN = 46;
};
//=============================================================================
Index: graphics/svx/source/dialog/langtab.src
diff -u graphics/svx/source/dialog/langtab.src:1.77 graphics/svx/source/dialog/langtab.src:1.77.162.3
--- graphics/svx/source/dialog/langtab.src:1.77 Tue Jul 3 07:01:46 2007
+++ graphics/svx/source/dialog/langtab.src Wed Nov 7 02:29:05 2007
@@ -69,8 +69,8 @@
< "Arabic (Saudi Arabia)" ; LANGUAGE_ARABIC_SAUDI_ARABIA ; > ;
< "Armenian" ; LANGUAGE_ARMENIAN ; > ;
< "Assami" ; LANGUAGE_ASSAMESE ; > ;
- < "Azerbaijani (Latin)" ; LANGUAGE_AZERI_LATIN ; > ;
- < "Azerbaijani (Cyrillic)" ; LANGUAGE_AZERI_CYRILLIC ; > ;
+ < "Azerbaijani Latin" ; LANGUAGE_AZERI_LATIN ; > ;
+ < "Azerbaijani Cyrillic" ; LANGUAGE_AZERI_CYRILLIC ; > ;
< "Basque" ; LANGUAGE_BASQUE ; > ;
< "Bengali (India)" ; LANGUAGE_BENGALI ; > ;
< "Bulgarian" ; LANGUAGE_BULGARIAN ; > ;
@@ -142,8 +142,8 @@
< "Marathi" ; LANGUAGE_MARATHI ; > ;
< "Nepali (Nepal)" ; LANGUAGE_NEPALI ; > ;
< "Nepali (India)" ; LANGUAGE_NEPALI_INDIA ; > ;
- < "Norwegian (Bokmål)" ; LANGUAGE_NORWEGIAN_BOKMAL ; > ;
- < "Norwegian (Nynorsk)" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ;
+ < "Norwegian, Bokmål" ; LANGUAGE_NORWEGIAN_BOKMAL ; > ;
+ < "Norwegian, Nynorsk" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ;
< "Oriya" ; LANGUAGE_ORIYA ; > ;
< "Polish" ; LANGUAGE_POLISH ; > ;
< "Portuguese (Portugal)" ; LANGUAGE_PORTUGUESE ; > ;
@@ -153,14 +153,18 @@
< "Romanian" ; LANGUAGE_ROMANIAN ; > ;
< "Russian" ; LANGUAGE_RUSSIAN ; > ;
< "Sanskrit" ; LANGUAGE_SANSKRIT ; > ;
- < "Serbian (Latin)" ; LANGUAGE_SERBIAN_LATIN ; > ;
- < "Serbian (Cyrillic)" ; LANGUAGE_SERBIAN_CYRILLIC ; > ;
+ < "Serbian Cyrillic (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_CYRILLIC ; > ;
+ < "Serbian Latin (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_LATIN ; > ;
+ < "Serbian Cyrillic (Serbia)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA ; > ;
+ < "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ;
+ < "Serbian Cyrillic (Montenegro)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ;
+ < "Serbian Latin (Montenegro)" ; LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ; > ;
< "Sindhi" ; LANGUAGE_SINDHI ; > ;
< "Slovakian" ; LANGUAGE_SLOVAK ; > ;
< "Slovenian" ; LANGUAGE_SLOVENIAN ; > ;
< "Spanish (Spain)" ; LANGUAGE_SPANISH ; > ;
< "Spanish (Mexico)" ; LANGUAGE_SPANISH_MEXICAN ; > ;
- < "Spanish (Modern)" ; LANGUAGE_SPANISH_MODERN ; > ;
+ < "Spanish, Modern (Spain)" ; LANGUAGE_SPANISH_MODERN ; > ;
< "Spanish (Guatemala)" ; LANGUAGE_SPANISH_GUATEMALA ; > ;
< "Spanish (Costa Rica)" ; LANGUAGE_SPANISH_COSTARICA ; > ;
< "Spanish (Panama)" ; LANGUAGE_SPANISH_PANAMA ; > ;
@@ -190,7 +194,7 @@
< "Urdu (Pakistan)" ; LANGUAGE_URDU_PAKISTAN ; > ;
< "Urdu (India)" ; LANGUAGE_URDU_INDIA ; > ;
< "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ;
- < "Uzbek (Latin)" ; LANGUAGE_UZBEK_LATIN ; > ;
+ < "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ;
< "Welsh" ; LANGUAGE_WELSH ; > ;
< "User 1" ; LANGUAGE_USER1 ; > ;
< "User 2" ; LANGUAGE_USER2 ; > ;
@@ -232,7 +236,7 @@
< "Vietnamese" ; LANGUAGE_VIETNAMESE ; > ;
< "Breton" ; LANGUAGE_USER_BRETON ; > ;
< "Kalaallisut" ; LANGUAGE_USER_KALAALLISUT ; > ;
- < "Ndebele (South)" ; LANGUAGE_USER_NDEBELE_SOUTH ; > ;
+ < "Ndebele, South" ; LANGUAGE_USER_NDEBELE_SOUTH ; > ;
< "Southern Sotho" ; LANGUAGE_SESOTHO ; > ;
< "Swazi" ; LANGUAGE_USER_SWAZI ; > ;
< "Tsonga" ; LANGUAGE_TSONGA ; > ;
@@ -265,6 +269,15 @@
< "Tagalog" ; LANGUAGE_USER_TAGALOG ; > ;
< "Ganda" ; LANGUAGE_USER_GANDA ; > ;
< "Lingala" ; LANGUAGE_USER_LINGALA_DRCONGO ; > ;
+ < "Low German" ; LANGUAGE_USER_LOW_GERMAN ; > ;
+ < "Hiligaynon" ; LANGUAGE_USER_HILIGAYNON ; > ;
+ < "Nyanja" ; LANGUAGE_USER_NYANJA ; > ;
+ < "Kashubian" ; LANGUAGE_USER_KASHUBIAN ; > ;
+ < "Spanish (Cuba)" ; LANGUAGE_USER_SPANISH_CUBA ; > ;
+ < "Tetun" ; LANGUAGE_USER_TETUN ; > ;
+ < "Quechua (Bolivia, North)" ; LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA ; > ;
+ < "Quechua (Bolivia, South)" ; LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA ; > ;
+ < "Somali" ; LANGUAGE_SOMALI ; > ;
};
};
Index: l10n/i18npool/inc/i18npool/lang.h
diff -u l10n/i18npool/inc/i18npool/lang.h:1.8 l10n/i18npool/inc/i18npool/lang.h:1.8.38.2
--- l10n/i18npool/inc/i18npool/lang.h:1.8 Tue Jul 3 07:02:28 2007
+++ l10n/i18npool/inc/i18npool/lang.h Thu Nov 1 06:19:52 2007
@@ -59,7 +59,7 @@
recent MSDEV version and the following web pages.
- The complete list, not necessarily supported by Windows:
+ The once complete list, not necessarily supported by Windows:
List of Locale ID (LCID) Values as Assigned by Microsoft
http://www.microsoft.com/globaldev/reference/lcid-all.mspx
@@ -69,23 +69,14 @@
And of course 2 lists aren't enough, so Windows Vista needs an extra one.
Which at least seems to include values of other versions of Windows.
- http://msdn.microsoft.com/library/en-us/intl/nls_238z.asp
+ Language Identifier Constants and Strings
+ http://msdn2.microsoft.com/en-us/library/ms776294.aspx
+ Lists for 2003, XP and Vista, overview with URLs pointing to regional settings:
+ NLS information page
+ http://www.microsoft.com/globaldev/nlsweb/default.mspx
- nls information page
- http://www.microsoft.com/globaldev/nlsweb/
-
- IDs used in specific Windows versions up to and including Windows XP:
- Table of Language Identifiers
- http://msdn.microsoft.com/library/en-us/intl/nls_238z.asp
-
- Primary Language Identifiers (International Features: Platform SDK)
- http://msdn.microsoft.com/library/en-us/intl/nls_61df.asp
-
- SubLanguage Identifiers (International Features: Platform SDK)
- http://msdn.microsoft.com/library/en-us/intl/nls_19ir.asp
-
- WD2000: Supported Language ID Reference Numbers (LCID)
+ List of supported locale identifiers in Word
http://support.microsoft.com/default.aspx?scid=KB;en-us;q221435
*/
@@ -321,10 +312,11 @@
#define LANGUAGE_SEPEDI 0x046C
#define LANGUAGE_NORTHERNSOTHO LANGUAGE_SEPEDI /* just an alias for the already existing localization */
#define LANGUAGE_SERBIAN 0x001A /* primary only, not a locale! */
-#define LANGUAGE_SERBIAN_CYRILLIC 0x0C1A
+#define LANGUAGE_SERBIAN_CYRILLIC 0x0C1A /* MS lists this as Serbian (Cyrillic, Serbia) 'sr-Cyrl-SP', but they use 'SP' since at least Windows2003 where it was Serbia and Montenegro! */
#define LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA 0x1C1A
-#define LANGUAGE_SERBIAN_LATIN 0x081A
+#define LANGUAGE_SERBIAN_LATIN 0x081A /* MS lists this as Serbian (Latin, Serbia) 'sr-Latn-SP', but they use 'SP' since at least Windows2003 where it was Serbia and Montenegro! */
#define LANGUAGE_SERBIAN_LATIN_BOSNIA_HERZEGOVINA 0x181A
+#define LANGUAGE_SERBIAN_LATIN_NEUTRAL 0x7C1A /* MS lists this as 'sr' only. What a mess. */
#define LANGUAGE_SESOTHO 0x0430 /* also called Sutu now by MS */
#define LANGUAGE_SINDHI 0x0459
#define LANGUAGE_SINDHI_PAKISTAN 0x0859
@@ -483,5 +475,17 @@
#define LANGUAGE_USER_LINGALA_DRCONGO 0x0639
#define LANGUAGE_USER_SANGO 0x063A
#define LANGUAGE_USER_GANDA 0x063B
+#define LANGUAGE_USER_LOW_GERMAN 0x063C
+#define LANGUAGE_USER_HILIGAYNON 0x063D
+#define LANGUAGE_USER_NYANJA 0x063E
+#define LANGUAGE_USER_KASHUBIAN 0x063F
+#define LANGUAGE_USER_SPANISH_CUBA 0x800A /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_SPANISH)) */
+#define LANGUAGE_USER_TETUN 0x0640
+#define LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA 0x0641
+#define LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA 0x0642
+#define LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA 0x8C1A /* makeLangID( 0x20+0x03, getPrimaryLanguage( LANGUAGE_SERBIAN_CYRILLIC)) */
+#define LANGUAGE_USER_SERBIAN_LATIN_SERBIA 0x881A /* makeLangID( 0x20+0x02, getPrimaryLanguage( LANGUAGE_SERBIAN_LATIN)) */
+#define LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO 0xCC1A /* makeLangID( 0x20+0x13, getPrimaryLanguage( LANGUAGE_SERBIAN_CYRILLIC)) */
+#define LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO 0xC81A /* makeLangID( 0x20+0x12, getPrimaryLanguage( LANGUAGE_SERBIAN_LATIN)) */
#endif /* INCLUDED_I18NPOOL_LANG_H */
Index: l10n/i18npool/source/breakiterator/gendict.cxx
diff -u l10n/i18npool/source/breakiterator/gendict.cxx:1.10 l10n/i18npool/source/breakiterator/gendict.cxx:1.10.32.1
--- l10n/i18npool/source/breakiterator/gendict.cxx:1.10 Fri Aug 3 05:33:51 2007
+++ l10n/i18npool/source/breakiterator/gendict.cxx Fri Oct 26 11:23:05 2007
@@ -132,7 +132,7 @@
count = 1;
fprintf(cfp, "0x%x, ", 0); // insert one slat for skipping 0 in index2 array.
for (i = 0; i < lenArrayCount; i++) {
- fprintf(cfp, "0x%lx, ", lenArray[i]);
+ fprintf(cfp, "0x%lx, ", static_cast<long unsigned int>(lenArray[i]));
if (count == 0xf) {
count = 0;
fprintf(cfp, "\n\t");
Index: l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
diff -u l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx:1.27 l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx:1.27.72.1
--- l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx:1.27 Tue Dec 12 08:15:52 2006
+++ l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx Mon Oct 29 10:34:02 2007
@@ -166,6 +166,13 @@
0x0449, 0x044B, 0x044D, 0x044E, 0x044F
};
+static sal_Unicode table_Alphabet_fa[] = {
+ 0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D,
+ 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634,
[...2936 lines suppressed...]
- <quarter2Abbreviation>К2</quarter2Abbreviation>
- <quarter3Abbreviation>К3</quarter3Abbreviation>
- <quarter4Abbreviation>К4</quarter4Abbreviation>
- </ReservedWords>
- </LC_MISC>
- <LC_NumberingLevel>
- <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
- <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
- </LC_NumberingLevel>
- <LC_OutLineNumberingLevel>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- </LC_OutLineNumberingLevel>
+ <LC_TRANSLITERATION ref="sr_RS"/>
+ <LC_MISC ref="sr_RS"/>
+ <LC_NumberingLevel ref="sr_RS"/>
+ <LC_OutLineNumberingLevel ref="sr_RS"/>
</Locale>
+
Index: l10n/i18npool/source/nativenumber/nativenumbersupplier.cxx
diff -u l10n/i18npool/source/nativenumber/nativenumbersupplier.cxx:1.24 l10n/i18npool/source/nativenumber/nativenumbersupplier.cxx:1.24.102.1
--- l10n/i18npool/source/nativenumber/nativenumbersupplier.cxx:1.24 Sun Sep 17 02:22:28 2006
+++ l10n/i18npool/source/nativenumber/nativenumbersupplier.cxx Mon Oct 29 10:34:02 2007
@@ -444,17 +444,77 @@
static Number natnum11 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_Hangul_ko], NUMBER_OMIT_ALL,
ExponentCount_6_CJK, MultiplierExponent_6_CJK };
-static const sal_Char *natnum1Locales[] = { "zh_CN", "zh_TW", "ja", "ko", "he", "ar", "th", "hi", "or", "mr", "bn", "pa", "gu", "ta", "te", "kn", "ml", "lo", "bo", "my", "km", "mn", "ne","dz" };
+//! ATTENTION: Do not change order of elements!
+//! Append new languages to the end of the list!
+static const sal_Char *natnum1Locales[] = {
+ "zh_CN",
+ "zh_TW",
+ "ja",
+ "ko",
+ "he",
+ "ar",
+ "th",
+ "hi",
+ "or",
+ "mr",
+ "bn",
+ "pa",
+ "gu",
+ "ta",
+ "te",
+ "kn",
+ "ml",
+ "lo",
+ "bo",
+ "my",
+ "km",
+ "mn",
+ "ne",
+ "dz",
+ "fa"
+};
static sal_Int16 nbOfLocale = sizeof(natnum1Locales)/sizeof(natnum1Locales[0]);
-static sal_Int16 natnum1[] = { NumberChar_Lower_zh, NumberChar_Lower_zh, NumberChar_Modern_ja, NumberChar_Lower_ko, NumberChar_he,
- NumberChar_Indic_ar, NumberChar_th, NumberChar_hi, NumberChar_or, NumberChar_mr, NumberChar_bn,
- NumberChar_pa, NumberChar_gu, NumberChar_ta, NumberChar_te, NumberChar_kn, NumberChar_ml,
- NumberChar_lo, NumberChar_bo, NumberChar_my, NumberChar_km, NumberChar_mn, NumberChar_ne,
-NumberChar_dz };
+//! ATTENTION: Do not change order of elements!
+//! Number and order must match elements of natnum1Locales!
+static sal_Int16 natnum1[] = {
+ NumberChar_Lower_zh,
+ NumberChar_Lower_zh,
+ NumberChar_Modern_ja,
+ NumberChar_Lower_ko,
+ NumberChar_he,
+ NumberChar_Indic_ar,
+ NumberChar_th,
+ NumberChar_hi,
+ NumberChar_or,
+ NumberChar_mr,
+ NumberChar_bn,
+ NumberChar_pa,
+ NumberChar_gu,
+ NumberChar_ta,
+ NumberChar_te,
+ NumberChar_kn,
+ NumberChar_ml,
+ NumberChar_lo,
+ NumberChar_bo,
+ NumberChar_my,
+ NumberChar_km,
+ NumberChar_mn,
+ NumberChar_ne,
+ NumberChar_dz,
+ NumberChar_EastIndic_ar
+};
static sal_Int16 sizeof_natnum1 = sizeof(natnum1)/sizeof(natnum1[0]);
-static sal_Int16 natnum2[] = { NumberChar_Upper_zh, NumberChar_Upper_zh_TW, NumberChar_Traditional_ja,
- NumberChar_Upper_ko, NumberChar_he };
+
+//! ATTENTION: Do not change order of elements!
+//! Order must match first elements of natnum1Locales!
+static sal_Int16 natnum2[] = {
+ NumberChar_Upper_zh,
+ NumberChar_Upper_zh_TW,
+ NumberChar_Traditional_ja,
+ NumberChar_Upper_ko,
+ NumberChar_he
+};
static sal_Int16 sizeof_natnum2 = sizeof(natnum2)/sizeof(natnum2[0]);
#define isLang(lang) rLocale.Language.equalsAsciiL(lang, 2)
Index: l10n/i18npool/source/nativenumber/data/numberchar.h
diff -u l10n/i18npool/source/nativenumber/data/numberchar.h:1.12 l10n/i18npool/source/nativenumber/data/numberchar.h:1.12.118.1
--- l10n/i18npool/source/nativenumber/data/numberchar.h:1.12 Mon Jun 19 21:47:47 2006
+++ l10n/i18npool/source/nativenumber/data/numberchar.h Mon Oct 29 10:34:02 2007
@@ -117,7 +117,7 @@
0x9EDE, // Korean Upper
0xC810, // Korean Hangul
0x066B, // Arabic Indic
- 0x0000, // Est. Arabic Indic
+ 0x066B, // Est. Arabic Indic
0x0000, // Indic (Devanagari)
0x0000, // Thai
0x0000, // Oriya
@@ -151,7 +151,7 @@
0x5069, // Korean Upper
0xFF0D, // Korean Hangul ???
0x0000, // Arabic Indic
- 0x0000, // Est. Arabic Indic
+ 0x2212, // Est. Arabic Indic
0x0000, // Indic
0x0000, // Thai
0x0000, // Oriya
@@ -185,7 +185,7 @@
0x3001, // Korean Upper
0x3001, // Korean Hangul
0x0000, // Arabic Indic
- 0x0000, // Est. Arabic Indic
+ 0x066C, // Est. Arabic Indic
0x0000, // Indic
0x0000, // Thai
0x0000, // Oriya
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1334
retrieving revision 1.1335
diff -u -r1.1334 -r1.1335
--- openoffice.org.spec 3 Dec 2007 18:52:04 -0000 1.1334
+++ openoffice.org.spec 16 Dec 2007 12:37:57 -0000 1.1335
@@ -1,6 +1,6 @@
%define oootag OOG680
%define ooomilestone 6
-%define rh_rpm_release 7
+%define rh_rpm_release 8
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -155,6 +155,7 @@
Patch73: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
Patch74: workspace.hsql1808.patch
Patch75: workspace.allowcurloldies.patch
+Patch76: workspace.locales24.patch
%define instdir %{_libdir}/openoffice.org
@@ -1105,6 +1106,7 @@
%patch73 -p1 -b .ooo83930.sw.flushanchors.patch
%patch74 -p1 -b .workspace.hsql1808.patch
%patch75 -p1 -b .workspace.allowcurloldies.patch
+%patch76 -p1 -b .workspace.locales24.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2805,6 +2807,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Sun Dec 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8-UNRELEASED
+- Resolves: rhbz#425701 add workspace.locales24.patch
+
* Wed Dec 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
- Resolves: rhbz#303601 CVE-2007-4575 workspace.hsql1808.patch
- add workspace.allowcurloldies.patch because curl became build-time incompatible
- Previous message (by thread): rpms/mfiler2/devel .cvsignore, 1.3, 1.4 mfiler2.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message (by thread): rpms/openoffice.org/devel workspace.locales24.patch, NONE, 1.1 openoffice.org.spec, 1.1361, 1.1362
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list