svx: sal_Bool->bool

Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7

26 files changed, 64 insertions, 64 deletions

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index d65884bf05c3..0bd6a01ec411 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -698,7 +698,7 @@ void SwDoc::PrtDataChanged()
     }
     if ( bDraw && mpDrawModel )
     {
-        const sal_Bool bTmpAddExtLeading = get(IDocumentSettingAccess::ADD_EXT_LEADING);
+        const bool bTmpAddExtLeading = get(IDocumentSettingAccess::ADD_EXT_LEADING);
         if ( bTmpAddExtLeading != mpDrawModel->IsAddExtLeading() )
             mpDrawModel->SetAddExtLeading( bTmpAddExtLeading );
 
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index d94eb3590d90..7173f8d0b5cb 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -413,7 +413,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
                 if( pFrmFmt &&
                     FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
                 {
-                    rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), sal_True );
+                    rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), true );
                     --i;
                     DelLayoutFmt( pFrmFmt );
                 }
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ebe533ca35e0..a1714b03b419 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1608,7 +1608,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
         for( SdrView* pView = aIter.FirstView(); pView;
                     pView = aIter.NextView() )
         {
-            pView->MarkObj( GetMaster(), pView->GetSdrPageView(), sal_True );
+            pView->MarkObj( GetMaster(), pView->GetSdrPageView(), true );
         }
 
         // Instead of removing 'master' object from drawing page, move the
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 7cf986c17a17..4886a8e62241 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -121,7 +121,7 @@ SwDrawDocument::~SwDrawDocument()
 {
     Broadcast(SdrHint(HINT_MODELCLEARED));
 
-    ClearModel(sal_True);
+    ClearModel(true);
 }
 
 /** Create a new page (SdPage) and return a pointer to it back.
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index b025b987029b..eeeb492ff799 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -62,13 +62,13 @@ class SwSdrHdl : public SdrHdl
 public:
     SwSdrHdl(const Point& rPnt, bool bTopRight ) :
         SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {}
-    virtual sal_Bool IsFocusHdl() const;
+    virtual bool IsFocusHdl() const;
 };
 
-sal_Bool SwSdrHdl::IsFocusHdl() const
+bool SwSdrHdl::IsFocusHdl() const
 {
     if( HDL_ANCHOR == eKind || HDL_ANCHOR_TR == eKind )
-        return sal_True;
+        return true;
     return SdrHdl::IsFocusHdl();
 }
 
@@ -101,13 +101,13 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
     SetGridVisible( false );
     SetHlplVisible( false );
     SetGlueVisible( false );
-    SetFrameDragSingles( sal_True );
-    SetVirtualObjectBundling( sal_True );
-    SetSwapAsynchron( sal_True );
+    SetFrameDragSingles( true );
+    SetVirtualObjectBundling( true );
+    SetSwapAsynchron( true );
 
-    EnableExtendedKeyInputDispatcher( sal_False );
-    EnableExtendedMouseEventDispatcher( sal_False );
-    EnableExtendedCommandEventDispatcher( sal_False );
+    EnableExtendedKeyInputDispatcher( false );
+    EnableExtendedMouseEventDispatcher( false );
+    EnableExtendedCommandEventDispatcher( false );
 
     SetHitTolerancePixel( GetMarkHdlSizePixel()/2 );
 
@@ -650,11 +650,11 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
     _MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs );
 }
 
-sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
+bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
                                             Rectangle& rRect ) const
 {
     const SdrMarkList &rMrkList = GetMarkedObjectList();
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( 1 == rMrkList.GetMarkCount() )
     {
         const SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -662,7 +662,7 @@ sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
         if( ::CalcClipRect( pObj, aRect, eMode == SDRDRAG_MOVE ) )
         {
             rRect = aRect.SVRect();
-             bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 9c3e5a616bdb..f1a90752a580 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1491,7 +1491,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
                     aSet.Put(pClpObj->GetMergedItemSet());
                 }
 
-                pView->SetAttributes( aSet, sal_False );
+                pView->SetAttributes( aSet, false );
             }
             break;
 
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index cbcdbcfadaf2..68930af1d73c 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -255,7 +255,7 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
             pImpl->GetDrawView()->UnmarkAll();
 
         pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
-                                      pImpl->GetPageView(), sal_False, sal_False );
+                                      pImpl->GetPageView(), false, false );
         KillPams();
         ClearMark();
         SelFlyGrabCrsr();
@@ -934,7 +934,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
     {
         // select drawing object
         Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView(),
-                                       sal_False, sal_False );
+                                       false, false );
     }
     else
     {
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 4fb6bcaad2ac..4e188f1321cc 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1046,7 +1046,7 @@ void SwFEShell::EndTextEdit()
     }
     if ( !pObj->GetUpGroup() )
     {
-        if ( SDRENDTEXTEDIT_SHOULDBEDELETED == pView->SdrEndTextEdit(sal_True) )
+        if ( SDRENDTEXTEDIT_SHOULDBEDELETED == pView->SdrEndTextEdit(true) )
         {
             if ( pView->GetMarkedObjectList().GetMarkCount() > 1 )
             {
@@ -1115,7 +1115,7 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
         sal_uInt16 nOld = pDView->GetHitTolerancePixel();
         pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 );
 
-        bRet = 0 != pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMARKABLE );
+        bRet = pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMARKABLE );
         pDView->SetHitTolerancePixel( nOld );
     }
     return bRet;
@@ -1913,12 +1913,12 @@ sal_Bool SwFEShell::ImpEndCreate()
             if ( pMarkObj )
             {
                 Imp()->GetDrawView()->MarkObj( pMarkObj, Imp()->GetPageView(),
-                                                sal_False, sal_False );
+                                                false, false );
             }
             else
             {
                 Imp()->GetDrawView()->MarkObj( &rSdrObj, Imp()->GetPageView(),
-                                                sal_False, sal_False );
+                                                false, false );
             }
         }
     }
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 727c060ea67f..1d1617ad071f 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -92,7 +92,7 @@ public:
 
     virtual void         ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
                                             sal_uLong nNewPos );
-    virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+    virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
     virtual void MakeVisible( const Rectangle&, Window &rWin );
     virtual void CheckPossibilities();
 
diff --git a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
index a9a7c503a3e3..49ae7baf2b0c 100644
--- a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -136,7 +136,7 @@ static void lcl_LeaveDrawText(SwWrtShell& rSh)
 {
     if(rSh.GetDrawView())
     {
-        rSh.GetDrawView()->SdrEndTextEdit( sal_True );
+        rSh.GetDrawView()->SdrEndTextEdit( true );
         Point aPt(LONG_MIN, LONG_MIN);
         // go out of the frame
         rSh.SelectObj(aPt, SW_LEAVE_FRAME);
@@ -791,7 +791,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
                 {
                     // now the current one has to be deselected
                     if(pCurrentTextObj)
-                        pDrView->SdrEndTextEdit( sal_True );
+                        pDrView->SdrEndTextEdit( true );
                     // and the found one should be activated
                     rSh.MakeVisible(pTextObj->GetLogicRect());
                     Point aTmp( 0,0 );
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 10794255f42b..8f0b7ba08dbc 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -1279,7 +1279,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
                         if(!bWasNoSnap)
                             ((SdrDragStat&)rDragStat).SetNoSnap(true);
                         if(bWasSnapEnabled)
-                            pSdrView->SetSnapEnabled(sal_False);
+                            pSdrView->SetSnapEnabled(false);
 
                         pSdrView->MovAction(aEndPoint);
                         pSdrView->EndDragObj();
diff --git a/sw/source/core/uibase/lingu/sdrhhcwrap.cxx b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
index 3a05a06b3328..5f74abc257d8 100644
--- a/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
@@ -90,7 +90,7 @@ SdrHHCWrapper::~SdrHHCWrapper()
     {
         SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
         OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" );
-        pSdrView->SdrEndTextEdit( sal_True );
+        pSdrView->SdrEndTextEdit( true );
         SetUpdateMode(false);
         pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
     }
@@ -111,7 +111,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
     {
         SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
         OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" );
-        pSdrView->SdrEndTextEdit( sal_True );
+        pSdrView->SdrEndTextEdit( true );
         SetUpdateMode(false);
         pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
         SetPaperSize( Size(1, 1) );
@@ -154,7 +154,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
                     SetUpdateMode(true);
                     pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect());
 
-                    pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), sal_False, this, pOutlView, sal_True, sal_True);
+                    pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), false, this, pOutlView, true, true);
                 }
                 else
                     SetUpdateMode(false);
diff --git a/sw/source/core/uibase/ribbar/conform.cxx b/sw/source/core/uibase/ribbar/conform.cxx
index 2b15f5f8e9e4..a3b5c3d2e7d1 100644
--- a/sw/source/core/uibase/ribbar/conform.cxx
+++ b/sw/source/core/uibase/ribbar/conform.cxx
@@ -46,13 +46,13 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
 
     if (rMEvt.IsMod2())
     {
-        pSdrView->SetCreate1stPointAsCenter(sal_True);
-        pSdrView->SetResizeAtCenter(sal_True);
+        pSdrView->SetCreate1stPointAsCenter(true);
+        pSdrView->SetResizeAtCenter(true);
     }
     else
     {
-        pSdrView->SetCreate1stPointAsCenter(sal_False);
-        pSdrView->SetResizeAtCenter(sal_False);
+        pSdrView->SetCreate1stPointAsCenter(false);
+        pSdrView->SetResizeAtCenter(false);
     }
 
     SdrViewEvent aVEvt;
diff --git a/sw/source/core/uibase/ribbar/conrect.cxx b/sw/source/core/uibase/ribbar/conrect.cxx
index b6646827c1b1..9b7aa478e549 100644
--- a/sw/source/core/uibase/ribbar/conrect.cxx
+++ b/sw/source/core/uibase/ribbar/conrect.cxx
@@ -100,7 +100,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
                 SdrTextObj* pText = (SdrTextObj*)pObj;
                 SfxItemSet aSet(pSdrView->GetModel()->GetItemPool());
 
-                pText->SetVerticalWriting(sal_True);
+                pText->SetVerticalWriting(true);
 
                 aSet.Put(SdrTextAutoGrowWidthItem(true));
                 aSet.Put(SdrTextAutoGrowHeightItem(false));
diff --git a/sw/source/core/uibase/ribbar/drawbase.cxx b/sw/source/core/uibase/ribbar/drawbase.cxx
index de3eddb8fe3d..927522a873a8 100644
--- a/sw/source/core/uibase/ribbar/drawbase.cxx
+++ b/sw/source/core/uibase/ribbar/drawbase.cxx
@@ -56,7 +56,7 @@ SwDrawBase::SwDrawBase(SwWrtShell* pSwWrtShell, SwEditWin* pWindow, SwView* pSwV
 SwDrawBase::~SwDrawBase()
 {
     if (m_pView->GetWrtShellPtr()) // In the view-dtor could the wrtsh already been deleted...
-        m_pSh->GetDrawView()->SetEditMode(sal_True);
+        m_pSh->GetDrawView()->SetEditMode(true);
 }
 
 sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
@@ -71,13 +71,13 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
 
     if (rMEvt.IsMod2())
     {
-        pSdrView->SetCreate1stPointAsCenter(sal_True);
-        pSdrView->SetResizeAtCenter(sal_True);
+        pSdrView->SetCreate1stPointAsCenter(true);
+        pSdrView->SetResizeAtCenter(true);
     }
     else
     {
-        pSdrView->SetCreate1stPointAsCenter(sal_False);
-        pSdrView->SetResizeAtCenter(sal_False);
+        pSdrView->SetCreate1stPointAsCenter(false);
+        pSdrView->SetResizeAtCenter(false);
     }
 
     SdrViewEvent aVEvt;
@@ -426,7 +426,7 @@ void SwDrawBase::Activate(const sal_uInt16 nSlot)
     SdrView *pSdrView = m_pSh->GetDrawView();
 
     pSdrView->SetCurrentObj( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()) );
-    pSdrView->SetEditMode(sal_False);
+    pSdrView->SetEditMode(false);
 
     SetDrawPointer();
     m_pSh->NoEdit();
@@ -436,7 +436,7 @@ void SwDrawBase::Deactivate()
 {
     SdrView *pSdrView = m_pSh->GetDrawView();
     pSdrView->SetOrtho(false);
-    pSdrView->SetAngleSnapEnabled(sal_False);
+    pSdrView->SetAngleSnapEnabled(false);
 
     if (m_pWin->IsDrawAction() && m_pSh->IsDrawCreate())
         m_pSh->BreakCreate();
diff --git a/sw/source/core/uibase/shells/drawdlg.cxx b/sw/source/core/uibase/shells/drawdlg.cxx
index 9ba12d925938..1abf9b0fac4f 100644
--- a/sw/source/core/uibase/shells/drawdlg.cxx
+++ b/sw/source/core/uibase/shells/drawdlg.cxx
@@ -88,7 +88,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
                 if (bHasMarked)
                     pView->SetAttributes(*pDlg->GetOutputItemSet());
                 else
-                    pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), sal_False);
+                    pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), false);
                 pSh->EndAction();
 
                 static sal_uInt16 aInval[] =
@@ -131,9 +131,9 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
             {
                 pSh->StartAction();
                 if(bHasMarked)
-                    pView->SetAttrToMarked(*pDlg->GetOutputItemSet(), sal_False);
+                    pView->SetAttrToMarked(*pDlg->GetOutputItemSet(), false);
                 else
-                    pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), sal_False);
+                    pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), false);
                 pSh->EndAction();
 
                 static sal_uInt16 aInval[] =
@@ -180,9 +180,9 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
     if (pArgs)
     {
         if(pView->AreObjectsMarked())
-            pView->SetAttrToMarked(*rReq.GetArgs(), sal_False);
+            pView->SetAttrToMarked(*rReq.GetArgs(), false);
         else
-            pView->SetDefaultAttr(*rReq.GetArgs(), sal_False);
+            pView->SetDefaultAttr(*rReq.GetArgs(), false);
     }
     else
     {
diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx
index 5932d12c999b..4763cb55931a 100644
--- a/sw/source/core/uibase/shells/drawsh.cxx
+++ b/sw/source/core/uibase/shells/drawsh.cxx
@@ -532,7 +532,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
 
         if ( pDrView->IsTextEdit() )
         {
-            pDrView->SdrEndTextEdit( sal_True );
+            pDrView->SdrEndTextEdit( true );
             GetView().AttrChangedNotify(&rSh);
         }
 
diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
index 24abc785cf6e..db2014b014e7 100644
--- a/sw/source/core/uibase/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
@@ -490,7 +490,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
                 SdrView* pTmpView = pSdrView;
 
-                pSdrView->SdrEndTextEdit(sal_True);
+                pSdrView->SdrEndTextEdit(true);
 
                 SfxItemSet aAttr( *aNewAttr.GetPool(),
                             SDRATTR_TEXTDIRECTION,
@@ -514,7 +514,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
             SdrView* pTmpView = pSdrView;
 
-            pSdrView->SdrEndTextEdit(sal_True);
+            pSdrView->SdrEndTextEdit(true);
             bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
 
             const SfxPoolItem* pPoolItem;
diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
index 350c4f62c06a..a5b158795ed7 100644
--- a/sw/source/core/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/core/uibase/shells/drwtxtsh.cxx
@@ -216,7 +216,7 @@ void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
             //#111733# Sometimes SdrEndTextEdit() initiates the change in selection and
             // 'this' is not valid anymore
             SwView& rTempView = GetView();
-            pDrView->SdrEndTextEdit(sal_True);
+            pDrView->SdrEndTextEdit(true);
             //this removes the current shell from the dispatcher stack!!
             rTempView.AttrChangedNotify(&rSh);
         }
diff --git a/sw/source/core/uibase/shells/textdrw.cxx b/sw/source/core/uibase/shells/textdrw.cxx
index fcc12affcb9c..acc239b544b4 100644
--- a/sw/source/core/uibase/shells/textdrw.cxx
+++ b/sw/source/core/uibase/shells/textdrw.cxx
@@ -52,7 +52,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
     // OBJ_FM_BUTTON
     pSdrView->SetDesignMode(true);
     pSdrView->SetCurrentObj(OBJ_FM_BUTTON);
-    pSdrView->SetEditMode(sal_False);
+    pSdrView->SetEditMode(false);
 
     Point aStartPos(rSh.GetCharRect().Pos() + Point(0, 1));
 
diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx
index 50aa5e1bd92a..0c07be1eb895 100644
--- a/sw/source/core/uibase/uiview/pview.cxx
+++ b/sw/source/core/uibase/uiview/pview.cxx
@@ -1084,7 +1084,7 @@ void  SwPagePreview::StateUndo(SfxItemSet& rSet)
 void SwPagePreview::Init(const SwViewOption * pPrefs)
 {
     if ( GetViewShell()->HasDrawView() )
-        GetViewShell()->GetDrawView()->SetAnimationEnabled( sal_False );
+        GetViewShell()->GetDrawView()->SetAnimationEnabled( false );
 
     bNormalPrint = sal_True;
 
diff --git a/sw/source/core/uibase/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx
index e2d60dd2eac8..a96f76dec036 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -213,7 +213,7 @@ IMPL_LINK_NOARG(SwView, FormControlActivated)
         // if we're editing text currently, cancel this
         SdrView *pSdrView = m_pWrtShell ? m_pWrtShell->GetDrawView() : NULL;
         if ( pSdrView && pSdrView->IsTextEdit() )
-            pSdrView->SdrEndTextEdit( sal_True );
+            pSdrView->SdrEndTextEdit( true );
 
         const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell );
     }
@@ -1049,7 +1049,7 @@ SwView::~SwView()
     // the last view must end the text edit
     SdrView *pSdrView = m_pWrtShell ? m_pWrtShell->GetDrawView() : 0;
     if( pSdrView && pSdrView->IsTextEdit() )
-        pSdrView->SdrEndTextEdit( sal_True );
+        pSdrView->SdrEndTextEdit( true );
 
     SetWindow( 0 );
 
diff --git a/sw/source/core/uibase/uiview/viewdraw.cxx b/sw/source/core/uibase/uiview/viewdraw.cxx
index 0e9849c797c4..bcd7704afcdb 100644
--- a/sw/source/core/uibase/uiview/viewdraw.cxx
+++ b/sw/source/core/uibase/uiview/viewdraw.cxx
@@ -387,7 +387,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
     }
 
     if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit())
-        pSdrView->SdrEndTextEdit( sal_True );
+        pSdrView->SdrEndTextEdit( true );
 
     AttrChangedNotify(m_pWrtShell);
 }
@@ -558,7 +558,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
     // set in each case, thus it will be correct for all objects
     ((SdrTextObj*)pToBeActivated)->SetTextEditOffset(aNewTextEditOffset);
 
-    sal_Bool bRet(pSdrView->SdrBeginTextEdit( pToBeActivated, pPV, pWin, sal_True, pOutliner, 0, sal_False, sal_False, sal_False ));
+    bool bRet(pSdrView->SdrBeginTextEdit( pToBeActivated, pPV, pWin, true, pOutliner, 0, false, false, false ));
 
     // #i7672#
     // Since SdrBeginTextEdit actually creates the OutlinerView and thus also
@@ -594,7 +594,7 @@ bool SwView::IsTextTool() const
     OSL_ENSURE( pSdrView, "IsTextTool without DrawView?" );
 
     if (pSdrView->IsCreateMode())
-        pSdrView->SetCreateMode(sal_False);
+        pSdrView->SetCreateMode(false);
 
     pSdrView->TakeCurrentObj(nId,nInvent);
     return (nInvent==SdrInventor);
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 60ac680ffd66..9ffcf86c15f9 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -2732,7 +2732,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                                             SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/);
                                             if (pPV)
                                             {
-                                                pDrawView->MarkObj(pTemp, pPV, sal_True);
+                                                pDrawView->MarkObj(pTemp, pPV, true);
                                             }
                                         }
                                 }
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 5948312d7a34..0de8f0e8a51c 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -79,9 +79,9 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
         pDrawView->SetWorkArea( pRoot->Frm().SVRect() );
 
     if ( GetShell()->IsPreview() )
-        pDrawView->SetAnimationEnabled( sal_False );
+        pDrawView->SetAnimationEnabled( false );
 
-    pDrawView->SetUseIncompatiblePathCreateInterface( sal_False );
+    pDrawView->SetUseIncompatiblePathCreateInterface( false );
 
     // set handle size to 9 pixels, always
     pDrawView->SetMarkHdlSizePixel(9);
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 2e7e3152c8be..9bf78f7bac3f 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2121,13 +2121,13 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
             MakeDrawView();
 
         SwDrawView *pDView = Imp()->GetDrawView();
-        if ( pDView->IsDragStripes() != rOpt.IsCrossHair() )
+        if ( (pDView->IsDragStripes() ? 1 : 0) != rOpt.IsCrossHair() )
             pDView->SetDragStripes( rOpt.IsCrossHair() );
 
-        if ( pDView->IsGridSnap() != rOpt.IsSnap() )
+        if ( (pDView->IsGridSnap() ? 1 : 0) != rOpt.IsSnap() )
             pDView->SetGridSnap( rOpt.IsSnap() );
 
-        if ( pDView->IsGridVisible() != rOpt.IsGridVisible() )
+        if ( (pDView->IsGridVisible() ? 1 : 0) != rOpt.IsGridVisible() )
             pDView->SetGridVisible( rOpt.IsGridVisible() );
 
         const Size &rSz = rOpt.GetSnapSize();