diff options
Diffstat (limited to 'linguistic/inc')
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/iprcache.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/linguistic/hyphdta.hxx (renamed from linguistic/inc/hyphdta.hxx) | 28 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/linguistic/lngprophelp.hxx (renamed from linguistic/inc/lngprophelp.hxx) | 54 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/linguistic/lngprops.hxx (renamed from linguistic/inc/lngprops.hxx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/linguistic/misc.hxx (renamed from linguistic/inc/misc.hxx) | 44 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/linguistic/spelldta.hxx (renamed from linguistic/inc/spelldta.hxx) | 20 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/makefile.mk | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/pch/precompiled_linguistic.cxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/pch/precompiled_linguistic.hxx | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | linguistic/inc/thesdta.hxx | 4 |
10 files changed, 75 insertions, 75 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 06241d4cd2d6..06241d4cd2d6 100644..100755 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx index 76806a740fee..e88a0c6615a5 100644..100755 --- a/linguistic/inc/hyphdta.hxx +++ b/linguistic/inc/linguistic/hyphdta.hxx @@ -52,18 +52,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 @@ -88,10 +88,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; } }; @@ -105,17 +105,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 @@ -133,9 +133,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/linguistic/lngprophelp.hxx index 45dd77a7f876..543429758b82 100644..100755 --- a/linguistic/inc/lngprophelp.hxx +++ b/linguistic/inc/linguistic/lngprophelp.hxx @@ -81,12 +81,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 @@ -103,9 +103,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: @@ -156,8 +156,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; } }; @@ -190,15 +190,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 @@ -209,7 +209,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: @@ -227,12 +227,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; } }; /////////////////////////////////////////////////////////////////////////// @@ -241,12 +241,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; @@ -258,7 +258,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: @@ -276,9 +276,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/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx index 2b611d530ef8..2b611d530ef8 100644..100755 --- a/linguistic/inc/lngprops.hxx +++ b/linguistic/inc/linguistic/lngprops.hxx diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/linguistic/misc.hxx index 3a369e574217..3b6f1fa653c7 100644..100755 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -98,11 +98,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) { @@ -132,9 +132,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 ); @@ -142,10 +142,10 @@ 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 ); /////////////////////////////////////////////////////////////////////////// @@ -164,7 +164,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 > @@ -174,19 +174,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 ); /////////////////////////////////////////////////////////////////////////// @@ -198,11 +198,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 ); @@ -210,8 +210,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/linguistic/spelldta.hxx index f91675fb0824..0e501ee0002e 100644..100755 --- a/linguistic/inc/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx @@ -62,21 +62,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 ); @@ -93,8 +93,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 &); @@ -102,9 +102,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(); @@ -120,8 +120,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/makefile.mk b/linguistic/inc/makefile.mk index fa5aad7b0a40..fa5aad7b0a40 100644..100755 --- a/linguistic/inc/makefile.mk +++ b/linguistic/inc/makefile.mk diff --git a/linguistic/inc/pch/precompiled_linguistic.cxx b/linguistic/inc/pch/precompiled_linguistic.cxx index 0cf855ebe4f6..0cf855ebe4f6 100644..100755 --- a/linguistic/inc/pch/precompiled_linguistic.cxx +++ b/linguistic/inc/pch/precompiled_linguistic.cxx diff --git a/linguistic/inc/pch/precompiled_linguistic.hxx b/linguistic/inc/pch/precompiled_linguistic.hxx index e0e70ffb9bd9..e0e70ffb9bd9 100644..100755 --- a/linguistic/inc/pch/precompiled_linguistic.hxx +++ b/linguistic/inc/pch/precompiled_linguistic.hxx diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index ea4d7cc89991..8cfe95ac4789 100644..100755 --- a/linguistic/inc/thesdta.hxx +++ b/linguistic/inc/thesdta.hxx @@ -52,7 +52,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 &); @@ -60,7 +60,7 @@ protected: public: ThesaurusMeaning(const ::rtl::OUString &rText, - const ::rtl::OUString &rLookUpText, INT16 nLookUpLang ); + const ::rtl::OUString &rLookUpText, sal_Int16 nLookUpLang ); virtual ~ThesaurusMeaning(); // XMeaning |