accfixes: merged to m100

16 files changed, 148 insertions, 151 deletions

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index cfb5ad8f4afd..328b7391ef46 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -131,7 +131,7 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
     SetExchangeSupport();
 
     // Metriken
-    FieldUnit aMetric = ::GetDfltMetric(FALSE);
+    FieldUnit aMetric = ::GetDfltMetric(sal_False);
     SetMetric(aAddrLeftField,   aMetric);
     SetMetric(aAddrTopField,    aMetric);
     SetMetric(aSendLeftField,   aMetric);
@@ -176,29 +176,29 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
     aSizeFormatBox     .SetSelectHdl(LINK(this, SwEnvFmtPage, FormatHdl));
 
     // aSizeFormatBox
-    for (USHORT i = PAPER_A3; i <= PAPER_KAI32BIG; i++)
+    for (sal_uInt16 i = PAPER_A3; i <= PAPER_KAI32BIG; i++)
     {
         if (i != PAPER_USER)
         {
             String aPaperName = SvxPaperInfo::GetName((Paper) i),
                    aEntryName;
 
-            USHORT nPos   = 0;
-            BOOL   bFound = FALSE;
+            sal_uInt16 nPos   = 0;
+            sal_Bool   bFound = sal_False;
             while (nPos < aSizeFormatBox.GetEntryCount() && !bFound)
             {
                 aEntryName = aSizeFormatBox.GetEntry(i);
                 if (aEntryName < aPaperName)
                     nPos++;
                 else
-                    bFound = TRUE;
+                    bFound = sal_True;
             }
             aSizeFormatBox.InsertEntry(aPaperName, nPos);
-            aIDs.Insert((USHORT) i, nPos);
+            aIDs.Insert((sal_uInt16) i, nPos);
         }
     }
     aSizeFormatBox.InsertEntry(SvxPaperInfo::GetName(PAPER_USER));
-    aIDs.Insert((USHORT) PAPER_USER, aIDs.Count());
+    aIDs.Insert((sal_uInt16) PAPER_USER, aIDs.Count());
 
 }
 
@@ -226,13 +226,13 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
     if (pEdit == &aSizeWidthField || pEdit == &aSizeHeightField)
     {
         Paper ePaper = SvxPaperInfo::GetSvxPaper(
-            Size(lHeight, lWidth), MAP_TWIP, TRUE);
-        for (USHORT i = 0; i < aIDs.Count(); i++)
-            if (aIDs[i] == (USHORT)ePaper)
+            Size(lHeight, lWidth), MAP_TWIP, sal_True);
+        for (sal_uInt16 i = 0; i < aIDs.Count(); i++)
+            if (aIDs[i] == (sal_uInt16)ePaper)
                 aSizeFormatBox.SelectEntryPos(i);
 
         // Benutzergroesse merken
-        if (aIDs[aSizeFormatBox.GetSelectEntryPos()] == (USHORT)PAPER_USER)
+        if (aIDs[aSizeFormatBox.GetSelectEntryPos()] == (sal_uInt16)PAPER_USER)
         {
             lUserW = lWidth ;
             lUserH = lHeight;
@@ -259,9 +259,9 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
     ASSERT(pSh, "Shell fehlt");
 
     // Collection-Ptr ermitteln
-    BOOL bSender = pButton != &aAddrEditButton;
+    sal_Bool bSender = pButton != &aAddrEditButton;
 
-    SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool( static_cast< USHORT >(
+    SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool( static_cast< sal_uInt16 >(
         bSender ? RES_POOLCOLL_SENDADRESS : RES_POOLCOLL_JAKETADRESS));
     ASSERT(pColl, "Text-Collection fehlt");
 
@@ -279,7 +279,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
             const SfxPoolItem *pTmpBrush;
 
             if( SFX_ITEM_SET == aTmpSet.GetItemState( RES_CHRATR_BACKGROUND,
-                TRUE, &pTmpBrush ) )
+                sal_True, &pTmpBrush ) )
             {
                 SvxBrushItem aTmpBrush( *((SvxBrushItem*)pTmpBrush) );
                 aTmpBrush.SetWhich( RES_BACKGROUND );
@@ -297,7 +297,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
             {
                 SfxItemSet aOutputSet( *pDlg->GetOutputItemSet() );
                 if( SFX_ITEM_SET == aOutputSet.GetItemState( RES_BACKGROUND,
-                    FALSE, &pTmpBrush ) )
+                    sal_False, &pTmpBrush ) )
                 {
                     SvxBrushItem aTmpBrush( *((SvxBrushItem*)pTmpBrush) );
                     aTmpBrush.SetWhich( RES_CHRATR_BACKGROUND );
@@ -322,7 +322,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
             const SvxTabStopItem& rDefTabs = (const SvxTabStopItem&)
                 pSh->GetView().GetCurShell()->GetPool().GetDefaultItem(RES_PARATR_TABSTOP);
 
-            USHORT nDefDist = ::GetTabDist( rDefTabs );
+            sal_uInt16 nDefDist = ::GetTabDist( rDefTabs );
             SfxUInt16Item aDefDistItem( SID_ATTR_TABSTOP_DEFAULTS, nDefDist );
             aTmpSet.Put( aDefDistItem );
 
@@ -346,9 +346,9 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
                 // Defaults evtl umsetzen
                 const SfxPoolItem* pItem = 0;
                 SfxItemSet* pOutputSet = (SfxItemSet*)pDlg->GetOutputItemSet();
-                USHORT nNewDist;
+                sal_uInt16 nNewDist;
                 if( SFX_ITEM_SET == pOutputSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS,
-                    FALSE, &pItem ) &&
+                    sal_False, &pItem ) &&
                     nDefDist != (nNewDist = ((SfxUInt16Item*)pItem)->GetValue()) )
                 {
                     SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
@@ -373,16 +373,16 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
   Beschreibung: Ein temporaeres Itemset, das bei Abbruch verworfen wird
 ------------------------------------------------------------------------*/
 
-SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
+SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender)
 {
     SfxItemSet *&pAddrSet = bSender ? GetParent()->pSenderSet : GetParent()->pAddresseeSet;
 
     if (!pAddrSet)
     {
         // Range ermitteln (Ranges beider Itemsets mergen)
-        const USHORT *pRanges = pColl->GetAttrSet().GetRanges();
+        const sal_uInt16 *pRanges = pColl->GetAttrSet().GetRanges();
 
-        static USHORT __READONLY_DATA aRanges[] =
+        static sal_uInt16 __READONLY_DATA aRanges[] =
         {
             RES_PARATR_BEGIN, RES_PARATR_ADJUST,
             RES_PARATR_TABSTOP, RES_PARATR_END-1,
@@ -396,12 +396,12 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
         };
 
         // BruteForce-Merge, weil MergeRange in SvTools buggy ist:
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         SvLongsSort aMergedRanges( 0, 10 );
 
         while (pRanges[i])
         {
-            for (USHORT nPos = pRanges[i]; nPos <= pRanges[i+1]; nPos++)
+            for (sal_uInt16 nPos = pRanges[i]; nPos <= pRanges[i+1]; nPos++)
                 aMergedRanges.Insert(nPos);
             i += 2;
         }
@@ -410,7 +410,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
 
         while (aRanges[i])
         {
-            for (USHORT nPos = aRanges[i]; nPos <= aRanges[i+1]; nPos++)
+            for (sal_uInt16 nPos = aRanges[i]; nPos <= aRanges[i+1]; nPos++)
                 aMergedRanges.Insert(nPos);
             i += 2;
         }
@@ -438,9 +438,9 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
         }
 
         // Neue Ranges erzeugen
-        USHORT *pNewRanges = new USHORT[aCompactedRanges.Count() + 1];
+        sal_uInt16 *pNewRanges = new sal_uInt16[aCompactedRanges.Count() + 1];
         for (i = 0; i < aCompactedRanges.Count(); i++)
-            pNewRanges[i] = (USHORT)aCompactedRanges[i];
+            pNewRanges[i] = (sal_uInt16)aCompactedRanges[i];
 
         pNewRanges[i] = 0;
 
@@ -466,8 +466,8 @@ IMPL_LINK( SwEnvFmtPage, FormatHdl, ListBox *, EMPTYARG )
     long lAddrFromLeft;
     long lAddrFromTop;
 
-    USHORT nPaper = aIDs[aSizeFormatBox.GetSelectEntryPos()];
-    if (nPaper != (USHORT)PAPER_USER)
+    sal_uInt16 nPaper = aIDs[aSizeFormatBox.GetSelectEntryPos()];
+    if (nPaper != (sal_uInt16)PAPER_USER)
     {
         Size aSz = SvxPaperInfo::GetPaperSize((Paper)nPaper);
         lWidth  = Max(aSz.Width(), aSz.Height());
@@ -577,8 +577,8 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
     rItem.lSendFromLeft = static_cast< sal_Int32 >(GetFldVal(aSendLeftField));
     rItem.lSendFromTop  = static_cast< sal_Int32 >(GetFldVal(aSendTopField ));
 
-    USHORT nPaper = aIDs[aSizeFormatBox.GetSelectEntryPos()];
-    if (nPaper == (USHORT)PAPER_USER)
+    sal_uInt16 nPaper = aIDs[aSizeFormatBox.GetSelectEntryPos()];
+    if (nPaper == (sal_uInt16)PAPER_USER)
     {
         long lWVal = static_cast< long >(GetFldVal(aSizeWidthField ));
         long lHVal = static_cast< long >(GetFldVal(aSizeHeightField));
@@ -597,11 +597,11 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem)
 // --------------------------------------------------------------------------
 
 
-BOOL __EXPORT SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool __EXPORT SwEnvFmtPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(GetParent()->aEnvItem);
     rSet.Put(GetParent()->aEnvItem);
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------------
@@ -613,9 +613,9 @@ void __EXPORT SwEnvFmtPage::Reset(const SfxItemSet& rSet)
 
     Paper ePaper = SvxPaperInfo::GetSvxPaper(
         Size( Min(rItem.lWidth, rItem.lHeight),
-        Max(rItem.lWidth, rItem.lHeight)), MAP_TWIP, TRUE);
-    for (USHORT i = 0; i < (USHORT) aIDs.Count(); i++)
-        if (aIDs[i] == (USHORT)ePaper)
+        Max(rItem.lWidth, rItem.lHeight)), MAP_TWIP, sal_True);
+    for (sal_uInt16 i = 0; i < (sal_uInt16) aIDs.Count(); i++)
+        if (aIDs[i] == (sal_uInt16)ePaper)
             aSizeFormatBox.SelectEntryPos(i);
 
     // Die MetricFields
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index f8508bb7e69a..90c35adc50ff 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -88,7 +88,7 @@ class SwEnvFmtPage : public SfxTabPage
 
     void SetMinMax();
 
-    SfxItemSet  *GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender);
+    SfxItemSet  *GetCollItemSet(SwTxtFmtColl* pColl, sal_Bool bSender);
 
     using Window::GetParent;
     SwEnvDlg    *GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
@@ -103,7 +103,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwEnvItem& rItem);
-    virtual BOOL FillItemSet(SfxItemSet& rSet);
+    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
 
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 436f4bd27df6..1a2ee6c27f22 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -72,7 +72,7 @@ SW_DLLPUBLIC String MakeSender()
     String sRet;
     String sSenderToken(SW_RES(STR_SENDER_TOKENS));
     xub_StrLen nSttPos = 0, nTokenCount = sSenderToken.GetTokenCount(';');
-    BOOL bLastLength = TRUE;
+    sal_Bool bLastLength = sal_True;
     for( xub_StrLen i = 0; i < nTokenCount; i++ )
     {
         String sToken = sSenderToken.GetToken( 0, ';', nSttPos );
@@ -86,7 +86,7 @@ SW_DLLPUBLIC String MakeSender()
         {
             if(bLastLength)
                 sRet +=NEXTLINE;
-            bLastLength = TRUE;
+            bLastLength = sal_True;
         }
         else if(sToken.EqualsAscii("FIRSTNAME"))
             sRet += (String)rUserOpt.GetFirstName();
@@ -112,7 +112,7 @@ SwEnvItem::SwEnvItem() :
     SfxPoolItem(FN_ENVELOP)
 {
     aAddrText       = aEmptyStr;
-    bSend           = TRUE;
+    bSend           = sal_True;
     aSendText       = MakeSender();
     lSendFromLeft   = 566; // 1 cm
     lSendFromTop    = 566; // 1 cm
@@ -120,7 +120,7 @@ SwEnvItem::SwEnvItem() :
     lWidth          = aEnvSz.Width();
     lHeight         = aEnvSz.Height();
     eAlign          = ENV_HOR_LEFT;
-    bPrintFromAbove = TRUE;
+    bPrintFromAbove = sal_True;
     lShiftRight     = 0;
     lShiftDown      = 0;
 
@@ -322,7 +322,7 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
     return aNames;
 }
 
-BOOL SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const
+sal_Bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bRet = sal_True;
     switch(nMemberId & ~CONVERT_TWIPS)
@@ -349,9 +349,9 @@ BOOL SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const
 /* -----------------------------26.04.01 12:26--------------------------------
 
  ---------------------------------------------------------------------------*/
-BOOL SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId)
+sal_Bool SwEnvItem::PutValue(const Any& rVal, sal_uInt8 nMemberId)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     switch(nMemberId  & ~CONVERT_TWIPS)
     {
         case MID_ENV_ADDR_TEXT : bRet = (rVal >>= aAddrText); break;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index d10a938c3046..baa0013392ab 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -100,8 +100,8 @@ void SwEnvPreview::Paint(const Rectangle &)
     const SwEnvItem& rItem =
         ((SwEnvDlg*) GetParent()->GetParent()->GetParent())->aEnvItem;
 
-    USHORT nPageW = (USHORT) Max(rItem.lWidth, rItem.lHeight),
-           nPageH = (USHORT) Min(rItem.lWidth, rItem.lHeight);
+    sal_uInt16 nPageW = (sal_uInt16) Max(rItem.lWidth, rItem.lHeight),
+           nPageH = (sal_uInt16) Min(rItem.lWidth, rItem.lHeight);
 
     float fx = (float)GetOutputSizePixel().Width () / (float)nPageW,
           fy = (float)GetOutputSizePixel().Height() / (float)nPageH,
@@ -117,8 +117,8 @@ void SwEnvPreview::Paint(const Rectangle &)
     SetLineColor( aFront );
 
     // Umschlag
-    long   nW = (USHORT) (f * nPageW),
-           nH = (USHORT) (f * nPageH),
+    long   nW = (sal_uInt16) (f * nPageW),
+           nH = (sal_uInt16) (f * nPageH),
            nX = (GetOutputSizePixel().Width () - nW) / 2,
            nY = (GetOutputSizePixel().Height() - nH) / 2;
     SetFillColor( aBack );
@@ -127,28 +127,28 @@ void SwEnvPreview::Paint(const Rectangle &)
     // Absender
     if (rItem.bSend)
     {
-        long   nSendX = nX + (USHORT) (f * rItem.lSendFromLeft),
-               nSendY = nY + (USHORT) (f * rItem.lSendFromTop ),
-               nSendW = (USHORT) (f * (rItem.lAddrFromLeft - rItem.lSendFromLeft)),
-               nSendH = (USHORT) (f * (rItem.lAddrFromTop  - rItem.lSendFromTop  - 566));
+        long   nSendX = nX + (sal_uInt16) (f * rItem.lSendFromLeft),
+               nSendY = nY + (sal_uInt16) (f * rItem.lSendFromTop ),
+               nSendW = (sal_uInt16) (f * (rItem.lAddrFromLeft - rItem.lSendFromLeft)),
+               nSendH = (sal_uInt16) (f * (rItem.lAddrFromTop  - rItem.lSendFromTop  - 566));
         SetFillColor( aMedium );
 
         DrawRect(Rectangle(Point(nSendX, nSendY), Size(nSendW, nSendH)));
     }
 
     // Empfaenger
-    long   nAddrX = nX + (USHORT) (f * rItem.lAddrFromLeft),
-           nAddrY = nY + (USHORT) (f * rItem.lAddrFromTop ),
-           nAddrW = (USHORT) (f * (nPageW - rItem.lAddrFromLeft - 566)),
-           nAddrH = (USHORT) (f * (nPageH - rItem.lAddrFromTop  - 566));
+    long   nAddrX = nX + (sal_uInt16) (f * rItem.lAddrFromLeft),
+           nAddrY = nY + (sal_uInt16) (f * rItem.lAddrFromTop ),
+           nAddrW = (sal_uInt16) (f * (nPageW - rItem.lAddrFromLeft - 566)),
+           nAddrH = (sal_uInt16) (f * (nPageH - rItem.lAddrFromTop  - 566));
     SetFillColor( aMedium );
     DrawRect(Rectangle(Point(nAddrX, nAddrY), Size(nAddrW, nAddrH)));
 
     // Briefmarke
-    long   nStmpW = (USHORT) (f * 1417 /* 2,5 cm */),
-           nStmpH = (USHORT) (f * 1701 /* 3,0 cm */),
-           nStmpX = nX + nW - (USHORT) (f * 566) - nStmpW,
-           nStmpY = nY + (USHORT) (f * 566);
+    long   nStmpW = (sal_uInt16) (f * 1417 /* 2,5 cm */),
+           nStmpH = (sal_uInt16) (f * 1701 /* 3,0 cm */),
+           nStmpX = nX + nW - (sal_uInt16) (f * 566) - nStmpW,
+           nStmpY = nY + (sal_uInt16) (f * 566);
 
     SetFillColor( aBack );
     DrawRect(Rectangle(Point(nStmpX, nStmpY), Size(nStmpW, nStmpH)));
@@ -159,9 +159,9 @@ void SwEnvPreview::Paint(const Rectangle &)
 
 
 SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
-                    SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert) :
+                    SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert) :
 
-    SfxTabDialog(pParent, SW_RES(DLG_ENV), &rSet, FALSE, &aEmptyStr),
+    SfxTabDialog(pParent, SW_RES(DLG_ENV), &rSet, sal_False, &aEmptyStr),
     sInsert(SW_RES(ST_INSERT)),
     sChange(SW_RES(ST_CHANGE)),
     aEnvItem((const SwEnvItem&) rSet.Get(FN_ENVELOP)),
@@ -200,7 +200,7 @@ SwEnvDlg::~SwEnvDlg()
 
 
 
-void SwEnvDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
+void SwEnvDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 {
     if (nId == TP_ENV_PRT)
     {
@@ -285,7 +285,7 @@ SwEnvPage::~SwEnvPage()
 
 IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox )
 {
-    SwWait aWait( *pSh->GetView().GetDocShell(), TRUE );
+    SwWait aWait( *pSh->GetView().GetDocShell(), sal_True );
 
     if (pListBox == &aDatabaseLB)
     {
@@ -330,7 +330,7 @@ IMPL_LINK( SwEnvPage, FieldHdl, Button *, EMPTYARG )
 
 IMPL_LINK( SwEnvPage, SenderHdl, Button *, EMPTYARG )
 {
-    const BOOL bEnable = aSenderBox.IsChecked();
+    const sal_Bool bEnable = aSenderBox.IsChecked();
     GetParent()->aEnvItem.bSend = bEnable;
     aSenderEdit.Enable(bEnable);
     if ( bEnable )
@@ -418,11 +418,11 @@ void SwEnvPage::FillItem(SwEnvItem& rItem)
 
 
 
-BOOL SwEnvPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool SwEnvPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(GetParent()->aEnvItem);
     rSet.Put(GetParent()->aEnvItem);
-    return TRUE;
+    return sal_True;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 22690e95abff..f12eaa95240d 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -69,7 +69,7 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
     SetExchangeSupport();
 
     // Metriken
-    FieldUnit eUnit = ::GetDfltMetric(FALSE);
+    FieldUnit eUnit = ::GetDfltMetric(sal_False);
     SetMetric(aRightField, eUnit);
     SetMetric(aDownField , eUnit);
 
@@ -158,15 +158,15 @@ IMPL_LINK( SwEnvPrtPage, AlignHdl, ToolBox *, EMPTYARG )
 {
     if (aAlignBox.GetCurItemId())
     {
-        for (USHORT i = ITM_HOR_LEFT; i <= ITM_VER_RGHT; i++)
-            aAlignBox.CheckItem(i, FALSE);
-        aAlignBox.CheckItem(aAlignBox.GetCurItemId(), TRUE);
+        for (sal_uInt16 i = ITM_HOR_LEFT; i <= ITM_VER_RGHT; i++)
+            aAlignBox.CheckItem(i, sal_False);
+        aAlignBox.CheckItem(aAlignBox.GetCurItemId(), sal_True);
     }
     else
     {
         // GetCurItemId() == 0 ist moeglich!
         const SwEnvItem& rItem = (const SwEnvItem&) GetItemSet().Get(FN_ENVELOP);
-        aAlignBox.CheckItem((USHORT) rItem.eAlign + ITM_HOR_LEFT, TRUE);
+        aAlignBox.CheckItem((sal_uInt16) rItem.eAlign + ITM_HOR_LEFT, sal_True);
     }
     return 0;
 }
@@ -207,8 +207,8 @@ int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet)
 
 void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
 {
-    USHORT nID = 0;
-    for (USHORT i = ITM_HOR_LEFT; i <= ITM_VER_RGHT && !nID; i++)
+    sal_uInt16 nID = 0;
+    for (sal_uInt16 i = ITM_HOR_LEFT; i <= ITM_VER_RGHT && !nID; i++)
         if (aAlignBox.IsItemChecked(i))
             nID = i;
 
@@ -222,11 +222,11 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
 
 
 
-BOOL SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(GetParent()->aEnvItem);
     rSet.Put(GetParent()->aEnvItem);
-    return TRUE;
+    return sal_True;
 }
 
 // ----------------------------------------------------------------------------
@@ -240,7 +240,7 @@ void SwEnvPrtPage::Reset(const SfxItemSet& rSet)
 
     // Item auslesen
     const SwEnvItem& rItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP);
-    aAlignBox.CheckItem((USHORT) rItem.eAlign + ITM_HOR_LEFT);
+    aAlignBox.CheckItem((sal_uInt16) rItem.eAlign + ITM_HOR_LEFT);
 
     if (rItem.bPrintFromAbove)
         aTopButton   .Check();
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 4c2c14fb5cd6..afc7127c2702 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -83,7 +83,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwEnvItem& rItem);
-    virtual BOOL FillItemSet(SfxItemSet& rSet);
+    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 
     inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; }
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index c18e5587445f..cacd61a83434 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -472,17 +472,17 @@ IMPL_LINK( SwLabPage, MakeHdl, ListBox *, EMPTYARG )
     for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         const String aType ( GetParent()->Recs()[i]->aType );
-        BOOL bInsert = FALSE;
+        sal_Bool bInsert = sal_False;
         if ( GetParent()->Recs()[i]->aType == sCustom )
         {
-            bInsert = TRUE;
+            bInsert = sal_True;
             aTypeBox.InsertEntry(aType );
         }
         else if ( GetParent()->Recs()[i]->bCont == bCont )
         {
             if ( aHiddenSortTypeBox.GetEntryPos(aType) == LISTBOX_ENTRY_NOTFOUND )
             {
-                bInsert = TRUE;
+                bInsert = sal_True;
                 aHiddenSortTypeBox.InsertEntry( aType );
             }
         }
@@ -524,7 +524,7 @@ IMPL_LINK_INLINE_END( SwLabPage, TypeHdl, ListBox *, EMPTYARG )
 void SwLabPage::DisplayFormat()
 {
     MetricField aField(this, WinBits(0));
-    FieldUnit aMetric = ::GetDfltMetric(FALSE);
+    FieldUnit aMetric = ::GetDfltMetric(sal_False);
     SetMetric(aField, aMetric);
     aField.SetDecimalDigits(2);
     aField.SetMin         (0);
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 7b906c0ae6bf..d9981dced2e9 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -99,8 +99,8 @@ SwLabRec* lcl_CreateSwLabRec(Sequence<Any>& rValues, const OUString& rManufactur
 //continuous flag ('C'/'S')
                     pValues[nProp] >>= sTmp;
                     String sMeasure(sTmp);
-                    USHORT nTokenCount = sMeasure.GetTokenCount(';');
-                    for(USHORT i = 0; i < nTokenCount; i++)
+                    sal_uInt16 nTokenCount = sMeasure.GetTokenCount(';');
+                    for(sal_uInt16 i = 0; i < nTokenCount; i++)
                     {
                         String sToken(sMeasure.GetToken(i, ';' ));
                         int nVal = sToken.ToInt32();
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 22e281cfcef7..7af41110fff8 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -185,7 +185,7 @@ IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox )
                         aBlockNames.getConstArray() );
         }
         if(pExampleFrame->IsInitialized())
-            pExampleFrame->ClearDocument( TRUE );
+            pExampleFrame->ClearDocument( sal_True );
     }
     return 0;
 }
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index c39daed1729e..a4ed05353058 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::beans;
 
 // #define ------------------------------------------------------------------
 
-#define ROUND(x) ((USHORT) ((x) + .5))
+#define ROUND(x) ((sal_uInt16) ((x) + .5))
 
 // --------------------------------------------------------------------------
 SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
@@ -79,7 +79,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
     SetBackground(Wallpaper(rWinColor));
 
     Font aFont = GetFont();
-    aFont.SetTransparent(TRUE);
+    aFont.SetTransparent(sal_True);
     aFont.SetWeight  (WEIGHT_NORMAL);
     SetFont(aFont);
 
@@ -127,7 +127,7 @@ void SwLabPreview::Paint(const Rectangle &)
     SetLineColor(rWinColor);
     SetFillColor(aGrayColor);
     Font aPaintFont(GetFont());
-    aPaintFont.SetTransparent(FALSE);
+    aPaintFont.SetTransparent(sal_False);
     SetFont(aPaintFont);
 
     // Groesse des darzustellenden Bereichs
@@ -175,8 +175,8 @@ void SwLabPreview::Paint(const Rectangle &)
     // Etiketten
     SetClipRegion (Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)));
     SetFillColor(rWinColor);
-    for (USHORT nRow = 0; nRow < Min((USHORT) 2, (USHORT) aItem.nRows); nRow++)
-        for (USHORT nCol = 0; nCol < Min((USHORT) 2, (USHORT) aItem.nCols); nCol++)
+    for (sal_uInt16 nRow = 0; nRow < Min((sal_uInt16) 2, (sal_uInt16) aItem.nRows); nRow++)
+        for (sal_uInt16 nCol = 0; nCol < Min((sal_uInt16) 2, (sal_uInt16) aItem.nCols); nCol++)
             DrawRect(Rectangle(
               Point(ROUND(lX0 + f * (aItem.lLeft  + nCol * aItem.lHDist)),
                     ROUND(lY0 + f * (aItem.lUpper + nRow * aItem.lVDist))),
@@ -188,15 +188,15 @@ void SwLabPreview::Paint(const Rectangle &)
     if (aItem.lLeft)
     {
         long lX = (lX0 + lX1) / 2;
-        DrawArrow(Point(lX0, lY0 - 5), Point(lX1, lY0 - 5), FALSE);
-        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), TRUE);
+        DrawArrow(Point(lX0, lY0 - 5), Point(lX1, lY0 - 5), sal_False);
+        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), sal_True);
         DrawText(Point(lX1 - lLeftWidth, lY0 - 10 - lXHeight), aLeftStr);
     }
 
     // Beschriftung: Rand oben
     if (aItem.lUpper)
     {
-        DrawArrow(Point(lX0 - 5, lY0), Point(lX0 - 5, lY1), FALSE);
+        DrawArrow(Point(lX0 - 5, lY0), Point(lX0 - 5, lY1), sal_False);
         DrawText(Point(lX0 - 10 - lUpperWidth, ROUND(lY0 + f * aItem.lUpper / 2 - lXHeight / 2)), aUpperStr);
     }
 
@@ -216,29 +216,29 @@ void SwLabPreview::Paint(const Rectangle &)
     if (aItem.nCols > 1)
     {
         long lX = (lX1 + lX3) / 2;
-        DrawArrow(Point(lX1, lY0 - 5), Point(lX3, lY0 - 5), FALSE);
-        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), TRUE);
+        DrawArrow(Point(lX1, lY0 - 5), Point(lX3, lY0 - 5), sal_False);
+        DrawArrow(Point(lX, lY0 - 10), Point(lX, lY0 - 5), sal_True);
         DrawText(Point(lX - lHDistWidth / 2, lY0 - 10 - lXHeight), aHDistStr);
     }
 
     // Beschriftung: Vertikaler Abstand
     if (aItem.nRows > 1)
     {
-        DrawArrow(Point(lX0 - 5, lY1), Point(lX0 - 5, lY3), FALSE);
+        DrawArrow(Point(lX0 - 5, lY1), Point(lX0 - 5, lY3), sal_False);
         DrawText(Point(lX0 - 10 - lVDistWidth, ROUND(lY1 + f * aItem.lVDist / 2 - lXHeight / 2)), aVDistStr);
     }
 
     // Beschriftung: Spalten
     {
         long lY = lY0 + lOutlineH + 4;
-        DrawArrow(Point(lX0, lY), Point(lX0 + lOutlineW - 1, lY), TRUE);
+        DrawArrow(Point(lX0, lY), Point(lX0 + lOutlineW - 1, lY), sal_True);
         DrawText(Point((lX0 + lX0 + lOutlineW - 1) / 2 - lColsWidth / 2, lY + 5), aColsStr);
     }
 
     // Beschriftung: Zeilen
     {
         long lX = lX0 + lOutlineW + 4;
-        DrawArrow(Point(lX, lY0), Point(lX, lY0 + lOutlineH - 1), TRUE);
+        DrawArrow(Point(lX, lY0), Point(lX, lY0 + lOutlineH - 1), sal_True);
         DrawText(Point(lX + 5, (lY0 + lY0 + lOutlineH - 1 - lXHeight / 2) / 2), aRowsStr);
     }
 }
@@ -247,7 +247,7 @@ void SwLabPreview::Paint(const Rectangle &)
 
 
 
-void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, BOOL bArrow)
+void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, sal_Bool bArrow)
 {
     DrawLine(rP1, rP2);
 
@@ -334,14 +334,14 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) :
     aRowsText    (this, SW_RES(TXT_ROWS  )),
     aRowsField   (this, SW_RES(FLD_ROWS  )),
     aSavePB      (this, SW_RES(PB_SAVE  )),
-    bModified(FALSE),
+    bModified(sal_False),
     aItem        ((const SwLabItem&) rSet.Get(FN_LABEL))
 {
     FreeResource();
     SetExchangeSupport();
 
     // Metriken
-    FieldUnit aMetric = ::GetDfltMetric(FALSE);
+    FieldUnit aMetric = ::GetDfltMetric(sal_False);
     SetMetric(aHDistField , aMetric);
     SetMetric(aVDistField , aMetric);
     SetMetric(aWidthField , aMetric);
@@ -390,7 +390,7 @@ SwLabFmtPage::~SwLabFmtPage()
 
 IMPL_LINK_INLINE_START( SwLabFmtPage, ModifyHdl, Edit *, EMPTYARG )
 {
-    bModified = TRUE;
+    bModified = sal_True;
     aPreviewTimer.Start();
     return 0;
 }
@@ -515,7 +515,7 @@ int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet)
     if (_pSet)
         FillItemSet(*_pSet);
 
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------------
@@ -535,8 +535,8 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
         rItem.lHeight = rRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField));
         rItem.lLeft   = rRec.lLeft   = static_cast< long >(GETFLDVAL(aLeftField  ));
         rItem.lUpper  = rRec.lUpper  = static_cast< long >(GETFLDVAL(aUpperField ));
-        rItem.nCols   = rRec.nCols   = (USHORT) aColsField.GetValue();
-        rItem.nRows   = rRec.nRows   = (USHORT) aRowsField.GetValue();
+        rItem.nCols   = rRec.nCols   = (sal_uInt16) aColsField.GetValue();
+        rItem.nRows   = rRec.nRows   = (sal_uInt16) aRowsField.GetValue();
     }
 }
 
@@ -544,12 +544,12 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
 
 
 
-BOOL SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet)
 {
     FillItem(aItem);
     rSet.Put(aItem);
 
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------------
@@ -594,18 +594,18 @@ IMPL_LINK( SwLabFmtPage, SaveHdl, PushButton *, EMPTYARG )
     aRec.lHeight = static_cast< long >(GETFLDVAL(aHeightField));
     aRec.lLeft   = static_cast< long >(GETFLDVAL(aLeftField  ));
     aRec.lUpper  = static_cast< long >(GETFLDVAL(aUpperField ));
-    aRec.nCols   = (USHORT) aColsField.GetValue();
-    aRec.nRows   = (USHORT) aRowsField.GetValue();
+    aRec.nCols   = (sal_uInt16) aColsField.GetValue();
+    aRec.nRows   = (sal_uInt16) aRowsField.GetValue();
     aRec.bCont = aItem.bCont;
     SwSaveLabelDlg* pSaveDlg = new SwSaveLabelDlg(this, aRec);
     pSaveDlg->SetLabel(aItem.aLstMake, aItem.aLstType);
     pSaveDlg->Execute();
     if(pSaveDlg->GetLabel(aItem))
     {
-        bModified = FALSE;
+        bModified = sal_False;
         const Sequence<OUString>& rMan = GetParent()->GetLabelsConfig().GetManufacturers();
         SvStringsDtor& rMakes = GetParent()->Makes();
-        if(rMakes.Count() < (USHORT)rMan.getLength())
+        if(rMakes.Count() < (sal_uInt16)rMan.getLength())
         {
             rMakes.DeleteAndDestroy(0, rMakes.Count());
             const OUString* pMan = rMan.getConstArray();
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index ebe7ab46dc81..5b503c5da054 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -66,7 +66,7 @@ class SwLabPreview : public Window
 
     void Paint(const Rectangle&);
 
-    void DrawArrow(const Point& rP1, const Point& rP2, BOOL bArrow);
+    void DrawArrow(const Point& rP1, const Point& rP2, sal_Bool bArrow);
 
     using Window::GetParent;
     SwLabFmtPage* GetParent() {return (SwLabFmtPage*) Window::GetParent();}
@@ -107,7 +107,7 @@ class SwLabFmtPage : public SfxTabPage
     PushButton   aSavePB;
 
     Timer aPreviewTimer;
-    BOOL  bModified;
+    sal_Bool  bModified;
 
     SwLabItem    aItem;
 
@@ -132,7 +132,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwLabItem& rItem);
-    virtual BOOL FillItemSet(SfxItemSet& rSet);
+    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 
     SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 0be179372ca5..88f78f950b3c 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -59,8 +59,8 @@ SwLabItem::SwLabItem() :
     nCol  (1),
     nRow  (1)
 {
-    bAddr = bCont = bSynchron = FALSE;
-    bPage = TRUE;
+    bAddr = bCont = bSynchron = sal_False;
+    bPage = sal_True;
     lHDist  =
     lVDist  =
     lWidth  =
@@ -400,7 +400,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
         aItem.aCompFax = aItem.aPrivFax = rUserOpt.GetFax();
         aItem.aCompMail = aItem.aPrivMail = rUserOpt.GetEmail();
         aItem.aCompState = aItem.aPrivState = rUserOpt.GetState();
-        aItem.bSynchron = TRUE;
+        aItem.bSynchron = sal_True;
         SetModified();
     }
 }
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 633e40a5d146..2639109b8079 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -125,7 +125,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
         aPrinterInfo.SetText(pPrinter->GetName());
         return 0;
     }
-    const BOOL bEnable = pButton == &aSingleButton;
+    const sal_Bool bEnable = pButton == &aSingleButton;
     aColText .Enable(bEnable);
     aColField.Enable(bEnable);
     aRowText .Enable(bEnable);
@@ -168,7 +168,7 @@ int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
     if ( _pSet )
         FillItemSet(*_pSet);
 
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------------
@@ -178,8 +178,8 @@ int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
 void SwLabPrtPage::FillItem(SwLabItem& rItem)
 {
     rItem.bPage = aPageButton.IsChecked();
-    rItem.nCol  = (USHORT) aColField.GetValue();
-    rItem.nRow  = (USHORT) aRowField.GetValue();
+    rItem.nCol  = (sal_uInt16) aColField.GetValue();
+    rItem.nRow  = (sal_uInt16) aRowField.GetValue();
     rItem.bSynchron = aSynchronCB.IsChecked() && aSynchronCB.IsEnabled();
 }
 
@@ -187,14 +187,14 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem)
 
 
 
-BOOL SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet)
 {
     SwLabItem aItem;
     GetParent()->GetLabItem(aItem);
     FillItem(aItem);
     rSet.Put(aItem);
 
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------------
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index afebc78b4e82..44fa4f4e9f3e 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -76,7 +76,7 @@ public:
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet = 0);
             void FillItem(SwLabItem& rItem);
-    virtual BOOL FillItemSet(SfxItemSet& rSet);
+    virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
     inline Printer* GetPrt() { return (pPrinter); }
 };
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 43ef58b11d7c..106e792229e6 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -226,16 +226,16 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     FreeResource();
     aSingleJobsCB.Show(sal_False); // not supported in since cws printerpullpages anymore
     //task #97066# mailing of form letters is currently not supported
-    aMailingRB.Show(FALSE);
-    aSubjectFT.Show(FALSE);
-    aSubjectED.Show(FALSE);
-    aFormatFT.Show(FALSE);
-    aFormatSwCB.Show(FALSE);
-    aFormatHtmlCB.Show(FALSE);
-    aFormatRtfCB.Show(FALSE);
-    aAttachFT.Show(FALSE);
-    aAttachED.Show(FALSE);
-    aAttachPB.Show(FALSE);
+    aMailingRB.Show(sal_False);
+    aSubjectFT.Show(sal_False);
+    aSubjectED.Show(sal_False);
+    aFormatFT.Show(sal_False);
+    aFormatSwCB.Show(sal_False);
+    aFormatHtmlCB.Show(sal_False);
+    aFormatRtfCB.Show(sal_False);
+    aAttachFT.Show(sal_False);
+    aAttachED.Show(sal_False);
+    aAttachPB.Show(sal_False);
 
     Point aMailPos = aMailingRB.GetPosPixel();
     Point aFilePos = aFileRB.GetPosPixel();
@@ -247,7 +247,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
         m_aSelection = *pSelection;
         //move all controls
         long nDiff = aRecordFL.GetPosPixel().Y() - pBeamerWin->GetPosPixel().Y();
-        pBeamerWin->Show(FALSE);
+        pBeamerWin->Show(sal_False);
         ::Size aSize = GetSizePixel();
         aSize.Height() -= nDiff;
         SetSizePixel(aSize);
@@ -352,7 +352,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     aFormatHtmlCB.Check((nMailingMode & TXTFORMAT_HTML) != 0);
     aFormatRtfCB.Check((nMailingMode & TXTFORMAT_RTF) != 0);
 
-    aAllRB.Check(TRUE);
+    aAllRB.Check(sal_True);
 
     // Handler installieren
     Link aLk = LINK(this, SwMailMergeDlg, ButtonHdl);
@@ -373,7 +373,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
 
     aLk = LINK(this, SwMailMergeDlg, FilenameHdl);
     aGenerateFromDataBaseCB.SetClickHdl( aLk );
-    BOOL bColumn = pModOpt->IsNameFromColumn();
+    sal_Bool bColumn = pModOpt->IsNameFromColumn();
     if(bColumn)
         aGenerateFromDataBaseCB.Check();
 
@@ -395,7 +395,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
         pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTableName);
     else
         pNewDBMgr->GetColumnNames(&aAddressFldLB, rDBName, rTableName);
-    for(USHORT nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++)
+    for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++)
         aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
 
     aAddressFldLB.SelectEntry(C2S("EMAIL"));
@@ -424,14 +424,14 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     if (aColumnLB.GetSelectEntryCount() == 0)
         aColumnLB.SelectEntryPos(0);
 
-    const BOOL bEnable = m_aSelection.getLength() != 0;
+    const sal_Bool bEnable = m_aSelection.getLength() != 0;
     aMarkedRB.Enable(bEnable);
     if (bEnable)
         aMarkedRB.Check();
     else
     {
         aAllRB.Check();
-        aMarkedRB.Enable(FALSE);
+        aMarkedRB.Enable(sal_False);
     }
     SetMinOutputSizePixel(m_aDialogSize);
     try
@@ -448,7 +448,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
         const ::rtl::OUString sName = OUString::createFromAscii("Name");
         const ::rtl::OUString sFlags = OUString::createFromAscii("Flags");
         const ::rtl::OUString sUIName = OUString::createFromAscii("UIName");
-        USHORT nODT = USHRT_MAX;
+        sal_uInt16 nODT = USHRT_MAX;
         while(xList->hasMoreElements())
         {
             comphelper::SequenceAsHashMap aFilter(xList->nextElement());
@@ -469,7 +469,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
             }
             if( sUIName2.getLength() )
             {
-                USHORT nFilter = aFilterLB.InsertEntry( sUIName2 );
+                sal_uInt16 nFilter = aFilterLB.InsertEntry( sUIName2 );
                 if( 0 == sFilter.compareToAscii("writer8") )
                     nODT = nFilter;
                 aFilterLB.SetEntryData( nFilter, new ::rtl::OUString( sFilter ) );
@@ -496,7 +496,7 @@ SwMailMergeDlg::~SwMailMergeDlg()
     else
         delete pBeamerWin;
 
-    for( USHORT nFilter = 0; nFilter < aFilterLB.GetEntryCount(); ++nFilter )
+    for( sal_uInt16 nFilter = 0; nFilter < aFilterLB.GetEntryCount(); ++nFilter )
     {
         ::rtl::OUString* pData = reinterpret_cast< ::rtl::OUString* >( aFilterLB.GetEntryData(nFilter) );
         delete pData;
@@ -684,7 +684,7 @@ IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*,  pBtn )
 
 IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox )
 {
-    BOOL bEnable = pBox->IsChecked();
+    sal_Bool bEnable = pBox->IsChecked();
     aColumnFT.Enable( bEnable );
     aColumnLB.Enable(bEnable);
     aPathFT.Enable( bEnable );
@@ -728,7 +728,7 @@ bool SwMailMergeDlg::ExecQryShell()
     }
     else
     {
-        nMergeType = static_cast< USHORT >( aSaveSingleDocRB.IsChecked() ?
+        nMergeType = static_cast< sal_uInt16 >( aSaveSingleDocRB.IsChecked() ?
                     DBMGR_MERGE_SINGLE_FILE : DBMGR_MERGE_MAILFILES );
         SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
         INetURLObject aAbs;
@@ -804,17 +804,14 @@ bool SwMailMergeDlg::ExecQryShell()
             }
         }
     }
-    SwPrintData aPrtData = *SW_MOD()->GetPrtOptions(FALSE);
     IDocumentDeviceAccess* pIDDA = rSh.getIDocumentDeviceAccess();
-    SwPrintData* pShellPrintData = pIDDA->getPrintData();
-    if(pShellPrintData)
-        aPrtData = *pShellPrintData;
+    SwPrintData aPrtData( pIDDA->getPrintData() );
     aPrtData.SetPrintSingleJobs(aSingleJobsCB.IsChecked());
     pIDDA->setPrintData(aPrtData);
 
     pModOpt->SetSinglePrintJob(aSingleJobsCB.IsChecked());
 
-    BYTE nMailingMode = 0;
+    sal_uInt8 nMailingMode = 0;
 
     if (aFormatSwCB.IsChecked())
         nMailingMode |= TXTFORMAT_OFFICE;
diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/ui/envelp/syncbtn.cxx
index a0e7c0ac659e..d0b43dd2efc5 100644
--- a/sw/source/ui/envelp/syncbtn.cxx
+++ b/sw/source/ui/envelp/syncbtn.cxx
@@ -51,7 +51,7 @@ SFX_IMPL_FLOATINGWINDOW( SwSyncChildWin, FN_SYNC_LABELS )
 ------------------------------------------------------------------------*/
 
 SwSyncChildWin::SwSyncChildWin( Window* _pParent,
-                                USHORT nId,
+                                sal_uInt16 nId,
                                 SfxBindings* pBindings,
                                 SfxChildWinInfo* pInfo ) :
                                 SfxChildWindow( _pParent, nId )