diff options
author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
---|---|---|
committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
commit | fa1f3c352c6126b24ab5af87ea4ebea742c546c2 (patch) | |
tree | 5a5240e4969fee626bb060bd386fceb957081f90 /linguistic/inc | |
parent | d0097a3f35e5e2c68d293d604a2f6f51b2d822a5 (diff) | |
parent | 3c21373571fd0cf89391502aa132c5f420cd75c6 (diff) |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'linguistic/inc')
-rw-r--r-- | linguistic/inc/hyphdta.hxx | 28 | ||||
-rw-r--r-- | linguistic/inc/lngprophelp.hxx | 54 | ||||
-rw-r--r-- | linguistic/inc/misc.hxx | 46 | ||||
-rw-r--r-- | linguistic/inc/spelldta.hxx | 20 | ||||
-rw-r--r-- | linguistic/inc/thesdta.hxx | 4 |
5 files changed, 76 insertions, 76 deletions
diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/hyphdta.hxx index 167c11dcc65d..5d163e827239 100644 --- a/linguistic/inc/hyphdta.hxx +++ b/linguistic/inc/hyphdta.hxx @@ -51,18 +51,18 @@ class HyphenatedWord : { ::rtl::OUString aWord; ::rtl::OUString aHyphenatedWord; - INT16 nHyphPos; - INT16 nHyphenationPos; - INT16 nLanguage; - BOOL bIsAltSpelling; + sal_Int16 nHyphPos; + sal_Int16 nHyphenationPos; + sal_Int16 nLanguage; + sal_Bool bIsAltSpelling; // disallow copy-constructor and assignment-operator for now HyphenatedWord(const HyphenatedWord &); HyphenatedWord & operator = (const HyphenatedWord &); public: - HyphenatedWord(const ::rtl::OUString &rWord, INT16 nLang, INT16 nHyphenationPos, - const ::rtl::OUString &rHyphenatedWord, INT16 nHyphenPos ); + HyphenatedWord(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos, + const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos ); virtual ~HyphenatedWord(); // XHyphenatedWord @@ -87,10 +87,10 @@ public: ::rtl::OUString GetWord() { return aWord; } ::rtl::OUString GetHyphenatedWord() { return aHyphenatedWord; } - INT16 GetLanguage() { return nLanguage; } + sal_Int16 GetLanguage() { return nLanguage; } void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; } void SetHyphenatedWord( ::rtl::OUString &rTxt ) { aHyphenatedWord = rTxt; } - void SetLanguage( INT16 nLang ) { nLanguage = nLang; } + void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; } }; @@ -104,17 +104,17 @@ class PossibleHyphens : { ::rtl::OUString aWord; ::rtl::OUString aWordWithHyphens; - ::com::sun::star::uno::Sequence< INT16 > aOrigHyphenPos; - INT16 nLanguage; + ::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos; + sal_Int16 nLanguage; // disallow copy-constructor and assignment-operator for now PossibleHyphens(const PossibleHyphens &); PossibleHyphens & operator = (const PossibleHyphens &); public: - PossibleHyphens(const ::rtl::OUString &rWord, INT16 nLang, + PossibleHyphens(const ::rtl::OUString &rWord, sal_Int16 nLang, const ::rtl::OUString &rHyphWord, - const ::com::sun::star::uno::Sequence< INT16 > &rPositions); + const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions); virtual ~PossibleHyphens(); // XPossibleHyphens @@ -132,9 +132,9 @@ public: throw(::com::sun::star::uno::RuntimeException); ::rtl::OUString GetWord() { return aWord; } - INT16 GetLanguage() { return nLanguage; } + sal_Int16 GetLanguage() { return nLanguage; } void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; } - void SetLanguage( INT16 nLang ) { nLanguage = nLang; } + void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; } }; diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/lngprophelp.hxx index 18d125af560e..2deef9539fbc 100644 --- a/linguistic/inc/lngprophelp.hxx +++ b/linguistic/inc/lngprophelp.hxx @@ -80,12 +80,12 @@ class PropertyChgHelper : int nEvtFlags; // flags for event types allowed to be launched // default values - BOOL bIsIgnoreControlCharacters; - BOOL bIsUseDictionaryList; + sal_Bool bIsIgnoreControlCharacters; + sal_Bool bIsUseDictionaryList; // return values, will be set to default value or current temporary value - BOOL bResIsIgnoreControlCharacters; - BOOL bResIsUseDictionaryList; + sal_Bool bResIsIgnoreControlCharacters; + sal_Bool bResIsUseDictionaryList; // disallow use of copy-constructor and assignment-operator @@ -102,9 +102,9 @@ protected: ::com::sun::star::beans::XPropertySet > & GetPropSet() { return xPropSet; } - void AddPropNames( const char *pNewNames[], INT32 nCount ); + void AddPropNames( const char *pNewNames[], sal_Int32 nCount ); - virtual BOOL propertyChange_Impl( + virtual sal_Bool propertyChange_Impl( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ); public: @@ -155,8 +155,8 @@ public: ::com::sun::star::uno::XInterface > & GetEvtObj() const { return xMyEvtObj; } - BOOL IsIgnoreControlCharacters() const { return bResIsIgnoreControlCharacters; } - BOOL IsUseDictionaryList() const { return bResIsUseDictionaryList; } + sal_Bool IsIgnoreControlCharacters() const { return bResIsIgnoreControlCharacters; } + sal_Bool IsUseDictionaryList() const { return bResIsUseDictionaryList; } }; @@ -189,15 +189,15 @@ class PropertyHelper_Spell : public PropertyChgHelper { // default values - BOOL bIsSpellUpperCase; - BOOL bIsSpellWithDigits; - BOOL bIsSpellCapitalization; + sal_Bool bIsSpellUpperCase; + sal_Bool bIsSpellWithDigits; + sal_Bool bIsSpellCapitalization; // return values, will be set to default value or current temporary value - INT16 nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently - BOOL bResIsSpellUpperCase; - BOOL bResIsSpellWithDigits; - BOOL bResIsSpellCapitalization; + sal_Int16 nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently + sal_Bool bResIsSpellUpperCase; + sal_Bool bResIsSpellWithDigits; + sal_Bool bResIsSpellCapitalization; // disallow use of copy-constructor and assignment-operator @@ -208,7 +208,7 @@ protected: // PropertyChgHelper virtual void SetDefaultValues(); virtual void GetCurrentValues(); - virtual BOOL propertyChange_Impl( + virtual sal_Bool propertyChange_Impl( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ); public: @@ -226,12 +226,12 @@ public: propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException); - virtual INT16 GetDefaultNumberOfSuggestions() const; + virtual sal_Int16 GetDefaultNumberOfSuggestions() const; - INT16 GetMaxNumberOfSuggestions() const { return nResMaxNumberOfSuggestions; } - BOOL IsSpellUpperCase() const { return bResIsSpellUpperCase; } - BOOL IsSpellWithDigits() const { return bResIsSpellWithDigits; } - BOOL IsSpellCapitalization() const { return bResIsSpellCapitalization; } + sal_Int16 GetMaxNumberOfSuggestions() const { return nResMaxNumberOfSuggestions; } + sal_Bool IsSpellUpperCase() const { return bResIsSpellUpperCase; } + sal_Bool IsSpellWithDigits() const { return bResIsSpellWithDigits; } + sal_Bool IsSpellCapitalization() const { return bResIsSpellCapitalization; } }; /////////////////////////////////////////////////////////////////////////// @@ -240,12 +240,12 @@ class PropertyHelper_Hyphen : public PropertyChgHelper { // default values - INT16 nHyphMinLeading, + sal_Int16 nHyphMinLeading, nHyphMinTrailing, nHyphMinWordLength; // return values, will be set to default value or current temporary value - INT16 nResHyphMinLeading, + sal_Int16 nResHyphMinLeading, nResHyphMinTrailing, nResHyphMinWordLength; @@ -257,7 +257,7 @@ protected: // PropertyChgHelper virtual void SetDefaultValues(); virtual void GetCurrentValues(); - virtual BOOL propertyChange_Impl( + virtual sal_Bool propertyChange_Impl( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ); public: @@ -275,9 +275,9 @@ public: propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException); - INT16 GetMinLeading() const { return nResHyphMinLeading; } - INT16 GetMinTrailing() const { return nResHyphMinTrailing; } - INT16 GetMinWordLength() const { return nResHyphMinWordLength; } + sal_Int16 GetMinLeading() const { return nResHyphMinLeading; } + sal_Int16 GetMinTrailing() const { return nResHyphMinTrailing; } + sal_Int16 GetMinWordLength() const { return nResHyphMinWordLength; } }; /////////////////////////////////////////////////////////////////////////// diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index f40a0ae55803..2b49f37858c0 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -97,11 +97,11 @@ namespace linguistic ::osl::Mutex & GetLinguMutex(); -LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang ); +LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang ); /////////////////////////////////////////////////////////////////////////// -rtl_TextEncoding GetTextEncoding( INT16 nLanguage ); +rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage ); inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc) { @@ -131,9 +131,9 @@ LanguageType LanguageToLocale( ::com::sun::star::lang::Locale& rLocale, LanguageType eLang ); ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > - LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< INT16 > &rLangSeq ); + LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< sal_Int16 > &rLangSeq ); -::com::sun::star::uno::Sequence< INT16 > +::com::sun::star::uno::Sequence< sal_Int16 > LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > &rLocaleSeq ); @@ -141,17 +141,17 @@ LanguageType // checks if file pointed to by rURL is readonly // and may also check return if such a file exists or not -BOOL IsReadOnly( const String &rURL, BOOL *pbExist = 0 ); +sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 ); // checks if a file with the given URL exists -BOOL FileExists( const String &rURL ); +sal_Bool FileExists( const String &rURL ); #ifdef TL_OUTDATED // returns complete file URL for given filename that is to be searched in // the specified path String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName ); -String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim = TRUE ); +String GetModulePath( SvtPathOptions::Pathes ePath, sal_Bool bAddAccessDelim = sal_True ); #endif /////////////////////////////////////////////////////////////////////////// @@ -171,7 +171,7 @@ String SearchFileInPaths( const String &rFile, const ::com::sun::star::uno:: /////////////////////////////////////////////////////////////////////////// -INT32 GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos ); +sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > @@ -181,19 +181,19 @@ INT32 GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos ); /////////////////////////////////////////////////////////////////////////// -BOOL IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage ); -BOOL IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage ); +sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); +sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage ); -inline BOOL IsUpper( const String &rText, INT16 nLanguage ) { return IsUpper( rText, 0, rText.Len(), nLanguage ); } -inline BOOL IsLower( const String &rText, INT16 nLanguage ) { return IsLower( rText, 0, rText.Len(), nLanguage ); } +inline sal_Bool IsUpper( const String &rText, sal_Int16 nLanguage ) { return IsUpper( rText, 0, rText.Len(), nLanguage ); } +inline sal_Bool IsLower( const String &rText, sal_Int16 nLanguage ) { return IsLower( rText, 0, rText.Len(), nLanguage ); } -String ToLower( const String &rText, INT16 nLanguage ); -String ToUpper( const String &rText, INT16 nLanguage ); -String ToTitle( const String &rText, INT16 nLanguage ); -sal_Unicode ToLower( const sal_Unicode cChar, INT16 nLanguage ); -sal_Unicode ToUpper( const sal_Unicode cChar, INT16 nLanguage ); -BOOL HasDigits( const ::rtl::OUString &rText ); -BOOL IsNumeric( const String &rText ); +String ToLower( const String &rText, sal_Int16 nLanguage ); +String ToUpper( const String &rText, sal_Int16 nLanguage ); +String ToTitle( const String &rText, sal_Int16 nLanguage ); +sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage ); +sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage ); +sal_Bool HasDigits( const ::rtl::OUString &rText ); +sal_Bool IsNumeric( const String &rText ); /////////////////////////////////////////////////////////////////////////// @@ -205,11 +205,11 @@ BOOL IsNumeric( const String &rText ); /////////////////////////////////////////////////////////////////////////// -BOOL IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, +sal_Bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rxPropSet ); -BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties, +sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rxPropSet ); @@ -217,8 +217,8 @@ BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rPrope ::com::sun::star::linguistic2::XDictionaryEntry > SearchDicList( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList >& rDicList, - const ::rtl::OUString& rWord, INT16 nLanguage, - BOOL bSearchPosDics, BOOL bSearchSpellEntry ); + const ::rtl::OUString& rWord, sal_Int16 nLanguage, + sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry ); sal_uInt8 AddEntryToDic( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic, diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/spelldta.hxx index f4d0f5c660ce..7ab7cab06b56 100644 --- a/linguistic/inc/spelldta.hxx +++ b/linguistic/inc/spelldta.hxx @@ -61,21 +61,21 @@ namespace linguistic MergeProposalSeqs( ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt1, ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt2, - BOOL bAllowDuplicates ); + sal_Bool bAllowDuplicates ); void SeqRemoveNegEntries( ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &rxDicList, - INT16 nLanguage ); + sal_Int16 nLanguage ); -BOOL SeqHasEntry( +sal_Bool SeqHasEntry( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq, const ::rtl::OUString &rTxt); /////////////////////////////////////////////////////////////////////////// -void SearchSimilarText( const rtl::OUString &rText, INT16 nLanguage, +void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList, std::vector< rtl::OUString > & rDicListProps ); @@ -92,8 +92,8 @@ class SpellAlternatives : { ::com::sun::star::uno::Sequence< ::rtl::OUString > aAlt; // list of alternatives, may be empty. ::rtl::OUString aWord; - INT16 nType; // type of failure - INT16 nLanguage; + sal_Int16 nType; // type of failure + sal_Int16 nLanguage; // disallow copy-constructor and assignment-operator for now SpellAlternatives(const SpellAlternatives &); @@ -101,9 +101,9 @@ class SpellAlternatives : public: SpellAlternatives(); - SpellAlternatives(const ::rtl::OUString &rWord, INT16 nLang, INT16 nFailureType, + SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType, const ::rtl::OUString &rRplcWord ); - SpellAlternatives(const ::rtl::OUString &rWord, INT16 nLang, INT16 nFailureType, + SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives ); virtual ~SpellAlternatives(); @@ -119,8 +119,8 @@ public: virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException); // non-interface specific functions - void SetWordLanguage(const ::rtl::OUString &rWord, INT16 nLang); - void SetFailureType(INT16 nTypeP); + void SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang); + void SetFailureType(sal_Int16 nTypeP); void SetAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt ); }; diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index 1b262ab73da7..2267a7d4c2fd 100644 --- a/linguistic/inc/thesdta.hxx +++ b/linguistic/inc/thesdta.hxx @@ -51,7 +51,7 @@ class ThesaurusMeaning : protected: ::rtl::OUString aText; // one of the found 'meanings' for the looked up text ::rtl::OUString aLookUpText; // text that was looked up in the thesaurus - INT16 nLookUpLanguage; // language of the text that was looked up + sal_Int16 nLookUpLanguage; // language of the text that was looked up // disallow copy-constructor and assignment-operator for now ThesaurusMeaning(const ThesaurusMeaning &); @@ -59,7 +59,7 @@ protected: public: ThesaurusMeaning(const ::rtl::OUString &rText, - const ::rtl::OUString &rLookUpText, INT16 nLookUpLang ); + const ::rtl::OUString &rLookUpText, sal_Int16 nLookUpLang ); virtual ~ThesaurusMeaning(); // XMeaning |