From fb2013ccb1a13921eb398fb6e4f2b4d55f0761a2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Apr 2017 17:56:59 +0200 Subject: loplugin:salunicodeliteral: i18npool Change-Id: I7307cc96eac5868ed26e8ace1fc3c1a93e1bfec4 --- i18npool/qa/cppunit/test_breakiterator.cxx | 2 +- .../defaultnumberingprovider/defaultnumberingprovider.cxx | 10 +++++----- i18npool/source/indexentry/indexentrysupplier_default.cxx | 8 ++++---- .../source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx | 2 +- i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx | 2 +- .../source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx | 2 +- .../source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx | 2 +- i18npool/source/transliteration/transliteration_Ignore.cxx | 2 +- i18npool/source/transliteration/transliteration_OneToOne.cxx | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index fb1a155ae9db..d3da7dda4d95 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -380,7 +380,7 @@ void TestBreakIterator::testWordBoundaries() } const sal_Int32 aSingleQuotePositions[] = {0, 1, 9, 10}; - CPPUNIT_ASSERT_EQUAL(static_cast('\''), aTests[0]); + CPPUNIT_ASSERT_EQUAL(u'\'', aTests[0]); { OUString aTest = aBase.replaceAll("xx", OUStringLiteral1(aTests[0])); sal_Int32 nPos = -1; diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index e9a3e299bccc..901dd3048dd7 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -413,7 +413,7 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult ) if ((nDigit = nPart % 100) < 20) { if (!aTemp.isEmpty()) - aTemp.insert( 0, sal_Unicode(0x0020)); + aTemp.insert( 0, u' '); aTemp.insert( 0, table_PersianWord_decade1[nDigit]); } else @@ -449,10 +449,10 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult ) // Greek Letter Numbering // KERAIA separates numerals from other text -#define STIGMA (sal_Unicode) 0x03DB -#define LEFT_KERAIA (sal_Unicode) 0x0375 -#define MYRIAD_SYM (sal_Unicode) 0x039C -#define DOT_SYM (sal_Unicode) 0x002E +#define STIGMA u'\x03DB' +#define LEFT_KERAIA u'\x0375' +#define MYRIAD_SYM u'\x039C' +#define DOT_SYM u'.' #define SIGMA_OFFSET 19 #define TAU_OFFSET 20 #define MYRIAD 10000 diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index e88cabf47465..419d84c80c5e 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -187,7 +187,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm continue; switch(curr) { - case sal_Unicode('-'): + case u'-': if (key_count > 0 && i + 1 < len ) { for (curr = keyStr[++i]; key_count < MAX_KEYS && keys[key_count-1].key < curr; key_count++) { keys[key_count].key = keys[key_count-1].key+1; @@ -196,7 +196,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm } else throw RuntimeException(); break; - case sal_Unicode('['): + case u'[': for (i++; i < len && keyStr[i] != ']'; i++) { if (unicode::isWhiteSpace(keyStr[i])) { continue; @@ -209,10 +209,10 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm } } break; - case sal_Unicode('{'): + case u'{': close = '}'; SAL_FALLTHROUGH; - case sal_Unicode('('): + case u'(': if (key_count > 0) { sal_Int16 end = i+1; for (; end < len && keyStr[end] != close; end++) ; diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 642466c66185..ac7630c3facf 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -120,7 +120,7 @@ ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPo *dst ++ = previousChar; } - *dst = (sal_Unicode) 0; + *dst = u'\0'; newStr->length = sal_Int32(dst - newStr->buffer); if (useOffset) diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index 08cdc76f1811..9935d53590e4 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -130,7 +130,7 @@ ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, s *dst ++ = previousChar; } - *dst = (sal_Unicode) 0; + *dst = u'\0'; newStr->length = sal_Int32(dst - newStr->buffer); if (useOffset) diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx index aae059ed95f9..f057876a7dd9 100644 --- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx @@ -78,7 +78,7 @@ ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos *dst ++ = previousChar; } - *dst = (sal_Unicode) 0; + *dst = u'\0'; newStr->length = sal_Int32(dst - newStr->buffer); if (useOffset) diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index 11809b98251d..7c37be6e36bc 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -336,7 +336,7 @@ ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startP *dst ++ = previousChar; } - *dst = (sal_Unicode) 0; + *dst = u'\0'; newStr->length = sal_Int32(dst - newStr->buffer); if (useOffset) diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index 3d852afb8aea..355334ab28e0 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -190,7 +190,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, newStr->length = sal_Int32(dst - newStr->buffer); if (useOffset) offset.realloc(newStr->length); - *dst = (sal_Unicode) 0; + *dst = u'\0'; return OUString(newStr, SAL_NO_ACQUIRE); // take ownership } diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx index 978d7cf9cd7a..f820a35921e9 100644 --- a/i18npool/source/transliteration/transliteration_OneToOne.cxx +++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx @@ -75,7 +75,7 @@ transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startP if (useOffset) *p ++ = position ++; } - *dst = (sal_Unicode) 0; + *dst = u'\0'; return OUString(newStr, SAL_NO_ACQUIRE); // take ownership } -- cgit