diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-18 07:20:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-18 08:18:30 +0100 |
commit | 736b3970e7a49e0b11997602703852a7a5c0fdc3 (patch) | |
tree | 87fddc88ccffdd0476c054616b664852e3e0cb6d /i18nutil/source | |
parent | 8bcb8b187e157ddcf69943a070f29ad070f22f9a (diff) |
i18nutil: sal_Bool -> bool
Change-Id: Ic4a198d737692734ae3fbc096f370a3aa0667c5b
Diffstat (limited to 'i18nutil/source')
-rw-r--r-- | i18nutil/source/utility/casefolding.cxx | 2 | ||||
-rw-r--r-- | i18nutil/source/utility/unicode.cxx | 4 | ||||
-rw-r--r-- | i18nutil/source/utility/widthfolding.cxx | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx index c0f58d3464b5..cbe7ea91b833 100644 --- a/i18nutil/source/utility/casefolding.cxx +++ b/i18nutil/source/utility/casefolding.cxx @@ -108,7 +108,7 @@ Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 return dummy; } -inline sal_Bool SAL_CALL +inline bool SAL_CALL is_ja_voice_sound_mark(sal_Unicode& current, sal_Unicode next) { sal_Unicode c = 0; diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index ff928053d8c2..edea19846742 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -378,7 +378,7 @@ unicode::getUnicodeDirection( const sal_Unicode ch ) { bit(UnicodeType::PARAGRAPH_SEPARATOR) #define IsType(func, mask) \ -sal_Bool SAL_CALL func( const sal_Unicode ch) {\ +bool SAL_CALL func( const sal_Unicode ch) {\ return (bit(getUnicodeType(ch)) & (mask)) != 0;\ } @@ -389,7 +389,7 @@ IsType(unicode::isSpace, SPACEMASK) #define CONTROLSPACE bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\ bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f) -sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) { +bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) { return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & (CONTROLSPACE))); } diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx index a7ecb98052b4..2d3fcb1a93c9 100644 --- a/i18nutil/source/utility/widthfolding.cxx +++ b/i18nutil/source/utility/widthfolding.cxx @@ -41,7 +41,7 @@ sal_Unicode widthfolding::decompose_ja_voiced_sound_marksChar2Char (sal_Unicode /** * Decompose Japanese specific voiced and semi-voiced sound marks. */ -OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset ) +OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset ) { // Create a string buffer which can hold nCount * 2 + 1 characters. // Its size may become double of nCount. @@ -103,7 +103,7 @@ oneToOneMapping& widthfolding::getfull2halfTable(void) /** * Compose Japanese specific voiced and semi-voiced sound marks. */ -OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags ) +OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset, sal_Int32 nFlags ) { // Create a string buffer which can hold nCount + 1 characters. // Its size may become equal to nCount or smaller. @@ -157,14 +157,14 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal // 0 addresses a code point regarding 0x3099 or 0x309b (voiced sound mark), // 1 is 0x309a or 0x309c (semi-voiced sound mark) int i = int(previousChar - 0x3040); // i acts as an index of array - sal_Bool bCompose = sal_False; + bool bCompose = false; if (0 <= i && i <= (0x30ff - 0x3040) && composition_table[i][j]) - bCompose = sal_True; + bCompose = true; // not to use combined KATAKANA LETTER VU if ( previousChar == 0x30a6 && (nFlags & WIDTHFOLDNIG_DONT_USE_COMBINED_VU) ) - bCompose = sal_False; + bCompose = false; if( bCompose ){ if (useOffset) { |