Make it compile with MSVC

1 files changed, 46 insertions, 48 deletions

diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 210cf6591cd1..7a024633fa6e 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -215,60 +215,57 @@ static sal_Unicode lowerLetter[] = {
     0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
 };
 
-
-typedef sal_Unicode ArrUnicode[];
-
 // Tables used for numbering in persian words
-static sal_Unicode *table_PersianWord_decade1[]={
-    (ArrUnicode){0},                                                 // 0
-    (ArrUnicode){0x06cc, 0x06a9, 0},                                 // 1
-    (ArrUnicode){0x062f, 0x0648, 0},                                 // 2
-    (ArrUnicode){0x0633, 0x0647, 0},                                 // 3
-    (ArrUnicode){0x0686, 0x0647, 0x0627, 0x0631, 0},                 // 4
-    (ArrUnicode){0x067e, 0x0646, 0x062c, 0},                         // 5
-    (ArrUnicode){0x0634, 0x0634, 0},                                 // 6
-    (ArrUnicode){0x0647, 0x0641, 0x062a, 0},                         // 7
-    (ArrUnicode){0x0647, 0x0634, 0x062a, 0},                         // 8
-    (ArrUnicode){0x0646, 0x0647, 0},                                 // 9
-    (ArrUnicode){0x062f, 0x0647, 0},                                 // 10
-    (ArrUnicode){0x06cc, 0x0627, 0x0632, 0x062f, 0x0647, 0},         // 11
-    (ArrUnicode){0x062f, 0x0648, 0x0627, 0x0632, 0x062f, 0x0647, 0}, // 12
-    (ArrUnicode){0x0633, 0x06cc, 0x0632, 0x062f, 0x0647, 0},         // 13
-    (ArrUnicode){0x0686, 0x0647, 0x0627, 0x0631, 0x062f, 0x0647, 0}, // 14
-    (ArrUnicode){0x067e, 0x0627, 0x0646, 0x0632, 0x062f, 0x0647, 0}, // 15
-    (ArrUnicode){0x0634, 0x0627, 0x0646, 0x0632, 0x062f, 0x0647, 0}, // 16
-    (ArrUnicode){0x0647, 0x0641, 0x062f, 0x0647, 0},                 // 17
-    (ArrUnicode){0x0647, 0x062c, 0x062f, 0x0647, 0},                 // 18
-    (ArrUnicode){0x0646, 0x0648, 0x0632, 0x062f, 0x0647, 0}          // 19
+static sal_Unicode table_PersianWord_decade1[][7]={
+    {0},                                                 // 0
+    {0x06cc, 0x06a9, 0},                                 // 1
+    {0x062f, 0x0648, 0},                                 // 2
+    {0x0633, 0x0647, 0},                                 // 3
+    {0x0686, 0x0647, 0x0627, 0x0631, 0},                 // 4
+    {0x067e, 0x0646, 0x062c, 0},                         // 5
+    {0x0634, 0x0634, 0},                                 // 6
+    {0x0647, 0x0641, 0x062a, 0},                         // 7
+    {0x0647, 0x0634, 0x062a, 0},                         // 8
+    {0x0646, 0x0647, 0},                                 // 9
+    {0x062f, 0x0647, 0},                                 // 10
+    {0x06cc, 0x0627, 0x0632, 0x062f, 0x0647, 0},         // 11
+    {0x062f, 0x0648, 0x0627, 0x0632, 0x062f, 0x0647, 0}, // 12
+    {0x0633, 0x06cc, 0x0632, 0x062f, 0x0647, 0},         // 13
+    {0x0686, 0x0647, 0x0627, 0x0631, 0x062f, 0x0647, 0}, // 14
+    {0x067e, 0x0627, 0x0646, 0x0632, 0x062f, 0x0647, 0}, // 15
+    {0x0634, 0x0627, 0x0646, 0x0632, 0x062f, 0x0647, 0}, // 16
+    {0x0647, 0x0641, 0x062f, 0x0647, 0},                 // 17
+    {0x0647, 0x062c, 0x062f, 0x0647, 0},                 // 18
+    {0x0646, 0x0648, 0x0632, 0x062f, 0x0647, 0}          // 19
 };
 
-static sal_Unicode *table_PersianWord_decade2[]={
-    (ArrUnicode){0x0628, 0x06cc, 0x0633, 0x062a, 0},                 // 20
-    (ArrUnicode){0x0633, 0x06cc, 0},                                 // 30
-    (ArrUnicode){0x0686, 0x0647, 0x0644, 0},                         // 40
-    (ArrUnicode){0x067e, 0x0646, 0x062c, 0x0627, 0x0647, 0},         // 50
-    (ArrUnicode){0x0634, 0x0635, 0x062a, 0},                         // 60
-    (ArrUnicode){0x0647, 0x0641, 0x062a, 0x0627, 0x062f, 0},         // 70
-    (ArrUnicode){0x0647, 0x0634, 0x062a, 0x0627, 0x062f, 0},         // 80
-    (ArrUnicode){0x0646, 0x0648, 0x062f, 0}                          // 90
+static sal_Unicode table_PersianWord_decade2[][6]={
+    {0x0628, 0x06cc, 0x0633, 0x062a, 0},                 // 20
+    {0x0633, 0x06cc, 0},                                 // 30
+    {0x0686, 0x0647, 0x0644, 0},                         // 40
+    {0x067e, 0x0646, 0x062c, 0x0627, 0x0647, 0},         // 50
+    {0x0634, 0x0635, 0x062a, 0},                         // 60
+    {0x0647, 0x0641, 0x062a, 0x0627, 0x062f, 0},         // 70
+    {0x0647, 0x0634, 0x062a, 0x0627, 0x062f, 0},         // 80
+    {0x0646, 0x0648, 0x062f, 0}                          // 90
 };
 
-static sal_Unicode *table_PersianWord_decade3[]={
-    (ArrUnicode){0x0635, 0x062f, 0},                                 // 100
-    (ArrUnicode){0x062f, 0x0648, 0x06cc, 0x0633, 0x062a, 0},         // 200
-    (ArrUnicode){0x0633, 0x06cc, 0x0635, 0x062f, 0},                 // 300
-    (ArrUnicode){0x0686, 0x0647, 0x0627, 0x0631, 0x0635, 0x062f, 0}, // 400
-    (ArrUnicode){0x067e, 0x0627, 0x0646, 0x0635, 0x062f, 0},         // 500
-    (ArrUnicode){0x0634, 0x0635, 0x062f, 0},                         // 600
-    (ArrUnicode){0x0647, 0x0641, 0x062a, 0x0635, 0x062f, 0},         // 700
-    (ArrUnicode){0x0647, 0x0634, 0x062a, 0x0635, 0x062f, 0},         // 800
-    (ArrUnicode){0x0646, 0x0647, 0x0635, 0x062f, 0}                  // 900
+static sal_Unicode table_PersianWord_decade3[][7]={
+    {0x0635, 0x062f, 0},                                 // 100
+    {0x062f, 0x0648, 0x06cc, 0x0633, 0x062a, 0},         // 200
+    {0x0633, 0x06cc, 0x0635, 0x062f, 0},                 // 300
+    {0x0686, 0x0647, 0x0627, 0x0631, 0x0635, 0x062f, 0}, // 400
+    {0x067e, 0x0627, 0x0646, 0x0635, 0x062f, 0},         // 500
+    {0x0634, 0x0635, 0x062f, 0},                         // 600
+    {0x0647, 0x0641, 0x062a, 0x0635, 0x062f, 0},         // 700
+    {0x0647, 0x0634, 0x062a, 0x0635, 0x062f, 0},         // 800
+    {0x0646, 0x0647, 0x0635, 0x062f, 0}                  // 900
 };
 
-static sal_Unicode *table_PersianWord_decadeX[]={
-    (ArrUnicode){0x0647, 0x0632, 0x0627, 0x0631, 0},                        // 1000
-    (ArrUnicode){0x0645, 0x06cc, 0x0644, 0x06cc, 0x0648, 0x0646, 0},        // 1000000
-    (ArrUnicode){0x0645, 0x06cc, 0x0644, 0x06cc, 0x0627, 0x0631, 0x062f, 0} // 1000000000
+static sal_Unicode table_PersianWord_decadeX[][8]={
+    {0x0647, 0x0632, 0x0627, 0x0631, 0},                        // 1000
+    {0x0645, 0x06cc, 0x0644, 0x06cc, 0x0648, 0x0646, 0},        // 1000000
+    {0x0645, 0x06cc, 0x0644, 0x06cc, 0x0627, 0x0631, 0x062f, 0} // 1000000000
 };
 
 
@@ -408,7 +405,8 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult )
 {
     OUStringBuffer aTemp(64);
     unsigned char nDigit;
-    OUString asPersianWord_conjunction( (ArrUnicode){0x20,0x0648,0x20,0});
+    sal_Unicode asPersianWord_conjunction_data[] = {0x20,0x0648,0x20,0};
+    OUString asPersianWord_conjunction( asPersianWord_conjunction_data );
     unsigned char nSection = 0;
 
     while (int nPart = nNumber % 1000)