From f30cde45db99d5c57e8be6956bbf824ab92328c2 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 9 Aug 2013 09:14:53 +0900 Subject: Mark as const/static Change-Id: I5d51d7e01913ac9917578f8c9789312af9be3638 --- i18npool/source/indexentry/data/indexdata_alphanumeric.h | 2 +- i18npool/source/indexentry/data/indexdata_ja_phonetic.h | 6 +++--- i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'i18npool/source/indexentry') 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 -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 -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) -- cgit v1.2.3