Attachment 309971 Details for Bug 452374 – Serbian Cyrillic Numbering Provider

[patch] Serbian Cyrillic Numbering Provider

serbian_cyrillic_numbering.patch (text/plain), 11.04 KB, created by Goran Rakic on 2008-06-21 17:18:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Goran Rakic

Created: 2008-06-21 17:18:13 UTC

Size: 11.04 KB

patch

obsolete

>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
>--- i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx	13 Nov 2007 14:32:47 -0000	1.28
>+++ 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
>--- offapi/com/sun/star/style/NumberingType.idl	13 Nov 2007 14:30:30 -0000	1.17
>+++ 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
>--- svx/source/dialog/numpages.src	27 Jun 2007 17:23:30 -0000	1.62
>+++ 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
>--- sw/source/ui/misc/numberingtypelistbox.src	19 Apr 2007 13:21:04 -0000	1.19
>+++ 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
>--- writerfilter/source/dmapper/DomainMapper_Impl.cxx	29 Oct 2007 15:28:37 -0000	1.21
>+++ 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)

Actions: View | Diff

Attachments on bug 452374: 309971 | 309972