From b122a39c33d9c46ac376b80f51920527b98a3c8a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Jul 2020 09:22:45 +0200 Subject: Upcoming improved loplugin:staticanonymous -> redundantstatic: i18npool Change-Id: I8b93f7610103f4bd8e86e2d9f57929922b6dc92c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97568 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- i18npool/inc/bullet.h | 22 +++--- i18npool/inc/wtt.h | 2 +- .../source/breakiterator/breakiteratorImpl.cxx | 2 +- i18npool/source/breakiterator/breakiterator_th.cxx | 2 +- i18npool/source/calendar/calendar_gregorian.cxx | 8 +-- i18npool/source/collator/collator_unicode.cxx | 2 +- .../defaultnumberingprovider.cxx | 54 +++++++------- .../indexentry/data/indexdata_alphanumeric.h | 2 +- .../source/indexentry/data/indexdata_ja_phonetic.h | 6 +- .../indexentry/indexentrysupplier_ja_phonetic.cxx | 4 +- .../source/inputchecker/inputsequencechecker.cxx | 2 +- .../inputchecker/inputsequencechecker_hi.cxx | 4 +- i18npool/source/localedata/LocaleNode.cxx | 2 +- i18npool/source/localedata/localedata.cxx | 8 +-- i18npool/source/nativenumber/data/numberchar.h | 82 +++++++++++----------- .../source/nativenumber/nativenumbersupplier.cxx | 18 ++--- .../source/registerservices/registerservices.cxx | 2 +- i18npool/source/search/textsearch.cxx | 2 +- .../source/transliteration/ignoreBaFa_ja_JP.cxx | 2 +- .../source/transliteration/ignoreHyuByu_ja_JP.cxx | 2 +- .../ignoreProlongedSoundMark_ja_JP.cxx | 4 +- .../source/transliteration/ignoreSeZe_ja_JP.cxx | 2 +- .../source/transliteration/ignoreTiJi_ja_JP.cxx | 2 +- .../source/transliteration/transliterationImpl.cxx | 2 +- 24 files changed, 119 insertions(+), 119 deletions(-) (limited to 'i18npool') diff --git a/i18npool/inc/bullet.h b/i18npool/inc/bullet.h index 9852625b09c0..67ea0f7d2600 100644 --- a/i18npool/inc/bullet.h +++ b/i18npool/inc/bullet.h @@ -19,7 +19,7 @@ namespace i18npool { -static const sal_Unicode table_AIUFullWidth_ja_JP[] = { +const sal_Unicode table_AIUFullWidth_ja_JP[] = { 0x30A2, // KATAKANA LETTER A 0x30A4, // KATAKANA LETTER I 0x30A6, // KATAKANA LETTER U @@ -68,7 +68,7 @@ static const sal_Unicode table_AIUFullWidth_ja_JP[] = { 0x30F3 // KATAKANA LETTER N }; -static const sal_Unicode table_AIUHalfWidth_ja_JP[] = { +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 const sal_Unicode table_AIUHalfWidth_ja_JP[] = { 0xFF9D // HALFWIDTH KATAKANA LETTER N }; -static const sal_Unicode table_IROHAFullWidth_ja_JP[] = { +const sal_Unicode table_IROHAFullWidth_ja_JP[] = { 0x30A4, // KATAKANA LETTER I 0x30ED, // KATAKANA LETTER RO 0x30CF, // KATAKANA LETTER HA @@ -168,7 +168,7 @@ static const sal_Unicode table_IROHAFullWidth_ja_JP[] = { 0x30F3 // KATAKANA LETTER N }; -static const sal_Unicode table_IROHAHalfWidth_ja_JP[] = { +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 const sal_Unicode table_IROHAHalfWidth_ja_JP[] = { 0xFF9D // HALFWIDTH KATAKANA LETTER N }; -static const sal_Unicode table_CircledNumber[] = { +const sal_Unicode table_CircledNumber[] = { 0x2460, // CIRCLED DIGIT ONE 0x2461, // CIRCLED DIGIT TWO 0x2462, // CIRCLED DIGIT THREE @@ -242,7 +242,7 @@ static const sal_Unicode table_CircledNumber[] = { 0x2473 // CIRCLED NUMBER TWENTY }; -static const sal_Unicode table_HangulJamo_ko[] = { +const sal_Unicode table_HangulJamo_ko[] = { 0x3131, // HANGUL LETTER KIYEOK 0x3134, // HANGUL LETTER NIEUN 0x3137, // HANGUL LETTER TIKEUT @@ -259,7 +259,7 @@ static const sal_Unicode table_HangulJamo_ko[] = { 0x314E // HANGUL LETTER HIEUH }; -static const sal_Unicode table_HangulSyllable_ko[] = { +const sal_Unicode table_HangulSyllable_ko[] = { 0xAC00, // HANGUL SYLLABLE GA 0xB098, // HANGUL SYLLABLE NA 0xB2E4, // HANGUL SYLLABLE DA @@ -277,7 +277,7 @@ static const sal_Unicode table_HangulSyllable_ko[] = { }; -static const sal_Unicode table_HangulCircledJamo_ko[] = { +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 const sal_Unicode table_HangulCircledJamo_ko[] = { }; -static const sal_Unicode table_HangulCircledSyllable_ko[] = { +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 const sal_Unicode table_HangulCircledSyllable_ko[] = { 0x327B // CIRCLED HANGUL SYLLABLE HA }; -static const sal_Unicode table_TianGan_zh[] = { +const sal_Unicode table_TianGan_zh[] = { 0x7532,0x4e59,0x4e19,0x4e01,0x620a,0x5df1,0x5e9a,0x8f9b,0x58ec,0x7678 }; -static const sal_Unicode table_DiZi_zh[] = { +const sal_Unicode table_DiZi_zh[] = { 0x5b50,0x4e11,0x5bc5,0x536f,0x8fb0,0x5df3,0x5348,0x672a,0x7533,0x9149,0x620c,0x4ea5 }; diff --git a/i18npool/inc/wtt.h b/i18npool/inc/wtt.h index 2e248f04b75b..df4e2feac44f 100644 --- a/i18npool/inc/wtt.h +++ b/i18npool/inc/wtt.h @@ -45,7 +45,7 @@ namespace i18npool { #define MAX_CT 17 -static const sal_uInt16 thaiCT[128] = { // Thai character type +const sal_uInt16 thaiCT[128] = { // Thai character type CT_NON, CT_CONS, CT_CONS, CT_CONS, CT_CONS,CT_CONS, CT_CONS, CT_CONS, //0E00 CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, CT_CONS, //0E10 diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 5037a7c63474..3ceab17ccce6 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -480,7 +480,7 @@ struct UBlock2Script sal_Int16 script; }; -static const UBlock2Script scriptList[] = +const UBlock2Script scriptList[] = { {UBLOCK_NO_BLOCK, UBLOCK_NO_BLOCK, ScriptType::WEAK}, {UBLOCK_BASIC_LATIN, UBLOCK_SPACING_MODIFIER_LETTERS, ScriptType::LATIN}, diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index 2504ab888884..218f8b69ec1f 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -131,7 +131,7 @@ LineBreakResults SAL_CALL BreakIterator_th::getLineBreak( #define ST_NXT 2 // display the following character in the next cell #define ST_NDP 3 // non-display -static const sal_Int16 thaiCompRel[MAX_CT][MAX_CT] = { +const sal_Int16 thaiCompRel[MAX_CT][MAX_CT] = { // C N C L F F F B B B T A A A A A A // T O O V V V V V V D O D D D V V V // R N N 1 2 3 1 2 N 1 2 3 1 2 3 diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index b7ae49fbd96e..3aa516814538 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -209,7 +209,7 @@ Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Loc Calendar_gregorian::loadCalendar("hanja", rLocale); } -static const Era gengou_eraArray[] = { +const Era gengou_eraArray[] = { {1868, 1, 1, 0}, // Meiji {1912, 7, 30, 0}, // Taisho {1926, 12, 25, 0}, // Showa @@ -222,7 +222,7 @@ Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray) cCalendar = "com.sun.star.i18n.Calendar_gengou"; } -static const Era ROC_eraArray[] = { +const Era ROC_eraArray[] = { {1912, 1, 1, kDisplayEraForcedLongYear}, // #i116701# {0, 0, 0, 0} }; @@ -235,7 +235,7 @@ Calendar_ROC::Calendar_ROC() : Calendar_gregorian(ROC_eraArray) * The start year of the Korean traditional calendar (Dan-gi) is the inaugural * year of Dan-gun (BC 2333). */ -static const Era dangi_eraArray[] = { +const Era dangi_eraArray[] = { {-2332, 1, 1, 0}, {0, 0, 0, 0} }; @@ -244,7 +244,7 @@ Calendar_dangi::Calendar_dangi() : Calendar_gregorian(dangi_eraArray) cCalendar = "com.sun.star.i18n.Calendar_dangi"; } -static const Era buddhist_eraArray[] = { +const Era buddhist_eraArray[] = { {-542, 1, 1, 0}, {0, 0, 0, 0} }; diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 673f5c35d3c7..b046546ad12f 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; namespace i18npool { -static const char implementationName[] = "com.sun.star.i18n.Collator_Unicode"; +const char implementationName[] = "com.sun.star.i18n.Collator_Unicode"; Collator_Unicode::Collator_Unicode() { diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index e2cd4adc6cc4..ae1e77055e88 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -85,21 +85,21 @@ using namespace com::sun::star::lang; namespace i18npool { -static const sal_Unicode table_Alphabet_ar[] = { +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 const sal_Unicode table_Alphabet_ar_abjad[] = { +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 const sal_Unicode table_Alphabet_th[] = { +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, @@ -108,13 +108,13 @@ static const sal_Unicode table_Alphabet_th[] = { 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E }; -static const sal_Unicode table_Alphabet_he[] = { +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 const sal_Unicode table_Alphabet_ne[] = { +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, @@ -122,7 +122,7 @@ static const sal_Unicode table_Alphabet_ne[] = { 0x0939 }; -static const sal_Unicode table_Alphabet_km[] = { +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, @@ -130,21 +130,21 @@ static const sal_Unicode table_Alphabet_km[] = { 0x17A0, 0x17A1, 0x17A2 }; -static const sal_Unicode table_Alphabet_lo[] = { +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 const sal_Unicode table_Alphabet_dz[] = { +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 const sal_Unicode table_Alphabet_my[] = { +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, @@ -153,7 +153,7 @@ static const sal_Unicode table_Alphabet_my[] = { }; // Bulgarian Cyrillic upper case letters -static const sal_Unicode table_CyrillicUpperLetter_bg[] = { +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, @@ -161,7 +161,7 @@ static const sal_Unicode table_CyrillicUpperLetter_bg[] = { }; // Bulgarian cyrillic lower case letters -static const sal_Unicode table_CyrillicLowerLetter_bg[] = { +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, @@ -169,7 +169,7 @@ static const sal_Unicode table_CyrillicLowerLetter_bg[] = { }; // Russian Cyrillic upper letters -static const sal_Unicode table_CyrillicUpperLetter_ru[] = { +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, @@ -177,7 +177,7 @@ static const sal_Unicode table_CyrillicUpperLetter_ru[] = { }; // Russian cyrillic lower letters -static const sal_Unicode table_CyrillicLowerLetter_ru[] = { +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, @@ -185,7 +185,7 @@ static const sal_Unicode table_CyrillicLowerLetter_ru[] = { }; // Serbian Cyrillic upper letters -static const sal_Unicode table_CyrillicUpperLetter_sr[] = { +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, @@ -193,50 +193,50 @@ static const sal_Unicode table_CyrillicUpperLetter_sr[] = { }; // Serbian cyrillic lower letters -static const sal_Unicode table_CyrillicLowerLetter_sr[] = { +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 const sal_Unicode table_GreekUpperLetter[] = { +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 const sal_Unicode table_GreekLowerLetter[] = { +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 const sal_Unicode table_Alphabet_fa[] = { +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 const sal_Unicode upperLetter[] = { +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 const sal_Unicode lowerLetter[] = { +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 }; -static const sal_Unicode table_Chicago[] = { +const sal_Unicode table_Chicago[] = { 0x002a, 0x2020, 0x2021, 0x00a7 }; // Tables used for numbering in persian words -static const sal_Unicode table_PersianWord_decade1[][7]={ +const sal_Unicode table_PersianWord_decade1[][7]={ {0}, // 0 {0x06cc, 0x06a9, 0}, // 1 {0x062f, 0x0648, 0}, // 2 @@ -259,7 +259,7 @@ static const sal_Unicode table_PersianWord_decade1[][7]={ {0x0646, 0x0648, 0x0632, 0x062f, 0x0647, 0} // 19 }; -static const sal_Unicode table_PersianWord_decade2[][6]={ +const sal_Unicode table_PersianWord_decade2[][6]={ {0x0628, 0x06cc, 0x0633, 0x062a, 0}, // 20 {0x0633, 0x06cc, 0}, // 30 {0x0686, 0x0647, 0x0644, 0}, // 40 @@ -270,7 +270,7 @@ static const sal_Unicode table_PersianWord_decade2[][6]={ {0x0646, 0x0648, 0x062f, 0} // 90 }; -static const sal_Unicode table_PersianWord_decade3[][7]={ +const sal_Unicode table_PersianWord_decade3[][7]={ {0x0635, 0x062f, 0}, // 100 {0x062f, 0x0648, 0x06cc, 0x0633, 0x062a, 0}, // 200 {0x0633, 0x06cc, 0x0635, 0x062f, 0}, // 300 @@ -282,7 +282,7 @@ static const sal_Unicode table_PersianWord_decade3[][7]={ {0x0646, 0x0647, 0x0635, 0x062f, 0} // 900 }; -static const sal_Unicode table_PersianWord_decadeX[][8]={ +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 @@ -986,7 +986,7 @@ struct Supported_NumberingType const char* cSymbol; sal_Int16 langOption; }; -static const Supported_NumberingType aSupportedTypes[] = +const Supported_NumberingType aSupportedTypes[] = { {style::NumberingType::CHARS_UPPER_LETTER, "A", LANG_ALL}, {style::NumberingType::CHARS_LOWER_LETTER, "a", LANG_ALL}, @@ -1056,7 +1056,7 @@ static const Supported_NumberingType aSupportedTypes[] = {style::NumberingType::ARABIC_ZERO4, "0001, 0002, 0003, ...", LANG_ALL}, {style::NumberingType::ARABIC_ZERO5, "00001, 00002, 00003, ...", LANG_ALL}, }; -static const sal_Int32 nSupported_NumberingTypes = SAL_N_ELEMENTS(aSupportedTypes); +const sal_Int32 nSupported_NumberingTypes = SAL_N_ELEMENTS(aSupportedTypes); OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) { diff --git a/i18npool/source/indexentry/data/indexdata_alphanumeric.h b/i18npool/source/indexentry/data/indexdata_alphanumeric.h index bd4fde6d71fa..fc54cdad4bf8 100644 --- a/i18npool/source/indexentry/data/indexdata_alphanumeric.h +++ b/i18npool/source/indexentry/data/indexdata_alphanumeric.h @@ -18,7 +18,7 @@ */ #include -static const sal_Unicode idxStr[] = { +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 c58d1cb60af1..badaa14259a4 100644 --- a/i18npool/source/indexentry/data/indexdata_ja_phonetic.h +++ b/i18npool/source/indexentry/data/indexdata_ja_phonetic.h @@ -18,7 +18,7 @@ */ #include -static const sal_uInt16 idx[] = { +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 const sal_uInt16 idx[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0100, // f000 }; -static const sal_Unicode syllable[] = { +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 const sal_Unicode syllable[] = { }; -static const sal_Unicode consonant[] = { +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 bae3923b3146..214893a901d4 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -63,7 +63,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( return result; } -static const char first[] = "phonetic (alphanumeric first)"; +const char first[] = "phonetic (alphanumeric first)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, sal_Int32 collatorOptions ) @@ -77,7 +77,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0; } -static const char last[] = "phonetic (alphanumeric last)"; +const char last[] = "phonetic (alphanumeric last)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, sal_Int32 collatorOptions ) diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 747b8c569223..f27ed5c9e266 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -74,7 +74,7 @@ InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartP return nStartPos; } -static ScriptTypeList const typeList[] = { +ScriptTypeList const typeList[] = { //{ UnicodeScript_kHebrew, UnicodeScript_kHebrew }, // 10, //{ UnicodeScript_kArabic, UnicodeScript_kArabic }, // 11, { UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, sal_Int16(UnicodeScript_kDevanagari) }, // 14, diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx index 2a33fe104d7c..c857f286650a 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx @@ -54,7 +54,7 @@ InputSequenceChecker_hi::~InputSequenceChecker_hi() /* * Devanagari character type table */ -static const sal_uInt16 devaCT[128] = { +const sal_uInt16 devaCT[128] = { /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, E, F, */ /* 0900 */ ND_, UP_, UP_, NP_, ND_, IV_, IV_, IV_, @@ -78,7 +78,7 @@ static const sal_uInt16 devaCT[128] = { /* * Devanagari character composition table */ -static const sal_uInt16 dev_cell_check[14][14] = { +const sal_uInt16 dev_cell_check[14][14] = { /* ND, UP, NP, IV, CN, CK, RC, NM, RM, IM, HL, NK, VD, HD, */ /* 0 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* ND */ /* 1 */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* UP */ diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 3760ac753e06..b0d9156ddbb9 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -2016,7 +2016,7 @@ struct NameValuePair { } -static const NameValuePair ReserveWord[] = { +const NameValuePair ReserveWord[] = { { "trueWord", "true" }, { "falseWord", "false" }, { "quarter1Word", "1st quarter" }, diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 4a8e565dc8e1..5d3a0af75db3 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -58,7 +58,7 @@ static const char *lcl_DATA_OTHERS = "localedata_others"; #ifndef DISABLE_DYNLOADING -static const struct { +const struct { const char* pLocale; const char* pLib; } aLibTable[] = { @@ -339,10 +339,10 @@ static const struct { #endif -static const sal_Unicode cUnder = '_'; -static const sal_Unicode cHyphen = '-'; +const sal_Unicode cUnder = '_'; +const sal_Unicode cHyphen = '-'; -static const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable); +const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable); struct LocaleDataLookupTableItem { diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h index c36d7cff96f0..b4f0c65d554b 100644 --- a/i18npool/source/nativenumber/data/numberchar.h +++ b/i18npool/source/nativenumber/data/numberchar.h @@ -22,41 +22,41 @@ namespace i18npool { -static const sal_Int16 NumberChar_HalfWidth = 0; -static const sal_Int16 NumberChar_FullWidth = 1; -static const sal_Int16 NumberChar_Lower_zh = 2; -static const sal_Int16 NumberChar_Upper_zh = 3; -static const sal_Int16 NumberChar_Upper_zh_TW = 4; -static const sal_Int16 NumberChar_Modern_ja = 5; -static const sal_Int16 NumberChar_Traditional_ja= 6; -static const sal_Int16 NumberChar_Lower_ko = 7; -static const sal_Int16 NumberChar_Upper_ko = 8; -static const sal_Int16 NumberChar_Hangul_ko = 9; -static const sal_Int16 NumberChar_Indic_ar = 10; -static const sal_Int16 NumberChar_EastIndic_ar = 11; -static const sal_Int16 NumberChar_hi = 12; -static const sal_Int16 NumberChar_th = 13; -static const sal_Int16 NumberChar_or = 14; -static const sal_Int16 NumberChar_mr = 15; -static const sal_Int16 NumberChar_bn = 16; -static const sal_Int16 NumberChar_pa = 17; -static const sal_Int16 NumberChar_gu = 18; -static const sal_Int16 NumberChar_ta = 19; -static const sal_Int16 NumberChar_te = 20; -static const sal_Int16 NumberChar_kn = 21; -static const sal_Int16 NumberChar_ml = 22; -static const sal_Int16 NumberChar_lo = 23; -static const sal_Int16 NumberChar_bo = 24; -static const sal_Int16 NumberChar_my = 25; -static const sal_Int16 NumberChar_km = 26; -static const sal_Int16 NumberChar_mn = 27; -static const sal_Int16 NumberChar_he = 28; -static const sal_Int16 NumberChar_ne = 29; -static const sal_Int16 NumberChar_dz = 30; -static const sal_Int16 NumberChar_cu = 31; -static const sal_Int16 NumberChar_Count = 32; +const sal_Int16 NumberChar_HalfWidth = 0; +const sal_Int16 NumberChar_FullWidth = 1; +const sal_Int16 NumberChar_Lower_zh = 2; +const sal_Int16 NumberChar_Upper_zh = 3; +const sal_Int16 NumberChar_Upper_zh_TW = 4; +const sal_Int16 NumberChar_Modern_ja = 5; +const sal_Int16 NumberChar_Traditional_ja= 6; +const sal_Int16 NumberChar_Lower_ko = 7; +const sal_Int16 NumberChar_Upper_ko = 8; +const sal_Int16 NumberChar_Hangul_ko = 9; +const sal_Int16 NumberChar_Indic_ar = 10; +const sal_Int16 NumberChar_EastIndic_ar = 11; +const sal_Int16 NumberChar_hi = 12; +const sal_Int16 NumberChar_th = 13; +const sal_Int16 NumberChar_or = 14; +const sal_Int16 NumberChar_mr = 15; +const sal_Int16 NumberChar_bn = 16; +const sal_Int16 NumberChar_pa = 17; +const sal_Int16 NumberChar_gu = 18; +const sal_Int16 NumberChar_ta = 19; +const sal_Int16 NumberChar_te = 20; +const sal_Int16 NumberChar_kn = 21; +const sal_Int16 NumberChar_ml = 22; +const sal_Int16 NumberChar_lo = 23; +const sal_Int16 NumberChar_bo = 24; +const sal_Int16 NumberChar_my = 25; +const sal_Int16 NumberChar_km = 26; +const sal_Int16 NumberChar_mn = 27; +const sal_Int16 NumberChar_he = 28; +const sal_Int16 NumberChar_ne = 29; +const sal_Int16 NumberChar_dz = 30; +const sal_Int16 NumberChar_cu = 31; +const sal_Int16 NumberChar_Count = 32; -static const sal_Unicode NumberChar[][10] = { +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 @@ -127,7 +127,7 @@ static sal_Unicode DecimalChar[] = { 0x0000, // Church Slavic }; -static const sal_Unicode MinusChar[] = { +const sal_Unicode MinusChar[] = { 0x002D, // Half Width (Ascii) 0xFF0D, // Full Width 0xFF0D, // Chinese Lower @@ -218,10 +218,10 @@ const sal_Int16 Multiplier_Count = 9; const sal_Int16 ExponentCount_6_CJK = 6; -static const sal_Int16 MultiplierExponent_6_CJK[ExponentCount_6_CJK] = { +const sal_Int16 MultiplierExponent_6_CJK[ExponentCount_6_CJK] = { 12, 8, 4, 3, 2, 1 }; -static const sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = { +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 @@ -235,11 +235,11 @@ static const sal_Unicode MultiplierChar_6_CJK[][ExponentCount_6_CJK] = { const sal_Int16 ExponentCount_2_CJK = 2; -static const sal_Int16 MultiplierExponent_2_CJK[ExponentCount_2_CJK] = { +const sal_Int16 MultiplierExponent_2_CJK[ExponentCount_2_CJK] = { 8, 4, }; -static const sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = { +const sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = { {0x4EBF, 0x4E07}, // S. Chinese Lower {0x4EBF, 0x4E07}, // S. Chinese Upper {0x5104, 0x842C}, // T. Chinese Lower @@ -253,10 +253,10 @@ static const sal_Unicode MultiplierChar_2_CJK[][ExponentCount_2_CJK] = { const sal_Int16 ExponentCount_7_CJK = 7; -static const sal_Int16 MultiplierExponent_7_CJK[ExponentCount_7_CJK] = { +const sal_Int16 MultiplierExponent_7_CJK[ExponentCount_7_CJK] = { 16, 12, 8, 4, 3, 2, 1 }; -static const sal_Unicode MultiplierChar_7_CJK[][ExponentCount_7_CJK] = { +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 8579c51035d8..bf6457a02286 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -1023,11 +1023,11 @@ HebrewNumberChar const HebrewNumberCharArray[] = { { 0x05d0, 1 } }; -static const sal_Unicode thousand[] = {0x05d0, 0x05dc, 0x05e3, 0x0}; -static const sal_Unicode thousands[] = {0x05d0, 0x05dc, 0x05e4, 0x05d9, 0x0}; -static const sal_Unicode thousands_last[] = {0x05d0, 0x05dc, 0x05e4, 0x05d9, 0x05dd, 0x0}; -static const sal_Unicode geresh = 0x05f3; -static const sal_Unicode gershayim = 0x05f4; +const sal_Unicode thousand[] = {0x05d0, 0x05dc, 0x05e3, 0x0}; +const sal_Unicode thousands[] = {0x05d0, 0x05dc, 0x05e4, 0x05d9, 0x0}; +const sal_Unicode thousands_last[] = {0x05d0, 0x05dc, 0x05e4, 0x05d9, 0x05dd, 0x0}; +const sal_Unicode geresh = 0x05f3; +const sal_Unicode gershayim = 0x05f4; static void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, bool isLast, bool useGeresh) { @@ -1098,9 +1098,9 @@ OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGere // See UTN 41 for implementation information // http://www.unicode.org/notes/tn41/ -static const sal_Unicode cyrillicThousandsMark = 0x0482; -static const sal_Unicode cyrillicTitlo = 0x0483; -static const sal_Unicode cyrillicTen = 0x0456; +const sal_Unicode cyrillicThousandsMark = 0x0482; +const sal_Unicode cyrillicTitlo = 0x0483; +const sal_Unicode cyrillicTen = 0x0456; namespace { @@ -1220,7 +1220,7 @@ OUString getCyrillicNativeNumberString(const OUString& aNumberString) return aNumberString; } -static const char implementationName[] = "com.sun.star.i18n.NativeNumberSupplier"; +const char implementationName[] = "com.sun.star.i18n.NativeNumberSupplier"; OUString SAL_CALL NativeNumberSupplierService::getImplementationName() { diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 2ad7876d2a49..4db033335878 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -257,7 +257,7 @@ struct InstancesArray { } -static const InstancesArray aInstances[] = { +const InstancesArray aInstances[] = { { "com.sun.star.i18n.IndexEntrySupplier", "com.sun.star.i18n.IndexEntrySupplier", &IndexEntrySupplier_CreateInstance }, diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 1c74a085a03d..2bbd11ac0acb 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1540,7 +1540,7 @@ SearchResult TextSearch::WildcardSrchBkwrd( const OUString& searchStr, sal_Int32 } -static const char cSearchImpl[] = "com.sun.star.util.TextSearch_i18n"; +const char cSearchImpl[] = "com.sun.star.util.TextSearch_i18n"; static uno::Sequence< OUString > getServiceName_Static() { diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx index 44646ac14f97..042e09c1df9f 100644 --- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx @@ -23,7 +23,7 @@ using namespace com::sun::star::uno; namespace i18npool { -static const transliteration_Ignore::Mapping BaFa[] = { +const transliteration_Ignore::Mapping BaFa[] = { { 0x30F4, 0x30A1, 0x30D0, true }, { 0x3094, 0x3041, 0x3070, true }, { 0x30D5, 0x30A1, 0x30CF, true }, diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx index c4b58821ca13..be66ddfc9381 100644 --- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star::lang; namespace i18npool { -static const transliteration_Ignore::Mapping HyuByu[] = { +const transliteration_Ignore::Mapping HyuByu[] = { { 0x30D5, 0x30E5, 0x30D2, false }, { 0x3075, 0x3085, 0x3072, false }, { 0x30F4, 0x30E5, 0x30D3, false }, diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index 91358dc60a3d..d40bec956589 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::lang; namespace i18npool { -static const sal_Unicode table_normalwidth[] = { +const sal_Unicode table_normalwidth[] = { // 0x0000, // 0x3040 0x3041, // 0x3041 HIRAGANA LETTER SMALL A 0x3042, // 0x3042 HIRAGANA LETTER A @@ -221,7 +221,7 @@ static const sal_Unicode table_normalwidth[] = { // 0x0000 // 0x30ff }; -static const sal_Unicode table_halfwidth[] = { +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 b24a635df504..65378d866a1a 100644 --- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star::lang; namespace i18npool { -static const transliteration_Ignore::Mapping SeZe[] = { +const transliteration_Ignore::Mapping SeZe[] = { // SI + E --> SE { 0x30B7, 0x30A7, 0x30BB, true }, // SI + E --> SE diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx index 42c1aee7c0e9..4d61d171aba5 100644 --- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star::lang; namespace i18npool { -static const transliteration_Ignore::Mapping TiJi[] = { +const transliteration_Ignore::Mapping TiJi[] = { // TU + I --> TI { 0x30C4, 0x30A3, 0x30C1, true }, // TE + I --> TI diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 04819e2f5158..88fc122e4eca 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -59,7 +59,7 @@ struct TMList { } -static TMList const TMlist[] = { // Modules ModulesNew +TMList const TMlist[] = { // Modules ModulesNew TmItem1 (IGNORE_CASE), // 0. (1<<8 256) (7) TmItem1 (IGNORE_WIDTH), // 1. (1<<9 512) (8) TmItem1 (IGNORE_KANA), // 2. (1<<10 1024) (9) -- cgit