removetooltypes01: #i112600# Remove tools types from sw

7 files changed, 169 insertions, 169 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 63d878006f7e..244af428abe0 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -74,11 +74,11 @@ void SwBreakDlg::Apply()
     else if(aPageBtn.IsChecked())
     {
         nKind = 3;
-        const USHORT nPos = aPageCollBox.GetSelectEntryPos();
+        const sal_uInt16 nPos = aPageCollBox.GetSelectEntryPos();
         if(0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos)
         {
             aTemplate = aPageCollBox.GetSelectEntry();
-            nPgNum = aPageNumBox.IsChecked() ? (USHORT)aPageNumEdit.GetValue() : 0;
+            nPgNum = aPageNumBox.IsChecked() ? (sal_uInt16)aPageNumEdit.GetValue() : 0;
         }
     }
 }
@@ -125,18 +125,18 @@ IMPL_LINK( SwBreakDlg, OkHdl, Button *, EMPTYARG )
 {
     if(aPageNumBox.IsChecked()) {
             // wenn unterschiedliche Seitenvorlagen, testen auf Gueltigkeit
-        const USHORT nPos = aPageCollBox.GetSelectEntryPos();
+        const sal_uInt16 nPos = aPageCollBox.GetSelectEntryPos();
             // auf Position 0 steht 'Ohne'.
         const SwPageDesc *pPageDesc;
         if ( 0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos )
             pPageDesc = rSh.FindPageDescByName( aPageCollBox.GetSelectEntry(),
-                                                TRUE );
+                                                sal_True );
         else
             pPageDesc = &rSh.GetPageDesc(rSh.GetCurPageDesc());
 
         ASSERT(pPageDesc, Seitenvorlage nicht gefunden.);
-        const USHORT nUserPage = USHORT(aPageNumEdit.GetValue());
-        BOOL bOk = TRUE;
+        const sal_uInt16 nUserPage = sal_uInt16(aPageNumEdit.GetValue());
+        sal_Bool bOk = sal_True;
         switch(pPageDesc->GetUseOn())
         {
             case nsUseOnPage::PD_MIRROR:
@@ -190,8 +190,8 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) :
 
 
     // Einfuegen der vorhandenen Seitenvorlagen in die Listbox
-    const USHORT nCount = rSh.GetPageDescCnt();
-    USHORT i;
+    const sal_uInt16 nCount = rSh.GetPageDescCnt();
+    sal_uInt16 i;
 
     for( i = 0; i < nCount; ++i)
     {
@@ -216,22 +216,22 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) :
 
 void SwBreakDlg::CheckEnable()
 {
-    BOOL bEnable = TRUE;
+    sal_Bool bEnable = sal_True;
     if ( bHtmlMode )
     {
-        aColumnBtn  .Enable(FALSE);
-        aPageCollBox.Enable(FALSE);
-        bEnable = FALSE;
+        aColumnBtn  .Enable(sal_False);
+        aPageCollBox.Enable(sal_False);
+        bEnable = sal_False;
     }
-    else if(rSh.GetFrmType(0,TRUE)
+    else if(rSh.GetFrmType(0,sal_True)
         & (FRMTYPE_FLY_ANY | FRMTYPE_HEADER | FRMTYPE_FOOTER  | FRMTYPE_FOOTNOTE))
     {
-        aPageBtn.Enable(FALSE);
+        aPageBtn.Enable(sal_False);
         if(aPageBtn.IsChecked())
-            aLineBtn.Check(TRUE);
-        bEnable = FALSE;
+            aLineBtn.Check(sal_True);
+        bEnable = sal_False;
     }
-    const BOOL bPage = aPageBtn.IsChecked();
+    const sal_Bool bPage = aPageBtn.IsChecked();
     aPageCollText.Enable( bPage );
     aPageCollBox.Enable ( bPage );
 
@@ -239,9 +239,9 @@ void SwBreakDlg::CheckEnable()
     if ( bEnable )
     {
         // auf Position 0 steht 'Ohne' Seitenvorlage.
-        const USHORT nPos = aPageCollBox.GetSelectEntryPos();
+        const sal_uInt16 nPos = aPageCollBox.GetSelectEntryPos();
         if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos )
-            bEnable = FALSE;
+            bEnable = sal_False;
     }
     aPageNumBox .Enable(bEnable);
     aPageNumEdit.Enable(bEnable);
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index 44b144d28f4b..f2099aabdda1 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -156,7 +156,7 @@ TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem)
 ****************************************************************************/
 
 
-SwCondCollItem::SwCondCollItem(USHORT _nWhich ) :
+SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) :
     SfxPoolItem(_nWhich)
 {
 
@@ -188,11 +188,11 @@ SfxPoolItem*   SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const
 int SwCondCollItem::operator==( const SfxPoolItem& rItem) const
 {
     DBG_ASSERT( SfxPoolItem::operator==(rItem), "unterschiedliche Typen" );
-    BOOL bReturn = TRUE;
-    for(USHORT i = 0; i < COND_COMMAND_COUNT; i++)
+    sal_Bool bReturn = sal_True;
+    for(sal_uInt16 i = 0; i < COND_COMMAND_COUNT; i++)
         if(sStyles[i] != ((SwCondCollItem&)rItem).sStyles[i])
         {
-            bReturn = FALSE;
+            bReturn = sal_False;
             break;
         }
 
@@ -204,7 +204,7 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const
 ****************************************************************************/
 
 
-const String&   SwCondCollItem::GetStyle(USHORT nPos) const
+const String&   SwCondCollItem::GetStyle(sal_uInt16 nPos) const
 {
     return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr;
 }
@@ -214,7 +214,7 @@ const String&   SwCondCollItem::GetStyle(USHORT nPos) const
 ****************************************************************************/
 
 
-void SwCondCollItem::SetStyle(const String* pStyle, USHORT nPos)
+void SwCondCollItem::SetStyle(const String* pStyle, sal_uInt16 nPos)
 {
     if( nPos < COND_COMMAND_COUNT )
         sStyles[nPos] = pStyle ? *pStyle : aEmptyStr;
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 38b1ba906fdd..61ca1e90a750 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -99,7 +99,7 @@ using namespace ::sfx2;
 
 
 SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet,
-                     const String* pStr, BOOL bIsDrwTxtDlg) :
+                     const String* pStr, sal_Bool bIsDrwTxtDlg) :
     SfxTabDialog(pParent, SW_RES(DLG_CHAR), &rCoreSet, pStr != 0),
     rView(rVw),
     bIsDrwTxtMode(bIsDrwTxtDlg)
@@ -150,7 +150,7 @@ SwCharDlg::~SwCharDlg()
 
 
 
-void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     switch( nId )
@@ -211,18 +211,18 @@ SwCharURLPage::SwCharURLPage(   Window* pParent,
     aNotVisitedFT(  this, SW_RES(FT_NOT_VISITED)),
     aNotVisitedLB(  this, SW_RES(LB_NOT_VISITED)),
     pINetItem(0),
-    bModified(FALSE)
+    bModified(sal_False)
 
 {
     FreeResource();
 
     const SfxPoolItem* pItem;
     SfxObjectShell* pShell;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) ||
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
         ( 0 != ( pShell = SfxObjectShell::Current()) &&
                     0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
     {
-        USHORT nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
+        sal_uInt16 nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
         if(HTMLMODE_ON & nHtmlMode)
         {
             aStyleFL.Hide();
@@ -243,10 +243,10 @@ SwCharURLPage::SwCharURLPage(   Window* pParent,
     TargetList* pList = new TargetList;
     const SfxFrame& rFrame = pView->GetViewFrame()->GetTopFrame();
     rFrame.GetTargetList(*pList);
-    USHORT nCount = (USHORT)pList->Count();
+    sal_uInt16 nCount = (sal_uInt16)pList->Count();
     if( nCount )
     {
-        USHORT i;
+        sal_uInt16 i;
 
         for ( i = 0; i < nCount; i++ )
         {
@@ -278,7 +278,7 @@ SwCharURLPage::~SwCharURLPage()
 void SwCharURLPage::Reset(const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rSet.GetItemState(RES_TXTATR_INETFMT, FALSE, &pItem))
+    if(SFX_ITEM_SET == rSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem))
     {
         const SwFmtINetFmt* pINetFmt = (const SwFmtINetFmt*)pItem;
         aURLED.SetText( INetURLObject::decode( pINetFmt->GetValue(),
@@ -305,11 +305,11 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet)
         if( pINetFmt->GetMacroTbl() )
             pINetItem->SetMacroTable( *pINetFmt->GetMacroTbl() );
     }
-    if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, FALSE, &pItem))
+    if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, sal_False, &pItem))
     {
         aTextED.SetText(((const SfxStringItem*)pItem)->GetValue());
-        aTextFT.Enable( FALSE );
-        aTextED.Enable( FALSE );
+        aTextFT.Enable( sal_False );
+        aTextED.Enable( sal_False );
     }
 }
 
@@ -317,7 +317,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet)
 
 --------------------------------------------------*/
 
-BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
 {
    ::rtl::OUString sURL = aURLED.GetText();
    if(sURL.getLength())
@@ -338,7 +338,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
 
     //zuerst die gueltigen Einstellungen setzen
     String sEntry = aVisitedLB.GetSelectEntry();
-    USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
+    sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
     aINetFmt.SetVisitedFmtId(nId);
     aINetFmt.SetVisitedFmt(nId == RES_POOLCHR_INET_VISIT ? aEmptyStr : sEntry);
 
@@ -351,14 +351,14 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
         aINetFmt.SetMacroTbl( &pINetItem->GetMacroTable() );
 
     if(aVisitedLB.GetSavedValue() != aVisitedLB.GetSelectEntryPos())
-        bModified = TRUE;
+        bModified = sal_True;
 
     if(aNotVisitedLB.GetSavedValue() != aNotVisitedLB.GetSelectEntryPos())
-        bModified = TRUE;
+        bModified = sal_True;
 
     if(aTextED.IsModified())
     {
-        bModified = TRUE;
+        bModified = sal_True;
         rSet.Put(SfxStringItem(FN_PARAM_SELECTION, aTextED.GetText()));
     }
     if(bModified)
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index f31e5d7dc7a7..e4b95c599071 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -89,7 +89,7 @@ using namespace ::com::sun::star::lang;
 
 // Globals ******************************************************************
 
-static USHORT __FAR_DATA aPageRg[] = {
+static sal_uInt16 __FAR_DATA aPageRg[] = {
     RES_PARATR_DROP, RES_PARATR_DROP,
     0
 };
@@ -104,14 +104,14 @@ class SwDropCapsPict : public Control
     String          maScriptText;
     Color           maBackColor;
     Color           maTextLineColor;
-    BYTE            mnLines;
+    sal_uInt8           mnLines;
     long            mnTotLineH;
     long            mnLineH;
     long            mnTextH;
-    USHORT          mnDistance;
+    sal_uInt16          mnDistance;
     sal_Int32       mnLeading;
     Printer*        mpPrinter;
-    BOOL            mbDelPrinter;
+    sal_Bool            mbDelPrinter;
     SvULongs        maTextWidth;
     SvXub_StrLens   maScriptChg;
     SvUShorts       maScriptType;
@@ -126,19 +126,19 @@ class SwDropCapsPict : public Control
     Size            CalcTextSize( void );
     inline void     InitPrinter( void );
     void            _InitPrinter( void );
-    void            GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, USHORT _nWhich );
+    void            GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, sal_uInt16 _nWhich );
 public:
 
      SwDropCapsPict(Window *pParent, const ResId &rResId) :
-            Control(pParent, rResId), mpPrinter( NULL ), mbDelPrinter( FALSE ) {}
+            Control(pParent, rResId), mpPrinter( NULL ), mbDelPrinter( sal_False ) {}
     ~SwDropCapsPict();
 
     void UpdatePaintSettings( void );       // also invalidates control!
 
     inline void SetText( const String& rT );
-    inline void SetLines( BYTE nL );
-    inline void SetDistance( USHORT nD );
-    inline void SetValues( const String& rText, BYTE nLines, USHORT nDistance );
+    inline void SetLines( sal_uInt8 nL );
+    inline void SetDistance( sal_uInt16 nD );
+    inline void SetValues( const String& rText, sal_uInt8 nLines, sal_uInt16 nDistance );
 
     void        DrawPrev( const Point& rPt );
 };
@@ -149,19 +149,19 @@ inline void SwDropCapsPict::SetText( const String& rT )
     UpdatePaintSettings();
 }
 
-inline void SwDropCapsPict::SetLines( BYTE nL )
+inline void SwDropCapsPict::SetLines( sal_uInt8 nL )
 {
     mnLines = nL;
     UpdatePaintSettings();
 }
 
-inline void SwDropCapsPict::SetDistance( USHORT nD )
+inline void SwDropCapsPict::SetDistance( sal_uInt16 nD )
 {
     mnDistance = nD;
     UpdatePaintSettings();
 }
 
-inline void SwDropCapsPict::SetValues( const String& rText, BYTE nLines, USHORT nDistance )
+inline void SwDropCapsPict::SetValues( const String& rText, sal_uInt8 nLines, sal_uInt16 nDistance )
 {
     maText = rText;
     mnLines = nLines;
@@ -181,10 +181,10 @@ Default-String aus Zeichenanzahl erzeugen (A, AB, ABC, ...)
 ****************************************************************************/
 
 
-String GetDefaultString(USHORT nChars)
+String GetDefaultString(sal_uInt16 nChars)
 {
     String aStr;
-    for (USHORT i = 0; i < nChars; i++)
+    for (sal_uInt16 i = 0; i < nChars; i++)
         aStr += String((char) (i + 65));
     return aStr;
 }
@@ -218,7 +218,7 @@ Pict: Update Font
 #define LINES  10
 #define BORDER  2
 
-void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, USHORT _nWhich )
+void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, sal_uInt16 _nWhich )
 {
     SfxItemSet aSet( _rPage.rSh.GetAttrPool(), _nWhich, _nWhich);
     _rPage.rSh.GetCurAttr(aSet);
@@ -261,7 +261,7 @@ void SwDropCapsPict::UpdatePaintSettings( void )
             // CTL
             GetFontSettings( *pPage, maCTLFont, RES_CHRATR_CTL_FONT );
 
-            pPage->rSh.Pop(FALSE);
+            pPage->rSh.Pop(sal_False);
             pPage->rSh.EndCrsrMove();
         }
         else
@@ -285,9 +285,9 @@ void SwDropCapsPict::UpdatePaintSettings( void )
     maCJKFont.SetSize(Size(0, mnTextH));
     maCTLFont.SetSize(Size(0, mnTextH));
 
-    aFont.SetTransparent(TRUE);
-    maCJKFont.SetTransparent(TRUE);
-    maCTLFont.SetTransparent(TRUE);
+    aFont.SetTransparent(sal_True);
+    maCJKFont.SetTransparent(sal_True);
+    maCTLFont.SetTransparent(sal_True);
 
     aFont.SetColor( SwViewOption::GetFontColor() );
     maCJKFont.SetColor( SwViewOption::GetFontColor() );
@@ -337,12 +337,12 @@ void  SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
     ASSERT(mnLineH > 0, "So klein lassen wir uns nicht machen");
     long nY0 = (aOutputSizePixel.Height() - (LINES * mnTotLineH)) / 2;
     SetFillColor( maTextLineColor );
-    for (USHORT i = 0; i < LINES; ++i)
+    for (sal_uInt16 i = 0; i < LINES; ++i)
         DrawRect(Rectangle(Point(BORDER, nY0 + i * mnTotLineH), Size(aOutputSizePixel.Width() - 2 * BORDER, mnLineH)));
 
     // Texthintergrund mit Abstand (240 twips ~ 1 Zeilenhoehe)
-    ULONG lDistance = mnDistance;
-    USHORT nDistW = (USHORT) (ULONG) (((lDistance * 100) / 240) * mnTotLineH) / 100;
+    sal_uLong lDistance = mnDistance;
+    sal_uInt16 nDistW = (sal_uInt16) (sal_uLong) (((lDistance * 100) / 240) * mnTotLineH) / 100;
     SetFillColor( maBackColor );
     if(((SwDropCapsPage*)GetParent())->aDropCapsBox.IsChecked())
     {
@@ -363,7 +363,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
     InitPrinter();
 
     Font        aOldFont = mpPrinter->GetFont();
-    USHORT      nScript;
+    sal_uInt16      nScript;
     size_t      nIdx = 0;
     xub_StrLen  nStart = 0;
     xub_StrLen  nEnd;
@@ -396,7 +396,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
         else
             break;
     }
-    while( TRUE );
+    while( sal_True );
     mpPrinter->SetFont( aOldFont );
 }
 
@@ -422,8 +422,8 @@ void SwDropCapsPict::CheckScript( void )
     }
     if( xBreak.is() )
     {
-        USHORT nScript = xBreak->getScriptType( maText, 0 );
-        USHORT nChg = 0;
+        sal_uInt16 nScript = xBreak->getScriptType( maText, 0 );
+        sal_uInt16 nChg = 0;
         if( I18N_SCRIPTTYPE::WEAK == nScript )
         {
             nChg = (xub_StrLen)xBreak->endOfScript( maText, nChg, nScript );
@@ -438,13 +438,13 @@ void SwDropCapsPict::CheckScript( void )
             nChg = (xub_StrLen)xBreak->endOfScript( maText, nChg, nScript );
             maScriptChg.push_back( nChg );
             maScriptType.Insert( nScript, nCnt );
-            maTextWidth.Insert( ULONG(0), nCnt++ );
+            maTextWidth.Insert( sal_uLong(0), nCnt++ );
 
             if( nChg < maText.Len() )
                 nScript = xBreak->getScriptType( maText, nChg );
             else
                 break;
-        } while( TRUE );
+        } while( sal_True );
     }
 }
 
@@ -452,7 +452,7 @@ Size SwDropCapsPict::CalcTextSize( void )
 {
     InitPrinter();
 
-    USHORT      nScript;
+    sal_uInt16      nScript;
     size_t      nIdx = 0;
     xub_StrLen  nStart = 0;
     xub_StrLen  nEnd;
@@ -478,7 +478,7 @@ Size SwDropCapsPict::CalcTextSize( void )
     {
         SvxFont&    rFnt = ( nScript == I18N_SCRIPTTYPE::ASIAN )? maCJKFont :
                                 ( ( nScript == I18N_SCRIPTTYPE::COMPLEX )? maCTLFont : maFont );
-        ULONG       nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width();
+        sal_uLong       nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width();
 
         if( nIdx < maTextWidth.Count() )
             maTextWidth[ nIdx++ ] = nWidth;
@@ -504,7 +504,7 @@ Size SwDropCapsPict::CalcTextSize( void )
         else
             break;
     }
-    while( TRUE );
+    while( sal_True );
     nHeight -= nAscent;
     nCJKHeight -= nCJKAscent;
     nCTLHeight -= nCTLAscent;
@@ -532,7 +532,7 @@ void SwDropCapsPict::_InitPrinter()
     if ( !mpPrinter )
     {
         mpPrinter = new Printer;
-        mbDelPrinter = TRUE;
+        mbDelPrinter = sal_True;
     }
 }
 
@@ -547,7 +547,7 @@ SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) :
 
 {
     SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(this, rSet);
-    pNewPage->SetFormat(FALSE);
+    pNewPage->SetFormat(sal_False);
     SetTabPage(pNewPage);
 }
 
@@ -587,15 +587,15 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
 
     pPict         (new SwDropCapsPict(this, SW_RES(CNT_PICT))),
 
-    bModified(FALSE),
-    bFormat(TRUE),
+    bModified(sal_False),
+    bFormat(sal_True),
     rSh(::GetActiveView()->GetWrtShell())
 {
     FreeResource();
     SetExchangeSupport();
 
-    USHORT nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
-    bHtmlMode = nHtmlMode & HTMLMODE_ON ? TRUE : FALSE;
+    sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
+    bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False;
 
     //Im Vorlagendialog kann der Text nicht beeinflusst werden
     aTextText.Enable( !bFormat );
@@ -652,7 +652,7 @@ Page: FillItemSet-Overload
 ****************************************************************************/
 
 
-BOOL  SwDropCapsPage::FillItemSet(SfxItemSet &rSet)
+sal_Bool  SwDropCapsPage::FillItemSet(SfxItemSet &rSet)
 {
     if(bModified)
         FillSet(rSet);
@@ -682,7 +682,7 @@ void  SwDropCapsPage::Reset(const SfxItemSet &rSet)
         aDistanceField.SetValue(0);
     }
 
-    ::FillCharStyleListBox(aTemplateBox, rSh.GetView().GetDocShell(), TRUE);
+    ::FillCharStyleListBox(aTemplateBox, rSh.GetView().GetDocShell(), sal_True);
 
     aTemplateBox.InsertEntry(SW_RESSTR(SW_STR_NONE), 0);
     // Vorlage defaulten
@@ -692,7 +692,7 @@ void  SwDropCapsPage::Reset(const SfxItemSet &rSet)
 
     // Controls enablen
     aDropCapsBox.Check(aFmtDrop.GetLines() > 1);
-    const USHORT nVal = USHORT(aDropCapsField.GetValue());
+    const sal_uInt16 nVal = sal_uInt16(aDropCapsField.GetValue());
     if (bFormat)
         aTextEdit.SetText(GetDefaultString(nVal));
     else
@@ -704,11 +704,11 @@ void  SwDropCapsPage::Reset(const SfxItemSet &rSet)
 
     // Preview
     pPict->SetValues(   aTextEdit.GetText(),
-                        BYTE( aLinesField.GetValue() ),
-                        USHORT( aDistanceField.Denormalize( aDistanceField.GetValue( FUNIT_TWIP ) ) ) );
+                        sal_uInt8( aLinesField.GetValue() ),
+                        sal_uInt16( aDistanceField.Denormalize( aDistanceField.GetValue( FUNIT_TWIP ) ) ) );
 
     ClickHdl(&aDropCapsBox);
-    bModified = FALSE;
+    bModified = sal_False;
 }
 
 /****************************************************************************
@@ -718,7 +718,7 @@ Page: Click-Handler der CheckBox
 
 IMPL_LINK( SwDropCapsPage, ClickHdl, Button *, EMPTYARG )
 {
-    BOOL bChecked = aDropCapsBox.IsChecked();
+    sal_Bool bChecked = aDropCapsBox.IsChecked();
 
     aWholeWordCB  .Enable( bChecked && !bHtmlMode );
 
@@ -741,7 +741,7 @@ IMPL_LINK( SwDropCapsPage, ClickHdl, Button *, EMPTYARG )
     else
         pPict->SetText(aEmptyStr);
 
-    bModified = TRUE;
+    bModified = sal_True;
 
     return 0;
 }
@@ -757,7 +757,7 @@ IMPL_LINK( SwDropCapsPage, WholeWordHdl, CheckBox *, EMPTYARG )
 
     ModifyHdl(&aDropCapsField);
 
-    bModified = TRUE;
+    bModified = sal_True;
 
     return 0;
 }
@@ -774,11 +774,11 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
     // Ggf. Text setzen
     if (pEdit == &aDropCapsField)
     {
-        USHORT nVal;
-        BOOL bSetText = FALSE;
+        sal_uInt16 nVal;
+        sal_Bool bSetText = sal_False;
 
         if (!aWholeWordCB.IsChecked())
-            nVal = (USHORT)aDropCapsField.GetValue();
+            nVal = (sal_uInt16)aDropCapsField.GetValue();
         else
             nVal = 0;
 
@@ -786,7 +786,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
             sPreview = GetDefaultString(nVal);
         else
         {
-            bSetText = TRUE;
+            bSetText = sal_True;
             sPreview = rSh.GetDropTxt(nVal);
         }
 
@@ -795,7 +795,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
         if (sEdit.Len() && sPreview.CompareTo(sEdit, sEdit.Len()) != COMPARE_EQUAL)
         {
             sPreview = sEdit.Copy(0, sPreview.Len());
-            bSetText = FALSE;
+            bSetText = sal_False;
         }
 
         if (bSetText)
@@ -803,8 +803,8 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
     }
     else if (pEdit == &aTextEdit)   // Ggf. Anzahl setzen
     {
-        USHORT nTmp = aTextEdit.GetText().Len();
-        aDropCapsField.SetValue(Max((USHORT)1, nTmp));
+        sal_uInt16 nTmp = aTextEdit.GetText().Len();
+        aDropCapsField.SetValue(Max((sal_uInt16)1, nTmp));
 
         sPreview = aTextEdit.GetText().Copy(0, nTmp);
     }
@@ -813,11 +813,11 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
     if (pEdit == &aDropCapsField || pEdit == &aTextEdit)
         pPict->SetText (sPreview);
     else if (pEdit == &aLinesField)
-        pPict->SetLines((BYTE)aLinesField.GetValue());
+        pPict->SetLines((sal_uInt8)aLinesField.GetValue());
     else
-        pPict->SetDistance((USHORT)aDistanceField.Denormalize(aDistanceField.GetValue(FUNIT_TWIP)));
+        pPict->SetDistance((sal_uInt16)aDistanceField.Denormalize(aDistanceField.GetValue(FUNIT_TWIP)));
 
-    bModified = TRUE;
+    bModified = sal_True;
 
     return 0;
 }
@@ -830,13 +830,13 @@ Page: Select-Handler der Template-Box.
 IMPL_LINK_INLINE_START( SwDropCapsPage, SelectHdl, ListBox *, EMPTYARG )
 {
     pPict->UpdatePaintSettings();
-    bModified = TRUE;
+    bModified = sal_True;
     return 0;
 }
 IMPL_LINK_INLINE_END( SwDropCapsPage, SelectHdl, ListBox *, EMPTYARG )
 
 
-USHORT*  SwDropCapsPage::GetRanges()
+sal_uInt16*  SwDropCapsPage::GetRanges()
 {
     return aPageRg;
 }
@@ -848,13 +848,13 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet )
     {
         SwFmtDrop aFmt;
 
-        BOOL bOn = aDropCapsBox.IsChecked();
+        sal_Bool bOn = aDropCapsBox.IsChecked();
         if(bOn)
         {
             // Anzahl, Zeilen, Abstand
-            aFmt.GetChars()     = (BYTE) aDropCapsField.GetValue();
-            aFmt.GetLines()     = (BYTE) aLinesField.GetValue();
-            aFmt.GetDistance()  = (USHORT) aDistanceField.Denormalize(aDistanceField.GetValue(FUNIT_TWIP));
+            aFmt.GetChars()     = (sal_uInt8) aDropCapsField.GetValue();
+            aFmt.GetLines()     = (sal_uInt8) aLinesField.GetValue();
+            aFmt.GetDistance()  = (sal_uInt16) aDistanceField.Denormalize(aDistanceField.GetValue(FUNIT_TWIP));
             aFmt.GetWholeWord() = aWholeWordCB.IsChecked();
 
             // Vorlage
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index f80130f475e9..00d691edd9c3 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -56,7 +56,7 @@
 
 // Globals ******************************************************************
 
-static USHORT __FAR_DATA aPageRg[] = {
+static sal_uInt16 __FAR_DATA aPageRg[] = {
     FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT,
     0
 };
@@ -83,18 +83,18 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent,
     // --> OD 2008-04-14 #outlinelevel#
     msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ),
     // <--
-    bModified(FALSE),
-    bCurNumrule(FALSE)
+    bModified(sal_False),
+    bCurNumrule(sal_False)
 {
     FreeResource();
 
     const SfxPoolItem* pItem;
     SfxObjectShell* pObjSh;
-    if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, FALSE, &pItem) ||
+    if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
         ( 0 != ( pObjSh = SfxObjectShell::Current()) &&
                     0 != (pItem = pObjSh->GetItem(SID_HTML_MODE))))
     {
-        USHORT nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
+        sal_uInt16 nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
         if(HTMLMODE_ON & nHtmlMode)
         {
             aCountParaFL        .Hide();
@@ -131,7 +131,7 @@ SfxTabPage* SwParagraphNumTabPage::Create(  Window* pParent,
 /*-----------------31.01.98 08:38-------------------
 
 --------------------------------------------------*/
-USHORT* SwParagraphNumTabPage::GetRanges()
+sal_uInt16* SwParagraphNumTabPage::GetRanges()
 {
     return aPageRg;
 }
@@ -139,18 +139,18 @@ USHORT* SwParagraphNumTabPage::GetRanges()
 /*-----------------31.01.98 08:38-------------------
 
 --------------------------------------------------*/
-BOOL    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
 {
     //<-#outline level, added by zhaojianwei
     if( aOutlineLvLB.GetSelectEntryPos() != aOutlineLvLB.GetSavedValue())
     {
-        USHORT aOutlineLv = aOutlineLvLB.GetSelectEntryPos();
+        sal_uInt16 aOutlineLv = aOutlineLvLB.GetSelectEntryPos();
         const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( rSet, SID_ATTR_PARA_OUTLINE_LEVEL);
         SfxUInt16Item* pOutlineLv = (SfxUInt16Item*)pOldOutlineLv->Clone();
         pOutlineLv->SetValue( aOutlineLv );
         rSet.Put(*pOutlineLv);
         delete pOutlineLv;
-        bModified = TRUE;
+        bModified = sal_True;
     }
     //<-end
     if( aNumberStyleLB.GetSelectEntryPos() != aNumberStyleLB.GetSavedValue())
@@ -163,18 +163,18 @@ BOOL    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
         pRule->SetValue(aStyle);
         rSet.Put(*pRule);
         delete pRule;
-        bModified = TRUE;
+        bModified = sal_True;
     }
     if(aNewStartCB.GetState() != aNewStartCB.GetSavedValue() ||
         aNewStartNumberCB.GetState() != aNewStartNumberCB.GetSavedValue()||
         aNewStartNF.GetText() != aNewStartNF.GetSavedValue())
     {
-        bModified = TRUE;
-        BOOL bNewStartChecked = STATE_CHECK == aNewStartCB.GetState();
-        BOOL bNumberNewStartChecked = STATE_CHECK == aNewStartNumberCB.GetState();
+        bModified = sal_True;
+        sal_Bool bNewStartChecked = STATE_CHECK == aNewStartCB.GetState();
+        sal_Bool bNumberNewStartChecked = STATE_CHECK == aNewStartNumberCB.GetState();
         rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked));
         rSet.Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT,
-                  bNumberNewStartChecked && bNewStartChecked ? (USHORT)aNewStartNF.GetValue() : USHRT_MAX));
+                  bNumberNewStartChecked && bNewStartChecked ? (sal_uInt16)aNewStartNF.GetValue() : USHRT_MAX));
     }
 
     if(aCountParaCB.GetSavedValue() != aCountParaCB.GetState() ||
@@ -182,11 +182,11 @@ BOOL    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
             aRestartNF.GetSavedValue() != aRestartNF.GetText() )
     {
         SwFmtLineNumber aFmt;
-        aFmt.SetStartValue( static_cast< ULONG >(aRestartParaCountCB.GetState() == STATE_CHECK ?
+        aFmt.SetStartValue( static_cast< sal_uLong >(aRestartParaCountCB.GetState() == STATE_CHECK ?
                                 aRestartNF.GetValue() : 0 ));
         aFmt.SetCountLines( aCountParaCB.IsChecked() );
         rSet.Put(aFmt);
-        bModified = TRUE;
+        bModified = sal_True;
     }
     return bModified;
 }
@@ -196,7 +196,7 @@ BOOL    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
 --------------------------------------------------*/
 void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
 {
-    BOOL bHasNumberStyle = FALSE;
+    sal_Bool bHasNumberStyle = sal_False;
 
     SfxItemState eItemState = rSet.GetItemState( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) );
 
@@ -231,7 +231,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
         else
             aNumberStyleLB.SelectEntry( aStyle );
 
-        bHasNumberStyle = TRUE;
+        bHasNumberStyle = sal_True;
     }
     else
     {
@@ -243,12 +243,12 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
     eItemState = rSet.GetItemState( FN_NUMBER_NEWSTART );
     if(eItemState > SFX_ITEM_AVAILABLE )
     {
-        bCurNumrule = TRUE;
+        bCurNumrule = sal_True;
         const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(FN_NUMBER_NEWSTART);
         aNewStartCB.SetState(
             rStart.GetValue() ?
                         STATE_CHECK : STATE_NOCHECK );
-        aNewStartCB.EnableTriState(FALSE);
+        aNewStartCB.EnableTriState(sal_False);
     }
     else
         aNewStartCB.SetState(bHasNumberStyle ? STATE_NOCHECK : STATE_DONTKNOW);
@@ -257,13 +257,13 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
     eItemState = rSet.GetItemState( FN_NUMBER_NEWSTART_AT);
     if( eItemState > SFX_ITEM_AVAILABLE )
     {
-        USHORT nNewStart = ((const SfxUInt16Item&)rSet.Get(FN_NUMBER_NEWSTART_AT)).GetValue();
+        sal_uInt16 nNewStart = ((const SfxUInt16Item&)rSet.Get(FN_NUMBER_NEWSTART_AT)).GetValue();
         aNewStartNumberCB.Check(USHRT_MAX != nNewStart);
         if(USHRT_MAX == nNewStart)
             nNewStart = 1;
 
         aNewStartNF.SetValue(nNewStart);
-        aNewStartNumberCB.EnableTriState(FALSE);
+        aNewStartNumberCB.EnableTriState(sal_False);
     }
     else
         aNewStartCB.SetState(STATE_DONTKNOW);
@@ -274,14 +274,14 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
     if( SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_LINENUMBER))
     {
         SwFmtLineNumber& rNum = (SwFmtLineNumber&)rSet.Get(RES_LINENUMBER);
-        ULONG nStartValue = rNum.GetStartValue();
-        BOOL bCount = rNum.IsCount();
+        sal_uLong nStartValue = rNum.GetStartValue();
+        sal_Bool bCount = rNum.IsCount();
         aCountParaCB.SetState( bCount ? STATE_CHECK : STATE_NOCHECK );
         aRestartParaCountCB.SetState( 0 != nStartValue ? STATE_CHECK : STATE_NOCHECK );
         aRestartNF.SetValue(nStartValue == 0 ? 1 : nStartValue);
         LineCountHdl_Impl(&aCountParaCB);
-        aCountParaCB.EnableTriState(FALSE);
-        aRestartParaCountCB.EnableTriState(FALSE);
+        aCountParaCB.EnableTriState(sal_False);
+        aRestartParaCountCB.EnableTriState(sal_False);
     }
     else
     {
@@ -292,7 +292,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
     aRestartParaCountCB.SaveValue();
     aRestartNF.SaveValue();
 
-    bModified = FALSE;
+    bModified = sal_False;
 }
 
 /*-----------------31.01.98 08:38-------------------
@@ -324,7 +324,7 @@ void SwParagraphNumTabPage::EnableNewStart()
 --------------------------------------------------*/
 IMPL_LINK( SwParagraphNumTabPage, NewStartHdl_Impl, CheckBox*, EMPTYARG )
 {
-    BOOL bEnable = aNewStartCB.IsChecked();
+    sal_Bool bEnable = aNewStartCB.IsChecked();
     aNewStartNumberCB.Enable(bEnable);
     aNewStartNF.Enable(bEnable && aNewStartNumberCB.IsChecked());
     return 0;
@@ -337,7 +337,7 @@ IMPL_LINK( SwParagraphNumTabPage, LineCountHdl_Impl, CheckBox* , EMPTYARG)
 {
     aRestartParaCountCB.Enable(aCountParaCB.IsChecked());
 
-    BOOL bEnableRestartValue = aRestartParaCountCB.IsEnabled() &&
+    sal_Bool bEnableRestartValue = aRestartParaCountCB.IsEnabled() &&
                                                 aRestartParaCountCB.IsChecked();
     aRestartFT.Enable(bEnableRestartValue);
     aRestartNF.Enable(bEnableRestartValue);
@@ -354,7 +354,7 @@ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox )
 //  if( msOutlineNumbering == dd)
     {
     }
-    BOOL bEnable = bCurNumrule || pBox->GetSelectEntryPos() > 0;
+    sal_Bool bEnable = bCurNumrule || pBox->GetSelectEntryPos() > 0;
     aNewStartCB.Enable(bEnable);
     NewStartHdl_Impl(&aNewStartCB);
 
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 0976c7fbf5aa..e91f2d67d880 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -70,10 +70,10 @@
 SwParaDlg::SwParaDlg(Window *pParent,
                     SwView& rVw,
                     const SfxItemSet& rCoreSet,
-                    BYTE nDialogMode,
+                    sal_uInt8 nDialogMode,
                     const String *pTitle,
-                    BOOL bDraw,
-                    UINT16 nDefPage):
+                    sal_Bool bDraw,
+                    sal_uInt16 nDefPage):
 
     SfxTabDialog(pParent, bDraw ? SW_RES(DLG_DRAWPARA) : SW_RES(DLG_PARA),
                     &rCoreSet,  0 != pTitle),
@@ -86,7 +86,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
     FreeResource();
 
     nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
-    BOOL bHtmlMode = static_cast< BOOL >(nHtmlMode & HTMLMODE_ON);
+    sal_Bool bHtmlMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON);
     if(pTitle)
     {
             // Update des Titels
@@ -127,8 +127,8 @@ SwParaDlg::SwParaDlg(Window *pParent,
     else
         RemoveTabPage(TP_PARA_ASIAN);
 
-    USHORT nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
-    BOOL bLRValid = SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(nWhich);
+    sal_uInt16 nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
+    sal_Bool bLRValid = SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(nWhich);
     if(bHtmlMode || !bLRValid)
         RemoveTabPage(TP_TABULATOR);
     else
@@ -182,7 +182,7 @@ __EXPORT SwParaDlg::~SwParaDlg()
 }
 
 
-void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
+void __EXPORT SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
 {
     SwWrtShell& rSh = rView.GetWrtShell();
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
@@ -196,7 +196,7 @@ void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
     else if( nId == TP_PARA_STD )
     {
         aSet.Put(SfxUInt16Item(SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,
-                            static_cast< UINT16 >(rSh.GetAnyCurRect(RECT_PAGE_PRT).Width()) ));
+                            static_cast< sal_uInt16 >(rSh.GetAnyCurRect(RECT_PAGE_PRT).Width()) ));
 
         if (!bDrawParaDlg)
         {
@@ -210,7 +210,7 @@ void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
     {
         if (!bDrawParaDlg)
         {
-            aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,TRUE));
+            aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_True));
             rPage.PageCreated(aSet);
         }
     }
@@ -218,17 +218,17 @@ void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
     {
         // Seitenumbruch nur, wenn der Cursor im Body-Bereich und nicht in
         // einer Tabelle steht
-        const USHORT eType = rSh.GetFrmType(0,TRUE);
+        const sal_uInt16 eType = rSh.GetFrmType(0,sal_True);
         if( !(FRMTYPE_BODY & eType) ||
             rSh.GetSelectionType() & nsSelectionType::SEL_TBL )
         {
-            aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,TRUE));
+            aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_True));
             rPage.PageCreated(aSet);
         }
     }
     else if( TP_DROPCAPS == nId )
     {
-        ((SwDropCapsPage&)rPage).SetFormat(FALSE);
+        ((SwDropCapsPage&)rPage).SetFormat(sal_False);
     }
     else if( TP_BACKGROUND == nId )
     {
@@ -259,7 +259,7 @@ void __EXPORT SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
             aNames.Insert(new String(pBase->GetName()));
             pBase = pPool->Next();
         }
-        for(USHORT i = 0; i < aNames.Count(); i++)
+        for(sal_uInt16 i = 0; i < aNames.Count(); i++)
             rBox.InsertEntry(*aNames.GetObject(i));
     }
 
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 44006ef5cab4..94a0e7845930 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -59,7 +59,7 @@
 
 #include "swuiccoll.hxx"
 
-static USHORT __FAR_DATA aPageRg[] = {
+static sal_uInt16 __FAR_DATA aPageRg[] = {
     FN_COND_COLL, FN_COND_COLL,
     0
 };
@@ -94,7 +94,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
     pCmds( SwCondCollItem::GetCmds() ),
     pFmt(0),
 
-    bNewTemplate(FALSE)
+    bNewTemplate(sal_False)
 {
     FreeResource();
     SetExchangeSupport();
@@ -118,12 +118,12 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
 
     SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER));
     const SfxStyleFamilyItem* pFamilyItem = 0;
-    USHORT nCount = aFamilies.Count();
-    USHORT i;
+    sal_uInt16 nCount = aFamilies.Count();
+    sal_uInt16 i;
 
     for( i = 0; i < nCount; ++i)
     {
-        if(SFX_STYLE_FAMILY_PARA == (USHORT)(pFamilyItem = aFamilies.GetObject(i))->GetFamily())
+        if(SFX_STYLE_FAMILY_PARA == (sal_uInt16)(pFamilyItem = aFamilies.GetObject(i))->GetFamily())
             break;
     }
 
@@ -131,7 +131,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
     for( i = 0; i < rFilterList.Count(); ++i)
     {
         aFilterLB.InsertEntry(rFilterList.GetObject(i)->aName);
-        USHORT* pFilter = new USHORT(rFilterList.GetObject(i)->nFlags);
+        sal_uInt16* pFilter = new sal_uInt16(rFilterList.GetObject(i)->nFlags);
         aFilterLB.SetEntryData(i, pFilter);
     }
     aFilterLB.SelectEntryPos(1);
@@ -147,8 +147,8 @@ Page: Dtor
 
 __EXPORT SwCondCollPage::~SwCondCollPage()
 {
-    for(USHORT i = 0; i < aFilterLB.GetEntryCount(); ++i)
-        delete (USHORT*)aFilterLB.GetEntryData(i);
+    for(sal_uInt16 i = 0; i < aFilterLB.GetEntryCount(); ++i)
+        delete (sal_uInt16*)aFilterLB.GetEntryData(i);
 
 }
 
@@ -176,11 +176,11 @@ Page: FillItemSet-Overload
 ****************************************************************************/
 
 
-BOOL __EXPORT SwCondCollPage::FillItemSet(SfxItemSet &rSet)
+sal_Bool __EXPORT SwCondCollPage::FillItemSet(SfxItemSet &rSet)
 {
-    BOOL bModified = TRUE;
+    sal_Bool bModified = sal_True;
     SwCondCollItem aCondItem;
-    for(USHORT i = 0; i < aStrArr.Count(); i++)
+    for(sal_uInt16 i = 0; i < aStrArr.Count(); i++)
     {
         String sEntry = aTbLinks.GetEntryText(i, 1);
         aCondItem.SetStyle( &sEntry, i);
@@ -216,7 +216,7 @@ void __EXPORT SwCondCollPage::Reset(const SfxItemSet &/*rSet*/)
     }
     aStyleLB.SelectEntryPos(0);
 
-    for( USHORT n = 0; n < aStrArr.Count(); n++)
+    for( sal_uInt16 n = 0; n < aStrArr.Count(); n++)
     {
         String aEntry( aStrArr.GetString(n) );
         aEntry += '\t';
@@ -242,7 +242,7 @@ void __EXPORT SwCondCollPage::Reset(const SfxItemSet &/*rSet*/)
 ****************************************************************************/
 
 
-USHORT* __EXPORT SwCondCollPage::GetRanges()
+sal_uInt16* __EXPORT SwCondCollPage::GetRanges()
 {
     return aPageRg;
 }
@@ -255,10 +255,10 @@ USHORT* __EXPORT SwCondCollPage::GetRanges()
 
 IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox )
 {
-    const BOOL bEnable = pBox->IsChecked();
+    const sal_Bool bEnable = pBox->IsChecked();
     aContextFT.Enable( bEnable );
     aUsedFT   .Enable( bEnable );
-    aTbLinks  .EnableList( bEnable != FALSE );
+    aTbLinks  .EnableList( bEnable != sal_False );
     aStyleFT  .Enable( bEnable );
     aStyleLB  .Enable( bEnable );
     aFilterLB .Enable( bEnable );
@@ -277,7 +277,7 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox )
 IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn)
 {
     SvLBoxEntry* pE = aTbLinks.FirstSelected();
-    ULONG nPos;
+    sal_uLong nPos;
     if( !pE || LISTBOX_ENTRY_NOTFOUND ==
         ( nPos = aTbLinks.GetModel()->GetAbsPos( pE ) ) )
     {
@@ -285,21 +285,21 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn)
         return 0;
     }
 
-    String sSel = aStrArr.GetString( USHORT(nPos) );
+    String sSel = aStrArr.GetString( sal_uInt16(nPos) );
     sSel += '\t';
 
-    const BOOL bAssEnabled = pBtn != &aRemovePB && aAssignPB.IsEnabled();
+    const sal_Bool bAssEnabled = pBtn != &aRemovePB && aAssignPB.IsEnabled();
     aAssignPB.Enable( !bAssEnabled );
     aRemovePB.Enable(  bAssEnabled );
     if ( bAssEnabled )
         sSel += aStyleLB.GetSelectEntry();
 
-    aTbLinks.SetUpdateMode(FALSE);
+    aTbLinks.SetUpdateMode(sal_False);
     aTbLinks.GetModel()->Remove(pE);
     pE = aTbLinks.InsertEntryToColumn(sSel, nPos);
     aTbLinks.Select(pE);
     aTbLinks.MakeVisible(pE);
-    aTbLinks.SetUpdateMode(TRUE);
+    aTbLinks.SetUpdateMode(sal_True);
     return 0;
 }
 
@@ -313,8 +313,8 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
     if(pBox == &aFilterLB)
     {
         aStyleLB.Clear();
-        USHORT nSearchFlags = pBox->GetSelectEntryPos();
-        nSearchFlags = *(USHORT*)aFilterLB.GetEntryData(nSearchFlags);
+        sal_uInt16 nSearchFlags = pBox->GetSelectEntryPos();
+        nSearchFlags = *(sal_uInt16*)aFilterLB.GetEntryData(nSearchFlags);
         SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags);
         const SfxStyleSheetBase* pBase = pPool->First();
@@ -350,7 +350,7 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
 ****************************************************************************/
 
 
-void SwCondCollPage::SetCollection( SwFmt* pFormat, BOOL bNew )
+void SwCondCollPage::SetCollection( SwFmt* pFormat, sal_Bool bNew )
 {
     pFmt = pFormat;
     bNewTemplate = bNew;