diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-22 12:48:05 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-23 11:11:47 +0200 |
commit | e4f690b0389263c35f83fa8b58382c6518d00f62 (patch) | |
tree | e89a15c8f29c51394ff539eabc6e122ab6d1c70f /i18npool | |
parent | fc06e00fd4ae2b82d827163e72eb6824e88dbd40 (diff) |
i18npool: sal_Bool->bool
Change-Id: Id73ee64dbf8586743f0e436e004e663a65d4548f
Diffstat (limited to 'i18npool')
43 files changed, 193 insertions, 193 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index b43adbf24b23..bca243404013 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -125,12 +125,12 @@ private : com::sun::star::uno::Reference < XBreakIterator > xBI; com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName ) + bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName ) throw( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const com::sun::star::lang::Locale& rLocale ) throw( com::sun::star::uno::RuntimeException ); const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const OUString& Text, - sal_Int32 nStartPos, sal_Bool forward, sal_Bool skipWhiteSpace) + sal_Int32 nStartPos, bool forward, bool skipWhiteSpace) throw(com::sun::star::uno::RuntimeException); }; diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index 98c8d14eca1a..efe8c0730056 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -168,7 +168,7 @@ private: sal_Int32 nTokenType = 0xffffffff ); /// Setup International class, new'ed only if different from existing. - sal_Bool setupInternational( const com::sun::star::lang::Locale& rLocale ); + bool setupInternational( const com::sun::star::lang::Locale& rLocale ); /// Implementation of getCharacterType() for one single character sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment); diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index 069838968f12..024453e67041 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -87,7 +87,7 @@ private: com::sun::star::lang::Locale aLocale; OUString aName; com::sun::star::uno::Reference < XCharacterClassification > xCI; - sal_Bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) { + bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant; @@ -101,7 +101,7 @@ private: com::sun::star::uno::Reference < XCharacterClassification > SAL_CALL getLocaleSpecificCharacterClassification(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL + bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const com::sun::star::lang::Locale& rLocale); }; diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index d6a0f369f56c..8a614873124b 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -83,7 +83,7 @@ private : com::sun::star::uno::Reference < XCollator > xC; lookupTableItem(const lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service, com::sun::star::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {} - sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) { + bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant && @@ -98,7 +98,7 @@ private : // lang::Locale Data com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData; - sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName, + bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 713e54463807..42d3c2831bc9 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -90,7 +90,7 @@ private: TransliterationImpl* translit; OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ) throw(com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isScriptFlagEnabled(const OUString& aName ) + bool SAL_CALL isScriptFlagEnabled(const OUString& aName ) throw(com::sun::star::uno::RuntimeException); }; } } } } diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index f17c1ddf0e81..0c2f667d87a3 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -89,7 +89,7 @@ private: OUString aServiceName; com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES; com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( com::sun::star::uno::RuntimeException ); + bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( com::sun::star::uno::RuntimeException ); com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL getLocaleSpecificIndexEntrySupplier( const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index cc9c2df4a671..9e72ef36a8c1 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -89,7 +89,7 @@ public: protected: const sal_Char *implementationName; - sal_Bool usePhonetic; + bool usePhonetic; CollatorImpl *collator; const OUString& SAL_CALL getEntry( const OUString& IndexEntry, const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index fccbd4ae61a6..1c08c385f2cd 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -58,7 +58,7 @@ struct LocaleDataLookupTableItem; namespace com { namespace sun { namespace star { namespace i18n { -inline sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2) { +inline bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2) { return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; }; @@ -112,8 +112,8 @@ public: virtual OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); + virtual bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo @@ -122,7 +122,7 @@ public: virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private : - friend sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); + friend bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); ::std::auto_ptr< LocaleDataLookupTableItem > cachedItem; diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 81df93da73ee..c5848f075609 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -37,7 +37,7 @@ class NativeNumberSupplier : public cppu::WeakImplHelper2 > { public: - NativeNumberSupplier(sal_Bool _useOffset = sal_False) : useOffset(_useOffset) {} + NativeNumberSupplier(bool _useOffset = false) : useOffset(_useOffset) {} // Methods virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, @@ -75,7 +75,7 @@ public: private: ::com::sun::star::lang::Locale aLocale; - sal_Bool useOffset; + bool useOffset; }; } } } } diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index aff4181ed52e..7c4d1945a718 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -143,7 +143,7 @@ private : sal_Int32 maxLeftLength; sal_Int32 maxRightLength; com::sun::star::uno::Sequence< OUString > SAL_CALL - getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja); + getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja); }; @@ -194,8 +194,8 @@ private : // user defined dictionary list com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; OUString SAL_CALL getWordConversion(const OUString& aText, - sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset); - rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions); + sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset); + rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions); com::sun::star::lang::Locale aLocale; }; diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index e318f87b6f45..a12061647a37 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -103,12 +103,12 @@ private: #define maxCascade 27 com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > bodyCascade[maxCascade]; sal_Int16 numCascade; - sal_Bool caseignoreOnly; + bool caseignoreOnly; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; com::sun::star::uno::Reference< XLocaleData4 > mxLocaledata; com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > caseignore; - virtual sal_Bool SAL_CALL loadModuleByName( const OUString& implName, + virtual bool SAL_CALL loadModuleByName( const OUString& implName, com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index ea6e3b36ac6a..f57e1da04ffd 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -28,7 +28,7 @@ typedef struct { sal_Unicode previousChar; sal_Unicode currentChar; sal_Unicode replaceChar; - sal_Bool two2one; + bool two2one; } Mapping; namespace com { namespace sun { namespace star { namespace i18n { diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index 3aeaac9dce46..fa6d92c5a2a8 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -52,7 +52,7 @@ protected: sal_Int16 nNativeNumberMode; sal_Int16 tableSize; const sal_Unicode* table; - sal_Bool recycleSymbol; + bool recycleSymbol; private: OUString SAL_CALL transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index feb72cc1dc69..c27571f5215b 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -109,7 +109,7 @@ protected: com::sun::star::lang::Locale aLocale; const sal_Char* transliterationName; const sal_Char* implementationName; - sal_Bool useOffset; + bool useOffset; }; } } } } diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index 847cb097a3f1..13078e88d5c0 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.hxx @@ -37,7 +37,7 @@ struct WordBreakCache { sal_Int32 size; // size of wordboundary WordBreakCache(); - sal_Bool equals(const sal_Unicode *str, Boundary& boundary); // checking cached string + bool equals(const sal_Unicode *str, Boundary& boundary); // checking cached string }; class xdictionary @@ -52,22 +52,22 @@ private: oslModule hModule; #endif Boundary boundary; - sal_Bool japaneseWordBreak; + bool japaneseWordBreak; public: xdictionary(const sal_Char *lang); ~xdictionary(); Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); - Boundary getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection ); + Boundary getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, bool bDirection ); void setJapaneseWordBreak(); private: WordBreakCache cache[CACHE_MAX]; - sal_Bool seekSegment(const OUString& rText, sal_Int32 pos, Boundary& boundary); + bool seekSegment(const OUString& rText, sal_Int32 pos, Boundary& boundary); WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary); - sal_Bool exists(const sal_uInt32 u); + bool exists(const sal_uInt32 u); sal_Int32 getLongestMatch(const sal_Unicode *text, sal_Int32 len); }; diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index db36852085a3..5593b9e306ff 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -67,7 +67,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, #define isZWSP(c) (ch == 0x200B) -static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, sal_Int16 rWordType, sal_Bool bDirection) +static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, sal_Int16 rWordType, bool bDirection) { sal_uInt32 ch=0; sal_Int32 pos=nPos; @@ -107,7 +107,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n else { result = LBI->nextWord(Text, nStartPos, rLocale, rWordType); - nStartPos = skipSpace(Text, result.startPos, len, rWordType, sal_True); + nStartPos = skipSpace(Text, result.startPos, len, rWordType, true); if ( nStartPos != result.startPos) { if( nStartPos >= len ) @@ -122,7 +122,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n return result; } -static inline sal_Bool SAL_CALL isCJK( const Locale& rLocale ) { +static inline bool SAL_CALL isCJK( const Locale& rLocale ) { return rLocale.Language == "zh" || rLocale.Language == "ja" || rLocale.Language == "ko"; } @@ -138,7 +138,7 @@ Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int return result; } - sal_Int32 nPos = skipSpace(Text, nStartPos, len, rWordType, sal_False); + sal_Int32 nPos = skipSpace(Text, nStartPos, len, rWordType, false); // if some spaces are skiped, and the script type is Asian with no CJK rLocale, we have to return // (nStartPos, -1) for caller to send correct rLocale for loading correct dictionary. @@ -162,8 +162,8 @@ Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_ result.endPos = result.startPos = len; else { sal_Int32 next, prev; - next = skipSpace(Text, nPos, len, rWordType, sal_True); - prev = skipSpace(Text, nPos, len, rWordType, sal_False); + next = skipSpace(Text, nPos, len, rWordType, true); + prev = skipSpace(Text, nPos, len, rWordType, false); if (prev == 0 && next == len) { result.endPos = result.startPos = nPos; } else if (prev == 0 && ! bDirection) { @@ -192,7 +192,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int3 if (nPos < 0 || nPos >= len) return sal_False; - sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_True); + sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, true); if (tmp != nPos) return sal_False; @@ -208,7 +208,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 if (nPos <= 0 || nPos > len) return sal_False; - sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, sal_False); + sal_Int32 tmp = skipSpace(Text, nPos, len, rWordType, false); if (tmp != nPos) return sal_False; @@ -525,18 +525,18 @@ sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) return nRet; } -static inline sal_Bool operator == (const Locale& l1, const Locale& l2) { +static inline bool operator == (const Locale& l1, const Locale& l2) { return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; } -sal_Bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException ) +bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException ) { // to share service between same Language but different Country code, like zh_CN and zh_TW for (size_t l = 0; l < lookupTable.size(); l++) { lookupTableItem *listItem = lookupTable[l]; if (aLocaleName == listItem->aLocale.Language) { xBI = listItem->xBI; - return sal_True; + return true; } } @@ -547,10 +547,10 @@ sal_Bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUS xBI.set(xI, UNO_QUERY); if (xBI.is()) { lookupTable.push_back(new lookupTableItem(Locale(aLocaleName, aLocaleName, aLocaleName), xBI)); - return sal_True; + return true; } } - return sal_False; + return false; } Reference < XBreakIterator > SAL_CALL diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 205ff6c9f04c..126ac7a8d354 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -80,7 +80,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) throw(uno::RuntimeException) { - sal_Bool newBreak = sal_False; + bool newBreak = false; UErrorCode status = U_ZERO_ERROR; sal_Int16 breakType = 0; switch (rBreakType) { @@ -179,7 +179,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star:: } if (icuBI->aBreakIterator) { icuBI->maLocale=rLocale; - newBreak=sal_True; + newBreak=true; } else { throw uno::RuntimeException(); } @@ -371,7 +371,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( loadICUBreakIterator(rLocale, LOAD_LINE_BREAKITERATOR, 0, lineRule, Text); - sal_Bool GlueSpace=sal_True; + bool GlueSpace=true; while (GlueSpace) { if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { //Line boundary break lbr.breakIndex = nStartPos; @@ -423,15 +423,15 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( } #define WJ 0x2060 // Word Joiner - GlueSpace=sal_False; + GlueSpace=false; if (lbr.breakType == BreakType::WORDBOUNDARY) { nStartPos = lbr.breakIndex; if (Text[nStartPos--] == WJ) - GlueSpace=sal_True; + GlueSpace=true; while (nStartPos >= 0 && (u_isWhitespace(Text.iterateCodePoints(&nStartPos, 0)) || Text[nStartPos] == WJ)) { if (Text[nStartPos--] == WJ) - GlueSpace=sal_True; + GlueSpace=true; } if (GlueSpace && nStartPos < 0) { lbr.breakIndex = 0; diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 390b2cd7dcc4..6ded12393adc 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -66,7 +66,7 @@ xdictionary::xdictionary(const sal_Char *lang) : hModule( NULL ), #endif boundary(), - japaneseWordBreak( sal_False ) + japaneseWordBreak( false ) { existMark = NULL; index1 = NULL; @@ -150,7 +150,7 @@ xdictionary::xdictionary(const sal_Char *lang) : for (sal_Int32 i = 0; i < CACHE_MAX; i++) cache[i].size = 0; - japaneseWordBreak = sal_False; + japaneseWordBreak = false; } xdictionary::~xdictionary() @@ -168,13 +168,13 @@ xdictionary::~xdictionary() void xdictionary::setJapaneseWordBreak() { - japaneseWordBreak = sal_True; + japaneseWordBreak = true; } -sal_Bool xdictionary::exists(const sal_uInt32 c) +bool xdictionary::exists(const sal_uInt32 c) { // 0x1FFF is the hardcoded limit in gendict for existMarks - sal_Bool exist = (existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False; + bool exist = (existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False; if (!exist && japaneseWordBreak) return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN; else @@ -229,15 +229,15 @@ WordBreakCache::WordBreakCache() : * Compare two unicode string, */ -sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) +bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) { // Different length, different string. - if (length != boundary.endPos - boundary.startPos) return sal_False; + if (length != boundary.endPos - boundary.startPos) return false; for (sal_Int32 i = 0; i < length; i++) - if (contents[i] != str[i + boundary.startPos]) return sal_False; + if (contents[i] != str[i + boundary.startPos]) return false; - return sal_True; + return true; } @@ -246,7 +246,7 @@ sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) * @param pos : Position of the given character. * @return true if CJK. */ -sal_Bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos, +bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos, Boundary& segBoundary) { sal_Int32 indexUtf16; @@ -382,7 +382,7 @@ Boundary xdictionary::nextWord(const OUString& rText, sal_Int32 anyPos, sal_Int1 return getWordBoundary(rText, anyPos, wordType, true); } -Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, sal_Int16 wordType, sal_Bool bDirection) +Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, sal_Int16 wordType, bool bDirection) { const sal_Unicode *text=rText.getStr(); sal_Int32 len=rText.getLength(); diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index f08c94affaf6..e5f6fc82fd0f 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -806,13 +806,13 @@ Calendar_gregorian::isValid() throw(RuntimeException, std::exception) static sal_Int16 SAL_CALL NatNumForCalendar(const com::sun::star::lang::Locale& aLocale, sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 value ) { - sal_Bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || + bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR || nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR) && value >= 100) || nCalendarDisplayCode == CalendarDisplayCode::SHORT_QUARTER || nCalendarDisplayCode == CalendarDisplayCode::LONG_QUARTER; - sal_Bool isChinese = aLocale.Language == "zh"; - sal_Bool isJapanese = aLocale.Language == "ja"; - sal_Bool isKorean = aLocale.Language == "ko"; + bool isChinese = aLocale.Language == "zh"; + bool isJapanese = aLocale.Language == "ja"; + bool isKorean = aLocale.Language == "ko"; if (isChinese || isJapanese || isKorean) { switch (nNativeNumberMode) { diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index 02da34c2ddd8..0dc82bd1ac56 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -50,7 +50,7 @@ Calendar_jewish::Calendar_jewish() const int HebrewEpoch = -1373429; // Absolute date of start of Hebrew calendar // True if year is an Hebrew leap year -sal_Bool HebrewLeapYear(sal_Int32 year) { +bool HebrewLeapYear(sal_Int32 year) { return ((((7 * year) + 1) % 19) < 7); } @@ -102,12 +102,12 @@ sal_Int32 DaysInHebrewYear(sal_Int32 year) { } // True if Heshvan is long in Hebrew year. -sal_Bool LongHeshvan(sal_Int32 year) { +bool LongHeshvan(sal_Int32 year) { return ((DaysInHebrewYear(year) % 10) == 5); } // True if Kislev is short in Hebrew year. -sal_Bool ShortKislev(sal_Int32 year) { +bool ShortKislev(sal_Int32 year) { return ((DaysInHebrewYear(year) % 10) == 3); } diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx index 2c372eb01f80..395efd8ad1d7 100644 --- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx +++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx @@ -389,9 +389,9 @@ sal_Int32 cclass_Unicode::getParseTokensType( const sal_Unicode* aStr, sal_Int32 } } -sal_Bool cclass_Unicode::setupInternational( const Locale& rLocale ) +bool cclass_Unicode::setupInternational( const Locale& rLocale ) { - sal_Bool bChanged = (aParserLocale.Language != rLocale.Language + bool bChanged = (aParserLocale.Language != rLocale.Language || aParserLocale.Country != rLocale.Country || aParserLocale.Variant != rLocale.Variant); if ( bChanged ) diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index d2dd5be130e6..e109f0b0c084 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -127,14 +127,14 @@ ParseResult SAL_CALL CharacterClassificationImpl::parsePredefinedToken( contCharTokenType, userDefinedCharactersCont); } -sal_Bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassification(const OUString& serviceName, const Locale& rLocale) +bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassification(const OUString& serviceName, const Locale& rLocale) { // to share service between same Language but different Country code, like zh_CN and zh_SG for (size_t l = 0; l < lookupTable.size(); l++) { cachedItem = lookupTable[l]; if (serviceName == cachedItem->aName) { lookupTable.push_back( cachedItem = new lookupTableItem(rLocale, serviceName, cachedItem->xCI) ); - return sal_True; + return true; } } @@ -146,10 +146,10 @@ sal_Bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClas xCI.set( xI, UNO_QUERY ); if (xCI.is()) { lookupTable.push_back( cachedItem = new lookupTableItem(rLocale, serviceName, xCI) ); - return sal_True; + return true; } } - return sal_False; + return false; } Reference < XCharacterClassification > SAL_CALL diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index f0a56497d159..d11db2d6771e 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -141,7 +141,7 @@ CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) t return option_int; } -sal_Bool SAL_CALL +bool SAL_CALL CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm) throw(RuntimeException) { @@ -149,7 +149,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic cachedItem = lookupTable[l]; if (cachedItem->service.equals(serviceName)) {// cross locale sharing lookupTable.push_back(cachedItem = new lookupTableItem(rLocale, rSortAlgorithm, serviceName, cachedItem->xC)); - return sal_True; + return true; } } Reference < XInterface > xI = @@ -160,10 +160,10 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic xC.set( xI, UNO_QUERY ); if (xC.is()) { lookupTable.push_back(cachedItem = new lookupTableItem(rLocale, rSortAlgorithm, serviceName, xC)); - return sal_True; + return true; } } - return sal_False; + return false; } void SAL_CALL diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 693f6188939a..6e373b00061f 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -529,7 +529,7 @@ bool should_ignore( const OUString& s ) static Any getPropertyByName( const Sequence<beans::PropertyValue>& aProperties, - const char* name, sal_Bool bRequired ) + const char* name, bool bRequired ) { for( int i=0; i<aProperties.getLength(); i++ ) if( aProperties[i].Name.equalsAscii(name) ) @@ -565,7 +565,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal sal_Int16 natNum = 0; sal_Int16 tableSize = 0; const sal_Unicode *table = NULL; // initialize to avoid compiler warning - sal_Bool recycleSymbol = sal_False; + bool recycleSymbol = false; Locale locale; OUString prefix; @@ -577,22 +577,22 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal // int last = nProperties-1; try { - getPropertyByName(aProperties, "Prefix", sal_False) >>=prefix; + getPropertyByName(aProperties, "Prefix", false) >>=prefix; } catch (Exception&) { //prefix _must_ be empty here! } try { - getPropertyByName(aProperties, "Suffix", sal_False) >>=suffix; + getPropertyByName(aProperties, "Suffix", false) >>=suffix; } catch (Exception&) { //suffix _must_ be empty here! } try { - getPropertyByName(aProperties, "NumberingType", sal_True) >>=numType; + getPropertyByName(aProperties, "NumberingType", true) >>=numType; } catch (Exception& ) { numType = -1; } try { - getPropertyByName(aProperties, "Value", sal_True) >>=number; + getPropertyByName(aProperties, "Value", true) >>=number; } catch (Exception& ) { number = -1; } @@ -644,7 +644,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal try { const OUString &tmp = OUString::number( number ); OUString transliteration; - getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration; + getPropertyByName(aProperties, "Transliteration", true) >>= transliteration; impl_loadTranslit(); translit->loadModuleByImplName(transliteration, aLocale); result += translit->transliterateString2String(tmp, 0, tmp.getLength()); @@ -704,42 +704,42 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal case AIU_FULLWIDTH_JA: table = table_AIUFullWidth_ja_JP; tableSize = SAL_N_ELEMENTS(table_AIUFullWidth_ja_JP); - recycleSymbol = sal_True; + recycleSymbol = true; break; case AIU_HALFWIDTH_JA: table = table_AIUHalfWidth_ja_JP; tableSize = SAL_N_ELEMENTS(table_AIUHalfWidth_ja_JP); - recycleSymbol = sal_True; + recycleSymbol = true; break; case IROHA_FULLWIDTH_JA: table = table_IROHAFullWidth_ja_JP; tableSize = SAL_N_ELEMENTS(table_IROHAFullWidth_ja_JP); - recycleSymbol = sal_True; + recycleSymbol = true; break; case IROHA_HALFWIDTH_JA: table = table_IROHAHalfWidth_ja_JP; tableSize = SAL_N_ELEMENTS(table_IROHAHalfWidth_ja_JP); - recycleSymbol = sal_True; + recycleSymbol = true; break; case HANGUL_JAMO_KO: table = table_HangulJamo_ko; tableSize = SAL_N_ELEMENTS(table_HangulJamo_ko); - recycleSymbol = sal_True; + recycleSymbol = true; break; case HANGUL_SYLLABLE_KO: table = table_HangulSyllable_ko; tableSize = SAL_N_ELEMENTS(table_HangulSyllable_ko); - recycleSymbol = sal_True; + recycleSymbol = true; break; case HANGUL_CIRCLED_JAMO_KO: table = table_HangulCircledJamo_ko; tableSize = SAL_N_ELEMENTS(table_HangulCircledJamo_ko); - recycleSymbol = sal_True; + recycleSymbol = true; break; case HANGUL_CIRCLED_SYLLABLE_KO: table = table_HangulCircledSyllable_ko; tableSize = SAL_N_ELEMENTS(table_HangulCircledSyllable_ko); - recycleSymbol = sal_True; + recycleSymbol = true; break; case CHARS_ARABIC: lcl_formatChars(table_Alphabet_ar, SAL_N_ELEMENTS(table_Alphabet_ar), number - 1, result); @@ -965,7 +965,7 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) } } -sal_Bool SAL_CALL +bool SAL_CALL DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(RuntimeException) { if (! xHierarchicalNameAccess.is()) { @@ -992,7 +992,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti Any aEnabled = xHierarchicalNameAccess->getByHierarchicalName(aName); - sal_Bool enabled = sal_False; + bool enabled = false; aEnabled >>= enabled; @@ -1005,8 +1005,8 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( ) Sequence< sal_Int16 > aRet(nSupported_NumberingTypes ); sal_Int16* pArray = aRet.getArray(); - sal_Bool cjkEnabled = isScriptFlagEnabled(OUString("CJK/CJKFont")); - sal_Bool ctlEnabled = isScriptFlagEnabled(OUString("CTL/CTLFont")); + bool cjkEnabled = isScriptFlagEnabled(OUString("CJK/CJKFont")); + bool ctlEnabled = isScriptFlagEnabled(OUString("CTL/CTLFont")); for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) { if ( (aSupportedTypes[i].langOption & LANG_ALL) || diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 8da071164869..b64899abcab8 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -98,7 +98,7 @@ throw (RuntimeException, std::exception) getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); } -sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException ) +bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException ) { Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.i18n.IndexEntrySupplier_") + name, m_xContext); @@ -107,7 +107,7 @@ sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(con xIES.set( xI, UNO_QUERY ); return xIES.is(); } - return sal_False; + return false; } Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index c330ed582e0c..ce1e2fc7e814 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -32,7 +32,7 @@ IndexEntrySupplier_Common::IndexEntrySupplier_Common(const Reference < uno::XCom { implementationName = "com.sun.star.i18n.IndexEntrySupplier_Common"; collator = new CollatorImpl(rxContext); - usePhonetic = sal_False; + usePhonetic = false; } IndexEntrySupplier_Common::~IndexEntrySupplier_Common() diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index 64b1e930d5a6..339331a3d162 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -62,7 +62,7 @@ sal_Bool _TAC_Composible[3][5] = { /* Mode 2 */ {sal_True, sal_True, sal_False, sal_False, sal_True} // STRICT = 2 }; -static sal_Bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode) +static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputCheckMode) { sal_Int16 composible_class; switch (_TAC_celltype_inputcheck[getCharType(ch1)][getCharType(ch2)]) { diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 9d64b93e6646..7e965197fff9 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -312,7 +312,7 @@ struct LocaleDataLookupTableItem const sal_Char* localeName; com::sun::star::lang::Locale aLocale; - sal_Bool equals(const com::sun::star::lang::Locale& rLocale) + bool equals(const com::sun::star::lang::Locale& rLocale) { return (rLocale == aLocale); } @@ -703,7 +703,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException for(sal_Int16 i = 0; i < calendarsCount; i++) { OUString calendarID(allCalendars[offset]); offset++; - sal_Bool defaultCalendar = sal::static_int_cast<sal_Bool>( allCalendars[offset][0] ); + bool defaultCalendar = sal::static_int_cast<sal_Bool>( allCalendars[offset][0] ); offset++; Sequence< CalendarItem2 > days = getCalendarItems( allCalendars, offset, REF_DAYS, i, rLocale, calendarsSeq); @@ -1042,7 +1042,7 @@ LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeE return OUString(); } -sal_Bool SAL_CALL +bool SAL_CALL LocaleDataImpl::hasPhonetic( const Locale& rLocale ) throw(RuntimeException) { sal_Int16 indexCount = 0; @@ -1051,10 +1051,10 @@ LocaleDataImpl::hasPhonetic( const Locale& rLocale ) throw(RuntimeException) if ( indexArray ) { for(sal_Int16 i = 0; i < indexCount; i++) { if (indexArray[i*5 + 4][0]) - return sal_True; + return true; } } - return sal_False; + return false; } sal_Unicode ** SAL_CALL @@ -1071,7 +1071,7 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& return NULL; } -sal_Bool SAL_CALL +bool SAL_CALL LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 8cb9c166c20e..18d1374ee644 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -57,10 +57,10 @@ typedef struct { namespace com { namespace sun { namespace star { namespace i18n { -OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal_Bool useGeresh); +OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh); OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int16 number ) throw(RuntimeException) + Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number ) throw(RuntimeException) { const sal_Unicode *src = inStr.getStr() + startPos; rtl_uString *newStr = rtl_uString_alloc(nCount); @@ -87,22 +87,22 @@ OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, return OUString(newStr, SAL_NO_ACQUIRE); // take ownership } -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, +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, bool useOffset, sal_Int32 startPos, 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] ) { if (number->multiplierExponent[number->exponentCount-1] > 1) { sal_Int16 i; - sal_Bool notZero = false; + bool notZero = false; for (i = 0; i < len; i++, begin++) { if (notZero || str[begin] != NUMBER_ZERO) { dst[count] = numberChar[str[begin] - NUMBER_ZERO]; if (useOffset) offset[count] = begin + startPos; count++; - notZero = sal_True; + notZero = true; } } if (notZero && multiChar > 0) { @@ -133,7 +133,7 @@ sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 be } return str[begin] != NUMBER_ZERO; } else { - sal_Bool printPower = sal_False; + bool printPower = false; // sal_Int16 last = 0; for (sal_Int16 i = 1; i <= number->exponentCount; i++) { sal_Int32 tmp = len - (i == number->exponentCount ? 0 : number->multiplierExponent[i]); @@ -160,7 +160,7 @@ 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, const Number* number ) throw(RuntimeException) + Sequence< sal_Int32 >& offset, bool useOffset, const Number* number ) throw(RuntimeException) { OUString aRet; @@ -179,7 +179,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ if (useOffset) offset.realloc( nCount * 2 ); - sal_Bool doDecimal = sal_False; + bool doDecimal = false; for (i = 0; i <= nCount; i++) { @@ -196,7 +196,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ if (len > 0) { if (i < nCount-1 && isSeparator(str[i]) && isNumber(str[i+1])) continue; // skip comma inside number string - sal_Bool notZero = sal_False; + bool notZero = false; for (sal_Int32 begin = 0, end = len % number->multiplierExponent[0]; end <= len; begin = end, end += number->multiplierExponent[0]) { if (end == 0) continue; @@ -224,7 +224,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ len = 0; } if (i < nCount) { - if ((doDecimal = (!doDecimal && i < nCount-1 && isDecimal(str[i]) && isNumber(str[i+1]))) != sal_False) + if ((doDecimal = (!doDecimal && i < nCount-1 && isDecimal(str[i]) && isNumber(str[i+1]))) != false) newStr[count] = (DecimalChar[number->number] ? DecimalChar[number->number] : str[i]); else if (i < nCount-1 && isMinus(str[i]) && isNumber(str[i+1])) newStr[count] = (MinusChar[number->number] ? MinusChar[number->number] : str[i]); @@ -246,7 +246,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ return aRet; } static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, const sal_Unicode *str, - sal_Int32& i, sal_Int32 nCount, sal_Unicode *dst, sal_Int32& count, Sequence< sal_Int32 >& offset, sal_Bool useOffset, + sal_Int32& i, sal_Int32 nCount, sal_Unicode *dst, sal_Int32& count, Sequence< sal_Int32 >& offset, bool useOffset, OUString& numberChar, OUString& multiplierChar) { sal_Int16 curr = 0, num = 0, end = 0, shift = 0; @@ -295,7 +295,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co } static OUString SAL_CALL NativeToAscii(const OUString& inStr, - sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, sal_Bool useOffset ) throw(RuntimeException) + sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset ) throw(RuntimeException) { OUString aRet; @@ -730,12 +730,12 @@ NativeNumberXmlAttributes SAL_CALL NativeNumberSupplier::convertToXmlAttributes( OUString::createFromAscii(attType[type])); } -static sal_Bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len) +static bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len) { for (sal_Int16 i = 0; i < len; i++) if (natnum[i] == num) - return sal_True; - return sal_False; + return true; + return false; } sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException, std::exception) @@ -822,7 +822,7 @@ static sal_Unicode thousands_last[] = {0x05d0, 0x05dc, 0x05e4, 0x05d9, 0x05dd, 0 static sal_Unicode geresh = 0x05f3; static sal_Unicode gershayim = 0x05f4; -void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, sal_Bool isLast, sal_Bool useGeresh) +void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, bool isLast, bool useGeresh) { sal_Int16 num = sal::static_int_cast<sal_Int16>(value % 1000); @@ -852,7 +852,7 @@ void makeHebrewNumber(sal_Int64 value, OUStringBuffer& output, sal_Bool isLast, } } -OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal_Bool useGeresh) +OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, bool useGeresh) { sal_Int64 value = 0; sal_Int32 i, count = 0, len = aNumberString.getLength(); @@ -873,7 +873,7 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal if (value > 0) { OUStringBuffer output(count*2 + 2 + len - i); - makeHebrewNumber(value, output, sal_True, useGeresh); + makeHebrewNumber(value, output, true, useGeresh); if (i < len) output.append(aNumberString.copy(i)); diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index b6f02d285ce7..d95600d60936 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -218,7 +218,7 @@ sal_Int32 FindPosInSeq_Impl( const Sequence <sal_Int32>& rOff, sal_Int32 nPos ) return nRet; } -sal_Bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos) +bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos) throw( RuntimeException ) { sal_Int32 nDone; diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index ca93348ffe9d..39338e767aa6 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -111,8 +111,8 @@ class TextSearch: public cppu::WeakImplHelper2 bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const; - sal_Bool checkCTLStart, checkCTLEnd; - sal_Bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos) + bool checkCTLStart, checkCTLEnd; + bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos) throw(::com::sun::star::uno::RuntimeException); public: diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 3e916385716d..85f40195128f 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -76,7 +76,7 @@ TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTex return xTC->interactiveConversion(rLocale, nTextConversionType, nTextConversionOptions); } -static inline sal_Bool operator != (const Locale& l1, const Locale& l2) { +static inline bool operator != (const Locale& l1, const Locale& l2) { return l1.Language != l2.Language || l1.Country != l2.Country || l1.Variant != l2.Variant; } diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index 16965f825635..24231800d1d3 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -124,7 +124,7 @@ const sal_Unicode* getHanja2HangulData(); #endif Sequence< OUString > SAL_CALL -TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja) +TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja) { sal_Unicode ch; Sequence< OUString > output; @@ -236,7 +236,7 @@ TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, s sal_Int16 scriptType = SCRIPT_OTHERS; sal_Int32 len = 1; - sal_Bool toHanja = (nConversionType == TextConversionType::TO_HANJA); + bool toHanja = (nConversionType == TextConversionType::TO_HANJA); // FROM_LEFT: Hangul -> Hanja // FROM_RIGHT: Hanja -> Hangul ConversionDirection eDirection = toHanja ? ConversionDirection_FROM_LEFT : ConversionDirection_FROM_RIGHT; diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index db800f8a6031..74ecb1906f73 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -77,7 +77,7 @@ const sal_uInt16 *getSTC_WordEntry_S2T(); #endif OUString SAL_CALL -TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions) +TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions) { const sal_Unicode *Data; const sal_uInt16 *Index; @@ -114,7 +114,7 @@ TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, } OUString SAL_CALL -TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) +TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) { sal_Int32 dictLen = 0; sal_Int32 maxLen = 0; @@ -122,7 +122,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, const sal_uInt16 *entry; const sal_Unicode *charData; const sal_uInt16 *charIndex; - sal_Bool one2one=sal_True; + bool one2one=true; #ifndef DISABLE_DYNLOADING const sal_Unicode *wordData = ((const sal_Unicode* (*)(sal_Int32&)) getFunctionBySymbol("getSTC_WordData"))(dictLen); @@ -169,7 +169,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 currPos = 0, count = 0; while (currPos < nLength) { sal_Int32 len = nLength - currPos; - sal_Bool found = sal_False; + bool found = false; if (len > maxLen) len = maxLen; for (; len > 0 && ! found; len--) { @@ -197,7 +197,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, if (conversions.getLength() > 0) { if (offset.getLength() > 0) { if (word.getLength() != conversions[0].getLength()) - one2one=sal_False; + one2one=false; while (current < conversions[0].getLength()) { offset[count] = nStartPos + currPos + (current * word.getLength() / conversions[0].getLength()); @@ -209,7 +209,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, newStr[count++] = conversions[0][current++]; } currPos += word.getLength(); - found = sal_True; + found = true; } } @@ -232,7 +232,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 start=current; if (offset.getLength() > 0) { if (word.getLength() != OUString(&wordData[current]).getLength()) - one2one=sal_False; + one2one=false; sal_Int32 convertedLength=OUString(&wordData[current]).getLength(); while (wordData[current]) { offset[count]=nStartPos + currPos + ((current-start) * @@ -245,7 +245,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, newStr[count++] = wordData[current++]; } currPos += word.getLength(); - found = sal_True; + found = true; } } } @@ -287,7 +287,7 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) { aLocale=rLocale; - sal_Bool toSChinese = nConversionType == TextConversionType::TO_SCHINESE; + bool toSChinese = nConversionType == TextConversionType::TO_SCHINESE; if (nConversionOptions & TextConversionOption::CHARACTER_BY_CHARACTER) // char to char dictionary @@ -309,7 +309,7 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) { aLocale=rLocale; - sal_Bool toSChinese = nConversionType == TextConversionType::TO_SCHINESE; + bool toSChinese = nConversionType == TextConversionType::TO_SCHINESE; if (nConversionOptions & TextConversionOption::CHARACTER_BY_CHARACTER) { offset.realloc(0); diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index 1f8a8a623cfa..f9d308590765 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -47,9 +47,9 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); // One to One mapping - useOffset = sal_False; + useOffset = false; const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset); - useOffset = sal_True; + useOffset = true; return tmp; } @@ -82,9 +82,9 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_ const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); // One to One mapping - useOffset = sal_False; + useOffset = false; const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset); - useOffset = sal_True; + useOffset = true; return tmp; } @@ -117,9 +117,9 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); // One to One mapping - useOffset = sal_False; + useOffset = false; const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset); - useOffset = sal_True; + useOffset = true; return tmp; } diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index 2bfa4670c10c..d350e357df12 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -39,9 +39,9 @@ OUString SAL_CALL halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { - sal_Bool _useOffset = useOffset; + bool _useOffset = useOffset; // One to One mapping - useOffset = sal_False; + useOffset = false; const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset); useOffset = _useOffset; @@ -69,9 +69,9 @@ OUString SAL_CALL halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { - sal_Bool _useOffset = useOffset; + bool _useOffset = useOffset; // One to One mapping - useOffset = sal_False; + useOffset = false; const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset); useOffset = _useOffset; @@ -99,9 +99,9 @@ OUString SAL_CALL halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { - sal_Bool _useOffset = useOffset; + bool _useOffset = useOffset; // One to One mapping - useOffset = sal_False; + useOffset = false; const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset); useOffset = _useOffset; diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx index 2ba0dc999b0a..39cd4c20ab8a 100644 --- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx @@ -24,11 +24,11 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { static const Mapping BaFa[] = { - { 0x30F4, 0x30A1, 0x30D0, sal_True }, - { 0x3094, 0x3041, 0x3070, sal_True }, - { 0x30D5, 0x30A1, 0x30CF, sal_True }, - { 0x3075, 0x3041, 0x306F, sal_True }, - { 0, 0, 0, sal_True } + { 0x30F4, 0x30A1, 0x30D0, true }, + { 0x3094, 0x3041, 0x3070, true }, + { 0x30D5, 0x30A1, 0x30CF, true }, + { 0x3075, 0x3041, 0x306F, true }, + { 0, 0, 0, true } }; ignoreBaFa_ja_JP::ignoreBaFa_ja_JP() diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx index ac7ce2ceed91..ae3c0c1d8941 100644 --- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx @@ -25,11 +25,11 @@ using namespace com::sun::star::lang; namespace com { namespace sun { namespace star { namespace i18n { static const Mapping HyuByu[] = { - { 0x30D5, 0x30E5, 0x30D2, sal_False }, - { 0x3075, 0x3085, 0x3072, sal_False }, - { 0x30F4, 0x30E5, 0x30D3, sal_False }, - { 0x3094, 0x3085, 0x3073, sal_False }, - { 0, 0, 0, sal_False } + { 0x30D5, 0x30E5, 0x30D2, false }, + { 0x3075, 0x3085, 0x3072, false }, + { 0x30F4, 0x30E5, 0x30D3, false }, + { 0x3094, 0x3085, 0x3073, false }, + { 0, 0, 0, false } }; ignoreHyuByu_ja_JP::ignoreHyuByu_ja_JP() diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx index 602818d5a9cb..21c8853bfacc 100644 --- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx @@ -26,15 +26,15 @@ namespace com { namespace sun { namespace star { namespace i18n { static const Mapping SeZe[] = { // SI + E --> SE - { 0x30B7, 0x30A7, 0x30BB, sal_True }, + { 0x30B7, 0x30A7, 0x30BB, true }, // SI + E --> SE - { 0x3057, 0x3047, 0x305B, sal_True }, + { 0x3057, 0x3047, 0x305B, true }, // ZI + E --> ZE - { 0x30B8, 0x30A7, 0x30BC, sal_True }, + { 0x30B8, 0x30A7, 0x30BC, true }, // ZI + E --> ZE - { 0x3058, 0x3047, 0x305C, sal_True }, + { 0x3058, 0x3047, 0x305C, true }, - { 0, 0, 0, sal_True } + { 0, 0, 0, true } }; ignoreSeZe_ja_JP::ignoreSeZe_ja_JP() diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx index bdc58ddf3c7a..732257bc33cc 100644 --- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx @@ -26,19 +26,19 @@ namespace com { namespace sun { namespace star { namespace i18n { static const Mapping TiJi[] = { // TU + I --> TI - { 0x30C4, 0x30A3, 0x30C1, sal_True }, + { 0x30C4, 0x30A3, 0x30C1, true }, // TE + I --> TI - { 0x30C6, 0x30A3, 0x30C1, sal_True }, + { 0x30C6, 0x30A3, 0x30C1, true }, // TU + I --> TI - { 0x3064, 0x3043, 0x3061, sal_True }, + { 0x3064, 0x3043, 0x3061, true }, // TE + I --> TI - { 0x3066, 0x3043, 0x3061, sal_True }, + { 0x3066, 0x3043, 0x3061, true }, // DE + I --> ZI - { 0x30C7, 0x30A3, 0x30B8, sal_True }, + { 0x30C7, 0x30A3, 0x30B8, true }, // DE + I --> ZI - { 0x3067, 0x3043, 0x3058, sal_True }, + { 0x3067, 0x3043, 0x3058, true }, - { 0, 0, 0, sal_True } + { 0, 0, 0, true } }; ignoreTiJi_ja_JP::ignoreTiJi_ja_JP() diff --git a/i18npool/source/transliteration/numtotext_cjk.cxx b/i18npool/source/transliteration/numtotext_cjk.cxx index 617fe25a392f..f1d15d268afd 100644 --- a/i18npool/source/transliteration/numtotext_cjk.cxx +++ b/i18npool/source/transliteration/numtotext_cjk.cxx @@ -66,17 +66,17 @@ NumToText##name::NumToText##name() \ implementationName = "com.sun.star.i18n.Transliteration.NumToText"#name; \ } -TRANSLITERATION_NUMTOTEXT ( AIUFullWidth_ja_JP, table_AIUFullWidth_ja_JP, sal_True) -TRANSLITERATION_NUMTOTEXT ( AIUHalfWidth_ja_JP, table_AIUHalfWidth_ja_JP, sal_True) -TRANSLITERATION_NUMTOTEXT ( IROHAFullWidth_ja_JP, table_IROHAFullWidth_ja_JP, sal_True) -TRANSLITERATION_NUMTOTEXT ( IROHAHalfWidth_ja_JP, table_IROHAHalfWidth_ja_JP, sal_True) -TRANSLITERATION_NUMTOTEXT ( CircledNumber, table_CircledNumber, sal_False) -TRANSLITERATION_NUMTOTEXT ( TianGan_zh, table_TianGan_zh, sal_False) -TRANSLITERATION_NUMTOTEXT ( DiZi_zh, table_DiZi_zh, sal_False) -TRANSLITERATION_NUMTOTEXT ( HangulJamo_ko, table_HangulJamo_ko, sal_True) -TRANSLITERATION_NUMTOTEXT ( HangulSyllable_ko, table_HangulSyllable_ko, sal_True) -TRANSLITERATION_NUMTOTEXT ( HangulCircledJamo_ko, table_HangulCircledJamo_ko, sal_True) -TRANSLITERATION_NUMTOTEXT ( HangulCircledSyllable_ko, table_HangulCircledSyllable_ko, sal_True) +TRANSLITERATION_NUMTOTEXT ( AIUFullWidth_ja_JP, table_AIUFullWidth_ja_JP, true) +TRANSLITERATION_NUMTOTEXT ( AIUHalfWidth_ja_JP, table_AIUHalfWidth_ja_JP, true) +TRANSLITERATION_NUMTOTEXT ( IROHAFullWidth_ja_JP, table_IROHAFullWidth_ja_JP, true) +TRANSLITERATION_NUMTOTEXT ( IROHAHalfWidth_ja_JP, table_IROHAHalfWidth_ja_JP, true) +TRANSLITERATION_NUMTOTEXT ( CircledNumber, table_CircledNumber, false) +TRANSLITERATION_NUMTOTEXT ( TianGan_zh, table_TianGan_zh, false) +TRANSLITERATION_NUMTOTEXT ( DiZi_zh, table_DiZi_zh, false) +TRANSLITERATION_NUMTOTEXT ( HangulJamo_ko, table_HangulJamo_ko, true) +TRANSLITERATION_NUMTOTEXT ( HangulSyllable_ko, table_HangulSyllable_ko, true) +TRANSLITERATION_NUMTOTEXT ( HangulCircledJamo_ko, table_HangulCircledJamo_ko, true) +TRANSLITERATION_NUMTOTEXT ( HangulCircledSyllable_ko, table_HangulCircledSyllable_ko, true) #undef TRANSLITERATION_NUMTOTEXT diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index f9a9c135df6c..b9e4445d63f5 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -141,7 +141,7 @@ static struct TMlist { TransliterationImpl::TransliterationImpl(const Reference <XComponentContext>& xContext) : mxContext(xContext) { numCascade = 0; - caseignoreOnly = sal_True; + caseignoreOnly = true; mxLocaledata.set(LocaleData::create(xContext)); } @@ -578,7 +578,7 @@ TransliterationImpl::clear() bodyCascade[i].clear(); numCascade = 0; caseignore.clear(); - caseignoreOnly = sal_True; + caseignoreOnly = true; } namespace @@ -607,7 +607,7 @@ void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTrans body = lastTransBody.Body; } -sal_Bool SAL_CALL +bool SAL_CALL TransliterationImpl::loadModuleByName( const OUString& implName, Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException) { @@ -628,10 +628,10 @@ TransliterationImpl::loadModuleByName( const OUString& implName, } if (caseignore.is()) caseignore->loadModule(TMlist[i].tm, rLocale); - return sal_True; + return true; } } - caseignoreOnly = sal_False; // has other module than just ignore case/kana/width + caseignoreOnly = false; // has other module than just ignore case/kana/width } return body.is(); } diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx index 5b87f7df4313..0284e860f0ea 100644 --- a/i18npool/source/transliteration/transliteration_commonclass.cxx +++ b/i18npool/source/transliteration/transliteration_commonclass.cxx @@ -31,7 +31,7 @@ transliteration_commonclass::transliteration_commonclass() { transliterationName = ""; implementationName = ""; - useOffset = sal_True; + useOffset = true; } OUString SAL_CALL transliteration_commonclass::getName() throw(RuntimeException, std::exception) @@ -120,9 +120,9 @@ OUString SAL_CALL transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception) { Sequence < sal_Int32 > dummy_offset; - useOffset = sal_False; + useOffset = false; OUString tmpStr = transliterate(inStr, startPos, nCount, dummy_offset); - useOffset = sal_True; + useOffset = true; return tmpStr; } |