summaryrefslogtreecommitdiff
path: root/lingucomponent/source/thesaurus
diff options
context:
space:
mode:
Diffstat (limited to 'lingucomponent/source/thesaurus')
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.cxx4
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/thesaurus/libnth/nthesdta.hxx8
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/thesaurus/libnth/nthesimp.cxx24
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/thesaurus/libnth/nthesimp.hxx4
4 files changed, 20 insertions, 20 deletions
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 0c071a4eeb1f..7d140438886a 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -54,10 +54,10 @@ namespace linguistic
Meaning::Meaning(
#if 0
- const OUString &rTerm, INT16 nLang,
+ const OUString &rTerm, sal_Int16 nLang,
const PropertyHelper_Thes &rHelper ) :
#else
- const OUString &rTerm, INT16 nLang) :
+ const OUString &rTerm, sal_Int16 nLang) :
#endif
aSyn ( Sequence< OUString >(1) ),
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 23804d54f60f..77f6473277db 100755..100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -48,11 +48,11 @@ class Meaning :
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aSyn; // list of synonyms, may be empty.
::rtl::OUString aTerm;
- INT16 nLanguage;
+ sal_Int16 nLanguage;
#if 0
// this is for future use by a German thesaurus
- BOOL bIsGermanPreReform;
+ sal_Bool bIsGermanPreReform;
#endif
// disallow copy-constructor and assignment-operator for now
@@ -61,9 +61,9 @@ class Meaning :
public:
#if 0
- Meaning(const ::rtl::OUString &rTerm, INT16 nLang, const PropertyHelper_Thes &rHelper);
+ Meaning(const ::rtl::OUString &rTerm, sal_Int16 nLang, const PropertyHelper_Thes &rHelper);
#else
- Meaning(const ::rtl::OUString &rTerm, INT16 nLang);
+ Meaning(const ::rtl::OUString &rTerm, sal_Int16 nLang);
#endif
virtual ~Meaning();
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 02d469514593..efbe43359474 100755..100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -93,7 +93,7 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl()
Thesaurus::Thesaurus() :
aEvtListeners ( GetLinguMutex() )
{
- bDisposing = FALSE;
+ bDisposing = sal_False;
pPropHelper = NULL;
aThes = NULL;
aCharSetInfo = NULL;
@@ -289,16 +289,16 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
{
MutexGuard aGuard( GetLinguMutex() );
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if (!aSuppLocales.getLength())
getLocales();
- INT32 nLen = aSuppLocales.getLength();
- for (INT32 i = 0; i < nLen; ++i)
+ sal_Int32 nLen = aSuppLocales.getLength();
+ for (sal_Int32 i = 0; i < nLen; ++i)
{
const Locale *pLocale = aSuppLocales.getConstArray();
if (rLocale == pLocale[i])
{
- bRes = TRUE;
+ bRes = sal_True;
break;
}
}
@@ -324,7 +324,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes
sal_Int32 stem = 0;
sal_Int32 stem2 = 0;
- INT16 nLanguage = LocaleToLanguage( rLocale );
+ sal_Int16 nLanguage = LocaleToLanguage( rLocale );
if (nLanguage == LANGUAGE_NONE || !rTerm.getLength())
return noMeanings;
@@ -591,7 +591,7 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
if (!pPropHelper)
{
- INT32 nLen = rArguments.getLength();
+ sal_Int32 nLen = rArguments.getLength();
if (1 == nLen)
{
Reference< XPropertySet > xPropSet;
@@ -619,7 +619,7 @@ sal_uInt16 SAL_CALL Thesaurus::capitalType(const OUString& aTerm, CharClass * pC
{
String aStr(aTerm);
sal_Int32 nc = 0;
- for (USHORT tindex = 0; tindex < tlen; tindex++)
+ for (sal_uInt16 tindex = 0; tindex < tlen; tindex++)
{
if (pCC->getCharacterType(aStr,tindex) &
::com::sun::star::i18n::KCharacterType::UPPER) nc++;
@@ -682,7 +682,7 @@ void SAL_CALL Thesaurus::dispose()
if (!bDisposing)
{
- bDisposing = TRUE;
+ bDisposing = sal_True;
EventObject aEvtObj( (XThesaurus *) this );
aEvtListeners.disposeAndClear( aEvtObj );
}
@@ -728,10 +728,10 @@ sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName )
Sequence< OUString > aSNL = getSupportedServiceNames();
const OUString * pArray = aSNL.getConstArray();
- for( INT32 i = 0; i < aSNL.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index e6d447879701..b0595ad4286c 100755..100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -87,7 +87,7 @@ class Thesaurus :
::cppu::OInterfaceContainerHelper aEvtListeners;
Reference< XPropertyChangeListener > xPropHelper;
linguistic::PropertyHelper_Thes * pPropHelper;
- BOOL bDisposing;
+ sal_Bool bDisposing;
CharClass ** aCharSetInfo;
MyThes ** aThes;
rtl_TextEncoding * aTEncs;
@@ -98,7 +98,7 @@ class Thesaurus :
// cache for the Thesaurus dialog
Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > prevMeanings;
OUString prevTerm;
- INT16 prevLocale;
+ sal_Int16 prevLocale;
// disallow copy-constructor and assignment-operator for now
Thesaurus(const Thesaurus &);