diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-08-09 09:14:53 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-08-09 09:22:49 +0900 |
commit | f30cde45db99d5c57e8be6956bbf824ab92328c2 (patch) | |
tree | 1cf0db30957e97074542549e4e44900b1ef7aaed /i18npool | |
parent | Bin unused #include (diff) | |
download | core-f30cde45db99d5c57e8be6956bbf824ab92328c2.tar.gz core-f30cde45db99d5c57e8be6956bbf824ab92328c2.zip |
Mark as const/static
Change-Id: I5d51d7e01913ac9917578f8c9789312af9be3638
Diffstat (limited to 'i18npool')
18 files changed, 95 insertions, 95 deletions
diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h index 3392bbe2731e..c1f144326df5 100644 --- a/i18npool/inc/bullet.h +++ b/i18npool/inc/bullet.h @@ -19,7 +19,7 @@ namespace com { namespace sun { namespace star { namespace i18n { -static sal_Unicode table_AIUFullWidth_ja_JP[] = { +static const sal_Unicode table_AIUFullWidth_ja_JP[] = { 0x30A2, // KATAKANA LETTER A 0x30A4, // KATAKANA LETTER I 0x30A6, // KATAKANA LETTER U @@ -68,7 +68,7 @@ static sal_Unicode table_AIUFullWidth_ja_JP[] = { 0x30F3 // KATAKANA LETTER N }; -static sal_Unicode table_AIUHalfWidth_ja_JP[] = { +static const sal_Unicode table_AIUHalfWidth_ja_JP[] = { 0xFF71, // HALFWIDTH KATAKANA LETTER A 0xFF72, // HALFWIDTH KATAKANA LETTER I 0xFF73, // HALFWIDTH KATAKANA LETTER U @@ -117,7 +117,7 @@ static sal_Unicode table_AIUHalfWidth_ja_JP[] = { 0xFF9D // HALFWIDTH KATAKANA LETTER N }; -static sal_Unicode table_IROHAFullWidth_ja_JP[] = { +static const sal_Unicode table_IROHAFullWidth_ja_JP[] = { 0x30A4, // KATAKANA LETTER I 0x30ED, // KATAKANA LETTER RO 0x30CF, // KATAKANA LETTER HA @@ -168,7 +168,7 @@ static sal_Unicode table_IROHAFullWidth_ja_JP[] = { 0x30F3 // KATAKANA LETTER N }; -static sal_Unicode table_IROHAHalfWidth_ja_JP[] = { +static const sal_Unicode table_IROHAHalfWidth_ja_JP[] = { 0xFF72, // HALFWIDTH KATAKANA LETTER I 0xFF9B, // HALFWIDTH KATAKANA LETTER RO 0xFF8A, // HALFWIDTH KATAKANA LETTER HA @@ -219,7 +219,7 @@ static sal_Unicode table_IROHAHalfWidth_ja_JP[] = { 0xFF9D // HALFWIDTH KATAKANA LETTER N }; -static sal_Unicode table_CircledNumber[] = { +static const sal_Unicode table_CircledNumber[] = { 0x2460, // CIRCLED DIGIT ONE 0x2461, // CIRCLED DIGIT TWO 0x2462, // CIRCLED DIGIT THREE @@ -242,7 +242,7 @@ static sal_Unicode table_CircledNumber[] = { 0x2473 // CIRCLED NUMBER TWENTY }; -static sal_Unicode table_HangulJamo_ko[] = { +static const sal_Unicode table_HangulJamo_ko[] = { 0x3131, // HANGUL LETTER KIYEOK 0x3134, // HANGUL LETTER NIEUN 0x3137, // HANGUL LETTER TIKEUT @@ -259,7 +259,7 @@ static sal_Unicode table_HangulJamo_ko[] = { 0x314E // HANGUL LETTER HIEUH }; -static sal_Unicode table_HangulSyllable_ko[] = { +static const sal_Unicode table_HangulSyllable_ko[] = { 0xAC00, // HANGUL SYLLABLE GA 0xB098, // HANGUL SYLLABLE NA 0xB2E4, // HANGUL SYLLABLE DA @@ -277,7 +277,7 @@ static sal_Unicode table_HangulSyllable_ko[] = { }; -static sal_Unicode table_HangulCircledJamo_ko[] = { +static const sal_Unicode table_HangulCircledJamo_ko[] = { 0x3260, // CIRCLED HANGUL LETTER KIYEOK 0x3261, // CIRCLED HANGUL LETTER NIEUN 0x3262, // CIRCLED HANGUL LETTER TIKEUT @@ -295,7 +295,7 @@ static sal_Unicode table_HangulCircledJamo_ko[] = { }; -static sal_Unicode table_HangulCircledSyllable_ko[] = { +static const sal_Unicode table_HangulCircledSyllable_ko[] = { 0x326E, // CIRCLED HANGUL SYLLABLE GA 0x326F, // CIRCLED HANGUL SYLLABLE NA 0x3270, // CIRCLED HANGUL SYLLABLE DA @@ -312,11 +312,11 @@ static sal_Unicode table_HangulCircledSyllable_ko[] = { 0x327B // CIRCLED HANGUL SYLLABLE HA }; -static sal_Unicode table_TianGan_zh[] = { +static const sal_Unicode table_TianGan_zh[] = { 0x7532,0x4e59,0x4e19,0x4e01,0x620a,0x5df1,0x5e9a,0x8f9b,0x58ec,0x7678 }; -static sal_Unicode table_DiZi_zh[] = { +static const sal_Unicode table_DiZi_zh[] = { 0x5b50,0x4e11,0x5bc5,0x536f,0x8fb0,0x5df3,0x5348,0x672a,0x7533,0x9149,0x620c,0x4ea5 }; diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 691af7f9fca9..6a45d56e30ca 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -47,8 +47,8 @@ public: // Constructors Calendar_gregorian(); - Calendar_gregorian(Era *_eraArray); - void SAL_CALL init(Era *_eraArray); + Calendar_gregorian(const Era *_eraArray); + void SAL_CALL init(const Era *_eraArray); /** * Destructor @@ -91,7 +91,7 @@ public: virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); protected: - Era *eraArray; + const Era *eraArray; icu::Calendar *body; NativeNumberSupplier aNatNum; const sal_Char* cCalendar; diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index e66e16aff2f0..0f5c48618869 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -71,7 +71,7 @@ public: protected: TransFunc func; oneToOneMapping *table; - Mapping *map; + const Mapping *map; }; #define TRANSLITERATION_IGNORE( name ) \ diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index 585e6014c4b7..c9db417b7b04 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -51,7 +51,7 @@ public: protected: sal_Int16 nNativeNumberMode; sal_Int16 tableSize; - sal_Unicode* table; + const sal_Unicode* table; sal_Bool recycleSymbol; private: OUString SAL_CALL diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index fa26966c0f24..b3322fa6e338 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -130,12 +130,12 @@ Calendar_gregorian::Calendar_gregorian() { init(NULL); } -Calendar_gregorian::Calendar_gregorian(Era *_earArray) +Calendar_gregorian::Calendar_gregorian(const Era *_earArray) { init(_earArray); } void SAL_CALL -Calendar_gregorian::init(Era *_eraArray) +Calendar_gregorian::init(const Era *_eraArray) { cCalendar = "com.sun.star.i18n.Calendar_gregorian"; @@ -199,7 +199,7 @@ Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star Calendar_gregorian::loadCalendar(OUString("hanja"), rLocale); } -static Era gengou_eraArray[] = { +static const Era gengou_eraArray[] = { {1868, 1, 1, 0}, {1912, 7, 30, 0}, {1926, 12, 25, 0}, @@ -211,7 +211,7 @@ Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray) cCalendar = "com.sun.star.i18n.Calendar_gengou"; } -static Era ROC_eraArray[] = { +static const Era ROC_eraArray[] = { {1912, 1, 1, kDisplayEraForcedLongYear}, // #i116701# {0, 0, 0, 0} }; @@ -220,7 +220,7 @@ Calendar_ROC::Calendar_ROC() : Calendar_gregorian(ROC_eraArray) cCalendar = "com.sun.star.i18n.Calendar_ROC"; } -static Era buddhist_eraArray[] = { +static const Era buddhist_eraArray[] = { {-542, 1, 1, 0}, {0, 0, 0, 0} }; diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index d8b85cc14b16..0bc185ca4810 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -60,21 +60,21 @@ using namespace ::rtl; namespace com { namespace sun { namespace star { namespace i18n { -static sal_Unicode table_Alphabet_ar[] = { +static const sal_Unicode table_Alphabet_ar[] = { 0x0623, 0x0628, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649 }; -static sal_Unicode table_Alphabet_ar_abjad[] = { +static const sal_Unicode table_Alphabet_ar_abjad[] = { 0x0627, 0x0628, 0x062c, 0x062f, 0x0647, 0x0648, 0x0632, 0x062d, 0x0637, 0x064a, 0x0643, 0x0644, 0x0645, 0x0646, 0x0633, 0x0639, 0x0641, 0x0635, 0x0642, 0x0631, 0x0634, 0x062a, 0x062b, 0x062e, 0x0630, 0x0636, 0x0638, 0x063a }; -static sal_Unicode table_Alphabet_th[] = { +static const sal_Unicode table_Alphabet_th[] = { 0x0E01, 0x0E02, 0x0E04, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, @@ -83,13 +83,13 @@ static sal_Unicode table_Alphabet_th[] = { 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E }; -static sal_Unicode table_Alphabet_he[] = { +static const sal_Unicode table_Alphabet_he[] = { 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DB, 0x05DC, 0x05DE, 0x05E0, 0x05E1, 0x05E2, 0x05E4, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA }; -static sal_Unicode table_Alphabet_ne[] = { +static const sal_Unicode table_Alphabet_ne[] = { 0x0915, 0x0916, 0x0917, 0x0918, 0x0919, 0x091A, 0x091B, 0x091C, 0x091D, 0x091E, 0x091F, 0x0920, 0x0921, 0x0922, 0x0923, 0x0924, 0x0925, 0x0926, 0x0927, 0x0928, 0x092A, 0x092B, 0x092C, 0x092D, @@ -97,7 +97,7 @@ static sal_Unicode table_Alphabet_ne[] = { 0x0939 }; -static sal_Unicode table_Alphabet_km[] = { +static const sal_Unicode table_Alphabet_km[] = { 0x1780, 0x1781, 0x1782, 0x1783, 0x1784, 0x1785, 0x1786, 0x1787, 0x1788, 0x1789, 0x178A, 0x178B, 0x178C, 0x178D, 0x178E, 0x178F, 0x1790, 0x1791, 0x1792, 0x1793, 0x1794, 0x1795, 0x1796, 0x1797, @@ -105,21 +105,21 @@ static sal_Unicode table_Alphabet_km[] = { 0x17A0, 0x17A1, 0x17A2 }; -static sal_Unicode table_Alphabet_lo[] = { +static const sal_Unicode table_Alphabet_lo[] = { 0x0E81, 0x0E82, 0x0E84, 0x0E87, 0x0E88, 0x0E8A, 0x0E8D, 0x0E94, 0x0E95, 0x0E96, 0x0E97, 0x0E99, 0x0E9A, 0x0E9B, 0x0E9C, 0x0E9D, 0x0E9E, 0x0E9F, 0x0EA1, 0x0EA2, 0x0EA3, 0x0EA5, 0x0EA7, 0x0EAA, 0x0EAB, 0x0EAD, 0x0EAE, 0x0EAF, 0x0EAE, 0x0EDC, 0x0EDD }; -static sal_Unicode table_Alphabet_dz[] = { +static const sal_Unicode table_Alphabet_dz[] = { 0x0F40, 0x0F41, 0x0F42, 0x0F44, 0x0F45, 0x0F46, 0x0F47, 0x0F49, 0x0F4F, 0x0F50, 0x0F51, 0x0F53, 0x0F54, 0x0F55, 0x0F56, 0x0F58, 0x0F59, 0x0F5A, 0x0F5B, 0x0F5D, 0x0F5E, 0x0F5F, 0x0F60, 0x0F61, 0x0F62, 0x0F63, 0x0F64, 0x0F66, 0x0F67, 0x0F68 }; -static sal_Unicode table_Alphabet_my[] = { +static const sal_Unicode table_Alphabet_my[] = { 0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006, 0x1007, 0x1008,/*0x1009,*/0x100A, 0x100B, 0x100C, 0x100D, 0x100E, 0x100F, 0x1010, 0x1011, 0x1012, 0x1013, 0x1014, 0x1015, 0x1016, 0x1017, @@ -128,7 +128,7 @@ static sal_Unicode table_Alphabet_my[] = { }; // Bulgarian Cyrillic upper case letters -static sal_Unicode table_CyrillicUpperLetter_bg[] = { +static const sal_Unicode table_CyrillicUpperLetter_bg[] = { 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042E, @@ -136,7 +136,7 @@ static sal_Unicode table_CyrillicUpperLetter_bg[] = { }; // Bulgarian cyrillic lower case letters -static sal_Unicode table_CyrillicLowerLetter_bg[] = { +static const sal_Unicode table_CyrillicLowerLetter_bg[] = { 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044E, @@ -144,7 +144,7 @@ static sal_Unicode table_CyrillicLowerLetter_bg[] = { }; // Russian Cyrillic upper letters -static sal_Unicode table_CyrillicUpperLetter_ru[] = { +static const sal_Unicode table_CyrillicUpperLetter_ru[] = { 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, @@ -152,7 +152,7 @@ static sal_Unicode table_CyrillicUpperLetter_ru[] = { }; // Russian cyrillic lower letters -static sal_Unicode table_CyrillicLowerLetter_ru[] = { +static const sal_Unicode table_CyrillicLowerLetter_ru[] = { 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, @@ -160,7 +160,7 @@ static sal_Unicode table_CyrillicLowerLetter_ru[] = { }; // Serbian Cyrillic upper letters -static sal_Unicode table_CyrillicUpperLetter_sr[] = { +static const 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, @@ -168,46 +168,46 @@ static sal_Unicode table_CyrillicUpperLetter_sr[] = { }; // Serbian cyrillic lower letters -static sal_Unicode table_CyrillicLowerLetter_sr[] = { +static const 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_GreekUpperLetter[] = { +static const sal_Unicode table_GreekUpperLetter[] = { 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x03DB, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03DF, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03E0 }; -static sal_Unicode table_GreekLowerLetter[] = { +static const sal_Unicode table_GreekLowerLetter[] = { 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03DB, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03DF, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03E1 }; -static sal_Unicode table_Alphabet_fa[] = { +static const sal_Unicode table_Alphabet_fa[] = { 0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x0640, 0x0641, 0x0642, 0x06A9, 0x06AF, 0x0644, 0x0645, 0x0646, 0x0648, 0x0647, 0x06CC }; -static sal_Unicode upperLetter[] = { +static const sal_Unicode upperLetter[] = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A }; -static sal_Unicode lowerLetter[] = { +static const sal_Unicode lowerLetter[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A }; // Tables used for numbering in persian words -static sal_Unicode table_PersianWord_decade1[][7]={ +static const sal_Unicode table_PersianWord_decade1[][7]={ {0}, // 0 {0x06cc, 0x06a9, 0}, // 1 {0x062f, 0x0648, 0}, // 2 @@ -230,7 +230,7 @@ static sal_Unicode table_PersianWord_decade1[][7]={ {0x0646, 0x0648, 0x0632, 0x062f, 0x0647, 0} // 19 }; -static sal_Unicode table_PersianWord_decade2[][6]={ +static const sal_Unicode table_PersianWord_decade2[][6]={ {0x0628, 0x06cc, 0x0633, 0x062a, 0}, // 20 {0x0633, 0x06cc, 0}, // 30 {0x0686, 0x0647, 0x0644, 0}, // 40 @@ -241,7 +241,7 @@ static sal_Unicode table_PersianWord_decade2[][6]={ {0x0646, 0x0648, 0x062f, 0} // 90 }; -static sal_Unicode table_PersianWord_decade3[][7]={ +static const sal_Unicode table_PersianWord_decade3[][7]={ {0x0635, 0x062f, 0}, // 100 {0x062f, 0x0648, 0x06cc, 0x0633, 0x062a, 0}, // 200 {0x0633, 0x06cc, 0x0635, 0x062f, 0}, // 300 @@ -253,7 +253,7 @@ static sal_Unicode table_PersianWord_decade3[][7]={ {0x0646, 0x0647, 0x0635, 0x062f, 0} // 900 }; -static sal_Unicode table_PersianWord_decadeX[][8]={ +static const 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 @@ -334,7 +334,7 @@ OUString toRoman( sal_Int32 n ) // not used: static -void lcl_formatChars( sal_Unicode table[], int tableSize, int n, OUString& s ) +void lcl_formatChars( const sal_Unicode table[], int tableSize, int n, OUString& s ) { // string representation of n is appended to s. // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>AA, 27=>AB, ... @@ -346,7 +346,7 @@ void lcl_formatChars( sal_Unicode table[], int tableSize, int n, OUString& s ) } static -void lcl_formatChars1( sal_Unicode table[], int tableSize, int n, OUString& s ) +void lcl_formatChars1( const sal_Unicode table[], int tableSize, int n, OUString& s ) { // string representation of n is appended to s. // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>AA, 27=>BB, ... @@ -359,7 +359,7 @@ void lcl_formatChars1( sal_Unicode table[], int tableSize, int n, OUString& s ) } static -void lcl_formatChars2( sal_Unicode table_capital[], sal_Unicode table_small[], int tableSize, int n, OUString& s ) +void lcl_formatChars2( const sal_Unicode table_capital[], const sal_Unicode table_small[], int tableSize, int n, OUString& s ) { // string representation of n is appended to s. // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>Aa, 27=>Ab, ... @@ -373,7 +373,7 @@ void lcl_formatChars2( sal_Unicode table_capital[], sal_Unicode table_small[], i } static -void lcl_formatChars3( sal_Unicode table_capital[], sal_Unicode table_small[], int tableSize, int n, OUString& s ) +void lcl_formatChars3( const sal_Unicode table_capital[], const sal_Unicode table_small[], int tableSize, int n, OUString& s ) { // string representation of n is appended to s. // if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>Aa, 27=>Bb, ... @@ -396,7 +396,7 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult ) { OUStringBuffer aTemp(64); unsigned int nDigit; - sal_Unicode asPersianWord_conjunction_data[] = {0x20,0x0648,0x20,0}; + static const sal_Unicode asPersianWord_conjunction_data[] = {0x20,0x0648,0x20,0}; OUString asPersianWord_conjunction( asPersianWord_conjunction_data ); unsigned char nSection = 0; @@ -463,7 +463,7 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult ) * only for numbers up to 9999. */ static -OUString gr_smallNum(sal_Unicode table[], int n) +OUString gr_smallNum(const sal_Unicode table[], int n) { if (n > 9999) throw IllegalArgumentException(); @@ -491,7 +491,7 @@ OUString gr_smallNum(sal_Unicode table[], int n) } static -void lcl_formatCharsGR( sal_Unicode table[], int n, OUString& s ) +void lcl_formatCharsGR(const sal_Unicode table[], int n, OUString& s ) { OUStringBuffer sb; int myriadPower = 2; @@ -565,7 +565,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal sal_Int16 natNum = 0; sal_Int16 tableSize = 0; - sal_Unicode *table = NULL; // initialize to avoid compiler warning + const sal_Unicode *table = NULL; // initialize to avoid compiler warning sal_Bool recycleSymbol = sal_False; Locale locale; @@ -1042,7 +1042,7 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT return OUString(); } -const sal_Char cDefaultNumberingProvider[] = "com.sun.star.text.DefaultNumberingProvider"; +static const sal_Char cDefaultNumberingProvider[] = "com.sun.star.text.DefaultNumberingProvider"; OUString DefaultNumberingProvider::getImplementationName(void) throw( RuntimeException ) { diff --git a/i18npool/source/indexentry/data/indexdata_alphanumeric.h b/i18npool/source/indexentry/data/indexdata_alphanumeric.h index 253832801ac2..bd4fde6d71fa 100644 --- a/i18npool/source/indexentry/data/indexdata_alphanumeric.h +++ b/i18npool/source/indexentry/data/indexdata_alphanumeric.h @@ -18,7 +18,7 @@ */ #include <sal/types.h> -static sal_Unicode idxStr[] = { +static const sal_Unicode idxStr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 00-0F 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 10-1F 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 20-2F diff --git a/i18npool/source/indexentry/data/indexdata_ja_phonetic.h b/i18npool/source/indexentry/data/indexdata_ja_phonetic.h index 02146bbcdb2c..c58d1cb60af1 100644 --- a/i18npool/source/indexentry/data/indexdata_ja_phonetic.h +++ b/i18npool/source/indexentry/data/indexdata_ja_phonetic.h @@ -18,7 +18,7 @@ */ #include <sal/types.h> -static sal_uInt16 idx[] = { +static const sal_uInt16 idx[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0000 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 1000 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 2000 @@ -37,7 +37,7 @@ static sal_uInt16 idx[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0100, // f000 }; -static sal_Unicode syllable[] = { +static const sal_Unicode syllable[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 3000 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 3010 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 3020 @@ -74,7 +74,7 @@ static sal_Unicode syllable[] = { }; -static sal_Unicode consonant[] = { +static const sal_Unicode consonant[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 3000 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 3010 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 3020 diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx index ec0dc421a4e9..6a2f6622fef2 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -37,7 +37,7 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr // using alphanumeric index for non-define stirng return OUString(&idxStr[(ch & 0xFF00) ? 0 : ch], 1); } else { - sal_Unicode *idx2 = strstr(implementationName, "syllable") ? syllable : consonant; + const sal_Unicode *idx2 = strstr(implementationName, "syllable") ? syllable : consonant; return OUString(&idx2[ first + (ch & 0xff) ], 1); } } @@ -65,7 +65,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( return result; } -static sal_Char first[] = "ja_phonetic (alphanumeric first)"; +static const sal_Char first[] = "ja_phonetic (alphanumeric first)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException) @@ -79,7 +79,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant return collator->loadCollatorAlgorithm(OUString::createFromAscii(first), rLocale, collatorOptions) == 0; } -static sal_Char last[] = "ja_phonetic (alphanumeric last)"; +static const sal_Char last[] = "ja_phonetic (alphanumeric last)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException) diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 35c7ff42e7c9..4c49121ed1cf 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -1984,7 +1984,7 @@ struct NameValuePair { const sal_Char *name; const sal_Char *value; }; -static NameValuePair ReserveWord[] = { +static const NameValuePair ReserveWord[] = { { "trueWord", "true" }, { "falseWord", "false" }, { "quarter1Word", "1st quarter" }, diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h index f1aabb0ca93c..4052b4d507fb 100644 --- a/i18npool/source/nativenumber/data/numberchar.h +++ b/i18npool/source/nativenumber/data/numberchar.h @@ -54,7 +54,7 @@ static const sal_Int16 NumberChar_ne = 29; static const sal_Int16 NumberChar_dz = 30; static const sal_Int16 NumberChar_Count = 31; -static sal_Unicode NumberChar[][10] = { +static const sal_Unicode NumberChar[][10] = { // 0 1 2 3 4 5 6 7 8 9 { 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039 }, // Half Width (Ascii) { 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19 }, // Full Width @@ -123,7 +123,7 @@ static sal_Unicode DecimalChar[] = { 0x0000, // Dzongkha }; -static sal_Unicode MinusChar[] = { +static const sal_Unicode MinusChar[] = { 0x002D, // Half Width (Ascii) 0xFF0D, // Full Width 0xFF0D, // Chinese Lower @@ -211,10 +211,10 @@ const sal_Int16 Multiplier_Count = 8; const sal_Int16 ExponentCount_6_CJK = 6; -static sal_Int16 MultiplierExponent_6_CJK[ExponentCount_6_CJK] = { +static const sal_Int16 MultiplierExponent_6_CJK[ExponentCount_6_CJK] = { 12, 8, 4, 3, 2, 1 }; -static sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = { +static const sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = { {0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341}, // S. Chinese Lower {0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE}, // S. Chinese Upper {0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341}, // T. Chinese Lower @@ -227,11 +227,11 @@ static sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = { const sal_Int16 ExponentCount_2_CJK = 2; -static sal_Int16 MultiplierExponent_2_CJK[ExponentCount_2_CJK] = { +static const sal_Int16 MultiplierExponent_2_CJK[ExponentCount_2_CJK] = { 8, 4, }; -static sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = { +static const sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = { {0x4EBF, 0x4E07}, // S. Chinese Lower {0x4EBF, 0x4E07}, // S. Chinese Upper {0x5104, 0x842C}, // T. Chinese Lower @@ -244,10 +244,10 @@ static sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = { const sal_Int16 ExponentCount_7_CJK = 7; -static sal_Int16 MultiplierExponent_7_CJK[ExponentCount_7_CJK] = { +static const sal_Int16 MultiplierExponent_7_CJK[ExponentCount_7_CJK] = { 16, 12, 8, 4, 3, 2, 1 }; -static sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = { +static const sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = { {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341}, // S. Chinese Lower {0x4EAC, 0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE}, // S. Chinese Upper {0x4EAC, 0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341}, // T. Chinese Lower diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index e73c0c31a600..cb99fef3ce06 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -32,10 +32,10 @@ using namespace ::rtl; typedef struct { sal_Int16 number; - sal_Unicode *multiplierChar; + const sal_Unicode *multiplierChar; sal_Int16 numberFlag; sal_Int16 exponentCount; - sal_Int16 *multiplierExponent; + const sal_Int16 *multiplierExponent; } Number; @@ -89,7 +89,7 @@ OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, sal_Int32 len, sal_Unicode *dst, sal_Int32& count, sal_Int16 multiChar_index, Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 startPos, - Number *number, sal_Unicode* numberChar) + const Number *number, const sal_Unicode* numberChar) { sal_Unicode multiChar = (multiChar_index == -1 ? 0 : number->multiplierChar[multiChar_index]); if ( len <= number->multiplierExponent[number->exponentCount-1] ) { @@ -160,12 +160,12 @@ sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 be } OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset, sal_Bool useOffset, Number* number ) throw(RuntimeException) + Sequence< sal_Int32 >& offset, sal_Bool useOffset, const Number* number ) throw(RuntimeException) { OUString aRet; sal_Int32 strLen = inStr.getLength() - startPos; - sal_Unicode *numberChar = NumberChar[number->number]; + const sal_Unicode *numberChar = NumberChar[number->number]; if (nCount > strLen) nCount = strLen; @@ -373,7 +373,7 @@ static OUString SAL_CALL NativeToAscii(const OUString& inStr, return aRet; } -static Number natnum4[4] = { +static const Number natnum4[4] = { { NumberChar_Lower_zh, MultiplierChar_6_CJK[Multiplier_Lower_zh], 0, ExponentCount_6_CJK, MultiplierExponent_6_CJK }, { NumberChar_Lower_zh, MultiplierChar_6_CJK[Multiplier_Lower_zh_TW], 0, @@ -384,7 +384,7 @@ static Number natnum4[4] = { ExponentCount_6_CJK, MultiplierExponent_6_CJK }, }; -static Number natnum5[4] = { +static const Number natnum5[4] = { { NumberChar_Upper_zh, MultiplierChar_6_CJK[Multiplier_Upper_zh], 0, ExponentCount_6_CJK, MultiplierExponent_6_CJK }, { NumberChar_Upper_zh_TW, MultiplierChar_6_CJK[Multiplier_Upper_zh_TW], 0, @@ -395,7 +395,7 @@ static Number natnum5[4] = { ExponentCount_6_CJK, MultiplierExponent_6_CJK }, }; -static Number natnum6[4] = { +static const Number natnum6[4] = { { NumberChar_FullWidth, MultiplierChar_6_CJK[Multiplier_Lower_zh], 0, ExponentCount_6_CJK, MultiplierExponent_6_CJK }, { NumberChar_FullWidth, MultiplierChar_6_CJK[Multiplier_Lower_zh_TW], 0, @@ -406,7 +406,7 @@ static Number natnum6[4] = { ExponentCount_6_CJK, MultiplierExponent_6_CJK }, }; -static Number natnum7[4] = { +static const Number natnum7[4] = { { NumberChar_Lower_zh, MultiplierChar_6_CJK[Multiplier_Lower_zh], NUMBER_OMIT_ALL, ExponentCount_6_CJK, MultiplierExponent_6_CJK }, { NumberChar_Lower_zh, MultiplierChar_6_CJK[Multiplier_Lower_zh_TW], NUMBER_OMIT_ALL, @@ -417,7 +417,7 @@ static Number natnum7[4] = { ExponentCount_6_CJK, MultiplierExponent_6_CJK }, }; -static Number natnum8[4] = { +static const Number natnum8[4] = { { NumberChar_Upper_zh, MultiplierChar_6_CJK[Multiplier_Upper_zh], NUMBER_OMIT_ALL, ExponentCount_6_CJK, MultiplierExponent_6_CJK }, { NumberChar_Upper_zh_TW, MultiplierChar_6_CJK[Multiplier_Upper_zh_TW], NUMBER_OMIT_ALL, @@ -428,9 +428,9 @@ static Number natnum8[4] = { ExponentCount_6_CJK, MultiplierExponent_6_CJK }, }; -static Number natnum10 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_Hangul_ko], NUMBER_OMIT_ZERO, +static const Number natnum10 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_Hangul_ko], NUMBER_OMIT_ZERO, ExponentCount_6_CJK, MultiplierExponent_6_CJK }; -static Number natnum11 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_Hangul_ko], NUMBER_OMIT_ALL, +static const Number natnum11 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_Hangul_ko], NUMBER_OMIT_ALL, ExponentCount_6_CJK, MultiplierExponent_6_CJK }; //! ATTENTION: Do not change order of elements! @@ -466,7 +466,7 @@ static sal_Int16 nbOfLocale = SAL_N_ELEMENTS(natnum1Locales); //! ATTENTION: Do not change order of elements! //! Number and order must match elements of natnum1Locales! -static sal_Int16 natnum1[] = { +static const sal_Int16 natnum1[] = { NumberChar_Lower_zh, NumberChar_Lower_zh, NumberChar_Modern_ja, @@ -493,18 +493,18 @@ static sal_Int16 natnum1[] = { NumberChar_dz, NumberChar_EastIndic_ar }; -static sal_Int16 sizeof_natnum1 = SAL_N_ELEMENTS(natnum1); +static const sal_Int16 sizeof_natnum1 = SAL_N_ELEMENTS(natnum1); //! ATTENTION: Do not change order of elements! //! Order must match first elements of natnum1Locales! -static sal_Int16 natnum2[] = { +static const sal_Int16 natnum2[] = { NumberChar_Upper_zh, NumberChar_Upper_zh_TW, NumberChar_Traditional_ja, NumberChar_Upper_ko, NumberChar_he }; -static sal_Int16 sizeof_natnum2 = SAL_N_ELEMENTS(natnum2); +static const sal_Int16 sizeof_natnum2 = SAL_N_ELEMENTS(natnum2); #define isLang(lang) rLocale.Language.equalsAsciiL(lang, 2) @@ -523,7 +523,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) throw (RuntimeException) { - Number *number = 0; + const Number *number = 0; sal_Int16 num = -1; if (isValidNatNum(rLocale, nNativeNumberMode)) { @@ -734,7 +734,7 @@ NativeNumberXmlAttributes SAL_CALL NativeNumberSupplier::convertToXmlAttributes( OUString::createFromAscii(attType[type])); } -static sal_Bool natNumIn(sal_Int16 num, sal_Int16 natnum[], sal_Int16 len) +static sal_Bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len) { for (sal_Int16 i = 0; i < len; i++) if (natnum[i] == num) diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx index f3d12a83fa2a..9b47ff41b3ae 100644 --- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -static Mapping BaFa[] = { +static const Mapping BaFa[] = { { 0x30F4, 0x30A1, 0x30D0, sal_True }, { 0x3094, 0x3041, 0x3070, sal_True }, { 0x30D5, 0x30A1, 0x30CF, sal_True }, diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx index 4c117eefe147..9a8d747dace7 100644 --- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { -static Mapping HyuByu[] = { +static const Mapping HyuByu[] = { { 0x30D5, 0x30E5, 0x30D2, sal_False }, { 0x3075, 0x3085, 0x3072, sal_False }, { 0x30F4, 0x30E5, 0x30D3, sal_False }, diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index 67ad5043fda3..3c81fd73226c 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { -static sal_Unicode table_normalwidth[] = { +static const sal_Unicode table_normalwidth[] = { // 0x0000, // 0x3040 0x3041, // 0x3041 HIRAGANA LETTER SMALL A 0x3042, // 0x3042 HIRAGANA LETTER A @@ -224,7 +224,7 @@ static sal_Unicode table_normalwidth[] = { // 0x0000 // 0x30ff }; -static sal_Unicode table_halfwidth[] = { +static const sal_Unicode table_halfwidth[] = { // 0x0000, // 0xff61 HALFWIDTH IDEOGRAPHIC FULL STOP // 0x0000, // 0xff62 HALFWIDTH LEFT CORNER BRACKET // 0x0000, // 0xff63 HALFWIDTH RIGHT CORNER BRACKET diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx index 8f88782fcf4a..cb8124485389 100644 --- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { -static Mapping SeZe[] = { +static const Mapping SeZe[] = { // SI + E --> SE { 0x30B7, 0x30A7, 0x30BB, sal_True }, // SI + E --> SE diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx index 6fe1f2f85f2d..ed084242bff6 100644 --- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { -static Mapping TiJi[] = { +static const Mapping TiJi[] = { // TU + I --> TI { 0x30C4, 0x30A3, 0x30C1, sal_True }, // TE + I --> TI diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index a1de147f4e42..6851b7c4599d 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -146,7 +146,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, while (-- nCount > 0) { currentChar = *src ++; - Mapping *m; + const Mapping *m; for (m = map; m->replaceChar; m++) { if (previousChar == m->previousChar && currentChar == m->currentChar ) { if (useOffset) { |