From e4f690b0389263c35f83fa8b58382c6518d00f62 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 22 Apr 2014 12:48:05 +0200 Subject: i18npool: sal_Bool->bool Change-Id: Id73ee64dbf8586743f0e436e004e663a65d4548f --- i18npool/inc/breakiteratorImpl.hxx | 4 ++-- i18npool/inc/cclass_unicode.hxx | 2 +- i18npool/inc/characterclassificationImpl.hxx | 4 ++-- i18npool/inc/collatorImpl.hxx | 4 ++-- i18npool/inc/defaultnumberingprovider.hxx | 2 +- i18npool/inc/indexentrysupplier.hxx | 2 +- i18npool/inc/indexentrysupplier_common.hxx | 2 +- i18npool/inc/localedata.hxx | 8 ++++---- i18npool/inc/nativenumbersupplier.hxx | 4 ++-- i18npool/inc/textconversion.hxx | 6 +++--- i18npool/inc/transliterationImpl.hxx | 4 ++-- i18npool/inc/transliteration_Ignore.hxx | 2 +- i18npool/inc/transliteration_Numeric.hxx | 2 +- i18npool/inc/transliteration_commonclass.hxx | 2 +- i18npool/inc/xdictionary.hxx | 10 +++++----- 15 files changed, 29 insertions(+), 29 deletions(-) (limited to 'i18npool/inc') 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 & 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 & 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 & 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); }; -- cgit