rpms/openoffice.org/devel openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, NONE, 1.1 openoffice.org.spec, 1.1563, 1.1564
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Jul 7 13:23:04 UTC 2008
- Previous message: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, NONE, 1.1 workspace.locdat30.patch, NONE, 1.1 .cvsignore, 1.154, 1.155 openoffice.org.spec, 1.1498, 1.1499 sources, 1.279, 1.280 workspace.cairotext01.patch, 1.7, 1.8
- Next message: rpms/fonts-arabic/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE fonts-arabic.spec, 1.22, NONE sources, 1.9, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25467
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
Log Message:
Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
openoffice.org-3.0.0.ooo86142.serbiannumbering.patch:
--- NEW FILE openoffice.org-3.0.0.ooo86142.serbiannumbering.patch ---
Index: i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx,v
retrieving revision 1.28
diff -u -r1.28 defaultnumberingprovider.cxx
--- openoffice.org.orig/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 13 Nov 2007 14:32:47 -0000 1.28
+++ openoffice.org/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 15 Feb 2008 05:14:16 -0000
@@ -166,6 +166,22 @@
0x0449, 0x044B, 0x044D, 0x044E, 0x044F
};
+// Serbian Cyrillic upper letters
+static sal_Unicode table_CyrillicUpperLetter_sr[] = {
+ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416,
+ 0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D,
+ 0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423,
+ 0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428
+};
+
+// Serbian cyrillic lower letters
+static sal_Unicode table_CyrillicLowerLetter_sr[] = {
+ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436,
+ 0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D,
+ 0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443,
+ 0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448
+};
+
static sal_Unicode table_Alphabet_fa[] = {
0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D,
0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634,
@@ -623,6 +639,32 @@
sizeof(table_CyrillicLowerLetter_ru[0]), number-1,
result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
break;
+ case CHARS_CYRILLIC_UPPER_LETTER_SR:
+ lcl_formatChars2( table_CyrillicUpperLetter_sr,
+ table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Ab, ...
+ break;
+ case CHARS_CYRILLIC_LOWER_LETTER_SR:
+ lcl_formatChars( table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>ab, ...
+ break;
+ case CHARS_CYRILLIC_UPPER_LETTER_N_SR:
+ lcl_formatChars3( table_CyrillicUpperLetter_sr,
+ table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Bb, ...
+ break;
+ case CHARS_CYRILLIC_LOWER_LETTER_N_SR:
+ lcl_formatChars1( table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
+ break;
case CHARS_PERSIAN:
lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result);
break;
@@ -708,6 +750,10 @@
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (ru)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
{style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL},
};
static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
Index: offapi/com/sun/star/style/NumberingType.idl
===================================================================
RCS file: /cvs/api/offapi/com/sun/star/style/NumberingType.idl,v
retrieving revision 1.17
diff -u -r1.17 NumberingType.idl
--- openoffice.org.orig/offapi/com/sun/star/style/NumberingType.idl 13 Nov 2007 14:30:30 -0000 1.17
+++ openoffice.org/offapi/com/sun/star/style/NumberingType.idl 15 Feb 2008 05:14:42 -0000
@@ -396,6 +396,66 @@
const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45;
//-------------------------------------------------------------------------
+ /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE ,
+ CYRILLIC CAPITAL LETTER VE , CYRILLIC CAPITAL LETTER GHE , ... ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER BE ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+ */
+ const short CHARS_CYRILLIC_UPPER_LETTER_SR = 47;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Russian Serbian alphabet lower case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE ,
+ CYRILLIC SMALL LETTER VE , CYRILLIC SMALL LETTER GHE , ... ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+ */
+ const short CHARS_CYRILLIC_LOWER_LETTER_SR = 48;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , ... ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC CAPITAL LETTER BE CYRILLIC SMALL LETTER BE ,
+ CYRILLIC CAPITAL LETTER VE CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+ */
+ const short CHARS_CYRILLIC_UPPER_LETTER_N_SR = 49;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , ... ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC SMALL LETTER BE CYRILLIC SMALL LETTER BE ,
+ CYRILLIC SMALL LETTER VE CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+ */
+ const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 50;
+
+ //-------------------------------------------------------------------------
/** Numbering in Persian alphabet letters (aa, be, pe, te, ...)
@since OOo 2.4
Index: svx/source/dialog/numpages.src
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/numpages.src,v
retrieving revision 1.62
diff -u -r1.62 numpages.src
--- openoffice.org.orig/svx/source/dialog/numpages.src 27 Jun 2007 17:23:30 -0000 1.62
+++ openoffice.org/svx/source/dialog/numpages.src 15 Feb 2008 05:16:13 -0000
@@ -216,6 +216,10 @@
< "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
< "Ð, Б, .., Ðа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
< "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
+ < "Ð, Б, .., Ðа, Ðб, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
+ < "а, б, .., аа, аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
+ < "Ð, Б, .., Ðа, Бб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
+ < "а, б, .., аа, бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
};
};
Index: sw/source/ui/misc/numberingtypelistbox.src
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/numberingtypelistbox.src,v
retrieving revision 1.19
diff -u -r1.19 numberingtypelistbox.src
--- openoffice.org.orig/sw/source/ui/misc/numberingtypelistbox.src 19 Apr 2007 13:21:04 -0000 1.19
+++ openoffice.org/sw/source/ui/misc/numberingtypelistbox.src 15 Feb 2008 05:16:22 -0000
@@ -61,6 +61,10 @@
< "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
< "Ð, Б, .., Ðа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
< "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
+ < "Ð, Б, .., Ðа, Ðб, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
+ < "а, б, .., аа, аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
+ < "Ð, Б, .., Ðа, Бб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
+ < "а, б, .., аа, бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
};
};
};
Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx
===================================================================
RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v
retrieving revision 1.21
diff -u -r1.21 DomainMapper_Impl.cxx
--- openoffice.org.orig/writerfilter/source/dmapper/DomainMapper_Impl.cxx 29 Oct 2007 15:28:37 -0000 1.21
+++ openoffice.org/writerfilter/source/dmapper/DomainMapper_Impl.cxx 15 Feb 2008 05:16:48 -0000
@@ -1027,7 +1027,11 @@
CHARS_CYRILLIC_UPPER_LETTER_RU
CHARS_CYRILLIC_LOWER_LETTER_RU
CHARS_CYRILLIC_UPPER_LETTER_N_RU
- CHARS_CYRILLIC_LOWER_LETTER_N_RU*/
+ CHARS_CYRILLIC_LOWER_LETTER_N_RU
+ CHARS_CYRILLIC_UPPER_LETTER_SR
+ CHARS_CYRILLIC_LOWER_LETTER_SR
+ CHARS_CYRILLIC_UPPER_LETTER_N_SR
+ CHARS_CYRILLIC_LOWER_LETTER_N_SR*/
};
for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum)
Index: sh_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sh_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sh_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sh_RS.xml 13 Nov 2007 14:35:55 -0000 1.2
+++ openoffice.org/i18npool/source/localedata/data/sh_RS.xml 31 Mar 2008 17:33:14 -0000
@@ -210,72 +224,6 @@
<quarter4Abbreviation>K4</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_NumberingLevel ref="sr_RS"/>
+ <LC_OutLineNumberingLevel ref="sr_RS"/>
</Locale>
Index: sr_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sr_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sr_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sr_RS.xml 13 Nov 2007 14:37:09 -0000 1.2
+++ openoffice.org/i18npool/source/localedata/data/sr_RS.xml 31 Mar 2008 17:33:19 -0000
@@ -350,35 +364,35 @@
</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="4" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="2" Prefix=" " Suffix=""/>
+ <NumberingLevel NumType="3" Prefix=" " Suffix=""/>
+ <NumberingLevel NumType="47" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="48" 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="48" 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="48" 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="48" 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="47" 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>
@@ -390,13 +404,13 @@
</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="47" 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="48" 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="47" 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"/>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1563
retrieving revision 1.1564
diff -u -r1.1563 -r1.1564
--- openoffice.org.spec 7 Jul 2008 13:11:23 -0000 1.1563
+++ openoffice.org.spec 7 Jul 2008 13:22:16 -0000 1.1564
@@ -1,6 +1,6 @@
%define oootag DEV300
%define ooomilestone 23
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -118,6 +118,7 @@
Patch48: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
Patch49: workspace.cairo06.patch
Patch50: workspace.ab55.patch
+Patch51: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1278,6 +1279,7 @@
%patch48 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
%patch49 -p1 -b .workspace.cairo06.patch
%patch50 -p1 -b .workspace.ab55.patch
+%patch51 -p1 -b .ooo86142.serbiannumbering.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3581,6 +3583,9 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Mon Jul 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-2
+- Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+
* Sun Jul 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-1
- next version
- split out arcane ScriptProviders out of core into optional extensions
- Previous message: rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, NONE, 1.1 workspace.locdat30.patch, NONE, 1.1 .cvsignore, 1.154, 1.155 openoffice.org.spec, 1.1498, 1.1499 sources, 1.279, 1.280 workspace.cairotext01.patch, 1.7, 1.8
- Next message: rpms/fonts-arabic/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE fonts-arabic.spec, 1.22, NONE sources, 1.9, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list