removetooltypes01: #i112600# Remove tools types from sw

1 files changed, 82 insertions, 82 deletions

diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 847c6b229fd1..2333169f2222 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -70,7 +70,7 @@
 using namespace ::com::sun::star;
 
 
-USHORT SwNumRule::nRefCount = 0;
+sal_uInt16 SwNumRule::nRefCount = 0;
 SwNumFmt* SwNumRule::aBaseFmts[ RULE_END ][ MAXLEVEL ] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
 // --> OD 2008-02-11 #newlistlevelattrs#
@@ -81,13 +81,13 @@ char sOutline[] = "Outline";
 char* SwNumRule::pDefOutlineName = sOutline;
 
 // #i30312#
-USHORT SwNumRule::aDefNumIndents[ MAXLEVEL ] = {
+sal_uInt16 SwNumRule::aDefNumIndents[ MAXLEVEL ] = {
 //inch:   0,5  1,0  1,5  2,0   2,5   3,0   3,5   4,0   4,5   5,0
         1440/4, 1440/2, 1440*3/4, 1440, 1440*5/4, 1440*3/2, 1440*7/4, 1440*2,
         1440*9/4, 1440*5/2
 };
 
-const SwNumFmt& SwNumRule::Get( USHORT i ) const
+const SwNumFmt& SwNumRule::Get( sal_uInt16 i ) const
 {
     ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
     return aFmts[ i ]
@@ -99,7 +99,7 @@ const SwNumFmt& SwNumRule::Get( USHORT i ) const
            // <--
 }
 
-const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
+const SwNumFmt* SwNumRule::GetNumFmt( sal_uInt16 i ) const
 {
     const SwNumFmt * pResult = NULL;
 
@@ -176,13 +176,13 @@ void SwNumRule::SetNumRuleMap(std::hash_map<String, SwNumRule *, StringHash> *
     pNumRuleMap = _pNumRuleMap;
 }
 
-USHORT SwNumRule::GetNumIndent( BYTE nLvl )
+sal_uInt16 SwNumRule::GetNumIndent( sal_uInt8 nLvl )
 {
     ASSERT( MAXLEVEL > nLvl, "NumLevel is out of range" );
     return aDefNumIndents[ nLvl ];
 }
 
-USHORT SwNumRule::GetBullIndent( BYTE nLvl )
+sal_uInt16 SwNumRule::GetBullIndent( sal_uInt8 nLvl )
 {
     ASSERT( MAXLEVEL > nLvl, "NumLevel is out of range" );
     return aDefNumIndents[ nLvl ];
@@ -190,7 +190,7 @@ USHORT SwNumRule::GetBullIndent( BYTE nLvl )
 
 
 
-static void lcl_SetRuleChgd( SwTxtNode& rNd, BYTE nLevel )
+static void lcl_SetRuleChgd( SwTxtNode& rNd, sal_uInt8 nLevel )
 {
     if( rNd.GetActualListLevel() == nLevel )
         rNd.NumRuleChgd();
@@ -232,7 +232,7 @@ SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
         SwCharFmt* pCFmt = pDoc->FindCharFmtByName( rCharStyleName );
         if( !pCFmt )
         {
-            USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName( rCharStyleName,
+            sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCharStyleName,
                                             nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
             pCFmt = nId != USHRT_MAX
                         ? pDoc->GetCharFmtFromPool( nId )
@@ -261,7 +261,7 @@ void SwNumFmt::NotifyGraphicArrived()
 }
 
 // #i22362#
-BOOL SwNumFmt::IsEnumeration() const
+sal_Bool SwNumFmt::IsEnumeration() const
 {
     // --> FME 2004-08-12 #i30655# native numbering did not work any longer
     // using this code. Therefore HBRINKM and I agreed upon defining
@@ -270,7 +270,7 @@ BOOL SwNumFmt::IsEnumeration() const
     // <--
 
     /*
-    BOOL bResult;
+    sal_Bool bResult;
 
     switch(GetNumberingType())
     {
@@ -282,12 +282,12 @@ BOOL SwNumFmt::IsEnumeration() const
     case SVX_NUM_PAGEDESC:
     case SVX_NUM_CHARS_UPPER_LETTER_N:
     case SVX_NUM_CHARS_LOWER_LETTER_N:
-        bResult = TRUE;
+        bResult = sal_True;
 
         break;
 
     default:
-        bResult = FALSE;
+        bResult = sal_False;
     }
 
     return bResult;
@@ -295,20 +295,20 @@ BOOL SwNumFmt::IsEnumeration() const
 }
 
 // #i29560#
-BOOL SwNumFmt::IsItemize() const
+sal_Bool SwNumFmt::IsItemize() const
 {
-    BOOL bResult;
+    sal_Bool bResult;
 
     switch(GetNumberingType())
     {
     case SVX_NUM_CHAR_SPECIAL:
     case SVX_NUM_BITMAP:
-        bResult = TRUE;
+        bResult = sal_True;
 
         break;
 
     default:
-        bResult = FALSE;
+        bResult = sal_False;
     }
 
     return bResult;
@@ -331,9 +331,9 @@ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
 /* -----------------------------23.02.01 09:28--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
+sal_Bool SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
 {
-    BOOL bRet = SvxNumberFormat::operator==(rNumFmt) &&
+    sal_Bool bRet = SvxNumberFormat::operator==(rNumFmt) &&
         pRegisteredIn == rNumFmt.pRegisteredIn;
     return bRet;
 }
@@ -415,13 +415,13 @@ sal_Int16   SwNumFmt::GetVertOrient() const
  ---------------------------------------------------------------------------*/
 void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
 {
-    BOOL bDocIsModified = pDoc->IsModified();
-    BOOL bFnd = FALSE;
+    sal_Bool bDocIsModified = pDoc->IsModified();
+    sal_Bool bFnd = sal_False;
     const SwNumRule* pRule;
-    for( USHORT n = pDoc->GetNumRuleTbl().Count(); !bFnd && n; )
+    for( sal_uInt16 n = pDoc->GetNumRuleTbl().Count(); !bFnd && n; )
     {
         pRule = pDoc->GetNumRuleTbl()[ --n ];
-        for( BYTE i = 0; i < MAXLEVEL; ++i )
+        for( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
             if( pRule->GetNumFmt( i ) == this )
             {
                 // --> OD 2008-02-19 #refactorlists#
@@ -429,7 +429,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
 
 //                SwModify* pMod;
 //                const SfxPoolItem* pItem;
-//                USHORT k, nMaxItems = pDoc->GetAttrPool().GetItemCount(
+//                sal_uInt16 k, nMaxItems = pDoc->GetAttrPool().GetItemCount(
 //                                                    RES_PARATR_NUMRULE );
 //                for( k = 0; k < nMaxItems; ++k )
 //                    if( 0 != (pItem = pDoc->GetAttrPool().GetItem(
@@ -443,7 +443,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
 //                            SwNumRuleInfo aInfo( rRuleNm );
 //                            pMod->GetInfo( aInfo );
 
-//                            for( ULONG nFirst = 0, nLast = aInfo.GetList().Count();
+//                            for( sal_uLong nFirst = 0, nLast = aInfo.GetList().Count();
 //                                nFirst < nLast; ++nFirst )
 //                                lcl_SetRuleChgd(
 //                                    *aInfo.GetList().GetObject( nFirst ), i );
@@ -459,7 +459,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
                     lcl_SetRuleChgd( *(*aIter), i );
                 }
                 // <--
-                bFnd = TRUE;
+                bFnd = sal_True;
                 break;
             }
     }
@@ -491,7 +491,7 @@ long int SwNumRule::nInstances = 0;
 SwNumRule::SwNumRule( const String& rNm,
                       const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
                       SwNumRuleType eType,
-                      BOOL bAutoFlg )
+                      sal_Bool bAutoFlg )
     : maTxtNodeList(),
       // --> OD 2008-03-03 #refactorlists#
       maParagraphStyleList(),
@@ -503,9 +503,9 @@ SwNumRule::SwNumRule( const String& rNm,
     nPoolHelpId( USHRT_MAX ),
     nPoolHlpFileId( UCHAR_MAX ),
     bAutoRuleFlag( bAutoFlg ),
-    bInvalidRuleFlag( TRUE ),
-    bContinusNum( FALSE ),
-    bAbsSpaces( FALSE ),
+    bInvalidRuleFlag( sal_True ),
+    bContinusNum( sal_False ),
+    bAbsSpaces( sal_False ),
     // --> OD 2005-10-21 - initialize member <mbCountPhantoms>
     mbCountPhantoms( true ),
     // <--
@@ -523,7 +523,7 @@ SwNumRule::SwNumRule( const String& rNm,
     if( !nRefCount++ )          // zum erstmal, also initialisiern
     {
         SwNumFmt* pFmt;
-        BYTE n;
+        sal_uInt8 n;
 
         // numbering:
         // position-and-space mode LABEL_WIDTH_AND_POSITION:
@@ -623,7 +623,7 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       nPoolHelpId( rNumRule.GetPoolHelpId() ),
       nPoolHlpFileId( rNumRule.GetPoolHlpFileId() ),
       bAutoRuleFlag( rNumRule.bAutoRuleFlag ),
-      bInvalidRuleFlag( TRUE ),
+      bInvalidRuleFlag( sal_True ),
       bContinusNum( rNumRule.bContinusNum ),
       bAbsSpaces( rNumRule.bAbsSpaces ),
       // --> OD 2005-10-21 - initialize member <mbCountPhantoms>
@@ -642,14 +642,14 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
 
     ++nRefCount;
     memset( aFmts, 0, sizeof( aFmts ));
-    for( USHORT n = 0; n < MAXLEVEL; ++n )
+    for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
         if( rNumRule.aFmts[ n ] )
             Set( n, *rNumRule.aFmts[ n ] );
 }
 
 SwNumRule::~SwNumRule()
 {
-    for( USHORT n = 0; n < MAXLEVEL; ++n )
+    for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
         delete aFmts[ n ];
 
     if (pNumRuleMap)
@@ -688,7 +688,7 @@ SwNumRule::~SwNumRule()
 void SwNumRule::CheckCharFmts( SwDoc* pDoc )
 {
     SwCharFmt* pFmt;
-    for( BYTE n = 0; n < MAXLEVEL; ++n )
+    for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
         if( aFmts[ n ] && 0 != ( pFmt = aFmts[ n ]->GetCharFmt() ) &&
             pFmt->GetDoc() != pDoc )
         {
@@ -704,13 +704,13 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
 {
     if( this != &rNumRule )
     {
-        for( USHORT n = 0; n < MAXLEVEL; ++n )
+        for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
             Set( n, rNumRule.aFmts[ n ] );
 
         eRuleType = rNumRule.eRuleType;
         sName = rNumRule.sName;
         bAutoRuleFlag = rNumRule.bAutoRuleFlag;
-        bInvalidRuleFlag = TRUE;
+        bInvalidRuleFlag = sal_True;
         bContinusNum = rNumRule.bContinusNum;
         bAbsSpaces = rNumRule.bAbsSpaces;
         nPoolFmtId = rNumRule.GetPoolFmtId();
@@ -721,9 +721,9 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
 }
 
 
-BOOL SwNumRule::operator==( const SwNumRule& rRule ) const
+sal_Bool SwNumRule::operator==( const SwNumRule& rRule ) const
 {
-    BOOL bRet = eRuleType == rRule.eRuleType &&
+    sal_Bool bRet = eRuleType == rRule.eRuleType &&
                 sName == rRule.sName &&
                 bAutoRuleFlag == rRule.bAutoRuleFlag &&
                 bContinusNum == rRule.bContinusNum &&
@@ -733,10 +733,10 @@ BOOL SwNumRule::operator==( const SwNumRule& rRule ) const
                 nPoolHlpFileId == rRule.GetPoolHlpFileId();
     if( bRet )
     {
-        for( BYTE n = 0; n < MAXLEVEL; ++n )
+        for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
             if( !( rRule.Get( n ) == Get( n ) ))
             {
-                bRet = FALSE;
+                bRet = sal_False;
                 break;
             }
     }
@@ -744,7 +744,7 @@ BOOL SwNumRule::operator==( const SwNumRule& rRule ) const
 }
 
 
-void SwNumRule::Set( USHORT i, const SwNumFmt& rNumFmt )
+void SwNumRule::Set( sal_uInt16 i, const SwNumFmt& rNumFmt )
 {
     ASSERT( i < MAXLEVEL, "Serious defect, please inform OD" )
     if( i < MAXLEVEL )
@@ -753,12 +753,12 @@ void SwNumRule::Set( USHORT i, const SwNumFmt& rNumFmt )
         {
             delete aFmts[ i ];
             aFmts[ i ] = new SwNumFmt( rNumFmt );
-            bInvalidRuleFlag = TRUE;
+            bInvalidRuleFlag = sal_True;
         }
     }
 }
 
-void SwNumRule::Set( USHORT i, const SwNumFmt* pNumFmt )
+void SwNumRule::Set( sal_uInt16 i, const SwNumFmt* pNumFmt )
 {
     ASSERT( i < MAXLEVEL, "Serious defect, please inform OD" )
     if( i >= MAXLEVEL )
@@ -769,18 +769,18 @@ void SwNumRule::Set( USHORT i, const SwNumFmt* pNumFmt )
         if( pNumFmt )
         {
             aFmts[ i ] = new SwNumFmt( *pNumFmt );
-            bInvalidRuleFlag = TRUE;
+            bInvalidRuleFlag = sal_True;
         }
     }
     else if( !pNumFmt )
-        delete pOld, aFmts[ i ] = 0, bInvalidRuleFlag = TRUE;
+        delete pOld, aFmts[ i ] = 0, bInvalidRuleFlag = sal_True;
     else if( *pOld != *pNumFmt )
-        *pOld = *pNumFmt, bInvalidRuleFlag = TRUE;
+        *pOld = *pNumFmt, bInvalidRuleFlag = sal_True;
 }
 
 
-String SwNumRule::MakeNumString( const SwNodeNum& rNum, BOOL bInclStrings,
-                                BOOL bOnlyArabic ) const
+String SwNumRule::MakeNumString( const SwNodeNum& rNum, sal_Bool bInclStrings,
+                                sal_Bool bOnlyArabic ) const
 {
     String aStr;
 
@@ -792,8 +792,8 @@ String SwNumRule::MakeNumString( const SwNodeNum& rNum, BOOL bInclStrings,
 }
 
 String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
-                                 const BOOL bInclStrings,
-                                 const BOOL bOnlyArabic,
+                                 const sal_Bool bInclStrings,
+                                 const sal_Bool bOnlyArabic,
                                  const unsigned int _nRestrictToThisLevel ) const
 {
     String aStr;
@@ -808,13 +808,13 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
 
     if (nLevel < MAXLEVEL)
     {
-        const SwNumFmt& rMyNFmt = Get( static_cast<USHORT>(nLevel) );
+        const SwNumFmt& rMyNFmt = Get( static_cast<sal_uInt16>(nLevel) );
         // --> OD 2006-06-02 #b6432095#
         // - levels with numbering none has to provide prefix and suffix string
 //        if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
         // <--
         {
-            BYTE i = static_cast<BYTE>(nLevel);
+            sal_uInt8 i = static_cast<sal_uInt8>(nLevel);
 
             if( !IsContinusNum() &&
                 // --> OD 2006-09-19 #i69672#
@@ -823,7 +823,7 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
                 // <--
                 rMyNFmt.GetIncludeUpperLevels() )  // nur der eigene Level ?
             {
-                BYTE n = rMyNFmt.GetIncludeUpperLevels();
+                sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
                 if( 1 < n )
                 {
                     if( i+1 >= n )
@@ -887,7 +887,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
             bool bMakeNumStringForPhantom( false );
             if ( pWorkingNodeNum->IsPhantom() )
             {
-                SwNumFmt aFmt( Get( static_cast<USHORT>(pWorkingNodeNum->GetLevelInListTree()) ) );
+                SwNumFmt aFmt( Get( static_cast<sal_uInt16>(pWorkingNodeNum->GetLevelInListTree()) ) );
                 bMakeNumStringForPhantom = aFmt.IsEnumeration() &&
                                            SVX_NUM_NUMBER_NONE != aFmt.GetNumberingType();
 
@@ -906,7 +906,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
 
             if ( bInclSuperiorNumLabels && pWorkingNodeNum->GetLevelInListTree() > 0 )
             {
-                BYTE n = Get( static_cast<USHORT>(pWorkingNodeNum->GetLevelInListTree()) ).GetIncludeUpperLevels();
+                sal_uInt8 n = Get( static_cast<sal_uInt16>(pWorkingNodeNum->GetLevelInListTree()) ).GetIncludeUpperLevels();
                 pWorkingNodeNum = dynamic_cast<SwNodeNum*>(pWorkingNodeNum->GetParent());
                 // skip parents, whose list label is already contained in the actual list label.
                 while ( pWorkingNodeNum && n > 1 )
@@ -935,7 +935,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
 
 SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
 {
-    for( USHORT n = 0; n < MAXLEVEL; ++n )
+    for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
         Set( n, rNumRule.aFmts[ n ] );
         if( aFmts[ n ] && aFmts[ n ]->GetCharFmt() &&
@@ -952,7 +952,7 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
     nPoolFmtId = rNumRule.GetPoolFmtId();
     nPoolHelpId = rNumRule.GetPoolHelpId();
     nPoolHlpFileId = rNumRule.GetPoolHlpFileId();
-    bInvalidRuleFlag = TRUE;
+    bInvalidRuleFlag = sal_True;
     return *this;
 }
 /* -----------------30.10.98 08:33-------------------
@@ -960,14 +960,14 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
  * --------------------------------------------------*/
 void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
 {
-    for( USHORT n = 0; n < MAXLEVEL; ++n )
+    for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
         const SvxNumberFormat* pSvxFmt = rNumRule.Get(n);
         delete aFmts[n];
         aFmts[n] = pSvxFmt ? new SwNumFmt(*pSvxFmt, pDoc) : 0;
     }
 
-    bInvalidRuleFlag = TRUE;
+    bInvalidRuleFlag = sal_True;
     bContinusNum = rNumRule.IsContinuousNumbering();
 }
 /* -----------------30.10.98 08:33-------------------
@@ -982,7 +982,7 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
                             NUM_RULE ?
                                 SVX_RULETYPE_NUMBERING :
                                     SVX_RULETYPE_OUTLINE_NUMBERING );
-    for( USHORT n = 0; n < MAXLEVEL; ++n )
+    for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
     {
         SwNumFmt aNumFmt = Get(n);
         if(aNumFmt.GetCharFmt())
@@ -992,7 +992,7 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
     return aRule;
 }
 
-void SwNumRule::SetInvalidRule(BOOL bFlag)
+void SwNumRule::SetInvalidRule(sal_Bool bFlag)
 {
     if (bFlag)
     {
@@ -1026,11 +1026,11 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
 // --> OD 2008-06-16 #i90078#
 // #i23725#, #i23726#
 //void SwNumRule::Indent(short nAmount, int nLevel, int nReferenceLevel,
-//                       BOOL bRelative, BOOL bFirstLine, BOOL bCheckGtZero)
+//                       sal_Bool bRelative, sal_Bool bFirstLine, sal_Bool bCheckGtZero)
 //{
 //    int nStartLevel = 0;
 //    int nEndLevel = MAXLEVEL - 1;
-//    BOOL bGotInvalid = FALSE;
+//    sal_Bool bGotInvalid = sal_False;
 
 //    if (nLevel >= 0)
 //        nStartLevel = nEndLevel = nLevel;
@@ -1043,46 +1043,46 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
 //        if (bFirstLine)
 //        {
 //            if (nReferenceLevel >= 0)
-//                nAmount = nAmount - Get(static_cast<USHORT>(nReferenceLevel)).GetFirstLineOffset();
+//                nAmount = nAmount - Get(static_cast<sal_uInt16>(nReferenceLevel)).GetFirstLineOffset();
 //            else
-//                nAmount = nAmount - Get(static_cast<USHORT>(nStartLevel)).GetFirstLineOffset();
+//                nAmount = nAmount - Get(static_cast<sal_uInt16>(nStartLevel)).GetFirstLineOffset();
 //        }
 
-//        BOOL bFirst = TRUE;
+//        sal_Bool bFirst = sal_True;
 
 //        if (nReferenceLevel >= 0)
-//            nRealAmount = nAmount - Get(static_cast<USHORT>(nReferenceLevel)).GetAbsLSpace();
+//            nRealAmount = nAmount - Get(static_cast<sal_uInt16>(nReferenceLevel)).GetAbsLSpace();
 //        else
 //            for (i = nStartLevel; i < nEndLevel + 1; i++)
 //            {
-//                short nTmp = nAmount - Get(static_cast<USHORT>(i)).GetAbsLSpace();
+//                short nTmp = nAmount - Get(static_cast<sal_uInt16>(i)).GetAbsLSpace();
 
 //                if (bFirst || nTmp > nRealAmount)
 //                {
 //                    nRealAmount = nTmp;
-//                    bFirst = FALSE;
+//                    bFirst = sal_False;
 //                }
 //            }
 //    }
 
 //    if (nRealAmount < 0)
 //        for (i = nStartLevel; i < nEndLevel + 1; i++)
-//            if (Get(static_cast<USHORT>(i)).GetAbsLSpace() + nRealAmount < 0)
-//                nRealAmount = -Get(static_cast<USHORT>(i)).GetAbsLSpace();
+//            if (Get(static_cast<sal_uInt16>(i)).GetAbsLSpace() + nRealAmount < 0)
+//                nRealAmount = -Get(static_cast<sal_uInt16>(i)).GetAbsLSpace();
 
 //    for (i = nStartLevel; i < nEndLevel + 1; i++)
 //    {
-//        short nNew = Get(static_cast<USHORT>(i)).GetAbsLSpace() + nRealAmount;
+//        short nNew = Get(static_cast<sal_uInt16>(i)).GetAbsLSpace() + nRealAmount;
 
 //        if (bCheckGtZero && nNew < 0)
 //            nNew = 0;
 
-//        SwNumFmt aTmpNumFmt(Get(static_cast<USHORT>(i)));
+//        SwNumFmt aTmpNumFmt(Get(static_cast<sal_uInt16>(i)));
 //        aTmpNumFmt.SetAbsLSpace(nNew);
 
-//        Set(static_cast<USHORT>(i), aTmpNumFmt);
+//        Set(static_cast<sal_uInt16>(i), aTmpNumFmt);
 
-//        bGotInvalid = TRUE;
+//        bGotInvalid = sal_True;
 //    }
 
 //    if (bGotInvalid)
@@ -1092,7 +1092,7 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
 // change indent of all list levels by given difference
 void SwNumRule::ChangeIndent( const short nDiff )
 {
-    for ( USHORT i = 0; i < MAXLEVEL; ++i )
+    for ( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
     {
         SwNumFmt aTmpNumFmt( Get(i) );
 
@@ -1126,12 +1126,12 @@ void SwNumRule::ChangeIndent( const short nDiff )
         Set( i, aTmpNumFmt );
     }
 
-    SetInvalidRule( TRUE );
+    SetInvalidRule( sal_True );
 }
 
 // set indent of certain list level to given value
 void SwNumRule::SetIndent( const short nNewIndent,
-                           const USHORT nListLevel )
+                           const sal_uInt16 nListLevel )
 {
     SwNumFmt aTmpNumFmt( Get(nListLevel) );
 
@@ -1155,7 +1155,7 @@ void SwNumRule::SetIndent( const short nNewIndent,
         aTmpNumFmt.SetIndentAt( nNewIndent );
     }
 
-    SetInvalidRule( TRUE );
+    SetInvalidRule( sal_True );
 }
 
 // set indent of first list level to given value and change other list level's
@@ -1202,7 +1202,7 @@ void SwNumRule::Validate()
                    std::mem_fun( &SwList::ValidateListTree ) );
     // <--
 
-    SetInvalidRule(FALSE);
+    SetInvalidRule(sal_False);
 }
 
 bool SwNumRule::IsCountPhantoms() const
@@ -1286,7 +1286,7 @@ namespace numfunc
             {
                 return static_cast<short>(meFontItalic);
             }
-            inline sal_Unicode GetChar( BYTE p_nListLevel ) const
+            inline sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const
             {
                 if ( p_nListLevel > MAXLEVEL )
                 {
@@ -1521,7 +1521,7 @@ namespace numfunc
         return SwDefBulletConfig::getInstance()->GetFont();
     }
 
-    sal_Unicode GetBulletChar( BYTE nLevel )
+    sal_Unicode GetBulletChar( sal_uInt8 nLevel )
     {
         return SwDefBulletConfig::getInstance()->GetChar( nLevel );
     }