1 files changed, 13 insertions, 13 deletions

diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 4578ef27c2ea..f763792a3ef9 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -134,7 +134,7 @@ uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex)
     uno::Any aRet;
     sal_uInt16 nCount = pGlossaries->GetGroupCnt();
     if ( 0 <= nIndex && nIndex < nCount )
-        aRet = getByName(pGlossaries->GetGroupName( static_cast< USHORT >(nIndex) ));
+        aRet = getByName(pGlossaries->GetGroupName( static_cast< sal_uInt16 >(nIndex) ));
     else
         throw lang::IndexOutOfBoundsException();
     return aRet;
@@ -165,8 +165,8 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
 
     uno::Reference< text::XAutoTextGroup > xGroup;
     if ( pGlossaries && hasByName( GroupName ) )    // group name already known?
-        // TRUE = create group if not already available
-        xGroup = pGlossaries->GetAutoTextGroup( GroupName, TRUE );
+        // sal_True = create group if not already available
+        xGroup = pGlossaries->GetAutoTextGroup( GroupName, sal_True );
 
     if ( !xGroup.is() )
         throw container::NoSuchElementException();
@@ -274,15 +274,15 @@ OUString SwXAutoTextContainer::getImplementationName(void) throw( uno::RuntimeEx
 /* -----------------------------06.04.00 11:11--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
     const uno::Sequence< OUString > aNames = SwXAutoTextContainer_getSupportedServiceNames();
     for(sal_Int32 nService = 0; nService < aNames.getLength(); nService++)
     {
         if(aNames.getConstArray()[nService] == rServiceName)
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 /* -----------------------------06.04.00 11:11--------------------------------
 
@@ -837,7 +837,7 @@ OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeExcept
 /* -----------------------------06.04.00 11:11--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
     return C2U("com.sun.star.text.AutoTextGroup") == rServiceName;
 }
@@ -961,7 +961,7 @@ void SwXAutoTextEntry::GetBodyText ()
 {
     ::vos::OGuard aGuard(Application::GetSolarMutex());
 
-    xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, FALSE );
+    xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, sal_False );
     DBG_ASSERT( xDocSh.Is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" );
 
     // start listening at the document
@@ -1159,7 +1159,7 @@ OUString SwXAutoTextEntry::getImplementationName(void) throw( uno::RuntimeExcept
 /* -----------------------------06.04.00 11:11--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
     return C2U("com.sun.star.text.AutoTextEntry") == rServiceName;
 }
@@ -1220,7 +1220,7 @@ OUString SwAutoTextEventDescriptor::getImplementationName()
 
  ---------------------------------------------------------------------------*/
 void SwAutoTextEventDescriptor::replaceByName(
-    const USHORT nEvent,
+    const sal_uInt16 nEvent,
     const SvxMacro& rMacro)
             throw(
                 lang::IllegalArgumentException,
@@ -1242,7 +1242,7 @@ void SwAutoTextEventDescriptor::replaceByName(
 
     if( pBlocks && !pBlocks->GetError())
     {
-        USHORT nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
+        sal_uInt16 nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
         if( nIndex != USHRT_MAX )
         {
             SvxMacroTableDtor aMacroTable;
@@ -1263,7 +1263,7 @@ void SwAutoTextEventDescriptor::replaceByName(
  ---------------------------------------------------------------------------*/
 void SwAutoTextEventDescriptor::getByName(
     SvxMacro& rMacro,
-    const USHORT nEvent )
+    const sal_uInt16 nEvent )
             throw(
                 container::NoSuchElementException,
                 lang::WrappedTargetException,
@@ -1287,7 +1287,7 @@ void SwAutoTextEventDescriptor::getByName(
 
     if ( pBlocks &&  !pBlocks->GetError())
     {
-        USHORT nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
+        sal_uInt16 nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
         if( nIndex != USHRT_MAX )
         {
             SvxMacroTableDtor aMacroTable;