removetooltypes01: #i112600# Remove tools types from sw

5 files changed, 109 insertions, 109 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 766c3ca86377..c510705c533c 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -180,8 +180,8 @@ SwContact* GetUserCall( const SdrObject* pObj )
     return static_cast<SwContact*>(pObj->GetUserCall());
 }
 
-// liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist
-BOOL IsMarqueeTextObj( const SdrObject& rObj )
+// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist
+sal_Bool IsMarqueeTextObj( const SdrObject& rObj )
 {
     SdrTextAniKind eTKind;
     return SdrInventor == rObj.GetObjInventor() &&
@@ -252,7 +252,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
             if ( pAnchoredObj->GetPageFrm() )
             {
                 ::Notify_Background( _pDrawObj, pAnchoredObj->GetPageFrm(),
-                                     pAnchoredObj->GetObjRect(), PREP_FLY_ARRIVE, TRUE );
+                                     pAnchoredObj->GetObjRect(), PREP_FLY_ARRIVE, sal_True );
             }
 
             pAnchoredObj->InvalidateObjPos();
@@ -286,7 +286,7 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
         if ( pAnchoredObj && pAnchoredObj->GetPageFrm() )
         {
             ::Notify_Background( _pDrawObj, pAnchoredObj->GetPageFrm(),
-                                 pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, TRUE );
+                                 pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, sal_True );
         }
     }
     // <--
@@ -365,7 +365,7 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
                 static_cast<SdrObjGroup*>(_pDrawObj)->GetSubList();
         if ( pLst )
         {
-            for ( USHORT i = 0; i < pLst->GetObjCount(); ++i )
+            for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i )
             {
                 _MoveObjToLayer( _bToVisible, pLst->GetObj( i ) );
             }
@@ -565,7 +565,7 @@ SwVirtFlyDrawObj *SwFlyDrawContact::CreateNewRef( SwFlyFrm *pFly )
     SdrPage* pPg( 0L );
     if ( 0 != ( pPg = GetMaster()->GetPage() ) )
     {
-        const UINT32 nOrdNum = GetMaster()->GetOrdNum();
+        const sal_uInt32 nOrdNum = GetMaster()->GetOrdNum();
         pPg->ReplaceObject( pDrawObj, nOrdNum );
     }
     // --> OD 2004-08-16 #i27030# - insert new <SwVirtFlyDrawObj> instance
@@ -744,7 +744,7 @@ bool CheckControlLayer( const SdrObject *pObj )
     if ( pObj->ISA( SdrObjGroup ) )
     {
         const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
-        for ( USHORT i = 0; i < pLst->GetObjCount(); ++i )
+        for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i )
         {
             if ( ::CheckControlLayer( pLst->GetObj( i ) ) )
             {
@@ -765,7 +765,7 @@ SwDrawContact::SwDrawContact( SwFrmFmt* pToRegisterIn, SdrObject* pObj ) :
     // --> OD 2006-01-18 #129959#
     mbUserCallActive( false ),
     // Note: value of <meEventTypeOfCurrentUserCall> isn't of relevance, because
-    //       <mbUserCallActive> is FALSE.
+    //       <mbUserCallActive> is sal_False.
     meEventTypeOfCurrentUserCall( SDRUSERCALL_MOVEONLY )
     // <--
 {
@@ -1142,7 +1142,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
                 aOldRect.Pos() += pDrawVirtObj->GetOffset();
                 if( aOldRect.HasArea() )
                     ::Notify_Background( pDrawVirtObj, pPage,
-                                         aOldRect, PREP_FLY_LEAVE,TRUE);
+                                         aOldRect, PREP_FLY_LEAVE,sal_True);
             }
             // --> OD 2004-10-21 #i34640# - include spacing for wrapping
             SwRect aRect( pDrawVirtObj->GetAnchoredObj()->GetObjRectWithSpaces() );
@@ -1154,7 +1154,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
                 // <--
                 if ( pPg )
                     ::Notify_Background( pDrawVirtObj, pPg, aRect,
-                                         PREP_FLY_ARRIVE, TRUE );
+                                         PREP_FLY_ARRIVE, sal_True );
             }
             ::ClrContourCache( pDrawVirtObj );
         }
@@ -1184,7 +1184,7 @@ void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
                 SwPageFrm* pOldPageFrm = (SwPageFrm*)::FindPage( aOldRect, pPageFrm );
                 // <--
                 ::Notify_Background( &_rObj, pOldPageFrm, aOldRect,
-                                     PREP_FLY_LEAVE, TRUE);
+                                     PREP_FLY_LEAVE, sal_True);
             }
         }
         // --> OD 2004-10-21 #i34640# - include spacing for wrapping
@@ -1194,7 +1194,7 @@ void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
         {
             pPageFrm = (SwPageFrm*)::FindPage( aNewRect, pPageFrm );
             ::Notify_Background( &_rObj, pPageFrm, aNewRect,
-                                 PREP_FLY_ARRIVE, TRUE );
+                                 PREP_FLY_ARRIVE, sal_True );
         }
         ClrContourCache( &_rObj );
     }
@@ -1597,12 +1597,12 @@ namespace
 {
     static const SwFmtAnchor* lcl_getAnchorFmt( const SfxPoolItem& _rItem )
     {
-        USHORT nWhich = _rItem.Which();
+        sal_uInt16 nWhich = _rItem.Which();
         const SwFmtAnchor* pAnchorFmt = NULL;
         if ( RES_ATTRSET_CHG == nWhich )
         {
             static_cast<const SwAttrSetChg&>(_rItem).GetChgSet()->
-                GetItemState( RES_ANCHOR, FALSE, (const SfxPoolItem**)&pAnchorFmt );
+                GetItemState( RES_ANCHOR, sal_False, (const SfxPoolItem**)&pAnchorFmt );
         }
         else if ( RES_ANCHOR == nWhich )
         {
@@ -1627,14 +1627,14 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
     ASSERT( !mbDisconnectInProgress,
             "<SwDrawContact::Modify(..)> called during disconnection.");
 
-    USHORT nWhich = pNew ? pNew->Which() : 0;
+    sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
     const SwFmtAnchor* pNewAnchorFmt = pNew ? lcl_getAnchorFmt( *pNew ) : NULL;
 
     if ( pNewAnchorFmt )
     {
         // JP 10.04.95: nicht auf ein Reset Anchor reagieren !!!!!
         if ( SFX_ITEM_SET ==
-                GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, FALSE ) )
+                GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, sal_False ) )
         {
             // OD 10.10.2003 #112299# - no connect to layout during disconnection
             if ( !mbDisconnectInProgress )
@@ -1688,11 +1688,11 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
              RES_WRAP_INFLUENCE_ON_OBJPOS == nWhich ||
              ( RES_ATTRSET_CHG == nWhich &&
                ( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                           RES_SURROUND, FALSE ) ||
+                           RES_SURROUND, sal_False ) ||
                  SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                           RES_OPAQUE, FALSE ) ||
+                           RES_OPAQUE, sal_False ) ||
                  SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                           RES_WRAP_INFLUENCE_ON_OBJPOS, FALSE ) ) ) )
+                           RES_WRAP_INFLUENCE_ON_OBJPOS, sal_False ) ) ) )
         {
             lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L );
             NotifyBackgrdOfAllVirtObjs( 0L );
@@ -1704,15 +1704,15 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
                   RES_FOLLOW_TEXT_FLOW == nWhich ||
                   ( RES_ATTRSET_CHG == nWhich &&
                     ( SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                                RES_LR_SPACE, FALSE ) ||
+                                RES_LR_SPACE, sal_False ) ||
                       SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                                RES_UL_SPACE, FALSE ) ||
+                                RES_UL_SPACE, sal_False ) ||
                       SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                                RES_HORI_ORIENT, FALSE ) ||
+                                RES_HORI_ORIENT, sal_False ) ||
                       SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                                RES_VERT_ORIENT, FALSE ) ||
+                                RES_VERT_ORIENT, sal_False ) ||
                       SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
-                                RES_FOLLOW_TEXT_FLOW, FALSE ) ) ) )
+                                RES_FOLLOW_TEXT_FLOW, sal_False ) ) ) )
         {
             lcl_NotifyBackgroundOfObj( *this, *GetMaster(), 0L );
             NotifyBackgrdOfAllVirtObjs( 0L );
@@ -1827,7 +1827,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
         for( SdrView* pView = aIter.FirstView(); pView;
                     pView = aIter.NextView() )
         {
-            pView->MarkObj( GetMaster(), pView->GetSdrPageView(), TRUE );
+            pView->MarkObj( GetMaster(), pView->GetSdrPageView(), sal_True );
         }
 
         // OD 25.06.2003 #108784# - Instead of removing 'master' object from
@@ -1969,10 +1969,10 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
     {
         case FLY_AT_PAGE:
                 {
-                USHORT nPgNum = pAnch->GetPageNum();
+                sal_uInt16 nPgNum = pAnch->GetPageNum();
                 SwPageFrm *pPage = static_cast<SwPageFrm*>(pRoot->Lower());
 
-                for ( USHORT i = 1; i < nPgNum && pPage; ++i )
+                for ( sal_uInt16 i = 1; i < nPgNum && pPage; ++i )
                 {
                     pPage = static_cast<SwPageFrm*>(pPage->GetNext());
                 }
@@ -2105,7 +2105,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
             }
             break;
         default:
-            ASSERT( FALSE, "Unknown Anchor." )
+            ASSERT( sal_False, "Unknown Anchor." )
             break;
     }
     if ( GetAnchorFrm() )
@@ -2636,7 +2636,7 @@ SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const
     return pHdl;
 }
 
-SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const
+SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const
 {
     SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum);
     pHdl->SetPos(pHdl->GetPos() + GetOffset());
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 75111933e0ec..29def9485518 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star;
 
 using namespace ::com::sun::star;
 
-static BOOL bInResize = FALSE;
+static sal_Bool bInResize = sal_False;
 
 TYPEINIT1( SwFlyDrawObj, SdrObject )
 TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
@@ -158,19 +158,19 @@ SwFlyDrawObj::~SwFlyDrawObj()
 |*
 *************************************************************************/
 
-UINT32 __EXPORT SwFlyDrawObj::GetObjInventor() const
+sal_uInt32 __EXPORT SwFlyDrawObj::GetObjInventor() const
 {
     return SWGInventor;
 }
 
 
-UINT16 __EXPORT SwFlyDrawObj::GetObjIdentifier()    const
+sal_uInt16 __EXPORT SwFlyDrawObj::GetObjIdentifier()    const
 {
     return SwFlyDrawObjIdentifier;
 }
 
 
-UINT16 __EXPORT SwFlyDrawObj::GetObjVersion() const
+sal_uInt16 __EXPORT SwFlyDrawObj::GetObjVersion() const
 {
     return SwDrawFirst;
 }
@@ -429,7 +429,7 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
     pFlyFrm( pFly )
 {
     //#110094#-1
-    // bNotPersistent = bNeedColorRestore = bWriterFlyFrame = TRUE;
+    // bNotPersistent = bNeedColorRestore = bWriterFlyFrame = sal_True;
     const SvxProtectItem &rP = pFlyFrm->GetFmt()->GetProtect();
     bMovProt = rP.IsPosProtected();
     bSizProt = rP.IsSizeProtected();
@@ -522,13 +522,13 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const
 void __EXPORT SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
 {
     rInfo.bSelectAllowed     = rInfo.bMoveAllowed =
-    rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = TRUE;
+    rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = sal_True;
 
     rInfo.bRotateFreeAllowed = rInfo.bRotate90Allowed =
     rInfo.bMirrorFreeAllowed = rInfo.bMirror45Allowed =
     rInfo.bMirror90Allowed   = rInfo.bShearAllowed    =
     rInfo.bCanConvToPath     = rInfo.bCanConvToPoly   =
-    rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = FALSE;
+    rInfo.bCanConvToPathLineToArea = rInfo.bCanConvToPolyLineToArea = sal_False;
 }
 
 
@@ -700,7 +700,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
                                             RES_VERT_ORIENT, RES_HORI_ORIENT );
     SwFmtHoriOrient aHori( pFmt->GetHoriOrient() );
     SwFmtVertOrient aVert( pFmt->GetVertOrient() );
-    BOOL bPut = FALSE;
+    sal_Bool bPut = sal_False;
 
     if( !GetFlyFrm()->IsFlyLayFrm() &&
         ::GetHtmlMode(pFmt->GetDoc()->GetDocShell()) )
@@ -709,7 +709,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         //Einzig einen Snap auf Links/Rechts bzw. Linker-/Rechter-Rand koennen
         //wir versuchen.
         const SwFrm* pAnch = GetFlyFrm()->GetAnchorFrm();
-        BOOL bNextLine = FALSE;
+        sal_Bool bNextLine = sal_False;
 
         if( !GetFlyFrm()->IsAutoPos() || text::RelOrientation::PAGE_FRAME != aHori.GetRelationOrient() )
         {
@@ -720,9 +720,9 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
             }
             else
             {
-                bNextLine = TRUE;
+                bNextLine = sal_True;
                 //Horizontale Ausrichtung:
-                const BOOL bLeftFrm =
+                const sal_Bool bLeftFrm =
                     aFlyRect.Left() < pAnch->Frm().Left() + pAnch->Prt().Left(),
                     bLeftPrt = aFlyRect.Left() + aFlyRect.Width() <
                                pAnch->Frm().Left() + pAnch->Prt().Width()/2;
@@ -733,7 +733,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
                 }
                 else
                 {
-                    const BOOL bRightFrm = aFlyRect.Left() >
+                    const sal_Bool bRightFrm = aFlyRect.Left() >
                                        pAnch->Frm().Left() + pAnch->Prt().Width();
                     aHori.SetHoriOrient( text::HoriOrientation::RIGHT );
                     aHori.SetRelationOrient( bRightFrm ? text::RelOrientation::FRAME : text::RelOrientation::PRINT_AREA );
@@ -743,7 +743,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         }
         //Vertikale Ausrichtung bleibt grundsaetzlich schlicht erhalten,
         //nur bei nicht automatischer Ausrichtung wird umgeschaltet.
-        BOOL bRelChar = text::RelOrientation::CHAR == eRelVert;
+        sal_Bool bRelChar = text::RelOrientation::CHAR == eRelVert;
         aVert.SetVertOrient( eVert != text::VertOrientation::NONE ? eVert :
                 GetFlyFrm()->IsFlyInCntFrm() ? text::VertOrientation::CHAR_CENTER :
                 bRelChar && bNextLine ? text::VertOrientation::CHAR_TOP : text::VertOrientation::TOP );
@@ -752,7 +752,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         else
             aVert.SetRelationOrient( text::RelOrientation::PRINT_AREA );
         aSet.Put( aVert );
-        bPut = TRUE;
+        bPut = sal_True;
     }
 
     //Automatische Ausrichtungen wollen wir moeglichst nicht verlieren.
@@ -763,14 +763,14 @@ void __EXPORT SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
             aHori.SetHoriOrient( eHori );
             aHori.SetRelationOrient( eRelHori );
             aSet.Put( aHori );
-            bPut = TRUE;
+            bPut = sal_True;
         }
         if ( text::VertOrientation::NONE != eVert )
         {
             aVert.SetVertOrient( eVert );
             aVert.SetRelationOrient( eRelVert );
             aSet.Put( aVert );
-            bPut = TRUE;
+            bPut = sal_True;
         }
     }
     if ( bPut )
@@ -808,7 +808,7 @@ void __EXPORT SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             const SwFmtCol& rCol = rAttrs.GetAttrSet().GetCol();
             if ( rCol.GetColumns().Count() > 1 )
             {
-                for ( USHORT i = 0; i < rCol.GetColumns().Count(); ++i )
+                for ( sal_uInt16 i = 0; i < rCol.GetColumns().Count(); ++i )
                 {
                     nMin += rCol.GetColumns()[i]->GetLeft() +
                             rCol.GetColumns()[i]->GetRight() +
@@ -846,10 +846,10 @@ void __EXPORT SwVirtFlyDrawObj::NbcResize(const Point& rRef,
             }
             if ( aFrmSz.GetWidthPercent() && aFrmSz.GetWidthPercent() != 0xFF &&
                  aOldFrmSz.GetWidth() != aFrmSz.GetWidth() )
-                aFrmSz.SetWidthPercent( BYTE(aSz.Width() * 100L / nRelWidth + 0.5) );
+                aFrmSz.SetWidthPercent( sal_uInt8(aSz.Width() * 100L / nRelWidth + 0.5) );
             if ( aFrmSz.GetHeightPercent() && aFrmSz.GetHeightPercent() != 0xFF &&
                  aOldFrmSz.GetHeight() != aFrmSz.GetHeight() )
-                aFrmSz.SetHeightPercent( BYTE(aSz.Height() * 100L / nRelHeight + 0.5) );
+                aFrmSz.SetHeightPercent( sal_uInt8(aSz.Height() * 100L / nRelHeight + 0.5) );
             pFmt->GetDoc()->SetAttr( aFrmSz, *pFmt );
         }
     }
@@ -873,9 +873,9 @@ void __EXPORT SwVirtFlyDrawObj::NbcResize(const Point& rRef,
         }
         else if ( aOutRect.TopLeft() != aNewPos )
             aOutRect.SetPos( aNewPos );
-        bInResize = TRUE;
+        bInResize = sal_True;
         NbcMove( Size( 0, 0 ) );
-        bInResize = FALSE;
+        bInResize = sal_False;
     }
 }
 
@@ -884,7 +884,7 @@ void __EXPORT SwVirtFlyDrawObj::Move(const Size& rSiz)
 {
     NbcMove( rSiz );
     SetChanged();
-    GetFmt()->GetDoc()->SetNoDrawUndoObj( TRUE );
+    GetFmt()->GetDoc()->SetNoDrawUndoObj( sal_True );
 }
 
 
@@ -893,7 +893,7 @@ void __EXPORT SwVirtFlyDrawObj::Resize(const Point& rRef,
 {
     NbcResize( rRef, xFact, yFact );
     SetChanged();
-    GetFmt()->GetDoc()->SetNoDrawUndoObj( TRUE );
+    GetFmt()->GetDoc()->SetNoDrawUndoObj( sal_True );
 }
 
 
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 694599181b81..8c774bcdeba1 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::frame;
 
-SwDPage::SwDPage(SwDrawDocument& rNewModel, BOOL bMasterPage) :
+SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) :
     FmFormPage(rNewModel, 0, bMasterPage),
     pGridLst( 0 ),
     rDoc(rNewModel.GetDoc())
@@ -85,7 +85,7 @@ SwDPage::~SwDPage()
 |*
 *************************************************************************/
 
-SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, ULONG nObjNum )
+SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum )
 {
     SdrObject *pOld = GetObj( nObjNum );
     ASSERT( pOld, "Oups, Object not replaced" );
@@ -156,10 +156,10 @@ const SdrPageGridFrameList*  SwDPage::GetGridFrameList(
     return pGridLst;
 }
 
-BOOL SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
+sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
                            const HelpEvent& rEvt )
 {
-    BOOL bWeiter = TRUE;
+    sal_Bool bWeiter = sal_True;
 
     if( rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ))
     {
@@ -210,7 +210,7 @@ BOOL SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
             if ( sTxt.Len() )
             {
                 // --> OD 2007-07-26 #i80029#
-                BOOL bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly();
+                sal_Bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly();
                 if ( !bExecHyperlinks )
                 {
                     SvtSecurityOptions aSecOpts;
@@ -235,7 +235,7 @@ BOOL SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
                     Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) );
                     Help::ShowQuickHelp( pWindow, aRect, sTxt );
                 }
-                bWeiter = FALSE;
+                bWeiter = sal_False;
             }
         }
     }
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 650edcfceaed..be94db96d47f 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -68,11 +68,11 @@ const String GetPalettePath()
 
 SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
     FmFormModel( ::GetPalettePath(), &pD->GetAttrPool(),
-                 pD->GetDocShell(), TRUE ),
+                 pD->GetDocShell(), sal_True ),
     pDoc( pD )
 {
     SetScaleUnit( MAP_TWIP );
-    SetSwapGraphics( TRUE );
+    SetSwapGraphics( sal_True );
 
     SwDocShell* pDocSh = pDoc->GetDocShell();
     if ( pDocSh )
@@ -102,7 +102,7 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
     SfxItemPool* pSdrPool = pD->GetAttrPool().GetSecondaryPool();
     if( pSdrPool )
     {
-        const USHORT aWhichRanges[] =
+        const sal_uInt16 aWhichRanges[] =
             {
                 RES_CHRATR_BEGIN, RES_CHRATR_END,
                 RES_PARATR_BEGIN, RES_PARATR_END,
@@ -110,11 +110,11 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
             };
 
         SfxItemPool& rDocPool = pD->GetAttrPool();
-        USHORT nEdtWhich, nSlotId;
+        sal_uInt16 nEdtWhich, nSlotId;
         const SfxPoolItem* pItem;
-        for( const USHORT* pRangeArr = aWhichRanges;
+        for( const sal_uInt16* pRangeArr = aWhichRanges;
             *pRangeArr; pRangeArr += 2 )
-            for( USHORT nW = *pRangeArr, nEnd = *(pRangeArr+1);
+            for( sal_uInt16 nW = *pRangeArr, nEnd = *(pRangeArr+1);
                     nW < nEnd; ++nW )
                 if( 0 != (pItem = rDocPool.GetPoolDefaultItem( nW )) &&
                     0 != (nSlotId = rDocPool.GetSlotId( nW ) ) &&
@@ -131,7 +131,7 @@ SwDrawDocument::SwDrawDocument( SwDoc* pD ) :
 
     SetForbiddenCharsTable( pD->getForbiddenCharacterTable() );
     // #87795# Implementation for asian compression
-    SetCharCompressType( static_cast<UINT16>(pD->getCharacterCompressionType() ));
+    SetCharCompressType( static_cast<sal_uInt16>(pD->getCharacterCompressionType() ));
 }
 
 /*************************************************************************
@@ -196,7 +196,7 @@ SvStream* SwDrawDocument::GetDocumentStream( SdrDocumentStreamInfo& rInfo ) cons
                     pRet = utl::UcbStreamHelper::CreateStream( xStream );
                     if( pRet )
                     {
-                        rInfo.mbDeleteAfterUse = TRUE;
+                        rInfo.mbDeleteAfterUse = sal_True;
                         rInfo.mxStorageRef = xPictureStorage;
                     }
                 }
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 441b474c6b27..38ca0fd6e96f 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -77,17 +77,17 @@ class SwSdrHdl : public SdrHdl
 public:
     SwSdrHdl(const Point& rPnt, bool bTopRight ) :
         SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {}
-    virtual BOOL IsFocusHdl() const;
+    virtual sal_Bool IsFocusHdl() const;
 };
 
-BOOL SwSdrHdl::IsFocusHdl() const
+sal_Bool SwSdrHdl::IsFocusHdl() const
 {
     if( HDL_ANCHOR == eKind || HDL_ANCHOR_TR == eKind )
-        return TRUE;
+        return sal_True;
     return SdrHdl::IsFocusHdl();
 }
 
-const SwFrm *lcl_FindAnchor( const SdrObject *pObj, BOOL bAll )
+const SwFrm *lcl_FindAnchor( const SdrObject *pObj, sal_Bool bAll )
 {
     const SwVirtFlyDrawObj *pVirt = pObj->ISA(SwVirtFlyDrawObj) ?
                                             (SwVirtFlyDrawObj*)pObj : 0;
@@ -120,18 +120,18 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
     FmFormView( (FmFormModel*)pMd, pOutDev ),
     rImp( rI )
 {
-    SetPageVisible( FALSE );
-    SetBordVisible( FALSE );
-    SetGridVisible( FALSE );
-    SetHlplVisible( FALSE );
-    SetGlueVisible( FALSE );
-    SetFrameDragSingles( TRUE );
-    SetVirtualObjectBundling( TRUE );
-    SetSwapAsynchron( TRUE );
-
-    EnableExtendedKeyInputDispatcher( FALSE );
-    EnableExtendedMouseEventDispatcher( FALSE );
-    EnableExtendedCommandEventDispatcher( FALSE );
+    SetPageVisible( sal_False );
+    SetBordVisible( sal_False );
+    SetGridVisible( sal_False );
+    SetHlplVisible( sal_False );
+    SetGlueVisible( sal_False );
+    SetFrameDragSingles( sal_True );
+    SetVirtualObjectBundling( sal_True );
+    SetSwapAsynchron( sal_True );
+
+    EnableExtendedKeyInputDispatcher( sal_False );
+    EnableExtendedMouseEventDispatcher( sal_False );
+    EnableExtendedCommandEventDispatcher( sal_False );
 
     SetHitTolerancePixel( GetMarkHdlSizePixel()/2 );
 
@@ -153,7 +153,7 @@ sal_Bool SwDrawView::IsAntiAliasing() const
 
 //////////////////////////////////////////////////////////////////////////////
 
-SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT nTol, const SdrMarkList &rMrkList)
+SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt16 nTol, const SdrMarkList &rMrkList)
 {
     if(!nTol)
     {
@@ -212,7 +212,7 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT n
     return pRetval;
 }
 
-SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const
 {
     // call parent
     SdrObject* pRetval = FmFormView::CheckSingleSdrObjectHit(rPnt, nTol, pObj, pPV, nOptions, pMVisLay);
@@ -296,7 +296,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
 {
     if ( GetUserCall(pObj) )
     {
-        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, FALSE );
+        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False );
         if ( pAnch )
         {
             //Das oberste Obj innerhalb des Ankers darf nicht ueberholt
@@ -307,15 +307,15 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
                 const SwPageFrm *pPage = pFly->FindPageFrm();
                 if ( pPage->GetSortedObjs() )
                 {
-                    UINT32 nOrdNum = 0;
-                    for ( USHORT i = 0; i < pPage->GetSortedObjs()->Count(); ++i )
+                    sal_uInt32 nOrdNum = 0;
+                    for ( sal_uInt16 i = 0; i < pPage->GetSortedObjs()->Count(); ++i )
                     {
                         const SdrObject *pO =
                                     (*pPage->GetSortedObjs())[i]->GetDrawObj();
 
                         if ( pO->GetOrdNumDirect() > nOrdNum )
                         {
-                            const SwFrm *pTmpAnch = ::lcl_FindAnchor( pO, FALSE );
+                            const SwFrm *pTmpAnch = ::lcl_FindAnchor( pO, sal_False );
                             if ( pFly->IsAnLower( pTmpAnch ) )
                             {
                                 nOrdNum = pO->GetOrdNumDirect();
@@ -352,7 +352,7 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
 {
     if ( GetUserCall(pObj) )
     {
-        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, FALSE );
+        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False );
         if ( pAnch )
         {
             //Der Fly des Ankers darf nicht "unterflogen" werden.
@@ -376,22 +376,22 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
 |*
 *************************************************************************/
 
-inline BOOL lcl_IsChild( SdrObject *pParent, SdrObject *pChild )
+inline sal_Bool lcl_IsChild( SdrObject *pParent, SdrObject *pChild )
 {
     if ( pParent->ISA(SwVirtFlyDrawObj) )
     {
-        const SwFrm *pAnch = lcl_FindAnchor( pChild, FALSE );
+        const SwFrm *pAnch = lcl_FindAnchor( pChild, sal_False );
         if ( pAnch && ((SwVirtFlyDrawObj*)pParent)->GetFlyFrm()->IsAnLower( pAnch ))
         {
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 inline SdrObject *lcl_FindParent( SdrObject *pObj )
 {
-    const SwFrm *pAnch = lcl_FindAnchor( pObj, FALSE );
+    const SwFrm *pAnch = lcl_FindAnchor( pObj, sal_False );
     if ( pAnch && pAnch->IsInFly() )
         return (SdrObject*)pAnch->FindFlyFrm()->GetVirtDrawObj();
     return 0;
@@ -424,7 +424,7 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
         }
 
         if ( pObj->GetOrdNum() > nMaxChildOrdNum &&
-             _rParentObj.IsAnLower( lcl_FindAnchor( pObj, TRUE ) ) )
+             _rParentObj.IsAnLower( lcl_FindAnchor( pObj, sal_True ) ) )
         {
             nMaxChildOrdNum = pObj->GetOrdNum();
             break;
@@ -525,8 +525,8 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
 }
 
 // --> OD 2004-08-20 #110810# - adjustment and re-factoring of method
-void SwDrawView::ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
-                                          ULONG nNewPos )
+void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
+                                          sal_uLong nNewPos )
 {
     // --> OD 2004-08-17 #110810# - nothing to do for group members
     if ( pObj->GetUpGroup() )
@@ -650,7 +650,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
             // If object is anchored inside a invisible part of the document
             // (e.g. page header, whose page style isn't applied, or hidden
             // section), no anchor frame exists.
-            const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, TRUE );
+            const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, sal_True );
             const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm
                                             ? pTmpAnchorFrm->FindFlyFrm() : 0L;
             // <--
@@ -704,7 +704,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
             // If object is anchored inside a invisible part of the document
             // (e.g. page header, whose page style isn't applied, or hidden
             // section), no anchor frame exists.
-            const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, TRUE );
+            const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, sal_True );
             const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm
                                             ? pTmpAnchorFrm->FindFlyFrm() : 0L;
             // <--
@@ -764,11 +764,11 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, ULONG nOldPos,
 *************************************************************************/
 
 
-BOOL SwDrawView::TakeDragLimit( SdrDragMode eMode,
+sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
                                             Rectangle& rRect ) const
 {
     const SdrMarkList &rMrkList = GetMarkedObjectList();
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( 1 == rMrkList.GetMarkCount() )
     {
         const SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -776,7 +776,7 @@ BOOL SwDrawView::TakeDragLimit( SdrDragMode eMode,
         if( ::CalcClipRect( pObj, aRect, eMode == SDRDRAG_MOVE ) )
         {
             rRect = aRect.SVRect();
-             bRet = TRUE;
+             bRet = sal_True;
         }
     }
     return bRet;
@@ -804,7 +804,7 @@ const SwFrm* SwDrawView::CalcAnchor()
     //der aktuelle Anker. Nur suchen wenn wir gerade draggen.
     const SwFrm* pAnch;
     Rectangle aMyRect;
-    const BOOL bFly = pObj->ISA(SwVirtFlyDrawObj);
+    const sal_Bool bFly = pObj->ISA(SwVirtFlyDrawObj);
     if ( bFly )
     {
         pAnch = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetAnchorFrm();
@@ -964,9 +964,9 @@ void SwDrawView::CheckPossibilities()
     //OLE-Objekte konnen selbst einen Resize-Schutz wuenschen (StarMath)
 
     const SdrMarkList &rMrkList = GetMarkedObjectList();
-    BOOL bProtect = FALSE,
-             bSzProtect = FALSE;
-    for ( USHORT i = 0; !bProtect && i < rMrkList.GetMarkCount(); ++i )
+    sal_Bool bProtect = sal_False,
+             bSzProtect = sal_False;
+    for ( sal_uInt16 i = 0; !bProtect && i < rMrkList.GetMarkCount(); ++i )
     {
         const SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
         const SwFrm *pFrm = NULL;
@@ -989,7 +989,7 @@ void SwDrawView::CheckPossibilities()
                             // can be selected.
 
                             // TODO/LATER: retrieve Aspect - from where?!
-                            bSzProtect |= ( embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ) ) ? TRUE : FALSE;
+                            bSzProtect |= ( embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ) ) ? sal_True : sal_False;
 
                             // <--
 
@@ -1019,12 +1019,12 @@ void SwDrawView::CheckPossibilities()
             {
                 ASSERT( false,
                         "<SwDrawView::CheckPossibilities()> - missing frame format" );
-                bProtect = TRUE;
+                bProtect = sal_True;
             }
             else if ((FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId()) &&
                       rMrkList.GetMarkCount() > 1 )
             {
-                bProtect = TRUE;
+                bProtect = sal_True;
             }
         }
     }