sw: sal_Bool->bool

Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8

733 files changed, 12206 insertions, 12217 deletions

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index f1ab71ff6b15..b92d33421099 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -53,9 +53,9 @@ using namespace sw::access;
 const sal_Char sServiceName[] = "com.sun.star.table.AccessibleCellView";
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleCellView";
 
-sal_Bool SwAccessibleCell::IsSelected()
+bool SwAccessibleCell::IsSelected()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     OSL_ENSURE( GetMap(), "no map?" );
     const SwViewShell *pVSh = GetMap()->GetShell();
@@ -103,7 +103,7 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap,
                                     const SwCellFrm *pCellFrm )
     : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm )
     , aSelectionHelper( *this )
-    , bIsSelected( sal_False )
+    , bIsSelected( false )
 {
     SolarMutexGuard aGuard;
     OUString sBoxName( pCellFrm->GetTabBox()->GetName() );
@@ -122,10 +122,10 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap,
     m_pAccTable = static_cast<SwAccessibleTable *>(xTableReference.get());
 }
 
-sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
+bool SwAccessibleCell::_InvalidateMyCursorPos()
 {
-    sal_Bool bNew = IsSelected();
-    sal_Bool bOld;
+    bool bNew = IsSelected();
+    bool bOld;
     {
         osl::MutexGuard aGuard( aMutex );
         bOld = bIsSelected;
@@ -139,7 +139,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
         GetMap()->SetCursorContext( xThis );
     }
 
-    sal_Bool bChanged = bOld != bNew;
+    bool bChanged = bOld != bNew;
     if( bChanged )
     {
         FireStateChangedEvent( AccessibleStateType::SELECTED, bNew );
@@ -151,9 +151,9 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
     return bChanged;
 }
 
-sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
+bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
 {
-    sal_Bool bChanged = sal_False;
+    bool bChanged = false;
 
     const SwAccessibleChildSList aVisList( GetVisArea(), *pFrm, *GetMap() );
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
@@ -166,7 +166,7 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
             if( rLower.IsAccessible( GetMap()->GetShell()->IsPreview() )  )
             {
                 ::rtl::Reference< SwAccessibleContext > xAccImpl(
-                    GetMap()->GetContextImpl( pLower, sal_False ) );
+                    GetMap()->GetContextImpl( pLower, false ) );
                 if( xAccImpl.is() )
                 {
                     OSL_ENSURE( xAccImpl->GetFrm()->IsCellFrm(),
@@ -175,7 +175,7 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
                             xAccImpl.get() )->_InvalidateMyCursorPos();
                 }
                 else
-                    bChanged = sal_True; // If the context is not know we
+                    bChanged = true; // If the context is not know we
                                          // don't know whether the selection
                                          // changed or not.
             }
@@ -226,7 +226,7 @@ void SwAccessibleCell::_InvalidateCursorPos()
     }
 }
 
-sal_Bool SwAccessibleCell::HasCursor()
+bool SwAccessibleCell::HasCursor()
 {
     osl::MutexGuard aGuard( aMutex );
     return bIsSelected;
@@ -264,11 +264,11 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
     return aRet;
 }
 
-void SwAccessibleCell::Dispose( sal_Bool bRecursive )
+void SwAccessibleCell::Dispose( bool bRecursive )
 {
     const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
     ::rtl::Reference< SwAccessibleContext > xAccImpl(
-            GetMap()->GetContextImpl( pParent, sal_False ) );
+            GetMap()->GetContextImpl( pParent, false ) );
     if( xAccImpl.is() )
         xAccImpl->DisposeChild( SwAccessibleChild(GetFrm()), bRecursive );
     SwAccessibleContext::Dispose( bRecursive );
@@ -278,7 +278,7 @@ void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox )
 {
     const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
     ::rtl::Reference< SwAccessibleContext > xAccImpl(
-            GetMap()->GetContextImpl( pParent, sal_False ) );
+            GetMap()->GetContextImpl( pParent, false ) );
     if( xAccImpl.is() )
         xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrm()), rOldBox );
     SwAccessibleContext::InvalidatePosOrSize( rOldBox );
@@ -366,7 +366,7 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
     CHECK_FOR_DEFUNC( XAccessibleValue );
 
     double fValue = 0;
-    sal_Bool bValid = (aNumber >>= fValue);
+    bool bValid = (aNumber >>= fValue);
     if( bValid )
     {
         SwTblBoxValue aValue( fValue );
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 80b9e908a8c1..9bc19460f6f5 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -35,12 +35,12 @@ class SwAccessibleCell : public SwAccessibleContext,
 {
     // Implementation for XAccessibleSelection interface
     SwAccessibleSelectionHelper aSelectionHelper;
-    sal_Bool    bIsSelected;    // protected by base class mutex
+    bool    bIsSelected;    // protected by base class mutex
 
-    sal_Bool    IsSelected();
+    bool    IsSelected();
 
-    sal_Bool _InvalidateMyCursorPos();
-    sal_Bool _InvalidateChildrenCursorPos( const SwFrm *pFrm );
+    bool _InvalidateMyCursorPos();
+    bool _InvalidateChildrenCursorPos( const SwFrm *pFrm );
 
     rtl::Reference<SwAccessibleTable> m_pAccTable;
 
@@ -56,7 +56,7 @@ protected:
 public:
     SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
 
-    virtual sal_Bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
+    virtual bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
 
     // XAccessibleContext
 
@@ -83,7 +83,7 @@ public:
         getSupportedServiceNames (void)
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
+    virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE;
 
     virtual void InvalidatePosOrSize( const SwRect& rFrm ) SAL_OVERRIDE;
 
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index ca9ab352454d..e12f4ae69f02 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -60,7 +60,7 @@ void SwAccessibleContext::InitStates()
     SwViewShell *pVSh = GetMap()->GetShell();
     bIsEditableState = pVSh && IsEditable( pVSh );
     bIsOpaqueState = pVSh && IsOpaque( pVSh );
-    bIsDefuncState = sal_False;
+    bIsDefuncState = false;
 }
 
 void SwAccessibleContext::SetParent( SwAccessibleContext *pParent )
@@ -274,8 +274,8 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea )
 
     ChildrenScrolled( GetFrm(), rOldVisArea );
 
-    sal_Bool bIsOldShowingState;
-    sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
+    bool bIsOldShowingState;
+    bool bIsNewShowingState = IsShowing( *(GetMap()) );
     {
         osl::MutexGuard aGuard( aMutex );
         bIsOldShowingState = bIsShowingState;
@@ -307,7 +307,7 @@ void SwAccessibleContext::ScrolledIn()
     // Send child event at parent. That's all we have to do here.
     const SwFrm* pParent = GetParent();
     ::rtl::Reference< SwAccessibleContext > xParentImpl(
-         GetMap()->GetContextImpl( pParent, sal_False ) );
+         GetMap()->GetContextImpl( pParent, false ) );
     uno::Reference < XAccessibleContext > xThis( this );
     if( xParentImpl.is() )
     {
@@ -324,7 +324,7 @@ void SwAccessibleContext::ScrolledIn()
             Window *pWin = GetWindow();
             if( pWin && pWin->HasFocus() )
             {
-                FireStateChangedEvent( AccessibleStateType::FOCUSED, sal_True );
+                FireStateChangedEvent( AccessibleStateType::FOCUSED, true );
             }
         }
 
@@ -346,7 +346,7 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea )
     // Broadcast a state changed event for the showing state.
     // It might be that the child is freshly created just to send
     // the child event. In this case no listener will exist.
-    FireStateChangedEvent( AccessibleStateType::SHOWING, sal_False );
+    FireStateChangedEvent( AccessibleStateType::SHOWING, false );
 }
 
 // #i27301# - use new type definition for <_nStates>
@@ -364,7 +364,7 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
         {
             ::rtl::Reference< SwAccessibleContext > xAccImpl;
             if( rLower.IsAccessible( GetShell()->IsPreview() ) )
-                xAccImpl = GetMap()->GetContextImpl( pLower, sal_False );
+                xAccImpl = GetMap()->GetContextImpl( pLower, false );
             if( xAccImpl.is() )
                 xAccImpl->InvalidateStates( _nStates );
             else
@@ -384,7 +384,7 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
 }
 
 void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm,
-                                       sal_Bool bRecursive )
+                                           bool bRecursive )
 {
     const SwAccessibleChildSList aVisList( GetVisArea(), *pFrm, *(GetMap()) );
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
@@ -396,7 +396,7 @@ void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm,
         {
             ::rtl::Reference< SwAccessibleContext > xAccImpl;
             if( rLower.IsAccessible( GetShell()->IsPreview() ) )
-                xAccImpl = GetMap()->GetContextImpl( pLower, sal_False );
+                xAccImpl = GetMap()->GetContextImpl( pLower, false );
             if( xAccImpl.is() )
                 xAccImpl->Dispose( bRecursive );
             else if( bRecursive )
@@ -406,19 +406,19 @@ void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm,
         {
             ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl(
                     GetMap()->GetContextImpl( rLower.GetDrawObject(),
-                                          this, sal_False )  );
+                                          this, false )  );
             if( xAccImpl.is() )
                 DisposeShape( rLower.GetDrawObject(), xAccImpl.get() );
         }
         else if ( rLower.GetWindow() )
         {
-            DisposeChild( rLower, sal_False );
+            DisposeChild( rLower, false );
         }
         ++aIter;
     }
 }
 
-void SwAccessibleContext::_InvalidateContent( sal_Bool )
+void SwAccessibleContext::_InvalidateContent( bool )
 {
 }
 
@@ -455,7 +455,7 @@ void SwAccessibleContext::FireVisibleDataEvent()
 }
 
 void SwAccessibleContext::FireStateChangedEvent( sal_Int16 nState,
-                                                 sal_Bool bNewState )
+                                                 bool bNewState )
 {
     AccessibleEventObject aEvent;
 
@@ -499,9 +499,9 @@ void SwAccessibleContext::GetStates(
         rStateSet.AddState( AccessibleStateType::DEFUNC );
 }
 
-sal_Bool SwAccessibleContext::IsEditableState()
+bool SwAccessibleContext::IsEditableState()
 {
-    sal_Bool bRet;
+    bool bRet;
     {
         osl::MutexGuard aGuard( aMutex );
         bRet = bIsEditableState;
@@ -518,12 +518,12 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM,
     , pMap( pM )
     , nClientId(0)
     , nRole( nR )
-    , bDisposing( sal_False )
+    , bDisposing( false )
     , bRegisteredAtAccessibleMap( true )
     //Initialize the begin document load and IfAsynLoad to true
-    , bBeginDocumentLoad( sal_True )
-    , isIfAsynLoad( sal_True )
-    , bIsSeletedInDoc( sal_False)
+    , bBeginDocumentLoad( true )
+    , isIfAsynLoad( true )
+    , bIsSeletedInDoc( false)
 {
     InitStates();
 }
@@ -550,7 +550,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount( void )
     CHECK_FOR_DEFUNC( XAccessibleContext )
     //Notify the frame is a document
     if( nRole == AccessibleRole::DOCUMENT_TEXT )
-        bIsAccDocUse = sal_True;
+        bIsAccDocUse = true;
 
     return bDisposing ? 0 : GetChildCount( *(GetMap()) );
 }
@@ -565,7 +565,7 @@ uno::Reference< XAccessible> SAL_CALL
 
     //Notify the frame is a document
     if( nRole == AccessibleRole::DOCUMENT_TEXT )
-        bIsAccDocUse = sal_True;
+        bIsAccDocUse = true;
 
     const SwAccessibleChild aChild( GetChild( *(GetMap()), nIndex ) );
     if( !aChild.IsValid() )
@@ -586,19 +586,19 @@ uno::Reference< XAccessible> SAL_CALL
         if( bBeginDocumentLoad && nRole == AccessibleRole::DOCUMENT_TEXT )
         {
 
-            FireStateChangedEvent( AccessibleStateType::FOCUSABLE,sal_True );
-            FireStateChangedEvent( AccessibleStateType::BUSY,sal_True );
+            FireStateChangedEvent( AccessibleStateType::FOCUSABLE,true );
+            FireStateChangedEvent( AccessibleStateType::BUSY,true );
             if( !isIfAsynLoad )
             {
-                FireStateChangedEvent( AccessibleStateType::FOCUSED,sal_True );
+                FireStateChangedEvent( AccessibleStateType::FOCUSED,true );
                 // OFFSCREEN == !SHOWING, should stay consistent
                 // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_True );
-                FireStateChangedEvent( AccessibleStateType::SHOWING,sal_True );
-                FireStateChangedEvent( AccessibleStateType::BUSY,sal_False );
+                FireStateChangedEvent( AccessibleStateType::SHOWING,true );
+                FireStateChangedEvent( AccessibleStateType::BUSY,false );
                 // OFFSCREEN again?
                 // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_False );
             }
-            bBeginDocumentLoad = sal_False;
+            bBeginDocumentLoad = false;
         }
         if( xChildImpl.is() )
         {
@@ -760,7 +760,7 @@ void SAL_CALL SwAccessibleContext::removeAccessibleEventListener(
     }
 }
 
-static sal_Bool lcl_PointInRectangle(const awt::Point & aPoint,
+static bool lcl_PointInRectangle(const awt::Point & aPoint,
                                      const awt::Rectangle & aRect)
 {
     long nDiffX = aPoint.X - aRect.X;
@@ -776,7 +776,7 @@ sal_Bool SAL_CALL SwAccessibleContext::containsPoint(
             const awt::Point& aPoint )
         throw (uno::RuntimeException, std::exception)
 {
-    awt::Rectangle aPixBounds = getBoundsImpl(sal_True);
+    awt::Rectangle aPixBounds = getBoundsImpl(true);
     aPixBounds.X = 0;
     aPixBounds.Y = 0;
 
@@ -840,7 +840,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
    true: Use relative mode.
    false: Use absolute mode.
 */
-awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
+awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
         throw (uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -887,13 +887,13 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
 awt::Rectangle SAL_CALL SwAccessibleContext::getBounds()
         throw (uno::RuntimeException, std::exception)
 {
-    return getBoundsImpl(sal_True);
+    return getBoundsImpl(true);
 }
 
 awt::Point SAL_CALL SwAccessibleContext::getLocation()
     throw (uno::RuntimeException, std::exception)
 {
-    awt::Rectangle aRect = getBoundsImpl(sal_True);
+    awt::Rectangle aRect = getBoundsImpl(true);
     awt::Point aPoint(aRect.X, aRect.Y);
 
     return aPoint;
@@ -902,7 +902,7 @@ awt::Point SAL_CALL SwAccessibleContext::getLocation()
 awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
         throw (uno::RuntimeException, std::exception)
 {
-    awt::Rectangle aRect = getBoundsImpl(sal_False);
+    awt::Rectangle aRect = getBoundsImpl(false);
 
     Point aPixPos(aRect.X, aRect.Y);
 
@@ -916,7 +916,7 @@ awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
 awt::Size SAL_CALL SwAccessibleContext::getSize()
         throw (uno::RuntimeException, std::exception)
 {
-    awt::Rectangle aRect = getBoundsImpl(sal_False);
+    awt::Rectangle aRect = getBoundsImpl(false);
     awt::Size aSize( aRect.Width, aRect.Height );
 
     return aSize;
@@ -934,7 +934,7 @@ void SAL_CALL SwAccessibleContext::grabFocus()
         const SdrObject *pObj =
             static_cast < const SwFlyFrm * >( GetFrm() )->GetVirtDrawObj();
         if( pObj )
-            Select( const_cast < SdrObject * >( pObj ), sal_False );
+            Select( const_cast < SdrObject * >( pObj ), false );
     }
     else
     {
@@ -1008,7 +1008,7 @@ void SwAccessibleContext::DisposeShape( const SdrObject *pObj,
 {
     ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl( pAccImpl );
     if( !xAccImpl.is() )
-        xAccImpl = GetMap()->GetContextImpl( pObj, this, sal_True );
+        xAccImpl = GetMap()->GetContextImpl( pObj, this, true );
 
     AccessibleEventObject aEvent;
     aEvent.EventId = AccessibleEventId::CHILD;
@@ -1048,7 +1048,7 @@ void SwAccessibleContext::ScrolledInShape( const SdrObject* ,
     }
 }
 
-void SwAccessibleContext::Dispose( sal_Bool bRecursive )
+void SwAccessibleContext::Dispose( bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
@@ -1056,7 +1056,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
     OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
                 "invalid vis area for dispose" );
 
-    bDisposing = sal_True;
+    bDisposing = true;
 
     // dispose children
     if( bRecursive )
@@ -1081,7 +1081,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
     // event if the object is disposed afterwards)
     {
         osl::MutexGuard aDefuncStateGuard( aMutex );
-        bIsDefuncState = sal_True;
+        bIsDefuncState = true;
     }
 
     // broadcast dispose event
@@ -1095,11 +1095,11 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
     ClearFrm();
     pMap = 0;
 
-    bDisposing = sal_False;
+    bDisposing = false;
 }
 
 void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
-                                        sal_Bool bRecursive )
+                                        bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
@@ -1114,14 +1114,14 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
         {
             ::rtl::Reference< SwAccessibleContext > xAccImpl =
                     GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(),
-                                              sal_True );
+                                              true );
             xAccImpl->Dispose( bRecursive );
         }
         else if ( rChildFrmOrObj.GetDrawObject() )
         {
             ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
                     GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
-                                              this, sal_True );
+                                              this, true );
             DisposeShape( rChildFrmOrObj.GetDrawObject(),
                           xAccImpl.get() );
         }
@@ -1145,8 +1145,8 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
 
     OSL_ENSURE( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
 
-    sal_Bool bIsOldShowingState;
-    sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
+    bool bIsOldShowingState;
+    bool bIsNewShowingState = IsShowing( *(GetMap()) );
     {
         osl::MutexGuard aShowingStateGuard( aMutex );
         bIsOldShowingState = bIsShowingState;
@@ -1170,7 +1170,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
         return;
     }
 
-    _InvalidateContent( sal_True );
+    _InvalidateContent( true );
 }
 
 void SwAccessibleContext::InvalidateChildPosOrSize(
@@ -1204,14 +1204,14 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
                 // The frame becomes visible. A child event must be send.
                 ::rtl::Reference< SwAccessibleContext > xAccImpl =
                     GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(),
-                                              sal_True );
+                                              true );
                 xAccImpl->ScrolledIn();
             }
             else if ( rChildFrmOrObj.GetDrawObject() )
             {
                 ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
                         GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
-                                                  this, sal_True );
+                                                  this, true );
                 // #i37790#
                 if ( xAccImpl.is() )
                 {
@@ -1245,15 +1245,15 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
             {
                 ::rtl::Reference< SwAccessibleContext > xAccImpl =
                     GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(),
-                                              sal_True );
+                                              true );
                 xAccImpl->SetParent( this );
-                xAccImpl->Dispose( sal_True );
+                xAccImpl->Dispose( true );
             }
             else if ( rChildFrmOrObj.GetDrawObject() )
             {
                 ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
                         GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
-                                                  this, sal_True );
+                                                  this, true );
                 DisposeShape( rChildFrmOrObj.GetDrawObject(),
                           xAccImpl.get() );
             }
@@ -1269,7 +1269,7 @@ void SwAccessibleContext::InvalidateContent()
 {
     SolarMutexGuard aGuard;
 
-    _InvalidateContent( sal_False );
+    _InvalidateContent( false );
 }
 
 void SwAccessibleContext::InvalidateCursorPos()
@@ -1296,8 +1296,8 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
         {
             if( (_nStates & ACC_STATE_EDITABLE) != 0 )
             {
-                sal_Bool bIsOldEditableState;
-                sal_Bool bIsNewEditableState = IsEditable( pVSh );
+                bool bIsOldEditableState;
+                bool bIsNewEditableState = IsEditable( pVSh );
                 {
                     osl::MutexGuard aGuard( aMutex );
                     bIsOldEditableState = bIsEditableState;
@@ -1310,8 +1310,8 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
             }
             if( (_nStates & ACC_STATE_OPAQUE) != 0 )
             {
-                sal_Bool bIsOldOpaqueState;
-                sal_Bool bIsNewOpaqueState = IsOpaque( pVSh );
+                bool bIsOldOpaqueState;
+                bool bIsNewOpaqueState = IsOpaque( pVSh );
                 {
                     osl::MutexGuard aGuard( aMutex );
                     bIsOldOpaqueState = bIsOpaqueState;
@@ -1354,17 +1354,17 @@ void SwAccessibleContext::InvalidateAttr()
     FireAccessibleEvent( aEvent );
 }
 
-sal_Bool SwAccessibleContext::HasCursor()
+bool SwAccessibleContext::HasCursor()
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
-                                      sal_Bool bAdd )
+bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
+                                  bool bAdd )
 {
     SwCrsrShell* pCrsrShell = GetCrsrShell();
     if( !pCrsrShell )
-        return sal_False;
+        return false;
 
     SwFEShell* pFEShell = pCrsrShell->ISA( SwFEShell )
                                 ? static_cast<SwFEShell*>( pCrsrShell )
@@ -1377,7 +1377,7 @@ sal_Bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
                                 ? static_cast<SwWrtShell*>( pCrsrShell )
                                 : 0;
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( pObj )
     {
         if( pFEShell )
@@ -1385,20 +1385,20 @@ sal_Bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
             Point aDummy;
             sal_uInt8 nFlags = bAdd ? SW_ADD_SELECT : 0;
             pFEShell->SelectObj( aDummy, nFlags, pObj );
-            bRet = sal_True;
+            bRet = true;
         }
     }
     else if( pPaM )
     {
         // Get rid of frame selection. If there is one, make text cursor
         // visible again.
-        sal_Bool bCallShowCrsr = sal_False;
+        bool bCallShowCrsr = false;
         if( pFEShell && (pFEShell->IsFrmSelected() ||
                          pFEShell->IsObjSelected()) )
         {
             Point aPt( LONG_MIN, LONG_MIN );
             pFEShell->SelectObj( aPt, 0 );
-            bCallShowCrsr = sal_True;
+            bCallShowCrsr = true;
         }
         pCrsrShell->KillPams();
         if( pWrtShell && pPaM->HasMark() )
@@ -1414,7 +1414,7 @@ sal_Bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
             pCrsrShell->ClearMark();
         if( bCallShowCrsr )
             pCrsrShell->ShowCrsr();
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -1496,15 +1496,15 @@ void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< Window*
     }
 }
 
-sal_Bool SwAccessibleContext::SetSelectedState(sal_Bool bSeleted)
+bool SwAccessibleContext::SetSelectedState(bool bSeleted)
 {
     if(bIsSeletedInDoc != bSeleted)
     {
         bIsSeletedInDoc = bSeleted;
         FireStateChangedEvent( AccessibleStateType::SELECTED, bSeleted );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 6247f028786e..0a597e34869b 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -76,13 +76,13 @@ private:
     sal_Int16 nRole;        // immutable outside constructor
 
     // The current states (protected by mutex)
-    sal_Bool bIsShowingState : 1;
-    sal_Bool bIsEditableState : 1;
-    sal_Bool bIsOpaqueState : 1;
-    sal_Bool bIsDefuncState : 1;
+    bool bIsShowingState : 1;
+    bool bIsEditableState : 1;
+    bool bIsOpaqueState : 1;
+    bool bIsDefuncState : 1;
 
     // Are we currently disposing that object (protected by solar mutex)?
-    sal_Bool bDisposing : 1;
+    bool bDisposing : 1;
 
     // #i85634# - boolean, indicating if the accessible context is
     // in general registered at the accessible map.
@@ -90,7 +90,7 @@ private:
 
     void InitStates();
     //Add a member to identify the first time that document load
-    sal_Bool bBeginDocumentLoad;
+    bool bBeginDocumentLoad;
 
 protected:
     void SetName( const OUString& rName ) { sName = rName; }
@@ -99,13 +99,13 @@ protected:
         return nRole;
     }
     //Add a member to identify if the document is Asyn load.
-    sal_Bool isIfAsynLoad;
+    bool isIfAsynLoad;
     //This flag is used to mark the object's selected state.
-    sal_Bool   bIsSeletedInDoc;
+    bool   bIsSeletedInDoc;
     void SetParent( SwAccessibleContext *pParent );
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetWeakParent() const;
 
-    sal_Bool IsDisposing() const { return bDisposing; }
+    bool IsDisposing() const { return bDisposing; }
 
     Window *GetWindow();
     SwAccessibleMap *GetMap() { return pMap; }
@@ -153,14 +153,14 @@ protected:
     // Dispose children of the specified SwFrm. The SwFrm might belong to
     // the current object or to any other child or grandchild.
     void DisposeChildren( const SwFrm *pFrm,
-                                       sal_Bool bRecursive );
+                          bool bRecursive );
 
     void DisposeShape( const SdrObject *pObj,
                                 ::accessibility::AccessibleShape *pAccImpl );
     void ScrolledInShape( const SdrObject *pObj,
                                 ::accessibility::AccessibleShape *pAccImpl );
 
-    virtual void _InvalidateContent( sal_Bool bVisibleDataFired );
+    virtual void _InvalidateContent( bool bVisibleDataFired );
 
     virtual void _InvalidateCursorPos();
     virtual void _InvalidateFocus();
@@ -174,17 +174,17 @@ protected:
     void FireVisibleDataEvent();
 
     // broadcast state change event
-    void FireStateChangedEvent( sal_Int16 nState, sal_Bool bNewState );
+    void FireStateChangedEvent( sal_Int16 nState, bool bNewState );
 
     // Set states for getAccessibleStateSet.
     // This base class sets DEFUNC(0/1), EDITABLE(0/1), ENABLED(1),
     // SHOWING(0/1), OPAQUE(0/1) and VISIBLE(1).
     virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
 
-     sal_Bool IsEditableState();
+     bool IsEditableState();
 
     virtual ::com::sun::star::awt::Rectangle SAL_CALL
-        getBoundsImpl(sal_Bool bRelative)
+        getBoundsImpl(bool bRelative)
         throw (::com::sun::star::uno::RuntimeException);
 
     // #i85634#
@@ -325,10 +325,10 @@ public:
     // thread safe C++ interface
 
     // The object is not visible an longer and should be destroyed
-    virtual void Dispose( sal_Bool bRecursive = sal_False );
+    virtual void Dispose( bool bRecursive = false );
 
     // The child object is not visible an longer and should be destroyed
-    virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj, sal_Bool bRecursive );
+    virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj, bool bRecursive );
 
     // The object has been moved by the layout
     virtual void InvalidatePosOrSize( const SwRect& rFrm );
@@ -366,21 +366,21 @@ public:
 
     const OUString& GetName() const { return sName; }
 
-    virtual sal_Bool HasCursor();   // required by map to remember that object
+    virtual bool HasCursor();   // required by map to remember that object
 
-    sal_Bool Select( SwPaM *pPaM, SdrObject *pObj, sal_Bool bAdd );
-    inline sal_Bool Select( SwPaM& rPaM )
+    bool Select( SwPaM *pPaM, SdrObject *pObj, bool bAdd );
+    inline bool Select( SwPaM& rPaM )
     {
-        return Select( &rPaM, 0, sal_False );
+        return Select( &rPaM, 0, false );
     }
-    inline sal_Bool Select( SdrObject *pObj, sal_Bool bAdd )
+    inline bool Select( SdrObject *pObj, bool bAdd )
     {
         return Select( 0, pObj, bAdd );
     }
 
     //This method is used to updated the selected state and fire the selected state changed event.
-    virtual sal_Bool SetSelectedState(sal_Bool bSeleted);
-    sal_Bool  IsSeletedInDoc(){  return bIsSeletedInDoc; }
+    virtual bool SetSelectedState(bool bSeleted);
+    bool  IsSeletedInDoc(){  return bIsSeletedInDoc; }
 
     static OUString GetResource( sal_uInt16 nResId,
                                         const OUString *pArg1 = 0,
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 5a3cdf8f27d4..101415db0867 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -381,7 +381,7 @@ SwAccessibleDocument::~SwAccessibleDocument()
         pWin->RemoveChildEventListener( LINK( this, SwAccessibleDocument, WindowChildEventListener ));
 }
 
-void SwAccessibleDocument::Dispose( sal_Bool bRecursive )
+void SwAccessibleDocument::Dispose( bool bRecursive )
 {
     OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
 
@@ -572,24 +572,24 @@ void SAL_CALL SwAccessibleDocument::notifyEvent( const ::com::sun::star::documen
 
     if ( Event.EventName.equalsAscii( "FirstPageShows" ) )
     {
-        FireStateChangedEvent( AccessibleStateType::FOCUSED,sal_True );
+        FireStateChangedEvent( AccessibleStateType::FOCUSED,true );
     }
     else if ( Event.EventName.equalsAscii( "LoadFinished" ) )
     {
         // IA2 CWS. MT: OFFSCREEN == !SHOWING, should stay consistent
         // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_True );
         // MT: LoadFinished => Why not SHOWING == TRUE?
-        FireStateChangedEvent( AccessibleStateType::SHOWING,sal_False );
+        FireStateChangedEvent( AccessibleStateType::SHOWING,false );
     }
     else if ( Event.EventName.equalsAscii( "FormatFinished" ) )
     {
-        FireStateChangedEvent( AccessibleStateType::BUSY,sal_False );
+        FireStateChangedEvent( AccessibleStateType::BUSY,false );
         // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_False );
-        FireStateChangedEvent( AccessibleStateType::SHOWING,sal_True );
+        FireStateChangedEvent( AccessibleStateType::SHOWING,true );
     }
     else
     {
-        isIfAsynLoad = sal_False;
+        isIfAsynLoad = false;
     }
 }
 
@@ -624,7 +624,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
     if( pFEShell )
     {
-        pFEShell->GetPageNumber(-1,sal_True,nPage,nLogPage,sDisplay);
+        pFEShell->GetPageNumber(-1,true,nPage,nLogPage,sDisplay);
         sAttrName = "page-name:";
 
         sValue = sAttrName + sDisplay ;
@@ -863,7 +863,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
             SdrObject* pObj = GetSdrObjectFromXShape(xShape);
             if( pObj )
             {
-                uno::Reference<XAccessible> xAcc = pAccMap->GetContext(pObj, this, sal_False);
+                uno::Reference<XAccessible> xAcc = pAccMap->GetContext(pObj, this, false);
                 uno::Reference < XAccessibleSelection > xAccSelection( xAcc, uno::UNO_QUERY );
                 if ( xAccSelection.is() )
                 {
@@ -943,7 +943,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
                 std::vector<SwFrm*>::iterator aIter = vFrmList.begin();
                 for ( sal_Int32 nIndex = 0; aIter != vFrmList.end(); ++aIter, nIndex++ )
                 {
-                    uno::Reference< XAccessible > xAcc = pAccMap->GetContext(*aIter, sal_False);
+                    uno::Reference< XAccessible > xAcc = pAccMap->GetContext(*aIter, false);
                     if ( xAcc.is() )
                     {
                         SwAccessibleContext *pAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 65fe9fae933b..b724508b4f5d 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -205,7 +205,7 @@ public:
     // thread safe C++ interface
 
     // The object is not visible an longer and should be destroyed
-    virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
+    virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE;
 
     // XAccessibleComponent
     sal_Int32 SAL_CALL getBackground()
diff --git a/sw/source/core/access/accfield.cxx b/sw/source/core/access/accfield.cxx
index 3883bb20a359..cea3369a0879 100644
--- a/sw/source/core/access/accfield.cxx
+++ b/sw/source/core/access/accfield.cxx
@@ -131,7 +131,7 @@ com::sun::star::lang::Locale SAL_CALL SwAccessibleField::getLocale (void)
     return aLoc;
 }
 
-static sal_Bool lcl_PointInRectangle(const awt::Point & aPoint,
+static bool lcl_PointInRectangle(const awt::Point & aPoint,
                                      const awt::Rectangle & aRect)
 {
     long nDiffX = aPoint.X - aRect.X;
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index af564b2fbc7a..63f0c2744be8 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -44,7 +44,7 @@ const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccess
 
 SwAccessibleFootnote::SwAccessibleFootnote(
         SwAccessibleMap* pInitMap,
-        sal_Bool bIsEndnote,
+        bool bIsEndnote,
         const SwFtnFrm *pFtnFrm ) :
     SwAccessibleContext( pInitMap,
         bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
@@ -128,7 +128,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
-sal_Bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm )
+bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm )
 {
     const SwTxtFtn *pTxtFtn = pFtnFrm ->GetAttr();
     return pTxtFtn && pTxtFtn->GetFtn().IsEndNote() ;
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index e6cd36b938d4..7ad73058cebd 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -33,7 +33,7 @@ protected:
 
 public:
     SwAccessibleFootnote( SwAccessibleMap* pInitMap,
-                          sal_Bool bIsEndnote,
+                          bool bIsEndnote,
                           const SwFtnFrm *pFtnFrm );
 
     // XAccessibleContext
@@ -64,7 +64,7 @@ public:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    static sal_Bool IsEndnote( const SwFtnFrm *pFrm );
+    static bool IsEndnote( const SwFtnFrm *pFrm );
 };
 
 #endif
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 88885aa13ab7..351d62dfd38c 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -47,7 +47,7 @@ using namespace sw::access;
 sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
                                             const SwRect& rVisArea,
                                             const SwFrm *pFrm,
-                                            sal_Bool bInPagePreview )
+                                            bool bInPagePreview )
 {
     sal_Int32 nCount = 0;
 
@@ -79,7 +79,7 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
                                    const SwRect& rVisArea,
                                    const SwFrm& rFrm,
                                    sal_Int32& rPos,
-                                   sal_Bool bInPagePreview )
+                                   bool bInPagePreview )
 {
     SwAccessibleChild aRet;
 
@@ -141,15 +141,15 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
     return aRet;
 }
 
-sal_Bool SwAccessibleFrame::GetChildIndex(
+bool SwAccessibleFrame::GetChildIndex(
                                    SwAccessibleMap& rAccMap,
                                    const SwRect& rVisArea,
                                    const SwFrm& rFrm,
                                    const SwAccessibleChild& rChild,
                                    sal_Int32& rPos,
-                                   sal_Bool bInPagePreview )
+                                   bool bInPagePreview )
 {
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
 
     if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
     {
@@ -162,7 +162,7 @@ sal_Bool SwAccessibleFrame::GetChildIndex(
             if( rLower.IsAccessible( bInPagePreview ) )
             {
                 if( rChild == rLower )
-                    bFound = sal_True;
+                    bFound = true;
                 else
                     rPos++;
             }
@@ -189,7 +189,7 @@ sal_Bool SwAccessibleFrame::GetChildIndex(
             if( rLower.IsAccessible( bInPagePreview ) )
             {
                 if( rChild == rLower )
-                    bFound = sal_True;
+                    bFound = true;
                 else
                     rPos++;
             }
@@ -210,7 +210,7 @@ sal_Bool SwAccessibleFrame::GetChildIndex(
 SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
                                           const SwFrm& rFrm,
                                           const Point& rPixPos,
-                                          sal_Bool bInPagePreview,
+                                          bool bInPagePreview,
                                           SwAccessibleMap& rAccMap )
 {
     SwAccessibleChild aRet;
@@ -284,7 +284,7 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
                                      const SwRect& rVisArea,
                                      const SwFrm& rFrm,
                                      ::std::list< SwAccessibleChild >& rChildren,
-                                     sal_Bool bInPagePreview )
+                                     bool bInPagePreview )
 {
     if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
     {
@@ -342,47 +342,47 @@ SwRect SwAccessibleFrame::GetBounds( const SwAccessibleMap& rAccMap,
     return aBounds;
 }
 
-sal_Bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
+bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
 {
     const SwFrm *pFrm = GetFrm();
     if( !pFrm )
-        return sal_False;
+        return false;
 
     OSL_ENSURE( pVSh, "no view shell" );
     if( pVSh && (pVSh->GetViewOptions()->IsReadonly() ||
                  pVSh->IsPreview()) )
-        return sal_False;
+        return false;
 
     if( !pFrm->IsRootFrm() && pFrm->IsProtected() )
-        return sal_False;
+        return false;
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
+bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
 {
     SwAccessibleChild aFrm( GetFrm() );
     if( !aFrm.GetSwFrm() )
-        return sal_False;
+        return false;
 
     OSL_ENSURE( pVSh, "no view shell" );
     if( !pVSh )
-        return sal_False;
+        return false;
 
     const SwViewOption *pVOpt = pVSh->GetViewOptions();
     do
     {
         const SwFrm *pFrm = aFrm.GetSwFrm();
         if( pFrm->IsRootFrm() )
-            return sal_True;
+            return true;
 
         if( pFrm->IsPageFrm() && !pVOpt->IsPageBack() )
-            return sal_False;
+            return false;
 
         const SvxBrushItem &rBack = pFrm->GetAttrSet()->GetBackground();
         if( !rBack.GetColor().GetTransparency() ||
              rBack.GetGraphicPos() != GPOS_NONE )
-            return sal_True;
+            return true;
 
         // If a fly frame has a transparent background color, we have to consider the background.
         // But a background color "no fill"/"auto fill" should *not* be considered.
@@ -390,7 +390,7 @@ sal_Bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
             (rBack.GetColor().GetTransparency() != 0) &&
             (rBack.GetColor() != COL_TRANSPARENT)
           )
-            return sal_True;
+            return true;
 
         if( pFrm->IsSctFrm() )
         {
@@ -399,7 +399,7 @@ sal_Bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
                 TOX_CONTENT_SECTION == pSection->GetType() ) &&
                 !pVOpt->IsReadonly() &&
                 SwViewOption::IsIndexShadings() )
-                return sal_True;
+                return true;
         }
         if( pFrm->IsFlyFrm() )
             aFrm = static_cast<const SwFlyFrm*>(pFrm)->GetAnchorFrm();
@@ -407,16 +407,16 @@ sal_Bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
             aFrm = pFrm->GetUpper();
     } while( aFrm.GetSwFrm() && !aFrm.IsAccessible( IsInPagePreview() ) );
 
-    return sal_False;
+    return false;
 }
 
 SwAccessibleFrame::SwAccessibleFrame( const SwRect& rVisArea,
                                       const SwFrm *pF,
-                                      sal_Bool bIsPagePreview ) :
+                                      bool bIsPagePreview ) :
     maVisArea( rVisArea ),
     mpFrm( pF ),
     mbIsInPagePreview( bIsPagePreview ),
-    bIsAccDocUse( sal_False )
+    bIsAccDocUse( false )
 {
 }
 
@@ -425,7 +425,7 @@ SwAccessibleFrame::~SwAccessibleFrame()
 }
 
 const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj,
-                                           sal_Bool bInPagePreview )
+                                           bool bInPagePreview )
 {
     return rFrmOrObj.GetParent( bInPagePreview );
 }
@@ -476,7 +476,7 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
     GetChildren( rAccMap, maVisArea, *mpFrm, rChildren, IsInPagePreview() );
 }
 
-sal_Bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap,
+bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap,
                                        const sw::access::SwAccessibleChild& rFrmOrObj ) const
 {
     return IsShowing( rFrmOrObj.GetBox( rAccMap ) );
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index afbe6afb3266..f4219d7211a5 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -41,52 +41,52 @@ class SwAccessibleFrame
 {
     SwRect maVisArea;
     const SwFrm* mpFrm;
-    const sal_Bool mbIsInPagePreview;
+    const bool mbIsInPagePreview;
 
 protected:
     // #i77106# - method needs to be called by new class <SwAccessibleTableColHeaders>
     static sal_Int32 GetChildCount( SwAccessibleMap& rAccMap,
                                     const SwRect& rVisArea,
                                     const SwFrm *pFrm,
-                                    sal_Bool bInPagePreviewr );
+                                    bool bInPagePreviewr );
 
 // private:
     static sw::access::SwAccessibleChild GetChild( SwAccessibleMap& rAccMap,
                                                    const SwRect& rVisArea,
                                                    const SwFrm& rFrm,
                                                    sal_Int32& rPos,
-                                                   sal_Bool bInPagePreview);
+                                                   bool bInPagePreview);
 
-    static sal_Bool GetChildIndex( SwAccessibleMap& rAccMap,
-                                   const SwRect& rVisArea,
-                                   const SwFrm& rFrm,
-                                   const sw::access::SwAccessibleChild& rChild,
-                                   sal_Int32& rPos,
-                                   sal_Bool bInPagePreview );
+    static bool GetChildIndex( SwAccessibleMap& rAccMap,
+                               const SwRect& rVisArea,
+                               const SwFrm& rFrm,
+                               const sw::access::SwAccessibleChild& rChild,
+                               sal_Int32& rPos,
+                               bool bInPagePreview );
 
     static sw::access::SwAccessibleChild GetChildAtPixel( const SwRect& rVisArea,
                                                           const SwFrm& rFrm,
                                                           const Point& rPos,
-                                                          sal_Bool bInPagePreview,
+                                                          bool bInPagePreview,
                                                           SwAccessibleMap& rAccMap );
 
     static void GetChildren( SwAccessibleMap& rAccMap,
                              const SwRect& rVisArea,
                              const SwFrm& rFrm,
                              ::std::list< sw::access::SwAccessibleChild >& rChildren,
-                             sal_Bool bInPagePreview );
+                             bool bInPagePreview );
 
 protected:
-    sal_Bool IsEditable( SwViewShell *pVSh ) const;
+    bool IsEditable( SwViewShell *pVSh ) const;
 
-    sal_Bool IsOpaque( SwViewShell *pVSh ) const;
+    bool IsOpaque( SwViewShell *pVSh ) const;
 
-    sal_Bool IsShowing( const SwAccessibleMap& rAccMap,
+    bool IsShowing( const SwAccessibleMap& rAccMap,
                         const sw::access::SwAccessibleChild& rFrmOrObj ) const;
-    inline sal_Bool IsShowing( const SwRect& rFrm ) const;
-    inline sal_Bool IsShowing( const SwAccessibleMap& rAccMap ) const;
+    inline bool IsShowing( const SwRect& rFrm ) const;
+    inline bool IsShowing( const SwAccessibleMap& rAccMap ) const;
 
-    inline sal_Bool IsInPagePreview() const
+    inline bool IsInPagePreview() const
     {
         return mbIsInPagePreview;
     }
@@ -98,17 +98,17 @@ protected:
 
     SwAccessibleFrame( const SwRect& rVisArea,
                        const SwFrm *pFrm,
-                       sal_Bool bIsPagePreview );
+                       bool bIsPagePreview );
     virtual ~SwAccessibleFrame();
 
     // MT: Move to private area?
-    sal_Bool bIsAccDocUse;
+    bool bIsAccDocUse;
 public:
     // Return the SwFrm this context is attached to.
     const SwFrm* GetFrm() const { return mpFrm; };
 
     static const SwFrm* GetParent( const sw::access::SwAccessibleChild& rFrmOrObj,
-                                   sal_Bool bInPagePreview );
+                                   bool bInPagePreview );
 
     sal_Int32 GetChildIndex( SwAccessibleMap& rAccMap,
                              const sw::access::SwAccessibleChild& rChild ) const;
@@ -146,12 +146,12 @@ protected:
     OUString GetFormattedPageNumber() const;
 };
 
-inline sal_Bool SwAccessibleFrame::IsShowing( const SwRect& rFrm ) const
+inline bool SwAccessibleFrame::IsShowing( const SwRect& rFrm ) const
 {
     return rFrm.IsOver( maVisArea );
 }
 
-inline sal_Bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap ) const
+inline bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap ) const
 {
     sw::access::SwAccessibleChild aFrmOrObj( GetFrm() );
     return IsShowing( rAccMap, aFrmOrObj );
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index b22c8995ad28..9d8baf741fb1 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -43,9 +43,9 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
-sal_Bool SwAccessibleFrameBase::IsSelected()
+bool SwAccessibleFrameBase::IsSelected()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     OSL_ENSURE( GetMap(), "no map?" );
     const SwViewShell *pVSh = GetMap()->GetShell();
@@ -55,7 +55,7 @@ sal_Bool SwAccessibleFrameBase::IsSelected()
         const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
         const SwFrm *pFlyFrm = pFESh->GetCurrFlyFrm();
         if( pFlyFrm == GetFrm() )
-            bRet = sal_True;
+            bRet = true;
     }
 
     return bRet;
@@ -68,7 +68,7 @@ void SwAccessibleFrameBase::GetStates(
 
     const SwViewShell *pVSh = GetMap()->GetShell();
     OSL_ENSURE( pVSh, "no shell?" );
-    sal_Bool bSelectable =  pVSh->ISA( SwFEShell );
+    bool bSelectable =  pVSh->ISA( SwFEShell );
 
     // SELECTABLE
     if( bSelectable )
@@ -128,7 +128,7 @@ SwAccessibleFrameBase::SwAccessibleFrameBase(
         sal_Int16 nInitRole,
         const SwFlyFrm* pFlyFrm  ) :
     SwAccessibleContext( pInitMap, nInitRole, pFlyFrm ),
-    bIsSelected( sal_False )
+    bIsSelected( false )
 {
     SolarMutexGuard aGuard;
 
@@ -142,8 +142,8 @@ SwAccessibleFrameBase::SwAccessibleFrameBase(
 
 void SwAccessibleFrameBase::_InvalidateCursorPos()
 {
-    sal_Bool bNewSelected = IsSelected();
-    sal_Bool bOldSelected;
+    bool bNewSelected = IsSelected();
+    bool bOldSelected;
 
     {
         osl::MutexGuard aGuard( aMutex );
@@ -189,7 +189,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
     Window *pWin = GetWindow();
     if( pWin )
     {
-        sal_Bool bSelected;
+        bool bSelected;
 
         {
             osl::MutexGuard aGuard( aMutex );
@@ -202,7 +202,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
     }
 }
 
-sal_Bool SwAccessibleFrameBase::HasCursor()
+bool SwAccessibleFrameBase::HasCursor()
 {
     osl::MutexGuard aGuard( aMutex );
     return bIsSelected;
@@ -263,7 +263,7 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
     }
 }
 
-void SwAccessibleFrameBase::Dispose( sal_Bool bRecursive )
+void SwAccessibleFrameBase::Dispose( bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
@@ -288,7 +288,7 @@ SwPaM* SwAccessibleFrameBase::GetCrsr()
             !(pFESh->IsFrmSelected() || pFESh->IsObjSelected() > 0) )
         {
             // get the selection, and test whether it affects our text node
-            pCrsr = pCrsrShell->GetCrsr( sal_False /* ??? */ );
+            pCrsr = pCrsrShell->GetCrsr( false /* ??? */ );
         }
     }
 
@@ -297,13 +297,13 @@ SwPaM* SwAccessibleFrameBase::GetCrsr()
 
 //Return the selected state of the object.
 //when the object's anchor are in the selection cursor, we should return true.
-sal_Bool SwAccessibleFrameBase::GetSelectedState( )
+bool SwAccessibleFrameBase::GetSelectedState( )
 {
     SolarMutexGuard aGuard;
 
     if(GetMap()->IsDocumentSelAll())
     {
-        return sal_True;
+        return true;
     }
 
     // SELETED.
@@ -312,7 +312,7 @@ sal_Bool SwAccessibleFrameBase::GetSelectedState( )
     const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
     const SwPosition *pPos = pAnchor.GetCntntAnchor();
     if( !pPos )
-        return sal_False;
+        return false;
     int pIndex = pPos->nContent.GetIndex();
     if( pPos->nNode.GetNode().GetTxtNode() )
     {
@@ -340,13 +340,13 @@ sal_Bool SwAccessibleFrameBase::GetSelectedState( )
                         {
                             if( ((nHere == nStartIndex) && (pIndex >= pStart->nContent.GetIndex())) || (nHere > nStartIndex) )
                                 if( ((nHere == nEndIndex) && (pIndex < pEnd->nContent.GetIndex())) || (nHere < nEndIndex) )
-                                    return sal_True;
+                                    return true;
                         }
                         else if( pAnchor.GetAnchorId() == FLY_AT_PARA )
                         {
                             if( ((nHere > nStartIndex) || pStart->nContent.GetIndex() ==0 )
                                 && (nHere < nEndIndex ) )
-                                return sal_True;
+                                return true;
                         }
                         break;
                     }
@@ -360,7 +360,7 @@ sal_Bool SwAccessibleFrameBase::GetSelectedState( )
             while( pCrsr != pRingStart );
         }
     }
-    return sal_False;
+    return false;
 }
 
 SwFlyFrm* SwAccessibleFrameBase::getFlyFrm() const
@@ -377,17 +377,17 @@ SwFlyFrm* SwAccessibleFrameBase::getFlyFrm() const
     return pFlyFrm;
 }
 
-sal_Bool SwAccessibleFrameBase::SetSelectedState( sal_Bool )
+bool SwAccessibleFrameBase::SetSelectedState( bool )
 {
-    sal_Bool bParaSeleted = GetSelectedState() || IsSelected();
+    bool bParaSeleted = GetSelectedState() || IsSelected();
 
     if(bIsSeletedInDoc != bParaSeleted)
     {
         bIsSeletedInDoc = bParaSeleted;
         FireStateChangedEvent( AccessibleStateType::SELECTED, bParaSeleted );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index fed0f3e7d1d5..ab1e17e07481 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -29,8 +29,8 @@ class SwFlyFrm;
 class SwAccessibleFrameBase : public SwAccessibleContext,
                               public SwClient
 {
-    sal_Bool    bIsSelected;    // protected by base class mutex
-    sal_Bool    IsSelected();
+    bool    bIsSelected;    // protected by base class mutex
+    bool    IsSelected();
 
 protected:
     // Set states for getAccessibleStateSet.
@@ -38,7 +38,7 @@ protected:
     // FOCUSABLE(1) and FOCUSED(+)
     virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
     SwFlyFrm* getFlyFrm() const;
-    sal_Bool GetSelectedState( );
+    bool GetSelectedState( );
     SwPaM* GetCrsr();
 
     virtual void _InvalidateCursorPos() SAL_OVERRIDE;
@@ -52,13 +52,13 @@ public:
                            sal_Int16 nInitRole,
                            const SwFlyFrm *pFlyFrm );
 
-    virtual sal_Bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
+    virtual bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
 
     static sal_uInt8 GetNodeType( const SwFlyFrm *pFlyFrm );
 
     // The object is not visible an longer and should be destroyed
-    virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
-    virtual sal_Bool SetSelectedState( sal_Bool bSeleted ) SAL_OVERRIDE;
+    virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE;
+    virtual bool SetSelectedState( bool bSeleted ) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 47a37cf74838..a247357a6c34 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -120,7 +120,7 @@ void SwAccessibleChild::Init( Window* pWindow )
     mpDrawObj = 0;
 }
 
-bool SwAccessibleChild::IsAccessible( sal_Bool bPagePreview ) const
+bool SwAccessibleChild::IsAccessible( bool bPagePreview ) const
 {
     bool bRet( false );
 
@@ -324,7 +324,7 @@ bool SwAccessibleChild::AlwaysIncludeAsChild() const
     return bAlwaysIncludedAsChild;
 }
 
-const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
+const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
 {
     const SwFrm* pParent( 0 );
 
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 47e1f3ba6684..445b8eeb26c8 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -56,9 +56,9 @@ class SwAccessibleChild
         const SdrObject* GetDrawObject() const;
         Window* GetWindow() const;
 
-        const SwFrm* GetParent( const sal_Bool bInPagePreview ) const;
+        const SwFrm* GetParent( const bool bInPagePreview ) const;
 
-        bool IsAccessible( sal_Bool bPagePreview ) const;
+        bool IsAccessible( bool bPagePreview ) const;
         bool IsBoundAsChar() const;
 
         bool IsVisibleChildrenOnly() const;
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index b4be792acbc9..6c49b85aef55 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -95,7 +95,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
 
         {
             ::rtl::Reference < SwAccessibleContext > xAccImpl =
-                                rAccMap.GetContextImpl( &rFrm, sal_False );
+                                rAccMap.GetContextImpl( &rFrm, false );
             if( xAccImpl.is() )
             {
                 SwAccessibleContext* pAccImpl = xAccImpl.get();
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 60c28ab00058..697e3d986966 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -62,7 +62,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
             if ( !aCurr.IsValid() )
             {
                 ::rtl::Reference < SwAccessibleContext > xAccImpl =
-                                    rAccMap.GetContextImpl( &rFrm, sal_False );
+                                    rAccMap.GetContextImpl( &rFrm, false );
                 if( xAccImpl.is() )
                 {
                     SwAccessibleContext* pAccImpl = xAccImpl.get();
@@ -128,7 +128,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
             if ( !aCurr.IsValid() )
             {
                 ::rtl::Reference < SwAccessibleContext > xAccImpl =
-                                    rList.GetAccMap().GetContextImpl( &rFrm, sal_False );
+                                    rList.GetAccMap().GetContextImpl( &rFrm, false );
                 if( xAccImpl.is() )
                 {
                     SwAccessibleContext* pAccImpl = xAccImpl.get();
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index dcec789b65ab..0b8bb183fd0e 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -73,7 +73,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
 {
     SolarMutexGuard aGuard;
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
@@ -96,7 +96,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
                     const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisited(true);
                     const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisitedValid(true);
                 }
-                bRet = sal_True;
+                bRet = true;
             }
         }
     }
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 575002e60126..40451b7034d8 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -316,7 +316,7 @@ private:
 
 public:
     const SwFrm* mpParentFrm;   // The object that fires the event
-    sal_Bool IsNoXaccParentFrm() const
+    bool IsNoXaccParentFrm() const
     {
         return CHILD_POS_CHANGED == meType && mpParentFrm != 0;
     }
@@ -1075,7 +1075,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
     const SwViewShell *pVSh = GetShell();
     const SwFEShell *pFESh = pVSh->ISA( SwFEShell ) ?
                             static_cast< const SwFEShell * >( pVSh ) : 0;
-    SwPaM* pCrsr = pFESh ? pFESh->GetCrsr( sal_False /* ??? */ ) : NULL;
+    SwPaM* pCrsr = pFESh ? pFESh->GetCrsr( false /* ??? */ ) : NULL;
 
     //sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
 
@@ -1085,7 +1085,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
             pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape );
     }
 
-    sal_Bool bIsSelAll =IsDocumentSelAll();
+    bool bIsSelAll =IsDocumentSelAll();
 
     if( mpShapeMap )
     {
@@ -1109,7 +1109,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
         {
             while( aIter != aEndIter )
             {
-                sal_Bool bMarked = sal_False;
+                bool bMarked = false;
                 SwAccessibleChild pFrm( (*aIter).first );
 
                 const SwFrmFmt *pFrmFmt = (*aIter).first ? ::FindFrmFmt( (*aIter).first ) : 0;
@@ -1141,7 +1141,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                             // ignore, if no mark
                             if( pTmpCrsr->HasMark() )
                             {
-                                bMarked = sal_True;
+                                bMarked = true;
                                 // check whether nHere is 'inside' pCrsr
                                 SwPosition* pStart = pTmpCrsr->Start();
                                 sal_uLong nStartIndex = pStart->nNode.GetIndex();
@@ -1220,13 +1220,13 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
             const SwFrm *pFrm = (*aIter).first;
             if(pFrm->IsFlyFrm())
             {
-                sal_Bool bFrmChanged = sal_False;
+                bool bFrmChanged = false;
                 uno::Reference < XAccessible > xAcc = (*aIter).second;
 
                 if(xAcc.is())
                 {
                     SwAccessibleFrameBase *pAccFrame = (static_cast< SwAccessibleFrameBase * >(xAcc.get()));
-                    bFrmChanged = pAccFrame->SetSelectedState( sal_True );
+                    bFrmChanged = pAccFrame->SetSelectedState( true );
                     if (bFrmChanged)
                     {
                         const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
@@ -1267,7 +1267,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
     VEC_PARA vecRemove;
     //Checked for Paras.
     SwPaM* pTmpCrsr = pCrsr;
-    sal_Bool bMarkChanged = sal_False;
+    bool bMarkChanged = false;
     SwAccessibleContextMap_Impl mapTemp;
     if( pTmpCrsr != NULL )
     {
@@ -1300,10 +1300,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                         if( aIter != mpFrmMap->end() )
                         {
                             uno::Reference < XAccessible > xAcc = (*aIter).second;
-                            sal_Bool isChanged = sal_False;
+                            bool isChanged = false;
                             if( xAcc.is() )
                             {
-                                isChanged = (static_cast< SwAccessibleContext * >(xAcc.get()))->SetSelectedState( sal_True );
+                                isChanged = (static_cast< SwAccessibleContext * >(xAcc.get()))->SetSelectedState( true );
                             }
                             if(!isChanged)
                             {
@@ -1313,7 +1313,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                             }
                             else
                             {
-                                bMarkChanged = sal_True;
+                                bMarkChanged = true;
                                 vecAdd.push_back(static_cast< SwAccessibleContext * >(xAcc.get()));
                             }
 
@@ -1336,11 +1336,11 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
         {
             uno::Reference < XAccessible > xAcc = (*aIter).second;
             if(xAcc.is())
-                (static_cast< SwAccessibleContext * >(xAcc.get()))->SetSelectedState( sal_False );
+                (static_cast< SwAccessibleContext * >(xAcc.get()))->SetSelectedState( false );
             ++aIter;
             vecRemove.push_back(static_cast< SwAccessibleContext * >(xAcc.get()));
         }
-        bMarkChanged = sal_True;
+        bMarkChanged = true;
         mpSeletedFrmMap->clear();
     }
 
@@ -1382,7 +1382,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
 }
 
 //Marge with DoInvalidateShapeFocus
-void SwAccessibleMap::DoInvalidateShapeSelection(sal_Bool bInvalidateFocusMode /*=sal_False*/)
+void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=sal_False*/)
 {
     SwAccessibleObjShape_Impl *pShapes = 0;
     SwAccessibleObjShape_Impl *pSelShape = 0;
@@ -1635,7 +1635,7 @@ SwAccessibleMap::~SwAccessibleMap()
     {
     SwAccessibleDocument *pAcc =
         static_cast< SwAccessibleDocument * >( xAcc.get() );
-    pAcc->Dispose( sal_True );
+    pAcc->Dispose( true );
     }
     if( mpFrmMap )
     {
@@ -1816,7 +1816,7 @@ uno::Reference<XAccessible> SwAccessibleMap::GetDocumentPreview(
 }
 
 uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
-                                                     sal_Bool bCreate )
+                                                     bool bCreate )
 {
     uno::Reference < XAccessible > xAcc;
     uno::Reference < XAccessible > xOldCursorAcc;
@@ -1855,7 +1855,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                     {
                         const SwFtnFrm *pFtnFrm =
                             static_cast < const SwFtnFrm * >( pFrm );
-                        sal_Bool bIsEndnote =
+                        bool bIsEndnote =
                             SwAccessibleFootnote::IsEndnote( pFtnFrm );
                         pAcc = new SwAccessibleFootnote( this, bIsEndnote,
                                     /*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
@@ -1948,7 +1948,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
 
 ::rtl::Reference < SwAccessibleContext > SwAccessibleMap::GetContextImpl(
             const SwFrm *pFrm,
-            sal_Bool bCreate )
+            bool bCreate )
 {
     uno::Reference < XAccessible > xAcc( GetContext( pFrm, bCreate ) );
 
@@ -1961,7 +1961,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
 uno::Reference< XAccessible> SwAccessibleMap::GetContext(
         const SdrObject *pObj,
         SwAccessibleContext *pParentImpl,
-        sal_Bool bCreate )
+        bool bCreate )
 {
     uno::Reference < XAccessible > xAcc;
     uno::Reference < XAccessible > xOldCursorAcc;
@@ -2026,11 +2026,11 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
     return xAcc;
 }
 
-sal_Bool SwAccessibleMap::IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh)
+bool SwAccessibleMap::IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh)
 {
     if (pFESh)
         return pFESh->IsObjSameLevelWithMarked(pObj);
-    return sal_False;
+    return false;
 }
 
 void SwAccessibleMap::AddShapeContext(const SdrObject *pObj, uno::Reference < XAccessible > xAccShape)
@@ -2127,7 +2127,7 @@ void SwAccessibleMap::AddGroupContext(const SdrObject *pParentObj, uno::Referenc
 ::rtl::Reference < ::accessibility::AccessibleShape > SwAccessibleMap::GetContextImpl(
             const SdrObject *pObj,
             SwAccessibleContext *pParentImpl,
-            sal_Bool bCreate )
+            bool bCreate )
 {
     uno::Reference < XAccessible > xAcc( GetContext( pObj, pParentImpl, bCreate ) );
 
@@ -2203,7 +2203,7 @@ void SwAccessibleMap::RemoveContext( const SdrObject *pObj )
 void SwAccessibleMap::Dispose( const SwFrm *pFrm,
                                const SdrObject *pObj,
                                Window* pWindow,
-                               sal_Bool bRecursive )
+                               bool bRecursive )
 {
     SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow );
 
@@ -2420,14 +2420,14 @@ but when add graphic SwFrm ,the accessible of the new Paragraph is not created y
 so the new graphic accessible 'parent is NULL,
 so run here: save the parent's SwFrm not the accessible object parent,
 */
-            sal_Bool bIsValidFrm = sal_False;
-            sal_Bool bIsTxtParent = sal_False;
+            bool bIsValidFrm = false;
+            bool bIsTxtParent = false;
             if (aFrmOrObj.GetSwFrm())
             {
                 int nType = pFrm->GetType();
                 if ( FRM_FLY == nType )
                 {
-                    bIsValidFrm =sal_True;
+                    bIsValidFrm =true;
                 }
             }
             else if(pObj)
@@ -2435,11 +2435,11 @@ so run here: save the parent's SwFrm not the accessible object parent,
                 int nType = pParent->GetType();
                 if (FRM_TXT == nType)
                 {
-                    bIsTxtParent =sal_True;
+                    bIsTxtParent =true;
                 }
             }
-//          sal_Bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
-//          sal_Bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
+//          bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
+//          bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
             if((bIsValidFrm || bIsTxtParent) )
             {
                 if( GetShell()->ActionPend() )
@@ -2632,7 +2632,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                         xAcc = xOldAcc; // make sure ate least one
                 }
                 if( !xAcc.is() )
-                    xAcc = GetContext( aFrmOrObj.GetSwFrm(), sal_True );
+                    xAcc = GetContext( aFrmOrObj.GetSwFrm(), true );
             }
         }
         else if (bShapeSelected)
@@ -2642,7 +2642,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
             if (pMarkList != NULL && pMarkList->GetMarkCount() == 1)
             {
                 SdrObject *pObj = pMarkList->GetMark( 0 )->GetMarkedSdrObj();
-                ::rtl::Reference < ::accessibility::AccessibleShape > pAccShapeImpl = GetContextImpl(pObj,NULL,sal_False);
+                ::rtl::Reference < ::accessibility::AccessibleShape > pAccShapeImpl = GetContextImpl(pObj,NULL,false);
                 if (!pAccShapeImpl.is())
                 {
                     while (pObj && pObj->GetUpGroup())
@@ -2654,19 +2654,19 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                         const SwFrm *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
                         if( pParent )
                         {
-                            ::rtl::Reference< SwAccessibleContext > xParentAccImpl = GetContextImpl(pParent,sal_False);
+                            ::rtl::Reference< SwAccessibleContext > xParentAccImpl = GetContextImpl(pParent,false);
                             if (!xParentAccImpl.is())
                             {
                                 const SwTabFrm* pTabFrm = pParent->FindTabFrm();
                                 if (pTabFrm)
                                 {
                                     //The Table should not add in acc.because the "pParent" is not add to acc .
-                                    uno::Reference< XAccessible>  xAccParentTab = GetContext(pTabFrm,sal_True);//Should Create.
+                                    uno::Reference< XAccessible>  xAccParentTab = GetContext(pTabFrm,true);//Should Create.
 
                                     const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrm), GetShell()->IsPreview() );
                                     if (pParentRoot)
                                     {
-                                        ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,sal_False);
+                                        ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,false);
                                         if(xParentAccImplRoot.is())
                                         {
                                             AccessibleEventObject aEvent;
@@ -2677,16 +2677,16 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                                     }
 
                                     //Get "pParent" acc again.
-                                    xParentAccImpl = GetContextImpl(pParent,sal_False);
+                                    xParentAccImpl = GetContextImpl(pParent,false);
                                 }
                                 else
                                 {
                                     //directly create this acc para .
-                                    xParentAccImpl = GetContextImpl(pParent,sal_True);//Should Create.
+                                    xParentAccImpl = GetContextImpl(pParent,true);//Should Create.
 
                                     const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
 
-                                    ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,sal_False);
+                                    ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,false);
                                     if(xParentAccImplRoot.is())
                                     {
                                         AccessibleEventObject aEvent;
@@ -2699,7 +2699,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                             if (xParentAccImpl.is())
                             {
                                 uno::Reference< XAccessible>  xAccShape =
-                                    GetContext(pObj,xParentAccImpl.get(),sal_True);
+                                    GetContext(pObj,xParentAccImpl.get(),true);
 
                                 AccessibleEventObject aEvent;
                                 aEvent.EventId = AccessibleEventId::CHILD;
@@ -2730,7 +2730,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
         SwAccessibleParagraph* pAccPara = *si;
         if(pAccPara && pAccPara->getSelectedAccessibleChildCount() == 0 && pAccPara->getSelectedText().getLength() == 0)
         {
-            if(pAccPara->SetSelectedState(sal_False))
+            if(pAccPara->SetSelectedState(false))
             {
                 AccessibleEventObject aEvent;
                 aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_REMOVE;
@@ -2742,7 +2742,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
     for (; si != m_setParaAdd.end() ; ++si)
     {
         SwAccessibleParagraph* pAccPara = *si;
-        if(pAccPara && pAccPara->SetSelectedState(sal_True))
+        if(pAccPara && pAccPara->SetSelectedState(true))
         {
             AccessibleEventObject aEvent;
             aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
@@ -2837,7 +2837,7 @@ void SwAccessibleMap::InvalidateFocus()
     }
     else
     {
-        DoInvalidateShapeSelection(sal_True);
+        DoInvalidateShapeSelection(true);
     }
 }
 
@@ -2860,7 +2860,7 @@ void SwAccessibleMap::InvalidateStates( tAccessibleStates _nStates,
     if( !aFrmOrObj.GetSwFrm() )
         aFrmOrObj = GetShell()->GetLayout();
 
-    uno::Reference< XAccessible > xAcc( GetContext( aFrmOrObj.GetSwFrm(), sal_True ) );
+    uno::Reference< XAccessible > xAcc( GetContext( aFrmOrObj.GetSwFrm(), true ) );
     SwAccessibleContext *pAccImpl =
         static_cast< SwAccessibleContext *>( xAcc.get() );
     if( GetShell()->ActionPend() )
@@ -3437,7 +3437,7 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
                    pFEShell->IsObjSelected() == 0 ) )
             {
                 // get cursor without updating an existing table cursor.
-                pCrsr = pCrsrShell->GetCrsr( sal_False );
+                pCrsr = pCrsrShell->GetCrsr( false );
             }
         }
     }
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 84a6fd0f0f66..33d4b7a407e5 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -158,7 +158,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
     }
 }
 
-void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive )
+void SwAccessibleNoTextFrame::Dispose( bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index eace1934dc5f..9c4874fca198 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -99,7 +99,7 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // The object is not visible an longer and should be destroyed
-    virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
+    virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE;
 
     virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 5e59cc2c3158..7a8de1db4c4d 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
     if(nIndex < 0 || nIndex >= getAccessibleActionCount())
         throw lang::IndexOutOfBoundsException();
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwFmtURL aURL( GetFmt()->GetURL() );
     ImageMap* pMap = aURL.GetMap();
     if( pMap != NULL )
@@ -83,7 +83,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
             {
                 LoadURL( *pVSh, pMapObj->GetURL(), URLLOAD_NOFILTER,
                          pMapObj->GetTarget() );
-                bRet = sal_True;
+                bRet = true;
             }
         }
     }
@@ -94,7 +94,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
         {
             LoadURL( *pVSh, aURL.GetURL(), URLLOAD_NOFILTER,
                      aURL.GetTargetFrameName() );
-            bRet = sal_True;
+            bRet = true;
         }
     }
 
@@ -180,7 +180,7 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor(
 
     Any aRet;
     //SwFrm* pAnchor = ((SwFlyFrm*)mpFrm)->GetAnchor();
-    Reference< XAccessible > xAnchor = xFrame->GetAccessibleMap()->GetContext(mpFrm, sal_True);
+    Reference< XAccessible > xAnchor = xFrame->GetAccessibleMap()->GetContext(mpFrm, true);
     //SwAccessibleNoTextFrame* pFrame = xFrame.get();
     //Reference< XAccessible > xAnchor = (XAccessible*)pFrame;
     aRet <<= xAnchor;
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 552ffa18879b..75b63c90b303 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -39,7 +39,7 @@ using uno::Sequence;
 const sal_Char sServiceName[] = "com.sun.star.text.AccessiblePageView";
 const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessiblePageView";
 
-sal_Bool SwAccessiblePage::IsSelected()
+bool SwAccessiblePage::IsSelected()
 {
     return GetMap()->IsPageSelected( static_cast < const SwPageFrm * >( GetFrm() ) );
 }
@@ -67,8 +67,8 @@ void SwAccessiblePage::GetStates(
 
 void SwAccessiblePage::_InvalidateCursorPos()
 {
-    sal_Bool bNewSelected = IsSelected();
-    sal_Bool bOldSelected;
+    bool bNewSelected = IsSelected();
+    bool bOldSelected;
 
     {
         osl::MutexGuard aGuard( aMutex );
@@ -97,7 +97,7 @@ void SwAccessiblePage::_InvalidateFocus()
     Window *pWin = GetWindow();
     if( pWin )
     {
-        sal_Bool bSelected;
+        bool bSelected;
 
         {
             osl::MutexGuard aGuard( aMutex );
@@ -113,7 +113,7 @@ void SwAccessiblePage::_InvalidateFocus()
 SwAccessiblePage::SwAccessiblePage( SwAccessibleMap* pInitMap,
                                     const SwFrm* pFrame )
     : SwAccessibleContext( pInitMap, AccessibleRole::PANEL, pFrame )
-    , bIsSelected( sal_False )
+    , bIsSelected( false )
 {
     OSL_ENSURE( pFrame != NULL, "need frame" );
     OSL_ENSURE( pInitMap != NULL, "need map" );
@@ -130,7 +130,7 @@ SwAccessiblePage::~SwAccessiblePage()
 {
 }
 
-sal_Bool SwAccessiblePage::HasCursor()
+bool SwAccessiblePage::HasCursor()
 {
     osl::MutexGuard aGuard( aMutex );
     return bIsSelected;
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index 24a7f531bf2c..a4ab5f99a924 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -31,9 +31,9 @@
  */
 class SwAccessiblePage : public SwAccessibleContext
 {
-    sal_Bool    bIsSelected;    // protected by base class mutex
+    bool    bIsSelected;    // protected by base class mutex
 
-    sal_Bool    IsSelected();
+    bool    IsSelected();
 
     using SwAccessibleFrame::GetBounds;
 
@@ -75,7 +75,7 @@ public:
     // XTypeProvider
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual sal_Bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
+    virtual bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
 };
 
 #endif
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 1bc29560a54c..bc6fa41497c2 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -195,10 +195,10 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
     return nRet;
 }
 
-sal_Bool SwAccessibleParagraph::GetSelection(
+bool SwAccessibleParagraph::GetSelection(
     sal_Int32& nStart, sal_Int32& nEnd)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     nStart = -1;
     nEnd = -1;
 
@@ -305,7 +305,7 @@ sal_Bool SwAccessibleParagraph::GetSelection(
                     {
                         nStart = nLocalStart;
                         nEnd = nLocalEnd;
-                        bRet = sal_True;
+                        bRet = true;
                     }
                 }
                 // else: this PaM doesn't point to this paragraph
@@ -340,14 +340,14 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection )
             !(pFESh->IsFrmSelected() || pFESh->IsObjSelected() > 0) )
         {
             // get the selection, and test whether it affects our text node
-            pCrsr = pCrsrShell->GetCrsr( sal_False /* ??? */ );
+            pCrsr = pCrsrShell->GetCrsr( false /* ??? */ );
         }
     }
 
     return pCrsr;
 }
 
-sal_Bool SwAccessibleParagraph::IsHeading() const
+bool SwAccessibleParagraph::IsHeading() const
 {
     const SwTxtNode *pTxtNd = GetTxtNode();
     return pTxtNd->IsOutline();
@@ -385,7 +385,7 @@ void SwAccessibleParagraph::GetStates(
     }
 }
 
-void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
+void SwAccessibleParagraph::_InvalidateContent( bool bVisibleDataFired )
 {
     OUString sOldText( GetString() );
 
@@ -423,10 +423,10 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired )
         FireVisibleDataEvent();
     }
 
-    sal_Bool bNewIsHeading = IsHeading();
+    bool bNewIsHeading = IsHeading();
     //Get the real heading level, Heading1 ~ Heading10
     nHeadingLevel = GetRealHeadingLevel();
-    sal_Bool bOldIsHeading;
+    bool bOldIsHeading;
     {
         osl::MutexGuard aGuard( aMutex );
         bOldIsHeading = bIsHeading;
@@ -490,7 +490,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos()
     {
         // The cursor's node position is simulated by the focus!
         if( pWin && pWin->HasFocus() && -1 == nOld )
-            FireStateChangedEvent( AccessibleStateType::FOCUSED, sal_True );
+            FireStateChangedEvent( AccessibleStateType::FOCUSED, true );
 
         AccessibleEventObject aEvent;
         aEvent.EventId = AccessibleEventId::CARET_CHANGED;
@@ -500,11 +500,11 @@ void SwAccessibleParagraph::_InvalidateCursorPos()
         FireAccessibleEvent( aEvent );
 
         if( pWin && pWin->HasFocus() && -1 == nNew )
-            FireStateChangedEvent( AccessibleStateType::FOCUSED, sal_False );
+            FireStateChangedEvent( AccessibleStateType::FOCUSED, false );
         //To send TEXT_SELECTION_CHANGED event
         sal_Int32 nStart=0;
         sal_Int32 nEnd  =0;
-        sal_Bool bCurSelection=GetSelection(nStart,nEnd);
+        bool bCurSelection=GetSelection(nStart,nEnd);
         if(m_bLastHasSelection || bCurSelection )
         {
             aEvent.EventId = AccessibleEventId::TEXT_SELECTION_CHANGED;
@@ -542,7 +542,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
     , pPortionData( NULL )
     , pHyperTextData( NULL )
     , nOldCaretPos( -1 )
-    , bIsHeading( sal_False )
+    , bIsHeading( false )
     //Get the real heading level, Heading1 ~ Heading10
     , nHeadingLevel (-1)
     , aSelectionHelper( *this )
@@ -566,7 +566,7 @@ SwAccessibleParagraph::~SwAccessibleParagraph()
     delete mpParaChangeTrackInfo; // #i108125#
 }
 
-sal_Bool SwAccessibleParagraph::HasCursor()
+bool SwAccessibleParagraph::HasCursor()
 {
     osl::MutexGuard aGuard( aMutex );
     return nOldCaretPos != -1;
@@ -655,19 +655,19 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion(
 
 // range checking for parameter
 
-sal_Bool SwAccessibleParagraph::IsValidChar(
+bool SwAccessibleParagraph::IsValidChar(
     sal_Int32 nPos, sal_Int32 nLength)
 {
     return (nPos >= 0) && (nPos < nLength);
 }
 
-sal_Bool SwAccessibleParagraph::IsValidPosition(
+bool SwAccessibleParagraph::IsValidPosition(
     sal_Int32 nPos, sal_Int32 nLength)
 {
     return (nPos >= 0) && (nPos <= nLength);
 }
 
-sal_Bool SwAccessibleParagraph::IsValidRange(
+bool SwAccessibleParagraph::IsValidRange(
     sal_Int32 nBegin, sal_Int32 nEnd, sal_Int32 nLength)
 {
     return IsValidPosition(nBegin, nLength) && IsValidPosition(nEnd, nLength);
@@ -729,25 +729,25 @@ const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 )
 
 // text boundaries
 
-sal_Bool SwAccessibleParagraph::GetCharBoundary(
+bool SwAccessibleParagraph::GetCharBoundary(
     i18n::Boundary& rBound,
     const OUString&,
     sal_Int32 nPos )
 {
     if( GetPortionData().FillBoundaryIFDateField( rBound,  nPos) )
-        return sal_True;
+        return true;
 
     rBound.startPos = nPos;
     rBound.endPos = nPos+1;
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwAccessibleParagraph::GetWordBoundary(
+bool SwAccessibleParagraph::GetWordBoundary(
     i18n::Boundary& rBound,
     const OUString& rText,
     sal_Int32 nPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // now ask the Break-Iterator for the word
     OSL_ENSURE( g_pBreakIt != NULL, "We always need a break." );
@@ -781,7 +781,7 @@ sal_Bool SwAccessibleParagraph::GetWordBoundary(
     return bRet;
 }
 
-sal_Bool SwAccessibleParagraph::GetSentenceBoundary(
+bool SwAccessibleParagraph::GetSentenceBoundary(
     i18n::Boundary& rBound,
     const OUString& rText,
     sal_Int32 nPos )
@@ -794,10 +794,10 @@ sal_Bool SwAccessibleParagraph::GetSentenceBoundary(
     }
 
     GetPortionData().GetSentenceBoundary( rBound, nPos );
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwAccessibleParagraph::GetLineBoundary(
+bool SwAccessibleParagraph::GetLineBoundary(
     i18n::Boundary& rBound,
     const OUString& rText,
     sal_Int32 nPos )
@@ -806,34 +806,34 @@ sal_Bool SwAccessibleParagraph::GetLineBoundary(
         GetPortionData().GetLastLineBoundary( rBound );
     else
         GetPortionData().GetLineBoundary( rBound, nPos );
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwAccessibleParagraph::GetParagraphBoundary(
+bool SwAccessibleParagraph::GetParagraphBoundary(
     i18n::Boundary& rBound,
     const OUString& rText,
     sal_Int32 )
 {
     rBound.startPos = 0;
     rBound.endPos = rText.getLength();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwAccessibleParagraph::GetAttributeBoundary(
+bool SwAccessibleParagraph::GetAttributeBoundary(
     i18n::Boundary& rBound,
     const OUString&,
     sal_Int32 nPos )
 {
     GetPortionData().GetAttributeBoundary( rBound, nPos );
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
+bool SwAccessibleParagraph::GetGlyphBoundary(
     i18n::Boundary& rBound,
     const OUString& rText,
     sal_Int32 nPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // ask the Break-Iterator for the glyph by moving one cell
     // forward, and then one cell back
@@ -867,7 +867,7 @@ sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
     return bRet;
 }
 
-sal_Bool SwAccessibleParagraph::GetTextBoundary(
+bool SwAccessibleParagraph::GetTextBoundary(
     i18n::Boundary& rBound,
     const OUString& rText,
     sal_Int32 nPos,
@@ -883,7 +883,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
                 : IsValidChar( nPos, rText.getLength() ) ) )
         throw lang::IndexOutOfBoundsException();
 
-    sal_Bool bRet;
+    bool bRet;
 
     switch( nTextType )
     {
@@ -1318,7 +1318,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // get cursor shell
     SwCrsrShell* pCrsrShell = GetCrsrShell();
@@ -1368,14 +1368,14 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
         throw lang::IndexOutOfBoundsException();
 
     /*  #i12332#  */
-    sal_Bool bBehindText = sal_False;
+    bool bBehindText = false;
     if ( nIndex == GetString().getLength() )
-        bBehindText = sal_True;
+        bBehindText = true;
 
     // get model position & prepare GetCharRect() arguments
     SwCrsrMoveState aMoveState;
-    aMoveState.bRealHeight = sal_True;
-    aMoveState.bRealWidth = sal_True;
+    aMoveState.bRealHeight = true;
+    aMoveState.bRealWidth = true;
     SwSpecialPos aSpecialPos;
     SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
 
@@ -1566,7 +1566,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
             case RES_REFPAGESETFLD:
                 {
                     SwRefPageSetField* pRPld = (SwRefPageSetField*)pField;
-                    sal_Bool bOn = pRPld->IsOn();
+                    bool bOn = pRPld->IsOn();
                     strTypeName += "-";
                     if (bOn)
                         strTypeName += "on";
@@ -2125,7 +2125,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
 
     if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
     {
-        pSet->Put( pTxtNode->GetAttr(RES_PARATR_LIST_LEVEL, RES_PARATR_LIST_LEVEL) );
+        pSet->Put( pTxtNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
     }
     pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_UL_SPACE) );
     pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_LR_SPACE) );
@@ -2417,14 +2417,14 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
         throw lang::IndexOutOfBoundsException();
 
     // #i12332#
-    sal_Bool bBehindText = sal_False;
+    bool bBehindText = false;
     if ( nIndex == GetString().getLength() )
-        bBehindText = sal_True;
+        bBehindText = true;
 
     // get model position & prepare GetCharRect() arguments
     SwCrsrMoveState aMoveState;
-    aMoveState.bRealHeight = sal_True;
-    aMoveState.bRealWidth = sal_True;
+    aMoveState.bRealHeight = true;
+    aMoveState.bRealWidth = true;
     SwSpecialPos aSpecialPos;
     SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
 
@@ -2559,7 +2559,7 @@ OUString SwAccessibleParagraph::getSelectedText()
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
 
     sal_Int32 nStart, nEnd;
-    sal_Bool bSelected = GetSelection( nStart, nEnd );
+    bool bSelected = GetSelection( nStart, nEnd );
     return bSelected
            ? GetString().copy( nStart, nEnd - nStart )
            : OUString();
@@ -2603,7 +2603,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
         throw lang::IndexOutOfBoundsException();
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // get cursor shell
     SwCrsrShell* pCrsrShell = GetCrsrShell();
@@ -2674,7 +2674,7 @@ OUString SwAccessibleParagraph::getTextRange(
 
     // with error checking
     i18n::Boundary aBound;
-    sal_Bool bWord = GetTextBoundary( aBound, rText, nIndex, nTextType );
+    bool bWord = GetTextBoundary( aBound, rText, nIndex, nTextType );
 
     OSL_ENSURE( aBound.startPos >= 0,               "illegal boundary" );
     OSL_ENSURE( aBound.startPos <= aBound.endPos,   "illegal boundary" );
@@ -2712,7 +2712,7 @@ OUString SwAccessibleParagraph::getTextRange(
         aBound.startPos = aBound.endPos = nIndex;
     else
     {
-        sal_Bool bTmp = GetTextBoundary( aBound, rText, nIndex, nTextType );
+        bool bTmp = GetTextBoundary( aBound, rText, nIndex, nTextType );
 
         if ( ! bTmp )
             aBound.startPos = aBound.endPos = nIndex;
@@ -2739,7 +2739,7 @@ OUString SwAccessibleParagraph::getTextRange(
     }
     else
     {
-        sal_Bool bWord = sal_False;
+        bool bWord = false;
         while( !bWord )
         {
             nIndex = min( nIndex, aBound.startPos ) - 1;
@@ -2781,7 +2781,7 @@ OUString SwAccessibleParagraph::getTextRange(
     // get first word, then skip to next word
     i18n::Boundary aBound;
     GetTextBoundary( aBound, rText, nIndex, nTextType );
-    sal_Bool bWord = sal_False;
+    bool bWord = false;
     while( !bWord )
     {
         nIndex = max( sal_Int32(nIndex+1), aBound.endPos );
@@ -2935,7 +2935,7 @@ sal_Bool SwAccessibleParagraph::replaceText(
         // translate positions
         sal_Int32 nStart;
         sal_Int32 nEnd;
-        sal_Bool bSuccess = GetPortionData().GetEditableRange(
+        bool bSuccess = GetPortionData().GetEditableRange(
                                         nStartIndex, nEndIndex, nStart, nEnd );
 
         // edit only if the range is editable
@@ -3010,7 +3010,7 @@ sal_Bool SwAccessibleParagraph::setAttributes(
     delete[] pIndices;
 
     // now set the values
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     try
     {
         xPortion->setPropertyValues( aNames, aValues );
@@ -3018,7 +3018,7 @@ sal_Bool SwAccessibleParagraph::setAttributes(
     catch (const UnknownPropertyException&)
     {
         // error handling through return code!
-        bRet = sal_False;
+        bRet = false;
     }
 
     return bRet;
@@ -3185,22 +3185,22 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
     while( (nLinkIndex < getHyperLinkCount()) && nTIndex < nLinkIndex)
     {
         sal_Int32 nHStt = -1;
-        sal_Bool bH = sal_False;
+        bool bH = false;
 
         if( pHt )
             nHStt = *pHt->GetStart();
-        sal_Bool bTOC = sal_False;
+        bool bTOC = false;
         // Inside TOC & get the first link
         if( pTBase && nTIndex == -1 )
         {
             nTIndex++;
-            bTOC = sal_True;
+            bTOC = true;
         }
         else if( nHStt >= 0 )
         {
               // only hyperlink available
             nTIndex++;
-            bH = sal_True;
+            bH = true;
         }
 
         if( nTIndex == nLinkIndex )
@@ -3411,7 +3411,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
 
     if(selectionIndex < 0) return sal_False;
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_Int32 nSelected = selectionIndex;
 
     // get the selection, and test whether it affects our text node
@@ -3442,7 +3442,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
                     {
                         pCrsr->MoveTo((Ring*)0);
                         delete pCrsr;
-                        bRet = sal_True;
+                        bRet = true;
                     }
                     else
                     {
@@ -3479,7 +3479,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
     for ( sal_Int32 i = nSelectedCount ; i >= 0 ; i--)
     {
         sal_Int32 nStart, nEnd;
-        sal_Bool bSelected = GetSelectionAtIndex(i, nStart, nEnd );
+        bool bSelected = GetSelectionAtIndex(i, nStart, nEnd );
         if(bSelected)
         {
             if(nStart <= nEnd )
@@ -3508,7 +3508,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
 
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // get cursor shell
     SwCrsrShell* pCrsrShell = GetCrsrShell();
@@ -3526,7 +3526,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
         //bRet = Select( aPaM );
     }
 
-    return bRet;
+    return bRet ? 1 : 0;
 }
 
 /*accessibility::*/TextSegment SAL_CALL
@@ -3708,12 +3708,12 @@ void SwAccessibleParagraph::Modify( const SfxPoolItem* pOld, const SfxPoolItem*
     CheckRegistration( pOld, pNew );
 }
 
-sal_Bool SwAccessibleParagraph::GetSelectionAtIndex(
+bool SwAccessibleParagraph::GetSelectionAtIndex(
     sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd)
 {
-        if(nIndex < 0) return sal_False;
+        if(nIndex < 0) return false;
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     nStart = -1;
     nEnd = -1;
     sal_Int32 nSelected = nIndex;
@@ -3823,7 +3823,7 @@ sal_Bool SwAccessibleParagraph::GetSelectionAtIndex(
                         {
                             nStart = nLocalStart;
                             nEnd = nLocalEnd;
-                            bRet = sal_True;
+                            bRet = true;
                         }
                     } // if hit the index
                     else
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 09eb0ddf6518..fec85f191c58 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -82,7 +82,7 @@ class SwAccessibleParagraph :
                             // as the cursor is inside this object (protected by
                             // mutex)
 
-    sal_Bool bIsHeading;    // protected by base classes mutex
+    bool bIsHeading;    // protected by base classes mutex
     sal_Int32 nHeadingLevel;
 
     // implementation for XAccessibleSelection
@@ -103,7 +103,7 @@ class SwAccessibleParagraph :
 
     // determine the current selection. Fill the values with
     // -1 if there is no selection in the this paragraph
-    sal_Bool GetSelection(sal_Int32& nStart, sal_Int32& nEnd);
+    bool GetSelection(sal_Int32& nStart, sal_Int32& nEnd);
 
     // helper for GetSelection and getCaretPosition
     // #i27301# - add parameter <_bForSelection>, which indicates,
@@ -121,13 +121,13 @@ class SwAccessibleParagraph :
     // methods for checking the parameter range:
 
     // does nPos point to a char?
-    sal_Bool IsValidChar(sal_Int32 nPos, sal_Int32 nLength);
+    bool IsValidChar(sal_Int32 nPos, sal_Int32 nLength);
 
     // does nPos point to a position? (may be behind the last character)
-    sal_Bool IsValidPosition(sal_Int32 nPos, sal_Int32 nLength);
+    bool IsValidPosition(sal_Int32 nPos, sal_Int32 nLength);
 
     // is nBegin...nEnd a valid range? (nEnd points past the last character)
-    sal_Bool IsValidRange(sal_Int32 nBegin, sal_Int32 nEnd, sal_Int32 nLength);
+    bool IsValidRange(sal_Int32 nBegin, sal_Int32 nEnd, sal_Int32 nLength);
 
     // Ensure ordered range (i.e. nBegin is smaller then nEnd)
     void OrderRange(sal_Int32& nBegin, sal_Int32& nEnd)
@@ -163,7 +163,7 @@ class SwAccessibleParagraph :
 public:
     SwTOXSortTabBase* GetTOXSortTabBase();
 
-    sal_Bool IsHeading() const;
+    bool IsHeading() const;
 
 protected:
 
@@ -172,7 +172,7 @@ protected:
     // FOCUSABLE(+) and FOCUSED(+)
     virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) SAL_OVERRIDE;
 
-    virtual void _InvalidateContent( sal_Bool bVisibleDataFired ) SAL_OVERRIDE;
+    virtual void _InvalidateContent( bool bVisibleDataFired ) SAL_OVERRIDE;
 
     virtual void _InvalidateCursorPos() SAL_OVERRIDE;
     virtual void _InvalidateFocus() SAL_OVERRIDE;
@@ -198,35 +198,35 @@ protected:
     }
 
     // determine if portion data is currently available
-    sal_Bool HasPortionData()   { return (pPortionData != NULL); }
+    bool HasPortionData()   { return (pPortionData != NULL); }
 
     //helpers for word boundaries
 
-    sal_Bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound,
                               const OUString& rText,
                               sal_Int32 nPos );
-    sal_Bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound,
                               const OUString& rText,
                               sal_Int32 nPos );
-    sal_Bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound,
                                   const OUString& rText,
                                   sal_Int32 nPos );
-    sal_Bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound,
                               const OUString& rText,
                               sal_Int32 nPos );
-    sal_Bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound,
                                    const OUString& rText,
                                    sal_Int32 nPos );
-    sal_Bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound,
                                    const OUString& rText,
                                    sal_Int32 nPos );
-    sal_Bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound,
                                const OUString& rText,
                                sal_Int32 nPos );
 
     // get boundaries of word/sentence/etc. for specified text type
     // Does all argument checking, and then delegates to helper methods above.
-    sal_Bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound,
+    bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound,
                               const OUString& rText,
                               sal_Int32 nPos,
                               sal_Int16 aTextType )
@@ -244,7 +244,7 @@ public:
 
     inline operator ::com::sun::star::accessibility::XAccessibleText *();
 
-    virtual sal_Bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
+    virtual bool HasCursor() SAL_OVERRIDE;   // required by map to remember that object
 
     com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex  );
     virtual sal_Int16 SAL_CALL getAccessibleRole (void)     throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -438,10 +438,10 @@ public:
     // XAccessibleExtendedAttributes
     virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
         throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
-    sal_Bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd);
+    bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd);
     sal_Int32 GetRealHeadingLevel();
     // XAccessibleComponent
-    sal_Bool m_bLastHasSelection;
+    bool m_bLastHasSelection;
 
     // #i89175#
     // XAccessibleMultiLineText
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index b590c6e36d8d..0f402a242d7b 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -72,7 +72,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
     pTxtNode( pTxtNd ),
     aBuffer(),
     nModelPosition( 0 ),
-    bFinished( sal_False ),
+    bFinished( false ),
     pViewOptions( pViewOpt ),
     sAccessibleString(),
     aLineBreaks(),
@@ -80,7 +80,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
     aAccessiblePositions(),
     pSentences( 0 ),
     nBeforePortions( 0 ),
-    bLastIsSpecial( sal_False )
+    bLastIsSpecial( false )
 {
     OSL_ENSURE( pTxtNode != NULL, "Text node is needed!" );
 
@@ -122,7 +122,7 @@ void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int
         pTxtNode->GetTxt().copy(nModelPosition, nLength)) );
     nModelPosition += nLength;
 
-    bLastIsSpecial = sal_False;
+    bLastIsSpecial = false;
 }
 
 void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
@@ -225,7 +225,7 @@ void SwAccessiblePortionData::Special(
     // remember 'last' special portion (unless it's our own 'closing'
     // portions from 'Finish()'
     if( nType != POR_TERMINATE )
-        bLastIsSpecial = sal_True;
+        bLastIsSpecial = true;
 }
 
 void SwAccessiblePortionData::LineBreak(KSHORT /*nWidth*/)
@@ -258,10 +258,10 @@ void SwAccessiblePortionData::Finish()
     LineBreak(0);
 
     sAccessibleString = aBuffer.makeStringAndClear();
-    bFinished = sal_True;
+    bFinished = true;
 }
 
-sal_Bool SwAccessiblePortionData::IsPortionAttrSet(
+bool SwAccessiblePortionData::IsPortionAttrSet(
     size_t nPortionNo, sal_uInt8 nAttr ) const
 {
     OSL_ENSURE( nPortionNo < aPortionAttrs.size(),
@@ -269,21 +269,21 @@ sal_Bool SwAccessiblePortionData::IsPortionAttrSet(
     return (aPortionAttrs[nPortionNo] & nAttr) != 0;
 }
 
-sal_Bool SwAccessiblePortionData::IsSpecialPortion( size_t nPortionNo ) const
+bool SwAccessiblePortionData::IsSpecialPortion( size_t nPortionNo ) const
 {
     return IsPortionAttrSet(nPortionNo, PORATTR_SPECIAL);
 }
 
-sal_Bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const
+bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const
 {
     return IsPortionAttrSet(nPortionNo, PORATTR_READONLY);
 }
 
-sal_Bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
+bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
 {
     // gray portions?
     // Compare with: inftxt.cxx, SwTxtPaintInfo::DrawViewOpt(...)
-    sal_Bool bGray = sal_False;
+    bool bGray = false;
     switch( nType )
     {
         case POR_FTN:
@@ -674,19 +674,19 @@ sal_uInt16 SwAccessiblePortionData::FillSpecialPos(
     return static_cast<sal_uInt16>( nModelPos );
 }
 
-sal_Bool SwAccessiblePortionData::FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos )
+bool SwAccessiblePortionData::FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos )
 {
-    if( aFieldPosition.size() < 2 ) return sal_False;
+    if( aFieldPosition.size() < 2 ) return false;
     for( size_t i = 0; i < aFieldPosition.size() - 1; i += 2 )
     {
         if( nPos < aFieldPosition[ i + 1 ]  &&  nPos >= aFieldPosition[ i ] )
         {
             rBound.startPos = aFieldPosition[i];
             rBound.endPos =  aFieldPosition[i + 1];
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 void SwAccessiblePortionData::AdjustAndCheck(
@@ -707,7 +707,7 @@ void SwAccessiblePortionData::AdjustAndCheck(
         nCorePos += nPos - aAccessiblePositions[nPortionNo];
 }
 
-sal_Bool SwAccessiblePortionData::GetEditableRange(
+bool SwAccessiblePortionData::GetEditableRange(
     sal_Int32 nStart, sal_Int32 nEnd,
     sal_Int32& nCoreStart, sal_Int32& nCoreEnd ) const
 {
@@ -744,20 +744,20 @@ sal_Bool SwAccessiblePortionData::GetEditableRange(
     return bIsEditable;
 }
 
-sal_Bool SwAccessiblePortionData::IsValidCorePosition( sal_Int32 nPos ) const
+bool SwAccessiblePortionData::IsValidCorePosition( sal_Int32 nPos ) const
 {
     // a position is valid its within the model positions that we know
     return ( aModelPositions[0] <= nPos ) &&
            ( nPos <= aModelPositions[ aModelPositions.size()-1 ] );
 }
 
-sal_Bool SwAccessiblePortionData::IsZeroCorePositionData()
+bool SwAccessiblePortionData::IsZeroCorePositionData()
 {
-    if( aModelPositions.size() < 1  ) return sal_True;
+    if( aModelPositions.size() < 1  ) return true;
     return aModelPositions[0] == 0 &&  aModelPositions[aModelPositions.size()-1] == 0;
 }
 
-sal_Bool SwAccessiblePortionData::IsIndexInFootnode(sal_Int32 nIndex)
+bool SwAccessiblePortionData::IsIndexInFootnode(sal_Int32 nIndex)
 {
     VEC_PAIR_POS::iterator vi =m_vecPairPos.begin();
     for (;vi != m_vecPairPos.end() ; ++vi)
@@ -765,13 +765,13 @@ sal_Bool SwAccessiblePortionData::IsIndexInFootnode(sal_Int32 nIndex)
         const PAIR_POS &pairPos = *vi;
         if(nIndex >= pairPos.first && nIndex < pairPos.second )
         {
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwAccessiblePortionData::IsInGrayPortion( sal_Int32 nPos )
+bool SwAccessiblePortionData::IsInGrayPortion( sal_Int32 nPos )
 {
 //    return IsGrayPortion( FindBreak( aAccessiblePositions, nPos ) );
     return IsPortionAttrSet( FindBreak( aAccessiblePositions, nPos ),
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index 94743cdeb27a..0ceab1a7e48a 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -43,7 +43,7 @@ class SwAccessiblePortionData : public SwPortionHandler
     // variables used while collecting the data
     OUStringBuffer aBuffer;
     sal_Int32 nModelPosition;
-    sal_Bool bFinished;
+    bool bFinished;
     const SwViewOption* pViewOptions;
 
     // the accessible string
@@ -67,7 +67,7 @@ class SwAccessiblePortionData : public SwPortionHandler
     Positions_t* pSentences;    /// positions of sentence breaks
 
     size_t nBeforePortions;     /// # of portions before first model character
-    sal_Bool bLastIsSpecial;    /// set if last portion was 'Special()'
+    bool bLastIsSpecial;    /// set if last portion was 'Special()'
 
     /// returns the index of the first position whose value is smaller
     /// or equal, and whose following value is equal or larger
@@ -82,10 +82,10 @@ class SwAccessiblePortionData : public SwPortionHandler
                       size_t nPos ) const;
 
     /// Access to portion attributes
-    sal_Bool IsPortionAttrSet( size_t nPortionNo, sal_uInt8 nAttr ) const;
-    sal_Bool IsSpecialPortion( size_t nPortionNo ) const;
-    sal_Bool IsReadOnlyPortion( size_t nPortionNo ) const;
-    sal_Bool IsGrayPortionType( sal_uInt16 nType ) const;
+    bool IsPortionAttrSet( size_t nPortionNo, sal_uInt8 nAttr ) const;
+    bool IsSpecialPortion( size_t nPortionNo ) const;
+    bool IsReadOnlyPortion( size_t nPortionNo ) const;
+    bool IsGrayPortionType( sal_uInt16 nType ) const;
 
     // helper method for GetEditableRange(...):
     void AdjustAndCheck( sal_Int32 nPos, size_t& nPortionNo,
@@ -104,12 +104,12 @@ public:
     virtual void Finish() SAL_OVERRIDE;
 
     virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE;
-    sal_Bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
-    sal_Bool IsIndexInFootnode(sal_Int32 nIndex);
-    sal_Bool IsInGrayPortion( sal_Int32 nPos );
+    bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
+    bool IsIndexInFootnode(sal_Int32 nIndex);
+    bool IsInGrayPortion( sal_Int32 nPos );
     sal_Int32 GetFieldIndex(sal_Int32 nPos);
 
-    sal_Bool IsZeroCorePositionData();
+    bool IsZeroCorePositionData();
 
     // access to the portion data
 
@@ -128,7 +128,7 @@ public:
     ///  boundaries. In this case, only part of a paragraph is represented
     ///  through this object. This method determines whether one particular
     ///  position is valid for this object or not.)
-    sal_Bool IsValidCorePosition( sal_Int32 nPos ) const;
+    bool IsValidCorePosition( sal_Int32 nPos ) const;
     sal_Int32 GetFirstValidCorePosition() const;
     sal_Int32 GetLastValidCorePosition() const;
 
@@ -166,7 +166,7 @@ public:
     /// @returns true if 'special' portions are included either completely
     ///          or not at all. This can be used to test whether editing
     ///          that range would be legal
-    sal_Bool GetEditableRange( sal_Int32 nStart, sal_Int32 nEnd,
+    bool GetEditableRange( sal_Int32 nStart, sal_Int32 nEnd,
                                sal_Int32& nCoreStart, sal_Int32& nCoreEnd ) const;
 private:
     typedef std::pair<sal_Int32,sal_Int32> PAIR_POS;
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index f9c0626a536f..ff7d1a6ac6f4 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -84,7 +84,7 @@ OUString SAL_CALL SwAccessiblePreview::getAccessibleName (void) throw (::com::su
 
 void SwAccessiblePreview::_InvalidateFocus()
 {
-    FireStateChangedEvent( ::com::sun::star::accessibility::AccessibleStateType::FOCUSED, sal_True );
+    FireStateChangedEvent( ::com::sun::star::accessibility::AccessibleStateType::FOCUSED, true );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index cc0a222bffbb..16ff5c5c1642 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -107,25 +107,25 @@ void SwAccessibleSelectionHelper::selectAccessibleChild(
 }
 
 //When the selected state of the SwFrmOrObj is setted, return true.
-static sal_Bool lcl_getSelectedState(const SwAccessibleChild& aChild,
+static bool lcl_getSelectedState(const SwAccessibleChild& aChild,
                                      SwAccessibleContext* pContext,
                                      SwAccessibleMap* pMap)
 {
     Reference< XAccessible > xAcc;
     if ( aChild.GetSwFrm() )
     {
-        xAcc = pMap->GetContext( aChild.GetSwFrm(), sal_False );
+        xAcc = pMap->GetContext( aChild.GetSwFrm(), false );
     }
     else if ( aChild.GetDrawObject() )
     {
-        xAcc = pMap->GetContext( aChild.GetDrawObject(), pContext, sal_False );
+        xAcc = pMap->GetContext( aChild.GetDrawObject(), pContext, false );
     }
 
     if( xAcc.is() )
     {
         Reference< XAccessibleContext > pRContext = xAcc->getAccessibleContext();
         if(!pRContext.is())
-            return sal_False;
+            return false;
         Reference<XAccessibleStateSet> pRStateSet = pRContext->getAccessibleStateSet();
         if( pRStateSet.is() )
         {
@@ -134,14 +134,14 @@ static sal_Bool lcl_getSelectedState(const SwAccessibleChild& aChild,
             for( int i = 0; i < count; i++ )
             {
                 if( pStates[i] == AccessibleStateType::SELECTED)
-                    return sal_True;
+                    return true;
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
+bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
     sal_Int32 nChildIndex )
     throw ( lang::IndexOutOfBoundsException,
             RuntimeException )
@@ -155,7 +155,7 @@ sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
         throwIndexOutOfBoundsException();
 
     // ... and compare to the currently selected frame
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwFEShell* pFEShell = GetFEShell();
     if( pFEShell )
     {
@@ -170,8 +170,8 @@ sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
         //If the SwFrmOrObj is not selected directly in the UI, we should check whether it is selected in the selection cursor.
         if( !bRet )
         {
-            if( lcl_getSelectedState( aChild, &rContext, rContext.GetMap() ) == sal_True)
-                bRet = sal_True;
+            if( lcl_getSelectedState( aChild, &rContext, rContext.GetMap() ) )
+                bRet = true;
         }
     }
 
@@ -357,7 +357,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
     {
         ::rtl::Reference < SwAccessibleContext > xChildImpl(
                 rContext.GetMap()->GetContextImpl( aChild.GetSwFrm(),
-                sal_True ) );
+                true ) );
         if( xChildImpl.is() )
         {
             xChildImpl->SetParent( &rContext );
@@ -368,7 +368,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
     {
         ::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl(
                 rContext.GetMap()->GetContextImpl( aChild.GetDrawObject(),
-                                          &rContext, sal_True )  );
+                                          &rContext, true )  );
         if( xChildImpl.is() )
             xChild = xChildImpl.get();
     }
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index 05f2b3f7335e..a4f4ec3201a5 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -47,7 +47,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    sal_Bool isAccessibleChildSelected(
+    bool isAccessibleChildSelected(
         sal_Int32 nChildIndex )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index e9a5a363c760..e798c52c1d12 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -83,7 +83,7 @@ class SwAccessibleTableData_Impl
     Int32PairList_Impl maExtents;   // cell extends for event processing only
     Point   maTabFrmPos;
     const SwTabFrm *mpTabFrm;
-    sal_Bool mbIsInPagePreview;
+    bool mbIsInPagePreview;
     bool mbOnlyTableColumnHeader;
 
     void CollectData( const SwFrm *pFrm );
@@ -91,13 +91,13 @@ class SwAccessibleTableData_Impl
     void CollectRowHeaderData( const SwFrm *pFrm );
     void CollectExtents( const SwFrm *pFrm );
 
-    sal_Bool FindCell( const Point& rPos, const SwFrm *pFrm ,
-                           sal_Bool bExact, const SwFrm *& rFrm ) const;
+    bool FindCell( const Point& rPos, const SwFrm *pFrm ,
+                           bool bExact, const SwFrm *& rFrm ) const;
 
     void GetSelection( const Point& rTabPos, const SwRect& rArea,
                        const SwSelBoxes& rSelBoxes, const SwFrm *pFrm,
                        SwAccTableSelHander_Impl& rSelHdl,
-                       sal_Bool bColumns ) const;
+                       bool bColumns ) const;
 
     // #i77106#
     inline bool IncludeRow( const SwFrm& rFrm ) const
@@ -109,7 +109,7 @@ public:
     // #i77106# - add third optional parameter <bOnlyTableColumnHeader>, default value <false>
     SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap,
                                 const SwTabFrm *pTabFrm,
-                                sal_Bool bIsInPagePreview,
+                                bool bIsInPagePreview,
                                 bool bOnlyTableColumnHeader = false );
 
     const Int32Set_Impl& GetRows() const { return maRows; }
@@ -118,19 +118,19 @@ public:
     inline Int32Set_Impl::const_iterator GetRowIter( sal_Int32 nRow ) const;
     inline Int32Set_Impl::const_iterator GetColumnIter( sal_Int32 nCol ) const;
 
-    const SwFrm *GetCell( sal_Int32 nRow, sal_Int32 nColumn, sal_Bool bExact,
+    const SwFrm *GetCell( sal_Int32 nRow, sal_Int32 nColumn, bool bExact,
                           SwAccessibleTable *pThis ) const
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception);
     const SwFrm *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop,
-                                         sal_Bool bExact ) const;
+                                         bool bExact ) const;
     inline sal_Int32 GetRowCount() const;
     inline sal_Int32 GetColumnCount() const;
-    sal_Bool CompareExtents( const SwAccessibleTableData_Impl& r ) const;
+    bool CompareExtents( const SwAccessibleTableData_Impl& r ) const;
 
     void GetSelection( sal_Int32 nStart, sal_Int32 nEnd,
                        const SwSelBoxes& rSelBoxes,
                           SwAccTableSelHander_Impl& rSelHdl,
-                       sal_Bool bColumns ) const;
+                       bool bColumns ) const;
 
     void CheckRowAndCol( sal_Int32 nRow, sal_Int32 nCol,
                          SwAccessibleTable *pThis ) const
@@ -304,11 +304,11 @@ void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
     }
 }
 
-sal_Bool SwAccessibleTableData_Impl::FindCell(
-        const Point& rPos, const SwFrm *pFrm, sal_Bool bExact,
+bool SwAccessibleTableData_Impl::FindCell(
+        const Point& rPos, const SwFrm *pFrm, bool bExact,
         const SwFrm *& rRet ) const
 {
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
 
     const SwAccessibleChildSList aList( *pFrm, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
@@ -329,7 +329,7 @@ sal_Bool SwAccessibleTableData_Impl::FindCell(
                     // We have found the cell
                     OSL_ENSURE( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(),
                             "find frame moved to far!" );
-                    bFound = sal_True;
+                    bFound = true;
                     if( !bExact ||
                         (rFrm.Top() == rPos.Y() && rFrm.Left() == rPos.Y() ) )
                     {
@@ -359,7 +359,7 @@ void SwAccessibleTableData_Impl::GetSelection(
             const SwSelBoxes& rSelBoxes,
             const SwFrm *pFrm,
             SwAccTableSelHander_Impl& rSelHdl,
-            sal_Bool bColumns ) const
+            bool bColumns ) const
 {
     const SwAccessibleChildSList aList( *pFrm, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
@@ -419,7 +419,7 @@ void SwAccessibleTableData_Impl::GetSelection(
 }
 
 const SwFrm *SwAccessibleTableData_Impl::GetCell(
-        sal_Int32 nRow, sal_Int32 nColumn, sal_Bool,
+        sal_Int32 nRow, sal_Int32 nColumn, bool,
         SwAccessibleTable *pThis ) const
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
@@ -427,7 +427,7 @@ const SwFrm *SwAccessibleTableData_Impl::GetCell(
 
     Int32Set_Impl::const_iterator aSttCol( GetColumnIter( nColumn ) );
     Int32Set_Impl::const_iterator aSttRow( GetRowIter( nRow ) );
-    const SwFrm *pCellFrm = GetCellAtPos( *aSttCol, *aSttRow, sal_False );
+    const SwFrm *pCellFrm = GetCellAtPos( *aSttCol, *aSttRow, false );
 
     return pCellFrm;
 }
@@ -436,7 +436,7 @@ void SwAccessibleTableData_Impl::GetSelection(
                        sal_Int32 nStart, sal_Int32 nEnd,
                        const SwSelBoxes& rSelBoxes,
                           SwAccTableSelHander_Impl& rSelHdl,
-                       sal_Bool bColumns ) const
+                       bool bColumns ) const
 {
     SwRect aArea( mpTabFrm->Frm() );
     Point aPos( aArea.Pos() );
@@ -467,7 +467,7 @@ void SwAccessibleTableData_Impl::GetSelection(
 }
 
 const SwFrm *SwAccessibleTableData_Impl::GetCellAtPos(
-        sal_Int32 nLeft, sal_Int32 nTop, sal_Bool bExact ) const
+        sal_Int32 nLeft, sal_Int32 nTop, bool bExact ) const
 {
     Point aPos( mpTabFrm->Frm().Pos() );
     aPos.Move( nLeft, nTop );
@@ -489,18 +489,18 @@ inline sal_Int32 SwAccessibleTableData_Impl::GetColumnCount() const
     return static_cast< sal_Int32 >( maColumns.size() );
 }
 
-sal_Bool SwAccessibleTableData_Impl::CompareExtents(
+bool SwAccessibleTableData_Impl::CompareExtents(
                                 const SwAccessibleTableData_Impl& rCmp ) const
 {
     if( maExtents.size() != rCmp.maExtents.size() )
-        return sal_False;
+        return false;
 
     return ::std::equal(maExtents.begin(), maExtents.end(), rCmp.maExtents.begin()) ? sal_True : sal_False;
 }
 
 SwAccessibleTableData_Impl::SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap,
                                                         const SwTabFrm *pTabFrm,
-                                                        sal_Bool bIsInPagePreview,
+                                                        bool bIsInPagePreview,
                                                         bool bOnlyTableColumnHeader )
     : mrAccMap( rAccMap )
     , maTabFrmPos( pTabFrm->Frm().Pos() )
@@ -575,7 +575,7 @@ void SwAccessibleTableData_Impl::GetRowColumnAndExtent(
 
 class SwAccSingleTableSelHander_Impl : public SwAccTableSelHander_Impl
 {
-    sal_Bool bSelected;
+    bool bSelected;
 
 public:
 
@@ -583,19 +583,19 @@ public:
 
     virtual ~SwAccSingleTableSelHander_Impl() {}
 
-    inline sal_Bool IsSelected() const { return bSelected; }
+    inline bool IsSelected() const { return bSelected; }
 
     virtual void Unselect( sal_Int32, sal_Int32 ) SAL_OVERRIDE;
 };
 
 inline SwAccSingleTableSelHander_Impl::SwAccSingleTableSelHander_Impl() :
-    bSelected( sal_True )
+    bSelected( true )
 {
 }
 
 void SwAccSingleTableSelHander_Impl::Unselect( sal_Int32, sal_Int32 )
 {
-    bSelected = sal_False;
+    bSelected = false;
 }
 
 class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl
@@ -716,9 +716,9 @@ const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const
     return pBox;
 }
 
-sal_Bool SwAccessibleTable::IsChildSelected( sal_Int32 nChildIndex ) const
+bool SwAccessibleTable::IsChildSelected( sal_Int32 nChildIndex ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwSelBoxes* pSelBoxes = GetSelBoxes();
     if( pSelBoxes )
     {
@@ -1032,7 +1032,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt(
     Int32Set_Impl::const_iterator aSttRow(
                                     GetTableData().GetRowIter( nRow ) );
     const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
-                                                         sal_False );
+                                                         false );
     if( pCellFrm )
     {
         sal_Int32 nBottom = pCellFrm->Frm().Bottom();
@@ -1064,7 +1064,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt(
     Int32Set_Impl::const_iterator aSttRow(
                                     GetTableData().GetRowIter( nRow ) );
     const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
-                                                         sal_False );
+                                                         false );
     if( pCellFrm )
     {
         sal_Int32 nRight = pCellFrm->Frm().Right();
@@ -1117,7 +1117,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows
         SwAccAllTableSelHander_Impl aSelRows( nRows  );
 
         GetTableData().GetSelection( 0, nRows, *pSelBoxes, aSelRows,
-                                      sal_False );
+                                      false );
 
         return aSelRows.GetSelSequence();
     }
@@ -1140,7 +1140,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColu
         sal_Int32 nCols = GetTableData().GetColumnCount();
         SwAccAllTableSelHander_Impl aSelCols( nCols );
 
-        GetTableData().GetSelection( 0, nCols, *pSelBoxes, aSelCols, sal_True );
+        GetTableData().GetSelection( 0, nCols, *pSelBoxes, aSelCols, true );
 
         return aSelCols.GetSelSequence();
     }
@@ -1159,18 +1159,18 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow )
 
     GetTableData().CheckRowAndCol( nRow, 0, this );
 
-    sal_Bool bRet;
+    bool bRet;
     const SwSelBoxes *pSelBoxes = GetSelBoxes();
     if( pSelBoxes )
     {
         SwAccSingleTableSelHander_Impl aSelRow;
         GetTableData().GetSelection( nRow, nRow+1, *pSelBoxes, aSelRow,
-                                     sal_False );
+                                     false );
         bRet = aSelRow.IsSelected();
     }
     else
     {
-        bRet = sal_False;
+        bRet = false;
     }
 
     return bRet;
@@ -1186,19 +1186,19 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected(
 
     GetTableData().CheckRowAndCol( 0, nColumn, this );
 
-    sal_Bool bRet;
+    bool bRet;
     const SwSelBoxes *pSelBoxes = GetSelBoxes();
     if( pSelBoxes )
     {
         SwAccSingleTableSelHander_Impl aSelCol;
 
         GetTableData().GetSelection( nColumn, nColumn+1, *pSelBoxes, aSelCol,
-                                     sal_True );
+                                     true );
         bRet = aSelCol.IsSelected();
     }
     else
     {
-        bRet = sal_False;
+        bRet = false;
     }
 
     return bRet;
@@ -1215,9 +1215,9 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt(
     CHECK_FOR_DEFUNC( XAccessibleTable )
 
     const SwFrm *pCellFrm =
-                    GetTableData().GetCell( nRow, nColumn, sal_False, this );
+                    GetTableData().GetCell( nRow, nColumn, false, this );
     if( pCellFrm )
-        xRet = GetMap()->GetContext( pCellFrm, sal_True );
+        xRet = GetMap()->GetContext( pCellFrm, true );
 
     return xRet;
 }
@@ -1240,14 +1240,14 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected(
             sal_Int32 nRow, sal_Int32 nColumn )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SolarMutexGuard aGuard;
 
     CHECK_FOR_DEFUNC( XAccessibleTable )
 
     const SwFrm *pFrm =
-                    GetTableData().GetCell( nRow, nColumn, sal_False, this );
+                    GetTableData().GetCell( nRow, nColumn, false, this );
     if( pFrm && pFrm->IsCellFrm() )
     {
         const SwSelBoxes *pSelBoxes = GetSelBoxes();
@@ -1273,7 +1273,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex(
 
     CHECK_FOR_DEFUNC( XAccessibleTable )
 
-    SwAccessibleChild aCell( GetTableData().GetCell( nRow, nColumn, sal_False, this ));
+    SwAccessibleChild aCell( GetTableData().GetCell( nRow, nColumn, false, this ));
     if ( aCell.IsValid() )
     {
         nRet = GetChildIndex( *(GetMap()), aCell );
@@ -1398,7 +1398,7 @@ void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox )
     SwAccessibleContext::InvalidatePosOrSize( rOldBox );
 }
 
-void SwAccessibleTable::Dispose( sal_Bool bRecursive )
+void SwAccessibleTable::Dispose( bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
@@ -1409,7 +1409,7 @@ void SwAccessibleTable::Dispose( sal_Bool bRecursive )
 }
 
 void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
-                                      sal_Bool bRecursive )
+                                      bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
@@ -1426,7 +1426,7 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
     // the map, and we have to call our superclass.
     // The other situation is that we have been call by a call to get notified
     // about its change. We then must not call the superclass
-    uno::Reference< XAccessible > xAcc( GetMap()->GetContext( pFrm, sal_False ) );
+    uno::Reference< XAccessible > xAcc( GetMap()->GetContext( pFrm, false ) );
     if( !xAcc.is() )
         SwAccessibleContext::DisposeChild( rChildFrmOrObj, bRecursive );
 }
@@ -1450,10 +1450,10 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
                 {
                     Int32Set_Impl::const_iterator aSttCol( GetTableData().GetColumnIter( 0 ) );
                     Int32Set_Impl::const_iterator aSttRow( GetTableData().GetRowIter( 1 ) );
-                    const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, sal_False );
+                    const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, false );
                     Int32Set_Impl::const_iterator aSttCol2( pNewTableData->GetColumnIter( 0 ) );
                     Int32Set_Impl::const_iterator aSttRow2( pNewTableData->GetRowIter( 0 ) );
-                    const SwFrm *pCellFrm2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2, sal_False );
+                    const SwFrm *pCellFrm2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2, false );
 
                     if(pCellFrm == pCellFrm2)
                     {
@@ -1682,7 +1682,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     // reduce selection to mark.
     SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
                                                 : pCrsrShell->GetCrsr();
-    sal_Bool bDeselectPoint =
+    bool bDeselectPoint =
         pBox->GetSttNd() ==
             pPaM->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
 
@@ -1760,7 +1760,7 @@ void SwAccessibleTable::FireSelectionEvent( )
     }
 }
 
-void SwAccessibleTable::AddSelectionCell(const SwAccessibleContext* pAccCell ,sal_Bool bAddOrRemove)
+void SwAccessibleTable::AddSelectionCell(const SwAccessibleContext* pAccCell, bool bAddOrRemove)
 {
     if (bAddOrRemove)
     {
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 4fbb425a309d..88f5916e1b86 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -52,7 +52,7 @@ class SwAccessibleTable :
     /** get the SwTableBox* for the given child */
     const SwTableBox* GetTableBox( sal_Int32 ) const;
 
-    sal_Bool IsChildSelected( sal_Int32 nChildIndex ) const;
+    bool IsChildSelected( sal_Int32 nChildIndex ) const;
 
     sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
 
@@ -81,7 +81,7 @@ protected:
     inline SwAccessibleTableData_Impl& GetTableData();
 
     // Is table data evailable?
-    sal_Bool HasTableData() const { return (mpTableData != 0); }
+    bool HasTableData() const { return (mpTableData != 0); }
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 
@@ -224,10 +224,10 @@ public:
     virtual void InvalidatePosOrSize( const SwRect& rOldBox ) SAL_OVERRIDE;
 
     // The object is not visible an longer and should be destroyed
-    virtual void Dispose( sal_Bool bRecursive = sal_False ) SAL_OVERRIDE;
+    virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE;
 
     virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj,
-                               sal_Bool bRecursive ) SAL_OVERRIDE;
+                               bool bRecursive ) SAL_OVERRIDE;
     virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj,
                                            const SwRect& rFrm ) SAL_OVERRIDE;
 
@@ -270,7 +270,7 @@ public:
     VEC_CELL m_vecCellAdd;
     VEC_CELL m_vecCellRemove;
     void FireSelectionEvent( );
-    void AddSelectionCell(const SwAccessibleContext* ,sal_Bool bAddOrRemove);
+    void AddSelectionCell(const SwAccessibleContext* , bool bAddOrRemove);
 };
 
 inline SwAccessibleTableData_Impl& SwAccessibleTable::GetTableData()
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index cb37347d4d00..2cad1a6446b7 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -88,20 +88,20 @@ SwModify::SwModify()
     : SwClient(0), pRoot(0)
 {
     bModifyLocked = false;
-    bLockClientList = sal_False;
-    bInDocDTOR = sal_False;
-    bInCache = sal_False;
-    bInSwFntCache = sal_False;
+    bLockClientList = false;
+    bInDocDTOR = false;
+    bInCache = false;
+    bInSwFntCache = false;
 }
 
 SwModify::SwModify( SwModify* pToRegisterIn )
     : SwClient( pToRegisterIn ), pRoot( 0 )
 {
     bModifyLocked = false;
-    bLockClientList = sal_False;
-    bInDocDTOR = sal_False;
-    bInCache = sal_False;
-    bInSwFntCache = sal_False;
+    bLockClientList = false;
+    bInDocDTOR = false;
+    bInCache = false;
+    bInSwFntCache = false;
 }
 
 SwModify::~SwModify()
@@ -166,7 +166,7 @@ void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* p
     // mba: WTF?!
     if( !pOldValue )
     {
-        bLockClientList = sal_True;
+        bLockClientList = true;
     }
     else
     {
@@ -181,16 +181,16 @@ void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* p
         case RES_REFMARK_DELETED:
         case RES_TOXMARK_DELETED:
         case RES_FIELD_DELETED:
-            bLockClientList = sal_False;
+            bLockClientList = false;
             break;
 
         default:
-            bLockClientList = sal_True;
+            bLockClientList = true;
         }
     }
 
     ModifyBroadcast( pOldValue, pNewValue );
-    bLockClientList = sal_False;
+    bLockClientList = false;
     UnlockModify();
 }
 
@@ -305,7 +305,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich )
 {
     if( isCHRATR( nWhich ) )
     {
-        SetInSwFntCache( sal_False );
+        SetInSwFntCache( false );
     }
     else
     {
@@ -314,7 +314,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich )
         case RES_OBJECTDYING:
         case RES_FMT_CHG:
         case RES_ATTRSET_CHG:
-            SetInSwFntCache( sal_False );
+            SetInSwFntCache( false );
             // fall through
         case RES_UL_SPACE:
         case RES_LR_SPACE:
@@ -326,7 +326,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich )
             if( IsInCache() )
             {
                 SwFrm::GetCache().Delete( this );
-                SetInCache( sal_False );
+                SetInCache( false );
             }
             break;
         }
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index bc8beb5f24d5..b8957c18795e 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -33,7 +33,7 @@
 
 // SwTblBoxNumFormat
 
-SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, sal_Bool bFlag )
+SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
     : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag )
 {
 }
@@ -152,14 +152,14 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
                                             pUpdtFld->nSplitLine <= nLnPos;
             }
             else
-                pUpdtFld->bBehindSplitLine = sal_False;
+                pUpdtFld->bBehindSplitLine = false;
             // no break
         case TBL_MERGETBL:
             if( pUpdtFld->pHistory )
             {
                 // for a history record the unchanged formula is needed
                 SwTblBoxFormula aCopy( *this );
-                pUpdtFld->bModified = sal_False;
+                pUpdtFld->bModified = false;
                 ToSplitMergeBoxNm( *pUpdtFld );
 
                 if( pUpdtFld->bModified )
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index ea2d88ac979f..c0ca4b5f768f 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -46,7 +46,7 @@ SwFmt::SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
     nPoolHelpId( USHRT_MAX ),
     nPoolHlpFileId( UCHAR_MAX )
 {
-    bAutoUpdateFmt = sal_False; // LAYER_IMPL
+    bAutoUpdateFmt = false; // LAYER_IMPL
     bAutoFmt = true;
     bWritten = bFmtInDTOR = bHidden = false;
 
@@ -65,7 +65,7 @@ SwFmt::SwFmt( SwAttrPool& rPool, const OUString& rFmtNm,
     nPoolHelpId( USHRT_MAX ),
     nPoolHlpFileId( UCHAR_MAX )
 {
-    bAutoUpdateFmt = sal_False; // LAYER_IMPL
+    bAutoUpdateFmt = false; // LAYER_IMPL
     bAutoFmt = true;
     bWritten = bFmtInDTOR = bHidden = false;
 
@@ -103,9 +103,9 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     // copy only array with attributes delta
     SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
@@ -144,7 +144,7 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
     return *this;
 }
 
-void SwFmt::SetName( const OUString& rNewName, sal_Bool bBroadcast )
+void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
 {
     OSL_ENSURE( !IsDefault(), "SetName: Defaultformat" );
     if( bBroadcast )
@@ -171,15 +171,15 @@ void SwFmt::SetName( const OUString& rNewName, sal_Bool bBroadcast )
     in which <this> is defined. Currently this is important for DropCaps
     because that contains data that needs to be copied deeply.
 */
-void SwFmt::CopyAttrs( const SwFmt& rFmt, sal_Bool bReplace )
+void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
 {
     // copy only array with attributes delta
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     // special treatments for some attributes
     SwAttrSet* pChgSet = (SwAttrSet*)&rFmt.aSet;
@@ -339,7 +339,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
     }
 }
 
-sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
+bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
 {
     if ( pDerFrom )
     {
@@ -347,7 +347,7 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
         while ( pFmt != 0 )
         {
             if ( pFmt == this )
-                return sal_False;
+                return false;
 
             pFmt=pFmt->DerivedFrom();
         }
@@ -360,7 +360,7 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
             pDerFrom = pDerFrom->DerivedFrom();
     }
     if ( (pDerFrom == DerivedFrom()) || (pDerFrom == this) )
-        return sal_False;
+        return false;
 
     OSL_ENSURE( Which()==pDerFrom->Which()
             || ( Which()==RES_CONDTXTFMTCOLL && pDerFrom->Which()==RES_TXTFMTCOLL)
@@ -371,9 +371,9 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     pDerFrom->Add( this );
     aSet.SetParent( &pDerFrom->aSet );
@@ -382,10 +382,10 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     SwFmtChg aNewFmt( this );
     ModifyNotification( &aOldFmt, &aNewFmt );
 
-    return sal_True;
+    return true;
 }
 
-const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, sal_Bool bInParents ) const
+const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
 {
     if(RES_BACKGROUND == nWhich && RES_FLYFRMFMT == Which())
     {
@@ -405,7 +405,7 @@ const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, sal_Bool bInParents ) c
 }
 
 
-SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, const SfxPoolItem **ppItem ) const
+SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
 {
     if(RES_BACKGROUND == nWhich && RES_FLYFRMFMT == Which())
     {
@@ -532,9 +532,9 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     bool bRet = false;
 
@@ -669,9 +669,9 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     // if Modify is locked then no modifications will be sent
     if( IsModifyLocked() )
@@ -702,9 +702,9 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     // if Modify is locked then no modifications will be sent
     if( IsModifyLocked() )
@@ -782,7 +782,7 @@ void SwFmt::SetGrabBagItem(const uno::Any& rVal)
 }
 
 //UUUU
-const SvxBrushItem& SwFmt::GetBackground(sal_Bool bInP) const
+const SvxBrushItem& SwFmt::GetBackground(bool bInP) const
 {
     if(RES_FLYFRMFMT == Which())
     {
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index a518aed32334..44614b8e61b5 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -73,7 +73,7 @@ SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
     eFlags( TBL_CALC )
 {
     DATA.pDelTbl = 0;
-    bModified = bBehindSplitLine = sal_False;
+    bModified = bBehindSplitLine = false;
     OSL_ENSURE( pTbl, "No Table pointer" );
 }
 
@@ -84,7 +84,7 @@ SwAutoFmtGetDocNode::SwAutoFmtGetDocNode( const SwNodes* pNds )
 
 SwAttrSetChg::SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet )
     : SwMsgPoolItem( RES_ATTRSET_CHG ),
-    bDelSet( sal_False ),
+    bDelSet( false ),
     pChgSet( &rSet ),
     pTheChgdSet( &rTheSet )
 {
@@ -92,7 +92,7 @@ SwAttrSetChg::SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet )
 
 SwAttrSetChg::SwAttrSetChg( const SwAttrSetChg& rChgSet )
     : SwMsgPoolItem( RES_ATTRSET_CHG ),
-    bDelSet( sal_True ),
+    bDelSet( true ),
     pTheChgdSet( rChgSet.pTheChgdSet )
 {
     pChgSet = new SwAttrSet( *rChgSet.pChgSet );
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 819149f24794..984db36e7577 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -328,7 +328,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
                 {
                     SwNumRule* pDestRule = pDstDoc->FindNumRulePtr( rNm );
                     if( pDestRule )
-                        pDestRule->SetInvalidRule( sal_True );
+                        pDestRule->SetInvalidRule( true );
                     else
                         pDstDoc->MakeNumRule( rNm, pSrcDoc->FindNumRulePtr( rNm ) );
                 }
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 12374288c17d..acecbdeefa09 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -404,7 +404,7 @@ SwSbxValue SwCalc::Calculate( const OUString& rStr )
                 Now this parameter is ignored.
   @return ???
 */
-OUString SwCalc::GetStrResult( const SwSbxValue& rVal, sal_Bool bRound )
+OUString SwCalc::GetStrResult( const SwSbxValue& rVal, bool bRound )
 {
     if( !rVal.IsDouble() )
     {
@@ -413,7 +413,7 @@ OUString SwCalc::GetStrResult( const SwSbxValue& rVal, sal_Bool bRound )
     return GetStrResult( rVal.GetDouble(), bRound );
 }
 
-OUString SwCalc::GetStrResult( double nValue, sal_Bool )
+OUString SwCalc::GetStrResult( double nValue, bool )
 {
     if( nValue >= DBL_MAX )
         switch( eError )
@@ -1087,22 +1087,22 @@ SwSbxValue SwCalc::Term()
         case CALC_AND:
             {
                 GetToken();
-                sal_Bool bB = Prim().GetBool();
+                bool bB = Prim().GetBool();
                 left.PutBool( left.GetBool() && bB );
             }
             break;
         case CALC_OR:
             {
                 GetToken();
-                sal_Bool bB = Prim().GetBool();
+                bool bB = Prim().GetBool();
                 left.PutBool( left.GetBool() || bB );
             }
             break;
         case CALC_XOR:
             {
                 GetToken();
-                sal_Bool bR = Prim().GetBool();
-                sal_Bool bL = left.GetBool();
+                bool bR = Prim().GetBool();
+                bool bL = left.GetBool();
                 left.PutBool( (bL && !bR) || (!bL && bR) );
             }
             break;
@@ -1541,9 +1541,9 @@ bool SwCalc::Str2Double( const OUString& rCommand, sal_Int32& rCommandPos,
     return bRet;
 }
 
-sal_Bool SwCalc::IsValidVarName( const OUString& rStr, OUString* pValidName )
+bool SwCalc::IsValidVarName( const OUString& rStr, OUString* pValidName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     using namespace ::com::sun::star::i18n;
     {
         // Parse any token.
@@ -1596,7 +1596,7 @@ SwSbxValue::~SwSbxValue()
 {
 }
 
-sal_Bool SwSbxValue::GetBool() const
+bool SwSbxValue::GetBool() const
 {
     return SbxSTRING == GetType() ? !GetOUString().isEmpty()
                                   : SbxValue::GetBool();
@@ -1612,7 +1612,7 @@ double SwSbxValue::GetDouble() const
     }
     else if (IsBool())
     {
-        nRet = 0 != GetBool() ? 1.0 : 0.0;
+        nRet = GetBool() ? 1.0 : 0.0;
     }
     else
     {
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index de353fa43a3e..1abeb5b43397 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -547,7 +547,7 @@ void _InitCore()
     aAttrTab[ RES_PARATR_HYPHENZONE- POOLATTR_BEGIN ] =     pItem;
 
     aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] =           new SwFmtDrop;
-    aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] =      new SwRegisterItem( sal_False );
+    aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] =      new SwRegisterItem( false );
     aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] =       new SwNumRuleItem( OUString() );
 
     aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] =   new SvxScriptSpaceItem( true, RES_PARATR_SCRIPTSPACE );
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index f0cb3564022a..7b2d4e205fc9 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -224,7 +224,7 @@ void SwCache::ToTop( SwCacheObj *pObj )
 }
 
 SwCacheObj *SwCache::Get( const void *pOwner, const sal_uInt16 nIndex,
-                          const sal_Bool bToTop )
+                          const bool bToTop )
 {
     SwCacheObj *pRet;
     if ( 0 != (pRet = (nIndex < m_aCacheObjects.size()) ? m_aCacheObjects[ nIndex ] : 0) )
@@ -245,7 +245,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const sal_uInt16 nIndex,
     return pRet;
 }
 
-SwCacheObj *SwCache::Get( const void *pOwner, const sal_Bool bToTop )
+SwCacheObj *SwCache::Get( const void *pOwner, const bool bToTop )
 {
     SwCacheObj *pRet = pRealFirst;
     while ( pRet && !pRet->IsOwner( pOwner ) )
@@ -322,11 +322,11 @@ void SwCache::Delete( const void *pOwner )
 {
     INCREMENT( m_nDelete );
     SwCacheObj *pObj;
-    if ( 0 != (pObj = Get( pOwner, sal_Bool(sal_False) )) )
+    if ( 0 != (pObj = Get( pOwner, false )) )
         DeleteObj( pObj );
 }
 
-sal_Bool SwCache::Insert( SwCacheObj *pNew )
+bool SwCache::Insert( SwCacheObj *pNew )
 {
     CHECK;
     OSL_ENSURE( !pNew->GetPrev() && !pNew->GetNext(), "New but not new." );
@@ -359,7 +359,7 @@ sal_Bool SwCache::Insert( SwCacheObj *pNew )
         if ( !pObj )
         {
             OSL_FAIL( "Cache overflow." );
-            return sal_False;
+            return false;
         }
 
         nPos = pObj->GetCachePos();
@@ -398,7 +398,7 @@ sal_Bool SwCache::Insert( SwCacheObj *pNew )
     pFirst = pNew;
 
     CHECK;
-    return sal_True;
+    return true;
 }
 
 void SwCache::SetLRUOfst( const sal_uInt16 nOfst )
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 0d79ded1e322..c9108107ae77 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -97,7 +97,7 @@ SwRect& SwRect::_Intersection( const SwRect& rRect )
     return *this;
 }
 
-sal_Bool SwRect::IsInside( const SwRect& rRect ) const
+bool SwRect::IsInside( const SwRect& rRect ) const
 {
     const long nRight  = Right();
     const long nBottom = Bottom();
@@ -109,7 +109,7 @@ sal_Bool SwRect::IsInside( const SwRect& rRect ) const
            (Top()  <= nrBottom)     && (nrBottom    <= nBottom);
 }
 
-sal_Bool SwRect::IsInside( const Point& rPoint ) const
+bool SwRect::IsInside( const Point& rPoint ) const
 {
     return (Left()  <= rPoint.X()) &&
            (Top()   <= rPoint.Y()) &&
@@ -118,7 +118,7 @@ sal_Bool SwRect::IsInside( const Point& rPoint ) const
 }
 
 // mouse moving of table borders
-sal_Bool SwRect::IsNear( const Point& rPoint, long nTolerance ) const
+bool SwRect::IsNear( const Point& rPoint, long nTolerance ) const
 {
     bool bIsNearby = (((Left()   - nTolerance) <= rPoint.X()) &&
                       ((Top()    - nTolerance) <= rPoint.Y()) &&
@@ -127,7 +127,7 @@ sal_Bool SwRect::IsNear( const Point& rPoint, long nTolerance ) const
     return IsInside(rPoint) || bIsNearby;
 }
 
-sal_Bool SwRect::IsOver( const SwRect& rRect ) const
+bool SwRect::IsOver( const SwRect& rRect ) const
 {
     return (Top()   <= rRect.Bottom()) &&
            (Left()  <= rRect.Right())  &&
@@ -187,13 +187,13 @@ long SwRect::GetBottomDistance( long nLim ) const { return nLim - m_Point.getY()
 long SwRect::GetTopDistance( long nLimit ) const { return m_Point.getY() - nLimit; }
 long SwRect::GetRightDistance( long nLim ) const { return nLim - m_Point.getX() - m_Size.getWidth(); }
 
-sal_Bool SwRect::OverStepLeft( long nLimit ) const
+bool SwRect::OverStepLeft( long nLimit ) const
     { return nLimit > m_Point.getX() && m_Point.getX() + m_Size.getWidth() > nLimit; }
-sal_Bool SwRect::OverStepBottom( long nLimit ) const
+bool SwRect::OverStepBottom( long nLimit ) const
     { return nLimit > m_Point.getY() && m_Point.getY() + m_Size.getHeight() > nLimit; }
-sal_Bool SwRect::OverStepTop( long nLimit ) const
+bool SwRect::OverStepTop( long nLimit ) const
     { return nLimit > m_Point.getY() && m_Point.getY() + m_Size.getHeight() > nLimit; }
-sal_Bool SwRect::OverStepRight( long nLimit ) const
+bool SwRect::OverStepRight( long nLimit ) const
     { return nLimit > m_Point.getX() && m_Point.getX() + m_Size.getWidth() > nLimit; }
 
 void SwRect::SetLeftAndWidth( long nLeft, long nNew )
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index fcca7e209534..9f7a59575598 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -92,7 +92,7 @@ bool SwTabCols::operator==( const SwTabCols& rCmp ) const
 }
 
 void SwTabCols::Insert( long nValue, long nMin, long nMax,
-                        sal_Bool bValue, size_t nPos )
+                        bool bValue, size_t nPos )
 {
     SwTabColsEntry aEntry;
     aEntry.nPos = nValue;
@@ -102,7 +102,7 @@ void SwTabCols::Insert( long nValue, long nMin, long nMax,
     aData.insert( aData.begin() + nPos, aEntry );
 }
 
-void SwTabCols::Insert( long nValue, sal_Bool bValue, size_t nPos )
+void SwTabCols::Insert( long nValue, bool bValue, size_t nPos )
 {
     SwTabColsEntry aEntry;
     aEntry.nPos = nValue;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 36a907fe2b20..fe86bd36e33e 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -183,7 +183,7 @@ SwPaM & SwCrsrShell::GetCurrentShellCursor()
  * Return pointer to the current shell cursor
  * @return - returns pointer to current `SwPaM` shell cursor
  */
-SwPaM* SwCrsrShell::GetCrsr( sal_Bool bMakeTblCrsr ) const
+SwPaM* SwCrsrShell::GetCrsr( bool bMakeTblCrsr ) const
 {
     if( m_pTblCrsr )
     {
@@ -228,10 +228,10 @@ void SwCrsrShell::StartAction()
     SwViewShell::StartAction(); // to the SwViewShell
 }
 
-void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
+void SwCrsrShell::EndAction( const bool bIdleEnd )
 {
     comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false));
-    sal_Bool bVis = m_bSVCrsrVis;
+    bool bVis = m_bSVCrsrVis;
 
     // Idle-formatting?
     if( bIdleEnd && Imp()->GetRegion() )
@@ -245,8 +245,8 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
 
     // #i76923#: Don't show the cursor in the SwViewShell::EndAction() - call.
     //           Only the UpdateCrsr shows the cursor.
-    sal_Bool bSavSVCrsrVis = m_bSVCrsrVis;
-    m_bSVCrsrVis = sal_False;
+    bool bSavSVCrsrVis = m_bSVCrsrVis;
+    m_bSVCrsrVis = false;
 
     SwViewShell::EndAction( bIdleEnd );   // have SwViewShell go first
 
@@ -277,7 +277,7 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
             if( m_bCallChgLnk && m_bChgCallFlag && m_aChgLnk.IsSet() )
             {
                 m_aChgLnk.Call( this );
-                m_bChgCallFlag = sal_False; // reset flag
+                m_bChgCallFlag = false; // reset flag
             }
         }
         return;
@@ -305,7 +305,7 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
     if( m_bCallChgLnk && m_bChgCallFlag && m_aChgLnk.IsSet() )
     {
         m_aChgLnk.Call( this );
-        m_bChgCallFlag = sal_False;       // reset flag
+        m_bChgCallFlag = false;       // reset flag
     }
 }
 
@@ -317,23 +317,23 @@ void SwCrsrShell::SttCrsrMove()
     StartAction();
 }
 
-void SwCrsrShell::EndCrsrMove( const sal_Bool bIdleEnd )
+void SwCrsrShell::EndCrsrMove( const bool bIdleEnd )
 {
     OSL_ENSURE( m_nCrsrMove, "EndCrsrMove() without SttCrsrMove()." );
     EndAction( bIdleEnd );
     if( !--m_nCrsrMove )
-        m_bInCMvVisportChgd = sal_False;
+        m_bInCMvVisportChgd = false;
 }
 #endif
 
-sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
-                                 sal_Bool bVisualAllowed )
+bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
+                             bool bVisualAllowed )
 {
     if( IsTableMode() )
         return bLeft ? GoPrevCell() : GoNextCell();
 
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // #i27615# Handle cursor in front of label.
     const SwTxtNode* pTxtNd = 0;
@@ -347,7 +347,7 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMo
     if ( !bLeft && pShellCrsr->IsInFrontOfLabel() )
     {
         SetInFrontOfLabel( false );
-        bRet = sal_True;
+        bRet = true;
     }
     // 2. CASE: Cursor is at beginning of numbered paragraph. A move
     // to the left will simply set the bInFrontOfLabel flag:
@@ -357,12 +357,12 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMo
              pTxtNd->HasVisibleNumberingOrBullet() )
     {
         SetInFrontOfLabel( true );
-        bRet = sal_True;
+        bRet = true;
     }
     // 3. CASE: Regular cursor move. Reset the bInFrontOfLabel flag:
     else
     {
-        const sal_Bool bSkipHidden = !GetViewOptions()->IsShowHiddenChar();
+        const bool bSkipHidden = !GetViewOptions()->IsShowHiddenChar();
         // #i107447#
         // To avoid loop the reset of <bInFrontOfLabel> flag is no longer
         // reflected in the return value <bRet>.
@@ -466,7 +466,7 @@ void SwCrsrShell::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNew
 
 bool SwCrsrShell::bColumnChange()
 {
-    SwFrm* pCurrFrm = GetCurrFrm(sal_False);
+    SwFrm* pCurrFrm = GetCurrFrm(false);
 
     if (pCurrFrm == NULL)
     {
@@ -503,7 +503,7 @@ bool SwCrsrShell::UpDown( bool bUp, sal_uInt16 nCnt )
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
-    sal_Bool bTableMode = IsTableMode();
+    bool bTableMode = IsTableMode();
     SwShellCrsr* pTmpCrsr = getShellCrsr( true );
 
     bool bRet = pTmpCrsr->UpDown( bUp, nCnt );
@@ -528,13 +528,13 @@ bool SwCrsrShell::UpDown( bool bUp, sal_uInt16 nCnt )
     return bRet;
 }
 
-sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool bAPI)
+bool SwCrsrShell::LRMargin( bool bLeft, bool bAPI)
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     SET_CURR_SHELL( this );
     m_eMvState = MV_LEFTMARGIN; // status for Crsr travelling - GetCrsrOfst
 
-    const sal_Bool bTableMode = IsTableMode();
+    const bool bTableMode = IsTableMode();
     SwShellCrsr* pTmpCrsr = getShellCrsr( true );
 
     if( m_pBlockCrsr )
@@ -543,7 +543,7 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool bAPI)
     const bool bWasAtLM =
             ( 0 == _GetCrsr()->GetPoint()->nContent.GetIndex() );
 
-    sal_Bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI );
+    bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI );
 
     if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCrsr()->HasMark() )
     {
@@ -563,18 +563,18 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool bAPI)
     return bRet;
 }
 
-sal_Bool SwCrsrShell::IsAtLRMargin( sal_Bool bLeft, sal_Bool bAPI ) const
+bool SwCrsrShell::IsAtLRMargin( bool bLeft, bool bAPI ) const
 {
     const SwShellCrsr* pTmpCrsr = getShellCrsr( true );
     return pTmpCrsr->IsAtLeftRightMargin( bLeft, bAPI );
 }
 
-sal_Bool SwCrsrShell::SttEndDoc( sal_Bool bStt )
+bool SwCrsrShell::SttEndDoc( bool bStt )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
     SwShellCrsr* pTmpCrsr = m_pBlockCrsr ? &m_pBlockCrsr->getShellCrsr() : m_pCurCrsr;
-    sal_Bool bRet = pTmpCrsr->SttEndDoc( bStt );
+    bool bRet = pTmpCrsr->SttEndDoc( bStt );
     if( bRet )
     {
         if( bStt )
@@ -628,9 +628,9 @@ bool SwCrsrShell::StartsWithTable()
     return pCntntNode->FindTableNode();
 }
 
-sal_Bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
+bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // never jump of section borders at selection
     if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoCntnt() )
@@ -642,13 +642,13 @@ sal_Bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
         Point& rPt = m_pCurCrsr->GetPtPos();
         SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->
                             getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), false );
-        if( pFrm && sal_True == ( bRet = GetFrmInPage( pFrm, fnWhichPage,
-                                                fnPosPage, m_pCurCrsr )  ) &&
+        if( pFrm && ( bRet = GetFrmInPage( pFrm, fnWhichPage,
+                                           fnPosPage, m_pCurCrsr )  ) &&
             !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                  nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
             UpdateCrsr();
         else
-            bRet = sal_False;
+            bRet = false;
     }
     return bRet;
 }
@@ -661,11 +661,11 @@ bool SwCrsrShell::isInHiddenTxtFrm(SwShellCrsr* pShellCrsr)
     return !pFrm || (pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow());
 }
 
-sal_Bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
+bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     SwShellCrsr* pTmpCrsr = getShellCrsr( true );
-    sal_Bool bRet = pTmpCrsr->MovePara( fnWhichPara, fnPosPara );
+    bool bRet = pTmpCrsr->MovePara( fnWhichPara, fnPosPara );
     if( bRet )
     {
         //keep going until we get something visible, i.e. skip
@@ -684,12 +684,12 @@ sal_Bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
     return bRet;
 }
 
-sal_Bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
+bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
                                 SwPosSection fnPosSect)
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     SwCursor* pTmpCrsr = getShellCrsr( true );
-    sal_Bool bRet = pTmpCrsr->MoveSection( fnWhichSect, fnPosSect );
+    bool bRet = pTmpCrsr->MoveSection( fnWhichSect, fnPosSect );
     if( bRet )
         UpdateCrsr();
     return bRet;
@@ -713,7 +713,7 @@ static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
     return pFrm;
 }
 
-bool SwCrsrShell::IsInHeaderFooter( sal_Bool* pbInHeader ) const
+bool SwCrsrShell::IsInHeaderFooter( bool* pbInHeader ) const
 {
     Point aPt;
     SwFrm* pFrm = ::lcl_IsInHeaderFooter( m_pCurCrsr->GetPoint()->nNode, aPt );
@@ -722,7 +722,7 @@ bool SwCrsrShell::IsInHeaderFooter( sal_Bool* pbInHeader ) const
     return 0 != pFrm;
 }
 
-int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
+int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
 {
     SET_CURR_SHELL( this );
 
@@ -741,11 +741,11 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
         !pCrsr->HasMark() &&
         pTxtNd->HasVisibleNumberingOrBullet() )
     {
-        aTmpState.bInFrontOfLabel = sal_True; // #i27615#
+        aTmpState.bInFrontOfLabel = true; // #i27615#
     }
     else
     {
-        aTmpState.bInFrontOfLabel = sal_False;
+        aTmpState.bInFrontOfLabel = false;
     }
 
     int bRet = CRSR_POSOLD |
@@ -845,7 +845,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
             // there is no valid content -> hide cursor
             m_pVisCrsr->Hide(); // always hide visible cursor
             m_eMvState = MV_NONE; // status for Crsr travelling
-            m_bAllProtect = sal_True;
+            m_bAllProtect = true;
             if( GetDoc()->GetDocShell() )
             {
                 GetDoc()->GetDocShell()->SetReadOnlyUI( true );
@@ -923,7 +923,7 @@ void SwCrsrShell::ClearMark()
     }
 }
 
-void SwCrsrShell::NormalizePam(sal_Bool bPointFirst)
+void SwCrsrShell::NormalizePam(bool bPointFirst)
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     m_pCurCrsr->Normalize(bPointFirst);
@@ -946,10 +946,10 @@ void SwCrsrShell::SwapPam()
     @param bTstOnly Should I only do a test run? If true so do not move cursor.
     @param bTstHit ???
 */
-sal_Bool SwCrsrShell::ChgCurrPam(
+bool SwCrsrShell::ChgCurrPam(
     const Point & rPt,
-    sal_Bool bTstOnly,
-    sal_Bool bTstHit )
+    bool bTstOnly,
+    bool bTstHit )
 {
     SET_CURR_SHELL( this );
 
@@ -965,7 +965,7 @@ sal_Bool SwCrsrShell::ChgCurrPam(
     SwCrsrMoveState aTmpState( MV_NONE );
     aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
     if ( !GetLayout()->GetCrsrOfst( &aPtPos, aPt, &aTmpState ) && bTstHit )
-        return sal_False;
+        return false;
 
     // search in all selections for this position
     SwShellCrsr* pCmp = (SwShellCrsr*)m_pCurCrsr; // keep the pointer on cursor
@@ -974,15 +974,15 @@ sal_Bool SwCrsrShell::ChgCurrPam(
             *pCmp->Start() <= aPtPos && *pCmp->End() > aPtPos )
         {
             if( bTstOnly || m_pCurCrsr == pCmp ) // is the current
-                return sal_True;               // return without update
+                return true;               // return without update
 
             m_pCurCrsr = pCmp;
             UpdateCrsr(); // cursor is already at the right position
-            return sal_True;
+            return true;
         }
     } while( m_pCurCrsr !=
         ( pCmp = dynamic_cast<SwShellCrsr*>(pCmp->GetNext()) ) );
-    return sal_False;
+    return false;
 }
 
 void SwCrsrShell::KillPams()
@@ -1104,12 +1104,12 @@ bool SwCrsrShell::SetInFrontOfLabel( bool bNew )
     return false;
 }
 
-sal_Bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
+bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
 {
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
-    sal_Bool bRet = GetLayout()->SetCurrPage( m_pCurCrsr, nPage ) &&
+    bool bRet = GetLayout()->SetCurrPage( m_pCurCrsr, nPage ) &&
                     !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                          nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
     if( bRet )
@@ -1117,14 +1117,14 @@ sal_Bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
     return bRet;
 }
 
-sal_Bool SwCrsrShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
+bool SwCrsrShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
 {
     SwCntntFrm* pFrm = GetCurrFrm();
     return pFrm->GetCharRect( rRect, *pPos );
 }
 
 void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
-                              sal_Bool bAtCrsrPos, const sal_Bool bCalcFrm )
+                              bool bAtCrsrPos, const bool bCalcFrm )
 {
     SET_CURR_SHELL( this );
     // page number: first visible page or the one at the cursor
@@ -1143,7 +1143,7 @@ void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
     rnVirtNum = pPg? pPg->GetVirtPageNum() : 1;
 }
 
-sal_uInt16 SwCrsrShell::GetNextPrevPageNum( sal_Bool bNext )
+sal_uInt16 SwCrsrShell::GetNextPrevPageNum( bool bNext )
 {
     SET_CURR_SHELL( this );
     // page number: first visible page or the one at the cursor
@@ -1189,11 +1189,11 @@ sal_uInt16 SwCrsrShell::GetPageCnt()
 }
 
 /// go to the next SSelection
-sal_Bool SwCrsrShell::GoNextCrsr()
+bool SwCrsrShell::GoNextCrsr()
 {
     // is there a ring of cursors?
     if( m_pCurCrsr->GetNext() == m_pCurCrsr )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -1205,15 +1205,15 @@ sal_Bool SwCrsrShell::GoNextCrsr()
         UpdateCrsr();
         m_pCurCrsr->Show();
     }
-    return sal_True;
+    return true;
 }
 
 /// go to the previous SSelection
-sal_Bool SwCrsrShell::GoPrevCrsr()
+bool SwCrsrShell::GoPrevCrsr()
 {
     // is there a ring of cursors?
     if( m_pCurCrsr->GetNext() == m_pCurCrsr )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -1225,7 +1225,7 @@ sal_Bool SwCrsrShell::GoPrevCrsr()
         UpdateCrsr();
         m_pCurCrsr->Show();
     }
-    return sal_True;
+    return true;
 }
 
 void SwCrsrShell::Paint( const Rectangle &rRect)
@@ -1274,7 +1274,7 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
     if( ( bVis = m_pVisCrsr->IsVisible() ) )
         m_pVisCrsr->Hide();
 
-    m_bVisPortChgd = sal_True;
+    m_bVisPortChgd = true;
     m_aOldRBPos.setX(VisArea().Right());
     m_aOldRBPos.setY(VisArea().Bottom());
 
@@ -1287,9 +1287,9 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
         m_pVisCrsr->Show();
 
     if( m_nCrsrMove )
-        m_bInCMvVisportChgd = sal_True;
+        m_bInCMvVisportChgd = true;
 
-    m_bVisPortChgd = sal_False;
+    m_bVisPortChgd = false;
 }
 
 /** Set the cursor back into content.
@@ -1371,7 +1371,7 @@ class SwNotifyAccAboutInvalidTextSelections
         }
 };
 
-void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
+void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 {
     SET_CURR_SHELL( this );
     ClearUpCrsrs();
@@ -1381,7 +1381,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
     if( ActionPend() && BasicActionPend() )
     {
         if ( eFlags & SwCrsrShell::READONLY )
-            m_bIgnoreReadonly = sal_True;
+            m_bIgnoreReadonly = true;
         return; // if not then no update
     }
 
@@ -1389,7 +1389,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
 
     if ( m_bIgnoreReadonly )
     {
-        m_bIgnoreReadonly = sal_False;
+        m_bIgnoreReadonly = false;
         eFlags |= SwCrsrShell::READONLY;
     }
 
@@ -1504,7 +1504,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
             }
 
             SwCrsrMoveState aTmpState( MV_NONE );
-            aTmpState.bRealHeight = sal_True;
+            aTmpState.bRealHeight = true;
             if( !pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint(), &aTmpState ) )
             {
                 Point aCentrPt( m_aCharRect.Center() );
@@ -1589,7 +1589,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
                 else
                 {
                     m_eMvState = MV_NONE;     // state for cursor travelling
-                    m_bAllProtect = sal_True;
+                    m_bAllProtect = true;
                     if( GetDoc()->GetDocShell() )
                     {
                         GetDoc()->GetDocShell()->SetReadOnlyUI( true );
@@ -1601,8 +1601,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
         }
         if( bChgState )
         {
-            sal_Bool bWasAllProtect = m_bAllProtect;
-            m_bAllProtect = sal_False;
+            bool bWasAllProtect = m_bAllProtect;
+            m_bAllProtect = false;
             if( bWasAllProtect && GetDoc()->GetDocShell() &&
                 GetDoc()->GetDocShell()->IsReadOnlyUI() )
             {
@@ -1692,7 +1692,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
                     else
                     {
                         m_eMvState = MV_NONE;     // state for crusor travelling
-                        m_bAllProtect = sal_True;
+                        m_bAllProtect = true;
                         if( GetDoc()->GetDocShell() )
                         {
                             GetDoc()->GetDocShell()->SetReadOnlyUI( true );
@@ -1704,15 +1704,15 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
 
                 if( bChgState )
                 {
-                    sal_Bool bWasAllProtect = m_bAllProtect;
-                    m_bAllProtect = sal_False;
+                    bool bWasAllProtect = m_bAllProtect;
+                    m_bAllProtect = false;
                     if( bWasAllProtect && GetDoc()->GetDocShell() &&
                         GetDoc()->GetDocShell()->IsReadOnlyUI() )
                     {
                         GetDoc()->GetDocShell()->SetReadOnlyUI( false );
                         CallChgLnk();       // notify UI!
                     }
-                    m_bAllProtect = sal_False;
+                    m_bAllProtect = false;
                     bAgainst = true; // look for the right Frm again
                 }
             }
@@ -1722,7 +1722,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
         {
             SwCrsrMoveState aTmpState( m_eMvState );
             aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-            aTmpState.bRealHeight = sal_True;
+            aTmpState.bRealHeight = true;
             aTmpState.bRealWidth = IsOverwriteCrsr();
             aTmpState.nCursorBidiLevel = pShellCrsr->GetCrsrBidiLevel();
 
@@ -1789,8 +1789,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
         {
             // in case of scrolling this EndAction doesn't show the SV cursor
             // again, thus save and reset the flag here
-            sal_Bool bSav = m_bSVCrsrVis;
-            m_bSVCrsrVis = sal_False;
+            bool bSav = m_bSVCrsrVis;
+            m_bSVCrsrVis = false;
             MakeSelVisible();
             m_bSVCrsrVis = bSav;
         }
@@ -1981,13 +1981,13 @@ void SwCrsrShell::Push()
                     and assign the one from stack as the new current cursor.
     @return <true> if there was one on the stack, <false> otherwise
 */
-sal_Bool SwCrsrShell::Pop( sal_Bool bOldCrsr )
+bool SwCrsrShell::Pop( bool bOldCrsr )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
     // are there any left?
     if( 0 == m_pCrsrStk )
-        return sal_False;
+        return false;
 
     SwShellCrsr *pTmp = 0, *pOldStk = m_pCrsrStk;
 
@@ -2028,12 +2028,12 @@ sal_Bool SwCrsrShell::Pop( sal_Bool bOldCrsr )
         m_pCurCrsr->GetPtPos() = pOldStk->GetPtPos();
         delete pOldStk;
 
-        if( !m_pCurCrsr->IsInProtectTable( sal_True ) &&
+        if( !m_pCurCrsr->IsInProtectTable( true ) &&
             !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                  nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
             UpdateCrsr(); // update current cursor
     }
-    return sal_True;
+    return true;
 }
 
 /** Combine two cursors
@@ -2066,7 +2066,7 @@ void SwCrsrShell::Combine()
     m_pCurCrsr = m_pCrsrStk;
     m_pCrsrStk->MoveTo(0); // remove from ring
     m_pCrsrStk = pTmp;
-    if( !m_pCurCrsr->IsInProtectTable( sal_True ) &&
+    if( !m_pCurCrsr->IsInProtectTable( true ) &&
         !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                              nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
     {
@@ -2090,7 +2090,7 @@ void SwCrsrShell::HideCrsrs()
     pAktCrsr->Hide();
 }
 
-void SwCrsrShell::ShowCrsrs( sal_Bool bCrsrVis )
+void SwCrsrShell::ShowCrsrs( bool bCrsrVis )
 {
     if( !m_bHasFocus || m_bAllProtect || m_bBasicHideCrsr )
         return;
@@ -2107,7 +2107,7 @@ void SwCrsrShell::ShowCrsr()
 {
     if( !m_bBasicHideCrsr )
     {
-        m_bSVCrsrVis = sal_True;
+        m_bSVCrsrVis = true;
         m_pCurCrsr->SetShowTxtInputFldOverlay( true );
 #if defined(ANDROID) || defined(IOS)
         touch_ui_show_keyboard();
@@ -2120,7 +2120,7 @@ void SwCrsrShell::HideCrsr()
 {
     if( !m_bBasicHideCrsr )
     {
-        m_bSVCrsrVis = sal_False;
+        m_bSVCrsrVis = false;
         // possibly reverse selected areas!!
         SET_CURR_SHELL( this );
         m_pCurCrsr->SetShowTxtInputFldOverlay( false );
@@ -2135,12 +2135,12 @@ void SwCrsrShell::ShLooseFcs()
 {
     if( !m_bBasicHideCrsr )
         HideCrsrs();
-    m_bHasFocus = sal_False;
+    m_bHasFocus = false;
 }
 
-void SwCrsrShell::ShGetFcs( sal_Bool bUpdate )
+void SwCrsrShell::ShGetFcs( bool bUpdate )
 {
-    m_bHasFocus = sal_True;
+    m_bHasFocus = true;
     if( !m_bBasicHideCrsr && VisArea().Width() )
     {
         UpdateCrsr( static_cast<sal_uInt16>( bUpdate ?
@@ -2151,7 +2151,7 @@ void SwCrsrShell::ShGetFcs( sal_Bool bUpdate )
 }
 
 /** Get current frame in which the cursor is positioned. */
-SwCntntFrm *SwCrsrShell::GetCurrFrm( const sal_Bool bCalcFrm ) const
+SwCntntFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
 {
     SET_CURR_SHELL( (SwViewShell*)this );
     SwCntntFrm *pRet = 0;
@@ -2207,7 +2207,7 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
     This means checking if GetMark is set and if SPoint and GetMark differ.
 */
-sal_Bool SwCrsrShell::HasSelection() const
+bool SwCrsrShell::HasSelection() const
 {
     const SwPaM* pCrsr = getShellCrsr( true );
     return( IsTableMode() || ( pCrsr->HasMark() &&
@@ -2220,12 +2220,12 @@ void SwCrsrShell::CallChgLnk()
     // Do not make any call in start/end action but just remember the change.
     // This will be taken care of in the end action.
     if( BasicActionPend() )
-        m_bChgCallFlag = sal_True; // remember change
+        m_bChgCallFlag = true; // remember change
     else if( m_aChgLnk.IsSet() )
     {
         if( m_bCallChgLnk )
             m_aChgLnk.Call( this );
-        m_bChgCallFlag = sal_False; // reset flag
+        m_bChgCallFlag = false; // reset flag
     }
 }
 
@@ -2267,7 +2267,7 @@ OUString SwCrsrShell::GetText() const
     @param bEnd    Start counting from the end? From start otherwise.
     @param nOffset position of the character
 */
-sal_Unicode SwCrsrShell::GetChar( sal_Bool bEnd, long nOffset )
+sal_Unicode SwCrsrShell::GetChar( bool bEnd, long nOffset )
 {
     if( IsTableMode() ) // not possible in table mode
         return 0;
@@ -2293,10 +2293,10 @@ sal_Unicode SwCrsrShell::GetChar( sal_Bool bEnd, long nOffset )
     @param bEnd   Start counting from the end? From start otherwise.
     @param nCount Number of characters.
 */
-sal_Bool SwCrsrShell::ExtendSelection( sal_Bool bEnd, sal_Int32 nCount )
+bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
 {
     if( !m_pCurCrsr->HasMark() || IsTableMode() )
-        return sal_False; // no selection
+        return false; // no selection
 
     SwPosition* pPos = bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
     SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
@@ -2308,19 +2308,19 @@ sal_Bool SwCrsrShell::ExtendSelection( sal_Bool bEnd, sal_Int32 nCount )
         if ((nPos + nCount) <= pTxtNd->GetTxt().getLength())
             nPos = nPos + nCount;
         else
-            return sal_False; // not possible
+            return false; // not possible
     }
     else if( nPos >= nCount )
         nPos = nPos - nCount;
     else
-        return sal_False; // not possible anymore
+        return false; // not possible anymore
 
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
     pPos->nContent = nPos;
     UpdateCrsr();
 
-    return sal_True;
+    return true;
 }
 
 /** Move visible cursor to given position in document.
@@ -2328,14 +2328,14 @@ sal_Bool SwCrsrShell::ExtendSelection( sal_Bool bEnd, sal_Int32 nCount )
     @param rPt The position to move the visible cursor to.
     @return <sal_False> if SPoint was corrected by the layout.
 */
-sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt )
+bool SwCrsrShell::SetVisCrsr( const Point &rPt )
 {
     SET_CURR_SHELL( this );
     Point aPt( rPt );
     SwPosition aPos( *m_pCurCrsr->GetPoint() );
     SwCrsrMoveState aTmpState( MV_SETONLYTEXT );
     aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-    aTmpState.bRealHeight = sal_True;
+    aTmpState.bRealHeight = true;
 
     const bool bRet = GetLayout()->GetCrsrOfst( &aPos, aPt /*, &aTmpState*/ );
 
@@ -2344,13 +2344,13 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt )
     // show only in TextNodes
     SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode();
     if( !pTxtNd )
-        return sal_False;
+        return false;
 
     const SwSectionNode* pSectNd = pTxtNd->FindSectionNode();
     if( pSectNd && (pSectNd->GetSection().IsHiddenFlag() ||
                     ( !IsReadOnlyAvailable() &&
                       pSectNd->GetSection().IsProtectFlag())) )
-        return sal_False;
+        return false;
 
     SwCntntFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
     if ( Imp()->IsIdleAction() )
@@ -2361,7 +2361,7 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt )
 
     // #i10137#
     if( aTmp == m_aCharRect && m_pVisCrsr->IsVisible() )
-        return sal_True;
+        return true;
 
     m_pVisCrsr->Hide(); // always hide visible cursor
     if( IsScrollMDI( this, m_aCharRect ))
@@ -2385,7 +2385,7 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt )
     return bRet;
 }
 
-sal_Bool SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
+bool SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
 {
     Point aPt( rPt );
     SwPaM aPam( *m_pCurCrsr->GetPoint() );
@@ -2398,7 +2398,7 @@ sal_Bool SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
 
     @param bAll If <false> get only spanned ones (= with selections) (Basic).
 */
-sal_uInt16 SwCrsrShell::GetCrsrCnt( sal_Bool bAll ) const
+sal_uInt16 SwCrsrShell::GetCrsrCnt( bool bAll ) const
 {
     Ring* pTmp = GetCrsr()->GetNext();
     sal_uInt16 n = (bAll || ( m_pCurCrsr->HasMark() &&
@@ -2413,10 +2413,10 @@ sal_uInt16 SwCrsrShell::GetCrsrCnt( sal_Bool bAll ) const
     return n;
 }
 
-sal_Bool SwCrsrShell::IsStartOfDoc() const
+bool SwCrsrShell::IsStartOfDoc() const
 {
     if( m_pCurCrsr->GetPoint()->nContent.GetIndex() )
-        return sal_False;
+        return false;
 
     // after EndOfIcons comes the content selection (EndNd+StNd+CntntNd)
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfExtras(), 2 );
@@ -2425,7 +2425,7 @@ sal_Bool SwCrsrShell::IsStartOfDoc() const
     return aIdx == m_pCurCrsr->GetPoint()->nNode;
 }
 
-sal_Bool SwCrsrShell::IsEndOfDoc() const
+bool SwCrsrShell::IsEndOfDoc() const
 {
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
     SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
@@ -2443,10 +2443,10 @@ sal_Bool SwCrsrShell::IsEndOfDoc() const
 
     This is needed for Drag&Drop/ Clipboard-paste in tables.
 */
-sal_Bool SwCrsrShell::ParkTblCrsr()
+bool SwCrsrShell::ParkTblCrsr()
 {
     if( !m_pTblCrsr )
-        return sal_False;
+        return false;
 
     m_pTblCrsr->ParkCrsr();
 
@@ -2457,7 +2457,7 @@ sal_Bool SwCrsrShell::ParkTblCrsr()
     m_pCurCrsr->DeleteMark();
     *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
 
-    return sal_True;
+    return true;
 }
 
 void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
@@ -2488,19 +2488,19 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
         bGoNext = true;
         if (pTmpDel) // is the pam in the range -> delete
         {
-            sal_Bool bDelete = sal_True;
+            bool bDelete = true;
             if( *ppDelRing == pTmpDel )
             {
                 if( *ppDelRing == m_pCurCrsr )
                 {
-                    if( sal_True == ( bDelete = GoNextCrsr() ))
+                    if( ( bDelete = GoNextCrsr() ) )
                     {
                         bGoNext = false;
                         pTmp = (SwPaM*)pTmp->GetNext();
                     }
                 }
                 else
-                    bDelete = sal_False; // never delete the StackCrsr
+                    bDelete = false; // never delete the StackCrsr
             }
 
             if( bDelete )
@@ -2608,10 +2608,10 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
     m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
-    m_bOverwriteCrsr = sal_False;
-    m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = sal_True;
-    m_bSVCrsrVis = sal_True;
-    m_bSetCrsrInReadOnly = sal_True;
+    m_bOverwriteCrsr = false;
+    m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
+    m_bSVCrsrVis = true;
+    m_bSetCrsrInReadOnly = true;
     m_pVisCrsr = new SwVisCrsr( this );
     m_bMacroExecAllowed = rShell.IsMacroExecAllowed();
 
@@ -2658,10 +2658,10 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
     m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
-    m_bOverwriteCrsr = sal_False;
-    m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = sal_True;
-    m_bSVCrsrVis = sal_True;
-    m_bSetCrsrInReadOnly = sal_True;
+    m_bOverwriteCrsr = false;
+    m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
+    m_bSVCrsrVis = true;
+    m_bSetCrsrInReadOnly = true;
 
     m_pVisCrsr = new SwVisCrsr( this );
     m_bMacroExecAllowed = true;
@@ -2773,18 +2773,18 @@ void SwCrsrShell::MakeSelVisible()
 }
 
 /// search a valid content position (not protected/hidden)
-sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
+bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
 {
     if( m_pTblCrsr )
     {
         OSL_ENSURE( !this, "Did not remove table selection!" );
-        return sal_False;
+        return false;
     }
 
     // #i45129# - everything is allowed in UI-readonly
     if( !m_bAllProtect && GetDoc()->GetDocShell() &&
         GetDoc()->GetDocShell()->IsReadOnlyUI() )
-        return sal_True;
+        return true;
 
     if( m_pCurCrsr->HasMark() )
         ClearMark();
@@ -2806,17 +2806,17 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
         aPam.GetMark()->nNode = rNds.GetEndOfContent();
         aPam.GetPoint()->nNode = *pCNd->EndOfSectionNode();
 
-        sal_Bool bFirst = sal_False;
-        if( 0 == (pCNd = ::GetNode( aPam, bFirst, fnMoveForward, sal_False )))
+        bool bFirst = false;
+        if( 0 == (pCNd = ::GetNode( aPam, bFirst, fnMoveForward, false )))
         {
             aPam.GetMark()->nNode = *rNds.GetEndOfPostIts().StartOfSectionNode();
-            pCNd = ::GetNode( aPam, bFirst, fnMoveBackward, sal_False );
+            pCNd = ::GetNode( aPam, bFirst, fnMoveBackward, false );
         }
 
         if( !pCNd ) // should *never* happen
         {
             rNdIdx = nNdIdx; // back to old node
-            return sal_False;
+            return false;
         }
         *m_pCurCrsr->GetPoint() = *aPam.GetPoint();
     }
@@ -2829,7 +2829,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
         nNdIdx = rNdIdx.GetIndex();
     }
 
-    sal_Bool bOk = sal_True;
+    bool bOk = true;
 
     // #i9059# cursor may not stand in protected cells
     //         (unless cursor in protected areas is OK.)
@@ -2872,7 +2872,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
         typedef SwCntntNode* (SwNodes:: *FNGoSection)( SwNodeIndex *, bool, bool ) const;
         FNGoSection funcGoSection = &SwNodes::GoNextSection;
 
-        bOk = sal_False;
+        bOk = false;
 
         for( int nLoopCnt = 0; !bOk && nLoopCnt < 2; ++nLoopCnt )
         {
@@ -2888,14 +2888,14 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
                         SwCallLink aTmp( *this );
                         SwCrsrSaveState aSaveState( *m_pCurCrsr );
                         aTmp.nNdTyp = 0; // don't do anything in DTOR
-                        if( !m_pCurCrsr->IsInProtectTable( sal_True, sal_True ) )
+                        if( !m_pCurCrsr->IsInProtectTable( true, true ) )
                         {
                             const SwSectionNode* pSNd = pCNd->FindSectionNode();
                             if( !pSNd || !pSNd->GetSection().IsHiddenFlag()
                                 || (!IsReadOnlyAvailable()  &&
                                     pSNd->GetSection().IsProtectFlag() ))
                             {
-                                bOk = sal_True;
+                                bOk = true;
                                 break; // found non-protected cell
                             }
                             continue; // continue search
@@ -2903,7 +2903,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
                     }
                     else
                     {
-                        bOk = sal_True;
+                        bOk = true;
                         break; // found non-protected cell
                     }
                 }
@@ -2916,7 +2916,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
                         ( bOnlyText && pCNd->IsNoTxtNode() ) )
                     {
                         // continue search
-                        bOk = sal_False;
+                        bOk = false;
                         bContinue = true;
                     }
                 }
@@ -2951,12 +2951,12 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
     return bOk;
 }
 
-sal_Bool SwCrsrShell::IsCrsrReadonly() const
+bool SwCrsrShell::IsCrsrReadonly() const
 {
     if ( GetViewOptions()->IsReadonly() ||
          GetViewOptions()->IsFormView() /* Formula view */ )
     {
-        SwFrm *pFrm = GetCurrFrm( sal_False );
+        SwFrm *pFrm = GetCurrFrm( false );
         const SwFlyFrm* pFly;
         const SwSection* pSection;
 
@@ -2966,27 +2966,27 @@ sal_Bool SwCrsrShell::IsCrsrReadonly() const
             !pFly->Lower()->IsNoTxtFrm() &&
             !GetDrawView()->GetMarkedObjectList().GetMarkCount() )
         {
-            return sal_False;
+            return false;
         }
         // edit in readonly sections
         else if ( pFrm && pFrm->IsInSct() &&
             0 != ( pSection = pFrm->FindSctFrm()->GetSection() ) &&
             pSection->IsEditInReadonlyFlag() )
         {
-            return sal_False;
+            return false;
         }
         else if ( !IsMultiSelection() && CrsrInsideInputFld() )
         {
-            return sal_False;
+            return false;
         }
 
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /// is the cursor allowed to enter ReadOnly sections?
-void SwCrsrShell::SetReadOnlyAvailable( sal_Bool bFlag )
+void SwCrsrShell::SetReadOnlyAvailable( bool bFlag )
 {
     // *never* switch in GlobalDoc
     if( (!GetDoc()->GetDocShell() ||
@@ -3004,9 +3004,9 @@ void SwCrsrShell::SetReadOnlyAvailable( sal_Bool bFlag )
     }
 }
 
-sal_Bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
+bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( IsReadOnlyAvailable() || GetViewOptions()->IsFormView() )
     {
         if ( m_pTblCrsr != NULL )
@@ -3022,7 +3022,7 @@ sal_Bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
             {
                 if( pCrsr->HasReadonlySel( GetViewOptions()->IsFormView(), bAnnotationMode ) )
                 {
-                    bRet = sal_True;
+                    bRet = true;
                 }
 
                 pCrsr = (SwPaM*)pCrsr->GetNext();
@@ -3032,9 +3032,9 @@ sal_Bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
     return bRet;
 }
 
-sal_Bool SwCrsrShell::IsSelFullPara() const
+bool SwCrsrShell::IsSelFullPara() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
         m_pCurCrsr->GetMark()->nNode.GetIndex() && m_pCurCrsr == m_pCurCrsr->GetNext() )
@@ -3074,7 +3074,7 @@ bool SwCrsrShell::IsInVerticalText( const Point* pPt ) const
     return FRMDIR_VERT_TOP_RIGHT == nDir || FRMDIR_VERT_TOP_LEFT == nDir;
 }
 
-sal_Bool SwCrsrShell::IsInRightToLeftText( const Point* pPt ) const
+bool SwCrsrShell::IsInRightToLeftText( const Point* pPt ) const
 {
     const short nDir = GetTextDirection( pPt );
     // GetTextDirection uses FRMDIR_VERT_TOP_LEFT to indicate RTL in
@@ -3113,11 +3113,11 @@ bool SwCrsrShell::SelectHiddenRange()
 }
 
 sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
-                             sal_Bool bSearchInNotes,
+                             bool bSearchInNotes,
                              SwDocPositions eStart, SwDocPositions eEnd,
-                             sal_Bool& bCancel,
+                             bool& bCancel,
                              FindRanges eRng,
-                             int bReplace )
+                             bool bReplace )
 {
     if( m_pTblCrsr )
         GetCrsr();
@@ -3132,7 +3132,7 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
 
 sal_uLong SwCrsrShell::Find( const SwTxtFmtColl& rFmtColl,
                              SwDocPositions eStart, SwDocPositions eEnd,
-                             sal_Bool& bCancel,
+                             bool& bCancel,
                              FindRanges eRng,
                              const SwTxtFmtColl* pReplFmt )
 {
@@ -3148,9 +3148,9 @@ sal_uLong SwCrsrShell::Find( const SwTxtFmtColl& rFmtColl,
 }
 
 sal_uLong SwCrsrShell::Find( const SfxItemSet& rSet,
-                             sal_Bool bNoCollections,
+                             bool bNoCollections,
                              SwDocPositions eStart, SwDocPositions eEnd,
-                             sal_Bool& bCancel,
+                             bool& bCancel,
                              FindRanges eRng,
                              const SearchOptions* pSearchOpt,
                              const SfxItemSet* rReplSet )
@@ -3445,7 +3445,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             const sal_Int32 nLineStart = GetCrsr()->GetPoint()->nContent.GetIndex();
             RightMargin();
             const sal_Int32 nLineEnd = GetCrsr()->GetPoint()->nContent.GetIndex();
-            Pop(sal_False);
+            Pop(false);
 
             // make sure the selection build later from the data below does not
             // include "in word" character to the left and right in order to
@@ -3464,7 +3464,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             pCrsr = GetCrsr();
             *pCrsr->GetPoint() = aPos;
             pCrsr->SetMark();
-            ExtendSelection( sal_True, nLen - nLeft - nRight );
+            ExtendSelection( true, nLen - nLeft - nRight );
             // do not determine the rectangle in the current line
             const sal_Int32 nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft;
             // take one less than the line end - otherwise the next line would
@@ -3476,7 +3476,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             rContent = nWordStart;
             SwRect aStartRect;
             SwCrsrMoveState aState;
-            aState.bRealWidth = sal_True;
+            aState.bRealWidth = true;
             SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
             SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
 
@@ -3485,7 +3485,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             SwRect aEndRect;
             pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
             rSelectRect = aStartRect.Union( aEndRect );
-            Pop(sal_False);
+            Pop(false);
         }
     }
 }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ee0ac183b486..5327f7645ccc 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -119,7 +119,7 @@ bool SwCrsrShell::GotoPrevNum()
 }
 
 /// jump from content to header
-sal_Bool SwCrsrShell::GotoHeaderTxt()
+bool SwCrsrShell::GotoHeaderTxt()
 {
     const SwFrm* pFrm = GetCurrFrm()->FindPageFrm();
     while( pFrm && !pFrm->IsHeaderFrm() )
@@ -147,7 +147,7 @@ sal_Bool SwCrsrShell::GotoHeaderTxt()
 }
 
 /// jump from content to footer
-sal_Bool SwCrsrShell::GotoFooterTxt()
+bool SwCrsrShell::GotoFooterTxt()
 {
     const SwPageFrm* pFrm = GetCurrFrm()->FindPageFrm();
     if( pFrm )
@@ -183,9 +183,9 @@ sal_Bool SwCrsrShell::GotoFooterTxt()
     return 0 != pFrm;
 }
 
-sal_Bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, sal_Bool bInHeader )
+bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, bool bInHeader )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwDoc *pMyDoc = GetDoc();
 
     SET_CURR_SHELL( this );
@@ -255,9 +255,9 @@ sal_Bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, sal_Bool bInHeader )
 }
 
 /// jump to the next index
-sal_Bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
+bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     const SwSectionFmts& rFmts = GetDoc()->GetSections();
     SwCntntNode* pFnd = 0;
@@ -306,9 +306,9 @@ sal_Bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
 }
 
 /// jump to previous index
-sal_Bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
+bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     const SwSectionFmts& rFmts = GetDoc()->GetSections();
     SwCntntNode* pFnd = 0;
@@ -358,9 +358,9 @@ sal_Bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
 }
 
 /// jump to index of TOXMark
-sal_Bool SwCrsrShell::GotoTOXMarkBase()
+bool SwCrsrShell::GotoTOXMarkBase()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SwTOXMarks aMarks;
     sal_uInt16 nCnt = GetDoc()->GetCurTOXMark( *m_pCurCrsr->GetPoint(), aMarks );
@@ -407,12 +407,12 @@ sal_Bool SwCrsrShell::GotoTOXMarkBase()
 
 /// Jump to next/previous table formula
 /// Optionally it is possible to also jump to broken formulas
-sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors )
+bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
 {
     if( IsTableMode() )
-        return sal_False;
+        return false;
 
-    sal_Bool bFnd = sal_False;
+    bool bFnd = false;
     SwPosition& rPos = *m_pCurCrsr->GetPoint();
 
     Point aPt;
@@ -463,7 +463,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors
                               : ( aCmp < aCurGEF && aFndGEF < aCmp ))
                     {
                         aFndGEF = aCmp;
-                        bFnd = sal_True;
+                        bFnd = true;
                     }
                 }
             }
@@ -487,12 +487,12 @@ sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors
 }
 
 /// jump to next/previous index marker
-sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext )
+bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
 {
     if( IsTableMode() )
-        return sal_False;
+        return false;
 
-    sal_Bool bFnd = sal_False;
+    bool bFnd = false;
     SwPosition& rPos = *m_pCurCrsr->GetPoint();
 
     Point aPt;
@@ -529,7 +529,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext )
                           : ( aCmp < aCurGEF && aFndGEF < aCmp ))
                 {
                     aFndGEF = aCmp;
-                    bFnd = sal_True;
+                    bFnd = true;
                 }
             }
     }
@@ -605,7 +605,7 @@ void lcl_MakeFldLst(
     }
 }
 
-sal_Bool SwCrsrShell::MoveFldType(
+bool SwCrsrShell::MoveFldType(
     const SwFieldType* pFldType,
     const bool bNext,
     const sal_uInt16 nResType,
@@ -618,7 +618,7 @@ sal_Bool SwCrsrShell::MoveFldType(
     {
         if( RES_INPUTFLD != pFldType->Which() && !pFldType->GetDepends() )
         {
-            return sal_False;
+            return false;
         }
 
         // found Modify object, add all fields to array
@@ -655,7 +655,7 @@ sal_Bool SwCrsrShell::MoveFldType(
 
     // found no fields?
     if( aSrtLst.empty() )
-        return sal_False;
+        return false;
 
     _SetGetExpFlds::const_iterator it;
     SwCursor* pCrsr = getShellCrsr( true );
@@ -701,12 +701,12 @@ sal_Bool SwCrsrShell::MoveFldType(
             if( bNext )
             {
                 if( ++it == aSrtLst.end() )
-                    return sal_False; // already at the end
+                    return false; // already at the end
             }
             else
             {
                 if( it == aSrtLst.begin() )
-                    return sal_False; // no more steps backward possible
+                    return false; // no more steps backward possible
                 --it;
             }
         }
@@ -715,12 +715,12 @@ sal_Bool SwCrsrShell::MoveFldType(
             if( bNext )
             {
                 if( it == aSrtLst.end() )
-                    return sal_False;
+                    return false;
             }
             else
             {
                 if( it == aSrtLst.begin() )
-                    return sal_False; // no more steps backward possible
+                    return false; // no more steps backward possible
                 --it;
             }
         }
@@ -732,16 +732,16 @@ sal_Bool SwCrsrShell::MoveFldType(
     SwCrsrSaveState aSaveState( *pCrsr );
 
     rFnd.GetPosOfContent( *pCrsr->GetPoint() );
-    sal_Bool bRet = !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
+    bool bRet = !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                      nsSwCursorSelOverFlags::SELOVER_TOGGLE );
     if( bRet )
         UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
     return bRet;
 }
 
-sal_Bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
+bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( rFld.GetTxtFld() )
     {
         SET_CURR_SHELL( this );
@@ -910,7 +910,7 @@ bool SwCrsrShell::GotoOutline( const OUString& rName )
 }
 
 /// jump to next node with outline num.
-sal_Bool SwCrsrShell::GotoNextOutline()
+bool SwCrsrShell::GotoNextOutline()
 {
     SwCursor* pCrsr = getShellCrsr( true );
     const SwNodes& rNds = GetDoc()->GetNodes();
@@ -921,7 +921,7 @@ sal_Bool SwCrsrShell::GotoNextOutline()
         ++nPos;
 
     if( nPos == rNds.GetOutLineNds().size() )
-        return sal_False;
+        return false;
 
     pNd = rNds.GetOutLineNds()[ nPos ];
 
@@ -931,14 +931,14 @@ sal_Bool SwCrsrShell::GotoNextOutline()
     pCrsr->GetPoint()->nNode = *pNd;
     pCrsr->GetPoint()->nContent.Assign( (SwTxtNode*)pNd, 0 );
 
-    sal_Bool bRet = !pCrsr->IsSelOvr();
+    bool bRet = !pCrsr->IsSelOvr();
     if( bRet )
         UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
     return bRet;
 }
 
 /// jump to previous node with outline num.
-sal_Bool SwCrsrShell::GotoPrevOutline()
+bool SwCrsrShell::GotoPrevOutline()
 {
     SwCursor* pCrsr = getShellCrsr( true );
     const SwNodes& rNds = GetDoc()->GetNodes();
@@ -947,14 +947,14 @@ sal_Bool SwCrsrShell::GotoPrevOutline()
     sal_uInt16 nPos;
     rNds.GetOutLineNds().Seek_Entry( pNd, &nPos );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( nPos )
     {
         --nPos; // before
 
         pNd = rNds.GetOutLineNds()[ nPos ];
         if( pNd->GetIndex() > pCrsr->GetPoint()->nNode.GetIndex() )
-            return sal_False;
+            return false;
 
         SET_CURR_SHELL( this );
         SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -991,13 +991,13 @@ sal_uInt16 SwCrsrShell::GetOutlinePos( sal_uInt8 nLevel )
     return USHRT_MAX; // no more left
 }
 
-sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
-                                    sal_Bool bWithChildren )
+bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
+                                  bool bWithChildren )
 {
     const SwNodes& rNds = GetDoc()->GetNodes();
     const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
     if( rOutlNds.empty() )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -1043,14 +1043,14 @@ sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
     m_pCurCrsr->Move( fnMoveBackward, fnGoNode ); // end of predecessor
 
     // and everything is already selected
-    sal_Bool bRet = !m_pCurCrsr->IsSelOvr();
+    bool bRet = !m_pCurCrsr->IsSelOvr();
     if( bRet )
         UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
     return bRet;
 }
 
 /// jump to reference marker
-sal_Bool SwCrsrShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
+bool SwCrsrShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
                                     sal_uInt16 nSeqNo )
 {
     SET_CURR_SHELL( this );
@@ -1068,26 +1068,26 @@ sal_Bool SwCrsrShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType
         if( !m_pCurCrsr->IsSelOvr() )
         {
             UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwCrsrShell::IsPageAtPos( const Point &rPt ) const
+bool SwCrsrShell::IsPageAtPos( const Point &rPt ) const
 {
     if( GetLayout() )
         return 0 != GetLayout()->GetPageAtPos( rPt );
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
+bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                                    SwContentAtPos& rCntntAtPos,
-                                   sal_Bool bSetCrsr,
+                                   bool bSetCrsr,
                                    SwRect* pFldRect )
 {
     SET_CURR_SHELL( this );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( !IsTableMode() )
     {
@@ -1098,7 +1098,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
         SwCntntFrm *pFrm(0);
         SwTxtAttr* pTxtAttr;
         SwCrsrMoveState aTmpState;
-        aTmpState.bFieldInfo = sal_True;
+        aTmpState.bFieldInfo = true;
         aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos );
         aTmpState.bCntntCheck = (SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos) ?  sal_True : sal_False;
         aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
@@ -1120,13 +1120,13 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
             {
                 rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_OUTLINE;
                 rCntntAtPos.sStr = pONd->GetExpandTxt( 0, -1, true, true );
-                bRet = sal_True;
+                bRet = true;
             }
         }
         else if ( SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos
                   && bCrsrFoundExact )
         {
-            bRet = sal_True;
+            bRet = true;
         }
         else if( pTxtNd
                  && SwContentAtPos::SW_NUMLABEL & rCntntAtPos.eCntntAtPos)
@@ -1160,10 +1160,10 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             nCurrent = aTmpState.pSpecialPos->nCharOfst;
 
                             if ( pSubList->InWrongWord( nCurrent, nLen ) )
-                                bRet = sal_True;
+                                bRet = true;
                         }
                         else
-                            bRet = sal_True;
+                            bRet = true;
 
                         if( bRet && bSetCrsr )
                         {
@@ -1172,7 +1172,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             m_pCurCrsr->DeleteMark();
                             *m_pCurCrsr->GetPoint() = aPos;
                             if( m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE) )
-                                bRet = sal_False;
+                                bRet = false;
                             else
                                 UpdateCrsr();
                         }
@@ -1238,7 +1238,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         rCntntAtPos.aFnd.pFld = pFld;
                         rCntntAtPos.pFndTxtAttr = pTxtAttr;
                         rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FIELD;
-                        bRet = sal_True;
+                        bRet = true;
                     }
                 }
 
@@ -1249,7 +1249,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     if( bCrsrFoundExact && pTxtNd && pFldBookmark) {
                         rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FORMCTRL;
                         rCntntAtPos.aFnd.pFldmark = pFldBookmark;
-                        bRet=sal_True;
+                        bRet=true;
                     }
                 }
 
@@ -1258,12 +1258,12 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     if( aTmpState.bFtnNoInfo )
                     {
                         // over the footnote's char
-                        bRet = sal_True;
+                        bRet = true;
                         if( bSetCrsr )
                         {
                             *m_pCurCrsr->GetPoint() = aPos;
                             if( !GotoFtnAnchor() )
-                                bRet = sal_False;
+                                bRet = false;
                         }
                         if( bRet )
                             rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
@@ -1271,7 +1271,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     else if ( 0 != ( pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
                         aPos.nContent.GetIndex(), RES_TXTATR_FTN )) )
                     {
-                        bRet = sal_True;
+                        bRet = true;
                         if( bSetCrsr )
                         {
                             SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -1286,12 +1286,12 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                                 m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, 0 );
                                 if( m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                     nsSwCursorSelOverFlags::SELOVER_TOGGLE ))
-                                    bRet = sal_False;
+                                    bRet = false;
                                 else
                                     UpdateCrsr();
                             }
                             else
-                                bRet = sal_False;
+                                bRet = false;
                         }
 
                         if( bRet )
@@ -1336,7 +1336,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 
                     if( pTxtAttr )
                     {
-                        bRet = sal_True;
+                        bRet = true;
                         if( bSetCrsr )
                         {
                             SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -1344,7 +1344,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             m_pCurCrsr->DeleteMark();
                             *m_pCurCrsr->GetPoint() = aPos;
                             if( m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE ) )
-                                bRet = sal_False;
+                                bRet = false;
                             else
                                 UpdateCrsr();
                         }
@@ -1381,7 +1381,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     // "detect" only INetAttrs with URLs
                     if( pTxtAttr && !pTxtAttr->GetINetFmt().GetValue().isEmpty() )
                     {
-                        bRet = sal_True;
+                        bRet = true;
                         if( bSetCrsr )
                         {
                             SwCrsrSaveState aSaveState( *m_pCurCrsr );
@@ -1390,7 +1390,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             *m_pCurCrsr->GetPoint() = aPos;
                             if( m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                 nsSwCursorSelOverFlags::SELOVER_TOGGLE) )
-                                bRet = sal_False;
+                                bRet = false;
                             else
                                 UpdateCrsr();
                         }
@@ -1418,7 +1418,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         rCntntAtPos.aFnd.pRedl = pRedl;
                         rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
                         rCntntAtPos.pFndTxtAttr = 0;
-                        bRet = sal_True;
+                        bRet = true;
 
                         if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
                             pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
@@ -1442,9 +1442,9 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                     pSttNd->GetIndex() )) &&
 #ifdef DBG_UTIL
                     ( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
-                    RES_BOXATR_FORMULA, sal_False, &pItem ) ||
+                    RES_BOXATR_FORMULA, false, &pItem ) ||
                     SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
-                    RES_BOXATR_VALUE, sal_False, &pItem ))
+                    RES_BOXATR_VALUE, false, &pItem ))
 #else
                     SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
                     RES_BOXATR_FORMULA, sal_False, &pItem )
@@ -1480,7 +1480,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
 #endif
                             ((SwTblBoxFormula*)pItem)->PtrToBoxNm( &pTblNd->GetTable() );
 
-                        bRet = sal_True;
+                        bRet = true;
                         if( bSetCrsr )
                         {
                             SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -1488,7 +1488,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                             *m_pCurCrsr->GetPoint() = aPos;
                             if( m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                 nsSwCursorSelOverFlags::SELOVER_TOGGLE) )
-                                bRet = sal_False;
+                                bRet = false;
                             else
                                 UpdateCrsr();
                         }
@@ -1586,7 +1586,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
                         rCntntAtPos.sStr += "Attr: " + sAttrs;
                     }
                 }
-                bRet = sal_True;
+                bRet = true;
                 rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_CURR_ATTRS;
             }
 #endif
@@ -1690,11 +1690,11 @@ bool SwContentAtPos::IsInRTLText()const
     return bRet;
 }
 
-sal_Bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
+bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
                                  const sal_Int32 nEnd )
 {
     SET_CURR_SHELL( this );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SwCallLink aLk( *this );
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
@@ -1708,18 +1708,18 @@ sal_Bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
     if( !m_pCurCrsr->IsSelOvr() )
     {
         UpdateCrsr();
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
 }
 
-sal_Bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich,
-                                     sal_Bool bExpand,
+bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich,
+                                     bool bExpand,
                                      const SwTxtAttr* pTxtAttr )
 {
     SET_CURR_SHELL( this );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( !IsTableMode() )
     {
@@ -1769,12 +1769,12 @@ const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const OUString& rName ) const
     return mpDoc->FindINetAttr( rName );
 }
 
-sal_Bool SwCrsrShell::GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
+bool SwCrsrShell::GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
                                 SwRect& rRect, sal_Int16& rOrient )
 {
 
     SET_CURR_SHELL( this );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if (!IsTableMode() && !HasSelection()
         && GetDoc()->GetIDocumentUndoRedo().DoesUndo())
@@ -1791,16 +1791,16 @@ sal_Bool SwCrsrShell::GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
             // start position in protected section?
             rRect = aFPos.aCrsr;
             rOrient = aFPos.eOrient;
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
 }
 
-sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
+bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
 {
     SET_CURR_SHELL( this );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if (!IsTableMode() && !HasSelection()
         && GetDoc()->GetIDocumentUndoRedo().DoesUndo())
@@ -1927,7 +1927,7 @@ sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
             GetDoc()->GetIDocumentUndoRedo().EndUndo( nUndoId, NULL );
             EndAction();
 
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
@@ -1969,7 +1969,7 @@ const SwRangeRedline* SwCrsrShell::SelPrevRedline()
     return pFnd;
 }
 
-const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect )
+const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelect )
 {
     const SwRangeRedline* pFnd = 0;
     SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -2037,7 +2037,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, sal_Bool bS
     return pFnd;
 }
 
-const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect )
+const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect )
 {
     const SwRangeRedline* pFnd = 0;
     if( !IsTableMode() )
@@ -2054,7 +2054,7 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSe
             sal_uInt16 nArrSavPos = nArrPos;
 
             do {
-                pTmp = _GotoRedline( nArrPos, sal_True );
+                pTmp = _GotoRedline( nArrPos, true );
 
                 if( !pFnd )
                     pFnd = pTmp;
@@ -2210,7 +2210,7 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
             const SwFmtURL& rURLItem = pFmt->GetURL();
             if( rURLItem.GetMap() || !rURLItem.GetURL().isEmpty() )
             {
-                SwFlyFrm* pFly = pFmt->GetFrm( &aPt, sal_False );
+                SwFlyFrm* pFly = pFmt->GetFrm( &aPt, false );
                 SwPosition aTmpPos( *pBodySttNd );
                 if( pFly &&
                     GetBodyTxtNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
@@ -2265,10 +2265,10 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
         }
         else // then is it a fly
         {
-            SwFlyFrm* pFly = pFndFmt->GetFrm(&aPt, sal_False );
+            SwFlyFrm* pFly = pFndFmt->GetFrm(&aPt, false );
             if( pFly )
             {
-                ((SwFEShell*)this)->SelectFlyFrm( *pFly, sal_True );
+                ((SwFEShell*)this)->SelectFlyFrm( *pFly, true );
                 MakeSelVisible();
                 bRet = true;
             }
diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx
index 93597f7ad215..699302a7e4e1 100644
--- a/sw/source/core/crsr/crstrvl1.cxx
+++ b/sw/source/core/crsr/crstrvl1.cxx
@@ -21,67 +21,67 @@
 #include <viscrs.hxx>
 #include <callnk.hxx>
 
-sal_Bool SwCrsrShell::IsStartWord( sal_Int16 nWordType ) const
+bool SwCrsrShell::IsStartWord( sal_Int16 nWordType ) const
 {
     return m_pCurCrsr->IsStartWord( nWordType );
 }
-sal_Bool SwCrsrShell::IsEndWord( sal_Int16 nWordType ) const
+bool SwCrsrShell::IsEndWord( sal_Int16 nWordType ) const
 {
     return m_pCurCrsr->IsEndWord( nWordType );
 }
 
-sal_Bool SwCrsrShell::IsInWord( sal_Int16 nWordType ) const
+bool SwCrsrShell::IsInWord( sal_Int16 nWordType ) const
 {
     return m_pCurCrsr->IsInWord( nWordType );
 }
 
-sal_Bool SwCrsrShell::IsStartSentence() const
+bool SwCrsrShell::IsStartSentence() const
 {
     return m_pCurCrsr->IsStartEndSentence( false );
 }
-sal_Bool SwCrsrShell::IsEndSentence() const
+bool SwCrsrShell::IsEndSentence() const
 {
     return m_pCurCrsr->IsStartEndSentence( true );
 }
 
-sal_Bool SwCrsrShell::GoStartWord()
+bool SwCrsrShell::GoStartWord()
 {
     return CallCrsrFN( &SwCursor::GoStartWord );
 }
-sal_Bool SwCrsrShell::GoEndWord()
+bool SwCrsrShell::GoEndWord()
 {
     return CallCrsrFN( &SwCursor::GoEndWord );
 }
 
-sal_Bool SwCrsrShell::GoNextWord()
+bool SwCrsrShell::GoNextWord()
 {
     return CallCrsrFN( &SwCursor::GoNextWord );
 }
-sal_Bool SwCrsrShell::GoPrevWord()
+bool SwCrsrShell::GoPrevWord()
 {
     return CallCrsrFN( &SwCursor::GoPrevWord );
 }
 
-sal_Bool SwCrsrShell::GoNextSentence()
+bool SwCrsrShell::GoNextSentence()
 {
     return CallCrsrFN( &SwCursor::GoNextSentence );
 }
 
-sal_Bool SwCrsrShell::GoEndSentence()
+bool SwCrsrShell::GoEndSentence()
 {
     return CallCrsrFN( &SwCursor::GoEndSentence );
 }
-sal_Bool SwCrsrShell::GoStartSentence()
+bool SwCrsrShell::GoStartSentence()
 {
     return CallCrsrFN( &SwCursor::GoStartSentence );
 }
 
-sal_Bool SwCrsrShell::SelectWord( const Point* pPt )
+bool SwCrsrShell::SelectWord( const Point* pPt )
 {
     return m_pCurCrsr->SelectWord( this, pPt );
 }
 
-sal_Bool SwCrsrShell::ExpandToSentenceBorders()
+bool SwCrsrShell::ExpandToSentenceBorders()
 {
     return m_pCurCrsr->ExpandToSentenceBorders();
 }
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 5ad51819ee66..bc02b63d5ade 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -114,7 +114,7 @@ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
 }
 
 static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd,
-                     const sal_Bool bSaveMark )
+                     const bool bSaveMark )
 {
     sal_Int32 nCntntPos;
     if( bSaveMark )
@@ -151,15 +151,15 @@ static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd
     @param bValue   ???
     @return Returns <true> if found, <false> otherwise.
 */
-static sal_Bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
+static bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
                     const SfxPoolItem& rCmpItem,
-                    SwMoveFn fnMove, sal_Bool bValue )
+                    SwMoveFn fnMove, bool bValue )
 {
     if ( !rTxtNd.HasHints() )
-        return sal_False;
+        return false;
 
     const SwTxtAttr *pTxtHt = 0;
-    sal_Bool bForward = fnMove == fnMoveForward;
+    bool bForward = fnMove == fnMoveForward;
     sal_uInt16 nPos = bForward ? 0 : rTxtNd.GetSwpHints().Count();
     sal_Int32 nCntntPos = rPam.GetPoint()->nContent.GetIndex();
 
@@ -168,9 +168,9 @@ static sal_Bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
             ( !bValue || CmpAttr( pTxtHt->GetAttr(), rCmpItem )))
         {
             lcl_SetAttrPam( rPam, *pTxtHt->GetStart(), pTxtHt->End(), bForward );
-            return sal_True;
+            return true;
         }
-    return sal_False;
+    return false;
 }
 
 /// search for multiple text attributes
@@ -194,8 +194,8 @@ class SwAttrCheckArr
     sal_uInt16 nArrStart, nArrLen;
     sal_uInt16 nFound, nStackCnt;
     SfxItemSet aCmpSet;
-    sal_Bool bNoColls;
-    sal_Bool bForward;
+    bool bNoColls;
+    bool bForward;
 
 public:
     SwAttrCheckArr( const SfxItemSet& rSet, bool bForward, bool bNoCollections );
@@ -700,7 +700,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         if( !rCmpArr.Found() )
             return sal_False;
         nEndPos = rCmpArr.GetNdEnd();
-        lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, sal_True );
+        lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, true );
         return sal_True;
     }
 
@@ -718,7 +718,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
                 {
                     // found end
                     lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(),
-                                pAttr->GetStart(), sal_True );
+                                pAttr->GetStart(), true );
                     return sal_True;
                 }
                 // continue search
@@ -729,7 +729,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         {
             // found
             nEndPos = rCmpArr.GetNdEnd();
-            lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, sal_True );
+            lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, true );
             return sal_True;
         }
     }
@@ -752,7 +752,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
             if( (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) )
                 return sal_False;
 
-            lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_True );
+            lcl_SetAttrPam( rPam, nSttPos, &nEndPos, true );
             return sal_True;
         }
 
@@ -760,7 +760,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) )
         return sal_False;
 
-    lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_True );
+    lcl_SetAttrPam( rPam, nSttPos, &nEndPos, true );
     return sal_True;
 }
 
@@ -774,7 +774,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         if( !rCmpArr.Found() )
             return sal_False;
         nEndPos = rCmpArr.GetNdEnd();
-        lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, sal_False );
+        lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, false );
         return sal_True;
     }
 
@@ -794,7 +794,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
                 {
                     // found end
                     nEndPos = rCmpArr.GetNdEnd();
-                    lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_False );
+                    lcl_SetAttrPam( rPam, nSttPos, &nEndPos, false );
                     return sal_True;
                 }
 
@@ -806,7 +806,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         {
             // found
             nEndPos = rCmpArr.GetNdEnd();
-            lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, sal_False );
+            lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, false );
             return sal_True;
         }
     }
@@ -830,7 +830,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
             if( (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) )
                 return sal_False;
 
-            lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_False );
+            lcl_SetAttrPam( rPam, nSttPos, &nEndPos, false );
             return sal_True;
         }
 
@@ -838,11 +838,11 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
         (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) )
         return sal_False;
 
-    lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_False );
+    lcl_SetAttrPam( rPam, nSttPos, &nEndPos, false );
     return sal_True;
 }
 
-static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_Bool bNoColls )
+static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
 {
     // search only hard attribution?
     if( bNoColls && !rCNd.HasSwAttrSet() )
@@ -888,7 +888,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
     boost::scoped_ptr<SwPaM> pPam(MakeRegion( fnMove, pRegion ));
 
     bool bFound = false;
-    sal_Bool bFirst = sal_True;
+    bool bFirst = true;
     const bool bSrchForward = fnMove == fnMoveForward;
     SwCntntNode * pNode;
     const SfxPoolItem* pItem;
@@ -899,7 +899,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
         ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() )
     {
-        if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, sal_False ))
+        if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
@@ -966,7 +966,7 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
     boost::scoped_ptr<SwPaM> pPam(MakeRegion( fnMove, pRegion ));
 
     bool bFound = false;
-    sal_Bool bFirst = sal_True;
+    bool bFirst = true;
     const bool bSrchForward = fnMove == fnMoveForward;
     SwCntntNode * pNode;
     SwpFmts aFmtArr;
@@ -987,7 +987,7 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
         ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() ) )
     {
-        if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, sal_False ))
+        if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
@@ -1051,13 +1051,13 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
 /// parameters for search for attributes
 struct SwFindParaAttr : public SwFindParas
 {
-    sal_Bool bValue;
+    bool bValue;
     const SfxItemSet *pSet, *pReplSet;
     const SearchOptions *pSearchOpt;
     SwCursor& rCursor;
     utl::TextSearch* pSTxt;
 
-    SwFindParaAttr( const SfxItemSet& rSet, sal_Bool bNoCollection,
+    SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection,
                     const SearchOptions* pOpt, const SfxItemSet* pRSet,
                     SwCursor& rCrsr )
         : bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ),
@@ -1065,20 +1065,20 @@ struct SwFindParaAttr : public SwFindParas
 
     virtual ~SwFindParaAttr()   { delete pSTxt; }
 
-    virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE;
+    virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
 };
 
 int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
-                            sal_Bool bInReadOnly )
+                          bool bInReadOnly )
 {
     // replace string (only if text given and search is not parameterized)?
-    sal_Bool bReplaceTxt = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
+    bool bReplaceTxt = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
                                     !pSet->Count() );
-    sal_Bool bReplaceAttr = pReplSet && pReplSet->Count();
-    sal_Bool bMoveFirst = !bReplaceAttr;
+    bool bReplaceAttr = pReplSet && pReplSet->Count();
+    bool bMoveFirst = !bReplaceAttr;
     if( bInReadOnly && (bReplaceAttr || bReplaceTxt ))
-        bInReadOnly = sal_False;
+        bInReadOnly = false;
 
     // We search for attributes, should we search for text as well?
     {
@@ -1093,7 +1093,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
                 // first attributes
                 if( !aSrchPam.Find( *pSet, bValue, fnMove, &aRegion, bInReadOnly, bMoveFirst ) )
                     return FIND_NOT_FOUND;
-                bMoveFirst = sal_True;
+                bMoveFirst = true;
 
                 if( !pSearchOpt )
                     break; // ok, only attributes, so found
@@ -1118,7 +1118,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
             }
 
             // TODO: searching for attributes in Outliner text?!
-            sal_Bool bSearchInNotes = sal_False;
+            bool bSearchInNotes = false;
 
             // continue search in correct section (pTextRegion)
             if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSTxt, fnMove, pTextRegion, bInReadOnly ) &&
@@ -1214,9 +1214,9 @@ bool SwFindParaAttr::IsReplaceMode() const
 }
 
 /// search for attributes
-sal_uLong SwCursor::Find( const SfxItemSet& rSet, sal_Bool bNoCollections,
+sal_uLong SwCursor::Find( const SfxItemSet& rSet, bool bNoCollections,
                           SwDocPositions nStart, SwDocPositions nEnd,
-                          sal_Bool& bCancel, FindRanges eFndRngs,
+                          bool& bCancel, FindRanges eFndRngs,
                           const SearchOptions* pSearchOpt,
                           const SfxItemSet* pReplSet )
 {
@@ -1225,7 +1225,7 @@ sal_uLong SwCursor::Find( const SfxItemSet& rSet, sal_Bool bNoCollections,
     Link aLnk( pDoc->GetOle2Link() );
     pDoc->SetOle2Link( Link() );
 
-    sal_Bool bReplace = ( pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
+    bool bReplace = ( pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
                                     !rSet.Count() ) ) ||
                     (pReplSet && pReplSet->Count());
     bool const bStartUndo = pDoc->GetIDocumentUndoRedo().DoesUndo() && bReplace;
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 5cd0cc2f8cae..1e67ae58e027 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -36,16 +36,16 @@ struct SwFindParaFmtColl : public SwFindParas
         : pFmtColl( &rFmtColl ), pReplColl( pRpColl ), rCursor( rCrsr )
     {}
     virtual ~SwFindParaFmtColl() {}
-    virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE;
+    virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
 };
 
 int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
-                            sal_Bool bInReadOnly )
+                             bool bInReadOnly )
 {
     int nRet = FIND_FOUND;
     if( bInReadOnly && pReplColl )
-        bInReadOnly = sal_False;
+        bInReadOnly = false;
 
     if( !pCrsr->Find( *pFmtColl, fnMove, pRegion, bInReadOnly ) )
         nRet = FIND_NOT_FOUND;
@@ -64,7 +64,7 @@ bool SwFindParaFmtColl::IsReplaceMode() const
 
 /// search for Format-Collections
 sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
-                          SwDocPositions nEnd, sal_Bool& bCancel,
+                          SwDocPositions nEnd, bool& bCancel,
                           FindRanges eFndRngs, const SwTxtFmtColl* pReplFmtColl )
 {
     // switch off OLE-notifications
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index d73f5d902a8e..8ffc5b307b06 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -33,7 +33,7 @@ bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
         ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
         : !pPam->GetPoint()->nContent.GetIndex() )
     {
-        if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, sal_False ))
+        if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
         {
             return false;
         }
@@ -41,7 +41,7 @@ bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
         pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
     }
 
-    sal_Bool bFirst = sal_True;
+    bool bFirst = true;
     SwCntntNode* pNode;
     while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly )))
     {
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index b64b7749c2c1..8b0b33cbf51b 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -226,7 +226,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
     // If bFound is true then the string was found and is between nStart and nEnd
     bool bFound = false;
     // start position in text or initial position
-    sal_Bool bFirst = sal_True;
+    bool bFirst = true;
     SwCntntNode * pNode;
 
     const bool bRegSearch = SearchAlgorithms_REGEXP == rSearchOpt.algorithmType;
@@ -543,13 +543,13 @@ struct SwFindParaText : public SwFindParas
     const SearchOptions& rSearchOpt;
     SwCursor& rCursor;
     utl::TextSearch aSTxt;
-    sal_Bool bReplace;
-    sal_Bool bSearchInNotes;
+    bool bReplace;
+    bool bSearchInNotes;
 
-    SwFindParaText( const SearchOptions& rOpt, sal_Bool bSearchNotes, int bRepl, SwCursor& rCrsr )
-        : rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( 0 != bRepl ), bSearchInNotes( bSearchNotes )
+    SwFindParaText( const SearchOptions& rOpt, bool bSearchNotes, bool bRepl, SwCursor& rCrsr )
+        : rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
     {}
-    virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly ) SAL_OVERRIDE;
+    virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
     virtual bool IsReplaceMode() const SAL_OVERRIDE;
     virtual ~SwFindParaText();
 };
@@ -559,10 +559,10 @@ SwFindParaText::~SwFindParaText()
 }
 
 int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
-                            const SwPaM* pRegion, sal_Bool bInReadOnly )
+                          const SwPaM* pRegion, bool bInReadOnly )
 {
     if( bInReadOnly && bReplace )
-        bInReadOnly = sal_False;
+        bInReadOnly = false;
 
     const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSTxt, fnMove, pRegion, bInReadOnly );
 
@@ -608,9 +608,9 @@ bool SwFindParaText::IsReplaceMode() const
     return bReplace;
 }
 
-sal_uLong SwCursor::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes,
+sal_uLong SwCursor::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes,
                           SwDocPositions nStart, SwDocPositions nEnd,
-                          sal_Bool& bCancel, FindRanges eFndRngs, int bReplace )
+                          bool& bCancel, FindRanges eFndRngs, bool bReplace )
 {
     // switch off OLE-notifications
     SwDoc* pDoc = GetDoc();
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index b23a8ac22570..14cdadc9347a 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -262,21 +262,21 @@ bool CheckNodesRange( const SwNodeIndex& rStt,
     return false; // somewhere in between => error
 }
 
-sal_Bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
+bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
 {
     if( pNd->IsCntntNode() )
         return ((SwCntntNode*)pNd)->GoNext( pIdx, nMode );
-    return sal_False;
+    return false;
 }
 
-sal_Bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
+bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
 {
     if( pNd->IsCntntNode() )
         return ((SwCntntNode*)pNd)->GoPrevious( pIdx, nMode );
-    return sal_False;
+    return false;
 }
 
-SwCntntNode* GoNextNds( SwNodeIndex* pIdx, sal_Bool bChk )
+SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
     SwCntntNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
@@ -291,7 +291,7 @@ SwCntntNode* GoNextNds( SwNodeIndex* pIdx, sal_Bool bChk )
     return pNd;
 }
 
-SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, sal_Bool bChk )
+SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
 {
     SwNodeIndex aIdx( *pIdx );
     SwCntntNode* pNd = aIdx.GetNodes().GoPrevious( &aIdx );
@@ -663,7 +663,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
                     const SwSectionFmt* pFmt = rFmts[ --n ];
                     if( pFmt->GetProtect().IsCntntProtected() )
                     {
-                        const SwFmtCntnt& rCntnt = pFmt->GetCntnt(sal_False);
+                        const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
                         OSL_ENSURE( rCntnt.GetCntntIdx(), "where is the SectionNode?" );
                         sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
                         if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
@@ -735,8 +735,8 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
 /// left or the next is out of the area, then a null-pointer is returned.
 /// @param rbFirst If <true> than first time request. If so than the position of
 ///        the PaM must not be changed!
-SwCntntNode* GetNode( SwPaM & rPam, sal_Bool& rbFirst, SwMoveFn fnMove,
-                        sal_Bool bInReadOnly )
+SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
+                      bool bInReadOnly )
 {
     SwCntntNode * pNd = 0;
     SwCntntFrm* pFrm;
@@ -745,7 +745,7 @@ SwCntntNode* GetNode( SwPaM & rPam, sal_Bool& rbFirst, SwMoveFn fnMove,
     {
         if( rbFirst )
         {
-            rbFirst = sal_False;
+            rbFirst = false;
             pNd = rPam.GetCntntNode();
             if( pNd )
             {
@@ -768,7 +768,7 @@ SwCntntNode* GetNode( SwPaM & rPam, sal_Bool& rbFirst, SwMoveFn fnMove,
         if( !pNd ) // is the cursor not on a CntntNode?
         {
             SwPosition aPos( *rPam.GetPoint() );
-            sal_Bool bSrchForward = fnMove == fnMoveForward;
+            bool bSrchForward = fnMove == fnMoveForward;
             SwNodes& rNodes = aPos.nNode.GetNodes();
 
             // go to next/previous CntntNode
@@ -819,7 +819,7 @@ void GoEndDoc( SwPosition * pPos )
 {
     SwNodes& rNodes = pPos->nNode.GetNodes();
     pPos->nNode = rNodes.GetEndOfContent();
-    SwCntntNode* pCNd = GoPreviousNds( &pPos->nNode, sal_True );
+    SwCntntNode* pCNd = GoPreviousNds( &pPos->nNode, true );
     if( pCNd )
         pCNd->MakeEndIndex( &pPos->nContent );
 }
@@ -848,7 +848,7 @@ void GoEndSection( SwPosition * pPos )
     do { rNodes.GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
 
     // now on a EndNode, thus to the previous CntntNode
-    if( GoPreviousNds( &pPos->nNode, sal_True ) )
+    if( GoPreviousNds( &pPos->nNode, true ) )
         pPos->nNode.GetNode().GetCntntNode()->MakeEndIndex( &pPos->nContent );
 }
 
@@ -866,7 +866,7 @@ bool GoInSection( SwPaM & rPam, SwMoveFn fnMove )
 
 bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
 {
-    SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, sal_True );
+    SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
     if( pNd )
         rPam.GetPoint()->nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
@@ -905,7 +905,7 @@ bool GoInCntntCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
     return GoInNode( rPam, fnMove );
 }
 
-sal_Bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
+bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     if( rPam.Move( fnMoveBackward, fnGoNode ) )
     {
@@ -914,12 +914,12 @@ sal_Bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
         SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
         rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
+bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
@@ -931,23 +931,23 @@ sal_Bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
         if( nOld != nNew )
         {
             rPos.nContent.Assign( pNd, nNew );
-            return sal_True;
+            return true;
         }
     }
     // move node to next/previous CntntNode
     if( ( aPosPara==fnParaStart && 0 != ( pNd =
-            GoPreviousNds( &rPos.nNode, sal_True ))) ||
+            GoPreviousNds( &rPos.nNode, true ))) ||
         ( aPosPara==fnParaEnd && 0 != ( pNd =
-            GoNextNds( &rPos.nNode, sal_True ))) )
+            GoNextNds( &rPos.nNode, true ))) )
     {
         rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ));
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
+bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
 {
     if( rPam.Move( fnMoveForward, fnGoNode ) )
     {
@@ -956,12 +956,12 @@ sal_Bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
         SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
         rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
+bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
@@ -969,10 +969,10 @@ sal_Bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
     (rNds.*fnMove->fnSection)( &rPos.nNode );
     SwCntntNode *pNd;
     if( 0 == ( pNd = rPos.nNode.GetNode().GetCntntNode()) &&
-        0 == ( pNd = (*fnMove->fnNds)( &rPos.nNode, sal_True )) )
+        0 == ( pNd = (*fnMove->fnNds)( &rPos.nNode, true )) )
     {
         rPos = aSavePos; // do not change cursor
-        return sal_False;
+        return false;
     }
 
     rPos.nContent.Assign( pNd,
@@ -980,7 +980,7 @@ sal_Bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
     return aSavePos != rPos;
 }
 
-sal_Bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
+bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
@@ -991,16 +991,16 @@ sal_Bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
     if( !GoInCntnt( rPam, fnMoveForward ) )
     {
         rPos = aSavePos; // do not change cursor
-        return sal_False;
+        return false;
     }
     (rNds.*fnMove->fnSection)( &rPos.nNode );
     SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
     rPos.nContent.Assign( pNd,
                         ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
-    return sal_True;
+    return true;
 }
 
-sal_Bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
+bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
 {
     SwPosition& rPos = *rPam.GetPoint();
     SwPosition aSavePos( rPos ); // position for comparison
@@ -1011,13 +1011,13 @@ sal_Bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
     if( !GoInCntnt( rPam, fnMoveBackward ))
     {
         rPos = aSavePos; // do not change cursor
-        return sal_False;
+        return false;
     }
     (rNds.*fnMove->fnSection)( &rPos.nNode );
     SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
     rPos.nContent.Assign( pNd,
                             ::GetSttOrEnd( fnMove == fnMoveForward, *pNd ));
-    return sal_True;
+    return true;
 }
 
 OUString SwPaM::GetTxt() const
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 26b655108631..cfd5cb1bf45a 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -144,12 +144,12 @@ bool SwCursor::IsReadOnlyAvailable() const
     return false;
 }
 
-sal_Bool SwCursor::IsSkipOverHiddenSections() const
+bool SwCursor::IsSkipOverHiddenSections() const
 {
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwCursor::IsSkipOverProtectSections() const
+bool SwCursor::IsSkipOverProtectSections() const
 {
     return !IsReadOnlyAvailable();
 }
@@ -179,7 +179,7 @@ _SwCursor_SavePos* SwCursor::CreateNewSavePos() const
 }
 
 /// determine if point is outside of the node-array's content area
-sal_Bool SwCursor::IsNoCntnt() const
+bool SwCursor::IsNoCntnt() const
 {
     return GetPoint()->nNode.GetIndex() <
             GetDoc()->GetNodes().GetEndOfExtras().GetIndex();
@@ -209,17 +209,17 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
     return SwCursor::IsSelOvrCheck(eFlags);
 }
 
-sal_Bool SwCursor::IsSelOvr( int eFlags )
+bool SwCursor::IsSelOvr( int eFlags )
 {
     SwDoc* pDoc = GetDoc();
     SwNodes& rNds = pDoc->GetNodes();
 
-    sal_Bool bSkipOverHiddenSections = IsSkipOverHiddenSections();
-    sal_Bool bSkipOverProtectSections = IsSkipOverProtectSections();
+    bool bSkipOverHiddenSections = IsSkipOverHiddenSections();
+    bool bSkipOverProtectSections = IsSkipOverProtectSections();
 
     if ( IsSelOvrCheck( eFlags ) )
     {
-        return sal_True;
+        return true;
     }
 
     if( pSavePos->nNode != GetPoint()->nNode.GetIndex() &&
@@ -237,7 +237,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
             {
                 // then we're already done
                 RestoreSavePos();
-                return sal_True;
+                return true;
             }
 
             // set cursor to new position:
@@ -278,8 +278,8 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
             const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nCntntPos;
             GetPoint()->nContent.Assign( pCNd, nTmpPos );
             if( !bIsValidPos || !bValidNodesRange ||
-                IsInProtectTable( sal_True ) )
-                return sal_True;
+                IsInProtectTable( true ) )
+                return true;
         }
 
         // is there a protected section in the section?
@@ -301,7 +301,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
                 const SvxProtectItem& rProtect = pFmt->GetProtect();
                 if( rProtect.IsCntntProtected() )
                 {
-                    const SwFmtCntnt& rCntnt = pFmt->GetCntnt(sal_False);
+                    const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
                     OSL_ENSURE( rCntnt.GetCntntIdx(), "No SectionNode?" );
                     sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
                     if( nSttIdx <= nIdx && nEndIdx >= nIdx )
@@ -311,7 +311,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
                         if( CONTENT_SECTION == rSect.GetType() )
                         {
                             RestoreSavePos();
-                            return sal_True;
+                            return true;
                         }
                     }
                 }
@@ -366,7 +366,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
                     pFrm = NULL;
                 }
 
-                if ( IsInProtectTable( sal_True ) )
+                if ( IsInProtectTable( true ) )
                 {
                     // new position in protected table
                     // --> trigger restore of saved pos by setting <pFrm> to NULL - see below
@@ -379,7 +379,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
         {
             DeleteMark();
             RestoreSavePos();
-            return sal_True; // we need a frame
+            return true; // we need a frame
         }
     }
 
@@ -388,18 +388,18 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
     {
         DeleteMark();
         RestoreSavePos();
-        return sal_True;
+        return true;
     }
 
     if( !HasMark() )
-        return sal_False;
+        return false;
 
     // check for invalid sections
     if( !::CheckNodesRange( GetMark()->nNode, GetPoint()->nNode, true ))
     {
         DeleteMark();
         RestoreSavePos();
-        return sal_True; // we need a frame
+        return true; // we need a frame
     }
 
     if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode()
@@ -408,7 +408,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
     {
         DeleteMark();
         RestoreSavePos();
-        return sal_True; // we need a frame
+        return true; // we need a frame
     }
 
     // assure that selection is only inside an InputField or contains the InputField completely
@@ -464,7 +464,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
     const SwTableNode* pMrkNd = GetMark()->nNode.GetNode().FindTableNode();
     // both in no or in same table node
     if( ( !pMrkNd && !pPtNd ) || pPtNd == pMrkNd )
-        return sal_False;
+        return false;
 
     // in different tables or only mark in table
     if( ( pPtNd && pMrkNd ) || pMrkNd )
@@ -472,7 +472,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
         // not allowed, so go back to old position
         RestoreSavePos();
         // Crsr stays at old position
-        return sal_True;
+        return true;
     }
 
     // Note: this cannot happen in TableMode
@@ -480,7 +480,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
     {
         if( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags )
         {
-            sal_Bool bSelTop = GetPoint()->nNode.GetIndex() <
+            bool bSelTop = GetPoint()->nNode.GetIndex() <
                 (( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags ) ? pSavePos->nNode
                 : GetMark()->nNode.GetIndex());
 
@@ -522,7 +522,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
                     {
                         SwCntntNode* pCNd = (SwCntntNode*)pMyNd;
                         GetPoint()->nContent.Assign( pCNd, bSelTop ? pCNd->Len() : 0 );
-                        return sal_False;
+                        return false;
                     }
                 }
                 if( bSelTop
@@ -534,26 +534,26 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
 
         // stay on old position
         RestoreSavePos();
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr )
+bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
 {
     SwCntntNode* pCNd = GetCntntNode();
     if( !pCNd )
-        return sal_False;
+        return false;
 
     // No table, no protected cell:
     const SwTableNode* pTableNode = pCNd->FindTableNode();
     if ( !pTableNode )
-        return sal_False;
+        return false;
 
     // Current position == last save position?
     if ( pSavePos->nNode == GetPoint()->nNode.GetIndex() )
-        return sal_False;
+        return false;
 
     // Check for convered cell:
     bool bInCoveredCell = false;
@@ -568,11 +568,11 @@ sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr )
     {
         // Position not protected?
         if ( !pCNd->IsProtect() )
-            return sal_False;
+            return false;
 
         // Cursor in protected cells allowed?
         if ( IsReadOnlyAvailable() )
-            return sal_False;
+            return false;
     }
 
     // If we reach this point, we are in a protected or covered table cell!
@@ -583,7 +583,7 @@ sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr )
             // restore the last save position
             RestoreSavePos();
 
-        return sal_True; // Crsr stays at old position
+        return true; // Crsr stays at old position
     }
 
     // We are in a protected table cell. Traverse top to bottom?
@@ -614,7 +614,7 @@ SetNextCrsr:
             if( pTmpCNd )
             {
                 GetPoint()->nContent.Assign( pTmpCNd, 0 );
-                return sal_False;
+                return false;
             }
             return IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                              nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
@@ -627,7 +627,7 @@ SetNextCrsr:
             // if only table in FlyFrame or SSelection then stay on old position
             if( bChgCrsr )
                 RestoreSavePos();
-            return sal_True;
+            return true;
         }
         else if( pNd->IsTableNode() && aCellStt++ )
             goto GoNextCell;
@@ -663,7 +663,7 @@ SetPrevCrsr:
             if( pTmpCNd )
             {
                 GetPoint()->nContent.Assign( pTmpCNd, 0 );
-                return sal_False;
+                return false;
             }
             return IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                              nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
@@ -675,7 +675,7 @@ SetPrevCrsr:
             // if only table in FlyFrame or SSelection then stay on old position
             if( bChgCrsr )
                 RestoreSavePos();
-            return sal_True;
+            return true;
         }
         else if( pNd->StartOfSectionNode()->IsTableNode() && aCellStt-- )
             goto GoPrevCell;
@@ -734,7 +734,7 @@ SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
 static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
                         SwMoveFn fnMove, SwCursor*& pFndRing,
                         SwPaM& aRegion, FindRanges eFndRngs,
-                        sal_Bool bInReadOnly, sal_Bool& bCancel )
+                        bool bInReadOnly, bool& bCancel )
 {
     SwDoc* pDoc = pCurCrsr->GetDoc();
     bool const bDoesUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
@@ -814,7 +814,7 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
                     bEnd = true;
                     if(RET_CANCEL == nRet)
                     {
-                        bCancel = sal_True;
+                        bCancel = true;
                     }
                     break;
                 }
@@ -923,9 +923,9 @@ static bool lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
 // correct parameters and respective search method
 sal_uLong SwCursor::FindAll( SwFindParas& rParas,
                             SwDocPositions nStart, SwDocPositions nEnde,
-                            FindRanges eFndRngs, sal_Bool& bCancel )
+                            FindRanges eFndRngs, bool& bCancel )
 {
-    bCancel = sal_False;
+    bCancel = false;
     SwCrsrSaveState aSaveState( *this );
 
     // create region without adding it to the ring
@@ -934,7 +934,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
 
     sal_uLong nFound = 0;
     const bool bMvBkwrd = fnMove == fnMoveBackward;
-    sal_Bool bInReadOnly = IsReadOnlyAvailable();
+    bool bInReadOnly = IsReadOnlyAvailable();
 
     SwCursor* pFndRing = 0;
     SwNodes& rNds = GetDoc()->GetNodes();
@@ -1120,49 +1120,49 @@ short SwCursor::MaxReplaceArived()
     return RET_YES;
 }
 
-sal_Bool SwCursor::IsStartWord( sal_Int16 nWordType ) const
+bool SwCursor::IsStartWord( sal_Int16 nWordType ) const
 {
     return IsStartWordWT( nWordType );
 }
 
-sal_Bool SwCursor::IsEndWord( sal_Int16 nWordType ) const
+bool SwCursor::IsEndWord( sal_Int16 nWordType ) const
 {
     return IsEndWordWT( nWordType );
 }
 
-sal_Bool SwCursor::IsInWord( sal_Int16 nWordType ) const
+bool SwCursor::IsInWord( sal_Int16 nWordType ) const
 {
     return IsInWordWT( nWordType );
 }
 
-sal_Bool SwCursor::GoStartWord()
+bool SwCursor::GoStartWord()
 {
     return GoStartWordWT( WordType::ANYWORD_IGNOREWHITESPACES );
 }
 
-sal_Bool SwCursor::GoEndWord()
+bool SwCursor::GoEndWord()
 {
     return GoEndWordWT( WordType::ANYWORD_IGNOREWHITESPACES );
 }
 
-sal_Bool SwCursor::GoNextWord()
+bool SwCursor::GoNextWord()
 {
     return GoNextWordWT( WordType::ANYWORD_IGNOREWHITESPACES );
 }
 
-sal_Bool SwCursor::GoPrevWord()
+bool SwCursor::GoPrevWord()
 {
     return GoPrevWordWT( WordType::ANYWORD_IGNOREWHITESPACES );
 }
 
-sal_Bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt )
+bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt )
 {
     return SelectWordWT( pViewShell, WordType::ANYWORD_IGNOREWHITESPACES, pPt );
 }
 
-sal_Bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
+bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1175,9 +1175,9 @@ sal_Bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
     return bRet;
 }
 
-sal_Bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
+bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1191,9 +1191,9 @@ sal_Bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
     return bRet;
 }
 
-sal_Bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
+bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1216,9 +1216,9 @@ sal_Bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
     return bRet;
 }
 
-sal_Bool SwCursor::IsStartEndSentence( bool bEnd ) const
+bool SwCursor::IsStartEndSentence( bool bEnd ) const
 {
-    sal_Bool bRet = bEnd ?
+    bool bRet = bEnd ?
                     GetCntntNode() && GetPoint()->nContent == GetCntntNode()->Len() :
                     GetPoint()->nContent.GetIndex() == 0;
 
@@ -1232,9 +1232,9 @@ sal_Bool SwCursor::IsStartEndSentence( bool bEnd ) const
     return bRet;
 }
 
-sal_Bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
+bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1250,15 +1250,15 @@ sal_Bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
-                bRet = sal_True;
+                bRet = true;
         }
     }
     return bRet;
 }
 
-sal_Bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
+bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1275,15 +1275,15 @@ sal_Bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
-                bRet = sal_True;
+                bRet = true;
         }
     }
     return bRet;
 }
 
-sal_Bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
+bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1299,15 +1299,15 @@ sal_Bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
-                bRet = sal_True;
+                bRet = true;
         }
     }
     return bRet;
 }
 
-sal_Bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
+bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1326,18 +1326,18 @@ sal_Bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
-                bRet = sal_True;
+                bRet = true;
         }
     }
     return bRet;
 }
 
-sal_Bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt )
+bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt )
 {
     SwCrsrSaveState aSave( *this );
 
-    sal_Bool bRet = sal_False;
-    sal_Bool bForward = sal_True;
+    bool bRet = false;
+    bool bForward = true;
     DeleteMark();
     const SwRootFrm* pLayout = pViewShell->GetLayout();
     if( pPt && 0 != pLayout )
@@ -1369,7 +1369,7 @@ sal_Bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, c
                 GetMark()->nContent = rEnd.nContent;
                 GetMark()->nContent--; //Don't select the end delimiter
             }
-            bRet = sal_True;
+            bRet = true;
         }
         else
         {
@@ -1388,7 +1388,7 @@ sal_Bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, c
                     SetMark();
                     GetMark()->nContent = aBndry.startPos;
                     if( !IsSelOvr() )
-                        bRet = sal_True;
+                        bRet = true;
                 }
             }
         }
@@ -1435,9 +1435,9 @@ static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
     return aRes;
 }
 
-sal_Bool SwCursor::GoSentence( SentenceMoveType eMoveType )
+bool SwCursor::GoSentence( SentenceMoveType eMoveType )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
     if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
     {
@@ -1476,7 +1476,7 @@ sal_Bool SwCursor::GoSentence( SentenceMoveType eMoveType )
                                     nPtPos, g_pBreakIt->GetLocale(
                                                 pTxtNd->GetLang( nPtPos ) ));
             if (nPtPos == 0)
-                return sal_False;   // the previous sentence is not in this paragraph
+                return false;   // the previous sentence is not in this paragraph
             if (nPtPos > 0)
                 nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
                                     sNodeText,
@@ -1491,15 +1491,15 @@ sal_Bool SwCursor::GoSentence( SentenceMoveType eMoveType )
         {
             GetPoint()->nContent = nPtPos;
             if( !IsSelOvr() )
-                bRet = sal_True;
+                bRet = true;
         }
     }
     return bRet;
 }
 
-sal_Bool SwCursor::ExpandToSentenceBorders()
+bool SwCursor::ExpandToSentenceBorders()
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     const SwTxtNode* pStartNd = Start()->nNode.GetNode().GetTxtNode();
     const SwTxtNode* pEndNd   = End()->nNode.GetNode().GetTxtNode();
     if (pStartNd && pEndNd && g_pBreakIt->GetBreakIter().is())
@@ -1535,13 +1535,13 @@ sal_Bool SwCursor::ExpandToSentenceBorders()
             bChanged = true;
         }
         if (bChanged && !IsSelOvr())
-            bRes = sal_True;
+            bRes = true;
     }
     return bRes;
 }
 
-sal_Bool SwTableCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/,
-    sal_Bool /*bVisualAllowed*/, sal_Bool /*bSkipHidden*/, sal_Bool /*bInsertCrsr*/ )
+bool SwTableCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/,
+    bool /*bVisualAllowed*/, bool /*bSkipHidden*/, bool /*bInsertCrsr*/ )
 {
     return bLeft ? GoPrevCell( nCnt )
                  : GoNextCell( nCnt );
@@ -1550,7 +1550,7 @@ sal_Bool SwTableCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 /
 // calculate cursor bidi level: extracted from LeftRight()
 const SwCntntFrm*
 SwCursor::DoSetBidiLevelLeftRight(
-    sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr)
+    bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr)
 {
     // calculate cursor bidi level
     const SwCntntFrm* pSttFrm = NULL;
@@ -1597,8 +1597,8 @@ SwCursor::DoSetBidiLevelLeftRight(
     return pSttFrm;
 }
 
-sal_Bool SwCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
-                          sal_Bool bVisualAllowed,sal_Bool bSkipHidden, sal_Bool bInsertCrsr )
+bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
+                          bool bVisualAllowed,bool bSkipHidden, bool bInsertCrsr )
 {
     // calculate cursor bidi level
     SwNode& rNode = GetPoint()->nNode.GetNode();
@@ -1714,7 +1714,7 @@ sal_Bool SwCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
         }
     }
 
-    return 0 == nCnt && !IsInProtectTable( sal_True ) &&
+    return 0 == nCnt && !IsInProtectTable( true ) &&
             !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                        nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
 }
@@ -1855,7 +1855,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
     return bRet;
 }
 
-sal_Bool SwCursor::LeftRightMargin( sal_Bool bLeft, sal_Bool bAPI )
+bool SwCursor::LeftRightMargin( bool bLeft, bool bAPI )
 {
     Point aPt;
     SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->GetCurrentLayout(), &aPt, GetPoint() );
@@ -1870,9 +1870,9 @@ sal_Bool SwCursor::LeftRightMargin( sal_Bool bLeft, sal_Bool bAPI )
            && !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
 }
 
-sal_Bool SwCursor::IsAtLeftRightMargin( sal_Bool bLeft, sal_Bool bAPI ) const
+bool SwCursor::IsAtLeftRightMargin( bool bLeft, bool bAPI ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     Point aPt;
     SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->GetCurrentLayout(), &aPt, GetPoint() );
     if( pFrm )
@@ -1887,26 +1887,26 @@ sal_Bool SwCursor::IsAtLeftRightMargin( sal_Bool bLeft, sal_Bool bAPI ) const
     return bRet;
 }
 
-sal_Bool SwCursor::SttEndDoc( sal_Bool bStt )
+bool SwCursor::SttEndDoc( bool bStt )
 {
     SwCrsrSaveState aSave( *this );
     // Never jump over section boundaries during selection!
     // Can the cursor still moved on?
     SwMoveFn fnMove = bStt ? fnMoveBackward : fnMoveForward;
-    sal_Bool bRet = (!HasMark() || !IsNoCntnt() ) &&
+    bool bRet = (!HasMark() || !IsNoCntnt() ) &&
                     Move( fnMove, fnGoDoc ) &&
-                    !IsInProtectTable( sal_True ) &&
+                    !IsInProtectTable( true ) &&
                     !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                nsSwCursorSelOverFlags::SELOVER_CHANGEPOS |
                                nsSwCursorSelOverFlags::SELOVER_ENABLEREVDIREKTION );
     return bRet;
 }
 
-sal_Bool SwCursor::GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt )
+bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
 {
     const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     // If there is another EndNode in front of the cell's StartNode then there
     // exists a previous cell
@@ -1939,7 +1939,7 @@ sal_Bool SwCursor::GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt )
         SwNodeIndex aCellIdx( *pTmpNode, bNext ? 1 : -1 );
         if(  (bNext && !aCellIdx.GetNode().IsStartNode()) ||
             (!bNext && !aCellIdx.GetNode().IsEndNode()) )
-            return sal_False;
+            return false;
 
         rPtIdx = bNext ? aCellIdx : SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode());
 
@@ -1960,7 +1960,7 @@ sal_Bool SwCursor::GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt )
         GetDoc()->GetNodes().GoNextSection( &rPtIdx, true, false );
     GetPoint()->nContent.Assign( GetCntntNode(), 0 );
 
-    return !IsInProtectTable( sal_True );
+    return !IsInProtectTable( true );
 }
 
 bool SwTableCursor::GotoTable( const OUString& )
@@ -1987,9 +1987,9 @@ bool SwCursor::GotoTable( const OUString& rName )
     return bRet;
 }
 
-sal_Bool SwCursor::GotoTblBox( const OUString& rName )
+bool SwCursor::GotoTblBox( const OUString& rName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
     if( pTblNd )
     {
@@ -2008,7 +2008,7 @@ sal_Bool SwCursor::GotoTblBox( const OUString& rName )
     return bRet;
 }
 
-sal_Bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
+bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
 {
     // for optimization test something before
     const SwNode* pNd = &GetPoint()->nNode.GetNode();
@@ -2042,17 +2042,17 @@ sal_Bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
     // a same node type.
     SwCrsrSaveState aSave( *this );
     return (*fnWhichPara)( *this, fnPosPara ) &&
-            !IsInProtectTable( sal_True ) &&
+            !IsInProtectTable( true ) &&
             !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                        nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
 }
 
-sal_Bool SwCursor::MoveSection( SwWhichSection fnWhichSect,
+bool SwCursor::MoveSection( SwWhichSection fnWhichSect,
                                 SwPosSection fnPosSect)
 {
     SwCrsrSaveState aSave( *this );
     return (*fnWhichSect)( *this, fnPosSect ) &&
-            !IsInProtectTable( sal_True ) &&
+            !IsInProtectTable( true ) &&
             !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                        nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
 }
@@ -2087,8 +2087,8 @@ void SwCursor::RestoreSavePos()
 SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
     : SwCursor( rPos, pRing, false )
 {
-    bParked = sal_False;
-    bChg = sal_False;
+    bParked = false;
+    bChg = false;
     nTblPtNd = 0, nTblMkNd = 0;
     nTblPtCnt = 0, nTblMkCnt = 0;
 }
@@ -2136,10 +2136,10 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             Move( fnMoveForward );
             Exchange();
             Move( fnMoveForward );
-            bParked = sal_False;
+            bParked = false;
         }
 
-        bChg = sal_False;
+        bChg = false;
 
         // create temporary copies so that all boxes that
         // have already cursors can be removed
@@ -2228,13 +2228,13 @@ void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
 {
     SwTableBox* pBox = (SwTableBox*)&rTblBox;
     m_SelectedBoxes.insert(pBox);
-    bChg = sal_True;
+    bChg = true;
 }
 
 void SwTableCursor::DeleteBox(size_t const nPos)
 {
     m_SelectedBoxes.erase(m_SelectedBoxes.begin() + nPos);
-    bChg = sal_True;
+    bChg = true;
 }
 
 bool SwTableCursor::NewTableSelection()
@@ -2293,16 +2293,16 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
     }
 }
 
-sal_Bool SwTableCursor::IsCrsrMovedUpdt()
+bool SwTableCursor::IsCrsrMovedUpdt()
 {
     if( !IsCrsrMoved() )
-        return sal_False;
+        return false;
 
     nTblMkNd = GetMark()->nNode.GetIndex();
     nTblPtNd = GetPoint()->nNode.GetIndex();
     nTblMkCnt = GetMark()->nContent.GetIndex();
     nTblPtCnt = GetPoint()->nContent.GetIndex();
-    return sal_True;
+    return true;
 }
 
 /// park table cursor on the boxes' start node
@@ -2321,18 +2321,18 @@ void SwTableCursor::ParkCrsr()
     GetMark()->nNode = *pNd;
     GetMark()->nContent.Assign( 0, 0 );
 
-    bChg = sal_True;
-    bParked = sal_True;
+    bChg = true;
+    bParked = true;
 }
 
-sal_Bool SwTableCursor::HasReadOnlyBoxSel() const
+bool SwTableCursor::HasReadOnlyBoxSel() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     for (size_t n = m_SelectedBoxes.size(); n; )
     {
         if (m_SelectedBoxes[--n]->GetFrmFmt()->GetProtect().IsCntntProtected())
         {
-            bRet = sal_True;
+            bRet = true;
             break;
         }
     }
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index babac21ad0b6..87067976050c 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -70,9 +70,9 @@ SwWhichColumn fnColumnNext = &GetNextColumn;
 SwPosColumn fnColumnStart = &GetColumnStt;
 SwPosColumn fnColumnEnd = &GetColumnEnd;
 
-sal_Bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
+bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !m_pTblCrsr )
     {
         SwLayoutFrm* pLayFrm = GetCurrFrm()->GetUpper();
@@ -96,11 +96,11 @@ sal_Bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol
 
                 pCnt->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
 
-                if( !m_pCurCrsr->IsInProtectTable( sal_True ) &&
+                if( !m_pCurCrsr->IsInProtectTable( true ) &&
                     !m_pCurCrsr->IsSelOvr() )
                 {
                     UpdateCrsr();
-                    bRet = sal_True;
+                    bRet = true;
                 }
             }
         }
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index b956e2b7f958..a26fe9d19044 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -35,21 +35,21 @@
 #include <viscrs.hxx>
 #include <callnk.hxx>
 
-sal_Bool SwCrsrShell::CallCrsrFN( FNCrsr fnCrsr )
+bool SwCrsrShell::CallCrsrFN( FNCrsr fnCrsr )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves
     SwCursor* pCrsr = getShellCrsr( true );
-    sal_Bool bRet = (pCrsr->*fnCrsr)();
+    bool bRet = (pCrsr->*fnCrsr)();
     if( bRet )
         UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
                     SwCrsrShell::READONLY );
     return bRet;
 }
 
-sal_Bool SwCursor::GotoFtnTxt()
+bool SwCursor::GotoFtnTxt()
 {
     // jump from content to footnote
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTxtNode* pTxtNd = GetPoint()->nNode.GetNode().GetTxtNode();
 
     SwTxtAttr *const pFtn( (pTxtNd)
@@ -74,9 +74,9 @@ sal_Bool SwCursor::GotoFtnTxt()
     return bRet;
 }
 
-sal_Bool SwCrsrShell::GotoFtnTxt()
+bool SwCrsrShell::GotoFtnTxt()
 {
-    sal_Bool bRet = CallCrsrFN( &SwCursor::GotoFtnTxt );
+    bool bRet = CallCrsrFN( &SwCursor::GotoFtnTxt );
     if( !bRet )
     {
         SwTxtNode* pTxtNd = _GetCrsr() ?
@@ -106,7 +106,7 @@ sal_Bool SwCrsrShell::GotoFtnTxt()
                                 static_cast<const SwTxtFrm*>(pCnt)->GetOfst() );
                             UpdateCrsr( SwCrsrShell::SCROLLWIN |
                                 SwCrsrShell::CHKRANGE | SwCrsrShell::READONLY );
-                            bRet = sal_True;
+                            bRet = true;
                             break;
                         }
                     }
@@ -121,7 +121,7 @@ sal_Bool SwCrsrShell::GotoFtnTxt()
     return bRet;
 }
 
-sal_Bool SwCursor::GotoFtnAnchor()
+bool SwCursor::GotoFtnAnchor()
 {
     // jump from footnote to anchor
     const SwNode* pSttNd = GetNode()->FindFootnoteStartNode();
@@ -144,14 +144,14 @@ sal_Bool SwCursor::GotoFtnAnchor()
                                   nsSwCursorSelOverFlags::SELOVER_TOGGLE );
             }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwCrsrShell::GotoFtnAnchor()
+bool SwCrsrShell::GotoFtnAnchor()
 {
     // jump from footnote to anchor
     SwCallLink aLk( *this ); // watch Crsr-Moves
-    sal_Bool bRet = m_pCurCrsr->GotoFtnAnchor();
+    bool bRet = m_pCurCrsr->GotoFtnAnchor();
     if( bRet )
     {
         // special treatment for table header row
@@ -162,19 +162,19 @@ sal_Bool SwCrsrShell::GotoFtnAnchor()
     return bRet;
 }
 
-inline sal_Bool CmpLE( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpLE( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
 {
     const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
     return nTNd < nNd || ( nTNd == nNd && *rFtn.GetStart() <= nCnt );
 }
 
-inline sal_Bool CmpL( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpL( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
 {
     const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
     return nTNd < nNd || ( nTNd == nNd && *rFtn.GetStart() < nCnt );
 }
 
-sal_Bool SwCursor::GotoNextFtnAnchor()
+bool SwCursor::GotoNextFtnAnchor()
 {
     const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
     const SwTxtFtn* pTxtFtn = 0;
@@ -220,7 +220,7 @@ sal_Bool SwCursor::GotoNextFtnAnchor()
     else if( nPos < rFtnArr.size() )
         pTxtFtn = rFtnArr[ nPos ];
 
-    sal_Bool bRet = 0 != pTxtFtn;
+    bool bRet = 0 != pTxtFtn;
     if( bRet )
     {
         SwCrsrSaveState aSaveState( *this );
@@ -233,7 +233,7 @@ sal_Bool SwCursor::GotoNextFtnAnchor()
     return bRet;
 }
 
-sal_Bool SwCursor::GotoPrevFtnAnchor()
+bool SwCursor::GotoPrevFtnAnchor()
 {
     const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
     const SwTxtFtn* pTxtFtn = 0;
@@ -277,7 +277,7 @@ sal_Bool SwCursor::GotoPrevFtnAnchor()
     else if( nPos )
         pTxtFtn = rFtnArr[ nPos-1 ];
 
-    sal_Bool bRet = 0 != pTxtFtn;
+    bool bRet = 0 != pTxtFtn;
     if( bRet )
     {
         SwCrsrSaveState aSaveState( *this );
@@ -290,18 +290,18 @@ sal_Bool SwCursor::GotoPrevFtnAnchor()
     return bRet;
 }
 
-sal_Bool SwCrsrShell::GotoNextFtnAnchor()
+bool SwCrsrShell::GotoNextFtnAnchor()
 {
     return CallCrsrFN( &SwCursor::GotoNextFtnAnchor );
 }
 
-sal_Bool SwCrsrShell::GotoPrevFtnAnchor()
+bool SwCrsrShell::GotoPrevFtnAnchor()
 {
     return CallCrsrFN( &SwCursor::GotoPrevFtnAnchor );
 }
 
 /// jump from border to anchor
-sal_Bool SwCrsrShell::GotoFlyAnchor()
+bool SwCrsrShell::GotoFlyAnchor()
 {
     SET_CURR_SHELL( this );
     const SwFrm* pFrm = GetCurrFrm();
@@ -310,7 +310,7 @@ sal_Bool SwCrsrShell::GotoFlyAnchor()
     } while( pFrm && !pFrm->IsFlyFrm() );
 
     if( !pFrm ) // no FlyFrame
-        return sal_False;
+        return false;
 
     SwCallLink aLk( *this ); // watch Crsr-Moves
     SwCrsrSaveState aSaveState( *m_pCurCrsr );
@@ -326,10 +326,10 @@ sal_Bool SwCrsrShell::GotoFlyAnchor()
                 : pFrm->Frm().Left());
 
     const SwPageFrm* pPageFrm = pFrm->FindPageFrm();
-    const SwCntntFrm* pFndFrm = pPageFrm->GetCntntPos( aPt, sal_False, sal_True );
+    const SwCntntFrm* pFndFrm = pPageFrm->GetCntntPos( aPt, false, true );
     pFndFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
 
-    sal_Bool bRet = !m_pCurCrsr->IsInProtectTable() && !m_pCurCrsr->IsSelOvr();
+    bool bRet = !m_pCurCrsr->IsInProtectTable() && !m_pCurCrsr->IsSelOvr();
     if( bRet )
         UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
                     SwCrsrShell::READONLY );
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 0850dfb9144c..d5b8f231e950 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -28,8 +28,8 @@
 #include <section.hxx>
 #include <trvlreg.hxx>
 
-sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
-                        sal_Bool bInReadOnly )
+bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
+                        bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
     SwSectionNode* pNd = aIdx.GetNode().FindSectionNode();
@@ -75,14 +75,14 @@ sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
                 rCurCrsr.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
             }
             rCurCrsr.GetPoint()->nNode = aIdx;
-            return sal_True;
+            return true;
         }
     } while( pNd );
-    return sal_False;
+    return false;
 }
 
-sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
-                        sal_Bool bInReadOnly )
+bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
+                        bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
     SwSectionNode* pNd = aIdx.GetNode().FindSectionNode();
@@ -129,18 +129,18 @@ sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
                 rCurCrsr.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
             }
             rCurCrsr.GetPoint()->nNode = aIdx;
-            return sal_True;
+            return true;
         }
     } while( pNd );
-    return sal_False;
+    return false;
 }
 
-sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
-                        sal_Bool bInReadOnly )
+bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
+                        bool bInReadOnly )
 {
     SwSectionNode* pNd = rCurCrsr.GetNode()->FindSectionNode();
     if( !pNd )
-        return sal_False;
+        return false;
 
     SwPosition* pPos = rCurCrsr.GetPoint();
     bool bMoveBackward = fnPosRegion == fnMoveBackward;
@@ -165,13 +165,13 @@ sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
     return 0 != pCNd;
 }
 
-sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
-                                sal_Bool bInReadOnly )
+bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
+                                bool bInReadOnly )
 {
     SwNode* pCurrNd = rCurCrsr.GetNode();
     SwSectionNode* pNd = pCurrNd->FindSectionNode();
     if( !pNd )
-        return sal_False;
+        return false;
 
     SwPosition* pPos = rCurCrsr.GetPoint();
     const sal_Int32 nCurrCnt = pPos->nContent.GetIndex();
@@ -184,7 +184,7 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
             pCNd = pNd->GetNodes().GoPrevSection( &aIdx, true, !bInReadOnly );
             if( !pCNd )
-                return sal_False;
+                return false;
             pPos->nNode = aIdx;
         }
         else
@@ -192,7 +192,7 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
             SwNodeIndex aIdx( *pNd );
             pCNd = pNd->GetNodes().GoNextSection( &aIdx, true, !bInReadOnly );
             if( !pCNd )
-                return sal_False;
+                return false;
             pPos->nNode = aIdx;
         }
 
@@ -201,16 +201,16 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
         if( &pPos->nNode.GetNode() != pCurrNd ||
             pPos->nContent.GetIndex() != nCurrCnt )
             // there was a change
-            return sal_True;
+            return true;
 
         // try also the parent of this section
         SwSection* pParent = pNd->GetSection().GetParent();
         pNd = pParent ? pParent->GetFmt()->GetSectionNode() : 0;
     } while( pNd );
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
+bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
 {
     SwCrsrSaveState aSaveState( *this );
     return !dynamic_cast<SwTableCursor*>(this) &&
@@ -220,10 +220,10 @@ sal_Bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosReg
                 GetPoint()->nContent.GetIndex() != pSavePos->nCntnt );
 }
 
-sal_Bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
+bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
-    sal_Bool bRet = !m_pTblCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
+    bool bRet = !m_pTblCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
     if( bRet )
         UpdateCrsr();
     return bRet;
diff --git a/sw/source/core/crsr/trvlreg.hxx b/sw/source/core/crsr/trvlreg.hxx
index 881ecdd15a02..9679a6e248f4 100644
--- a/sw/source/core/crsr/trvlreg.hxx
+++ b/sw/source/core/crsr/trvlreg.hxx
@@ -23,10 +23,10 @@
 #include <sal/config.h>
 
 // Travelling in regions
-sal_Bool GotoPrevRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-sal_Bool GotoCurrRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-sal_Bool GotoCurrRegionAndSkip( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-sal_Bool GotoNextRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
+bool GotoPrevRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
+bool GotoCurrRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
+bool GotoCurrRegionAndSkip( SwPaM&, SwPosRegion, bool bInReadOnly );
+bool GotoNextRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
 
 #endif
 
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index cea8eceac641..e581c7a32496 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -40,16 +40,16 @@
 #include <trvltbl.hxx>
 
 /// set cursor into next/previous cell
-sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
+bool SwCrsrShell::GoNextCell( bool bAppendLine )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwTableNode* pTblNd = 0;
 
     if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
     {
         SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
         SwCallLink aLk( *this ); // watch Crsr-Moves
-        bRet = sal_True;
+        bRet = true;
 
         // Check if we have to move the cursor to a covered cell before
         // proceeding:
@@ -76,7 +76,7 @@ sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
         if( !aCellStt.GetNode().IsStartNode() )
         {
             if( pCrsr->HasMark() || !bAppendLine )
-                bRet = sal_False;
+                bRet = false;
             else
             {
                 // if there is no list anymore then create new one
@@ -95,15 +95,15 @@ sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
                 ((SwEditShell*)this)->EndAllAction();
             }
         }
-        if( bRet && 0 != ( bRet = pCrsr->GoNextCell() ))
+        if( bRet && ( bRet = pCrsr->GoNextCell() ) )
             UpdateCrsr();
     }
     return bRet;
 }
 
-sal_Bool SwCrsrShell::GoPrevCell()
+bool SwCrsrShell::GoPrevCell()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( IsTableMode() || IsCrsrInTbl() )
     {
         SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
@@ -248,12 +248,12 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
     return true;
 }
 
-sal_Bool SwCrsrShell::SelTbl()
+bool SwCrsrShell::SelTbl()
 {
     // check if the current cursor's SPoint/Mark are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     const SwTabFrm *pTblFrm = pFrm->ImplFindTabFrm();
     const SwTabFrm* pMasterTabFrm = pTblFrm->IsFollow() ? pTblFrm->FindMaster( true ) : pTblFrm;
@@ -278,10 +278,10 @@ sal_Bool SwCrsrShell::SelTbl()
     m_pTblCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
     m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
     UpdateCrsr();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwCrsrShell::SelTblBox()
+bool SwCrsrShell::SelTblBox()
 {
     // if we're in a table, create a table cursor, and select the cell
     // that the current cursor's point resides in
@@ -299,7 +299,7 @@ sal_Bool SwCrsrShell::SelTblBox()
                 "Schroedinger's table: We're in a box, and also we aren't." );
 #endif
     if( pStartNode == NULL )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
 
@@ -329,7 +329,7 @@ sal_Bool SwCrsrShell::SelTblBox()
     // needs updating
     UpdateCrsr();
 
-    return sal_True;
+    return true;
 }
 
 // TODO: provide documentation
@@ -341,7 +341,7 @@ sal_Bool SwCrsrShell::SelTblBox()
     @return <false> if no suitable cell could be found, otherwise <rIdx> points
             to content in a suitable cell and <true> is returned.
 */
-static bool lcl_FindNextCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
+static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
 {
     // check protected cells
     SwNodeIndex aTmp( rIdx, 2 ); // TableNode + StartNode
@@ -419,7 +419,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
 }
 
 /// see lcl_FindNextCell()
-static bool lcl_FindPrevCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly  )
+static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly  )
 {
     SwNodeIndex aTmp( rIdx, -2 ); // TableNode + EndNode
 
@@ -477,8 +477,8 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly  )
     return true;
 }
 
-sal_Bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
-                        sal_Bool bInReadOnly )
+bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+                    bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
 
@@ -533,15 +533,15 @@ sal_Bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                                                       pTxtNode->Len() :
                                                       0 );
             }
-            return sal_True;
+            return true;
         }
     } while( pTblNd );
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
-                        sal_Bool bInReadOnly )
+bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+                    bool bInReadOnly )
 {
     SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
     SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
@@ -585,33 +585,33 @@ sal_Bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                                                       pTxtNode->Len() :
                                                       0 );
             }
-            return sal_True;
+            return true;
         }
     } while( pTblNd );
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
-                        sal_Bool bInReadOnly )
+bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+                    bool bInReadOnly )
 {
     SwTableNode* pTblNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     SwTxtNode* pTxtNode = 0;
     if( fnPosTbl == fnMoveBackward ) // to the end of the table
     {
         SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
         if( !lcl_FindPrevCell( aIdx, bInReadOnly ))
-            return sal_False;
+            return false;
         pTxtNode = aIdx.GetNode().GetTxtNode();
     }
     else
     {
         SwNodeIndex aIdx( *pTblNd );
         if( !lcl_FindNextCell( aIdx, bInReadOnly ))
-            return sal_False;
+            return false;
         pTxtNode = aIdx.GetNode().GetTxtNode();
     }
 
@@ -623,12 +623,12 @@ sal_Bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
                                                         0 );
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTableCursor* m_pTblCrsr = dynamic_cast<SwTableCursor*>(this);
 
     if( m_pTblCrsr || !HasMark() )
@@ -641,13 +641,13 @@ sal_Bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
     return bRet;
 }
 
-sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
 {
     SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
 
     SwShellCrsr* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
     bool bCheckPos;
-    sal_Bool bRet;
+    bool bRet;
     sal_uLong nPtNd = 0;
     sal_Int32 nPtCnt = 0;
 
@@ -680,7 +680,7 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
         if( bCheckPos &&
             pCrsr->GetPoint()->nNode.GetIndex() == nPtNd &&
             pCrsr->GetPoint()->nContent.GetIndex() == nPtCnt )
-            bRet = sal_False;
+            bRet = false;
     }
     return bRet;
 }
@@ -767,10 +767,10 @@ bool SwCrsrShell::GotoTable( const OUString& rName )
     return bRet;
 }
 
-sal_Bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
+bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
 {
     if( !m_pBoxIdx || !m_pBoxPtr || IsSelTblCells() || !IsAutoUpdateCells() )
-        return sal_False;
+        return false;
 
     // check if box content is consistent with given box format, reset if not
     SwTableBox* pChkBox = 0;
@@ -823,7 +823,7 @@ sal_Bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
         // destroy pointer before next action starts
         ClearTblBoxCntnt();
         StartAction();
-        GetDoc()->ChkBoxNumFmt( *pChkBox, sal_True );
+        GetDoc()->ChkBoxNumFmt( *pChkBox, true );
         EndAction();
     }
 
@@ -875,9 +875,9 @@ void SwCrsrShell::ClearTblBoxCntnt()
     m_pBoxPtr = 0;
 }
 
-sal_Bool SwCrsrShell::EndAllTblBoxEdit()
+bool SwCrsrShell::EndAllTblBoxEdit()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwViewShell *pSh = this;
     do {
         if( pSh->IsA( TYPE( SwCrsrShell ) ) )
diff --git a/sw/source/core/crsr/trvltbl.hxx b/sw/source/core/crsr/trvltbl.hxx
index 1c686b5d1728..6fbcee1a42dd 100644
--- a/sw/source/core/crsr/trvltbl.hxx
+++ b/sw/source/core/crsr/trvltbl.hxx
@@ -23,9 +23,9 @@
 #include <sal/config.h>
 
 // Travelling in tables
-sal_Bool GotoPrevTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
-sal_Bool GotoCurrTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
-sal_Bool GotoNextTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
+bool GotoPrevTable( SwPaM&, SwPosTable, bool bInReadOnly );
+bool GotoCurrTable( SwPaM&, SwPosTable, bool bInReadOnly );
+bool GotoNextTable( SwPaM&, SwPosTable, bool bInReadOnly );
 
 #endif
 
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 6d342698f855..30b52eb4b86f 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -27,9 +27,9 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
 
 SwUnoCrsr::SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing )
     : SwCursor( rPos, pRing, false ), SwModify( 0 ),
-    bRemainInSection( sal_True ),
-    bSkipOverHiddenSections( sal_False ),
-    bSkipOverProtectSections( sal_False )
+    bRemainInSection( true ),
+    bSkipOverHiddenSections( false ),
+    bSkipOverProtectSections( false )
 {}
 
 SwUnoCrsr::~SwUnoCrsr()
@@ -85,7 +85,7 @@ bool SwUnoCrsr::IsReadOnlyAvailable() const
 }
 
 const SwCntntFrm*
-SwUnoCrsr::DoSetBidiLevelLeftRight( sal_Bool &, sal_Bool, sal_Bool )
+SwUnoCrsr::DoSetBidiLevelLeftRight( bool &, bool, bool )
 {
     return 0; // not for uno cursor
 }
@@ -95,7 +95,7 @@ void SwUnoCrsr::DoSetBidiLevelUpDown()
     return; // not for uno cursor
 }
 
-sal_Bool SwUnoCrsr::IsSelOvr( int eFlags )
+bool SwUnoCrsr::IsSelOvr( int eFlags )
 {
     if( bRemainInSection )
     {
@@ -174,7 +174,7 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags )
             {
                 rPtIdx = GetSavePos()->nNode;
                 GetPoint()->nContent.Assign( GetCntntNode(), GetSavePos()->nCntnt );
-                return sal_True;
+                return true;
             }
         }
     }
@@ -184,7 +184,7 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags )
 SwUnoTableCrsr::SwUnoTableCrsr(const SwPosition& rPos)
     : SwCursor(rPos,0,false), SwUnoCrsr(rPos), SwTableCursor(rPos), aTblSel(rPos,0,false)
 {
-    SetRemainInSection(sal_False);
+    SetRemainInSection(false);
 }
 
 SwUnoTableCrsr::~SwUnoTableCrsr()
@@ -193,9 +193,9 @@ SwUnoTableCrsr::~SwUnoTableCrsr()
         delete aTblSel.GetNext();
 }
 
-sal_Bool SwUnoTableCrsr::IsSelOvr( int eFlags )
+bool SwUnoTableCrsr::IsSelOvr( int eFlags )
 {
-    sal_Bool bRet = SwUnoCrsr::IsSelOvr( eFlags );
+    bool bRet = SwUnoCrsr::IsSelOvr( eFlags );
     if( !bRet )
     {
         const SwTableNode* pTNd = GetPoint()->nNode.GetNode().FindTableNode();
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index 5b5890ab5b5f..7ca4fbd50123 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -349,7 +349,7 @@ void DocumentDeviceManager::PrtDataChanged()
             m_rSwdoc.GetDrawModel()->SetRefDevice( pOutDev );
     }
 
-    m_rSwdoc.PrtOLENotify( sal_True );
+    m_rSwdoc.PrtOLENotify( true );
 
     if ( bEndAction )
         pTmpRoot->EndAllAction();
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 599df11e02ae..8c5a88b323d4 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -201,7 +201,7 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
 
                 const SwNumRuleTbl& rNmTbl = m_rDoc.GetNumRuleTbl();
                 for( sal_uInt16 n = 0; n < rNmTbl.size(); ++n )
-                    rNmTbl[n]->SetInvalidRule(sal_True);
+                    rNmTbl[n]->SetInvalidRule(true);
 
                 m_rDoc.UpdateNumRule();
 
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 95d0ffb00f13..08b4e3d0fba2 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -414,7 +414,7 @@ void SwAutoCompleteWord::DocumentDying(const SwDoc& rDoc)
     pImpl->RemoveDocument(rDoc);
 
     SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect();
-    const sal_Bool bDelete = !pACorr->GetSwFlags().bAutoCmpltKeepList;
+    const bool bDelete = !pACorr->GetSwFlags().bAutoCmpltKeepList;
     for (size_t nPos = m_WordList.size(); nPos; nPos--)
     {
         SwAutoCompleteString *const pCurrent =
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 623a5468cf8f..d7e75c449dc3 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -381,8 +381,8 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
                 {
                     // Only if the table has page breaks!
                     const SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
-                    if( SFX_ITEM_SET != pFrmFmt->GetItemState(RES_PAGEDESC, sal_False) &&
-                        SFX_ITEM_SET != pFrmFmt->GetItemState( RES_BREAK, sal_False ) )
+                    if( SFX_ITEM_SET != pFrmFmt->GetItemState(RES_PAGEDESC, false) &&
+                        SFX_ITEM_SET != pFrmFmt->GetItemState( RES_BREAK, false ) )
                         pNd = 0;
                 }
             }
@@ -403,13 +403,13 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
                         SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
                         const SfxPoolItem *pItem;
                         if( SFX_ITEM_SET == pFrmFmt->GetItemState( RES_PAGEDESC,
-                            sal_False, &pItem ) )
+                            false, &pItem ) )
                         {
                             pTxtNd->SetAttr( *pItem );
                             pFrmFmt->ResetFmtAttr( RES_PAGEDESC );
                         }
                         if( SFX_ITEM_SET == pFrmFmt->GetItemState( RES_BREAK,
-                            sal_False, &pItem ) )
+                            false, &pItem ) )
                         {
                             pTxtNd->SetAttr( *pItem );
                             pFrmFmt->ResetFmtAttr( RES_BREAK );
@@ -850,7 +850,7 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
 
     const SwFrmFmt &rFmt = pStartFrm->GetPageDesc()->GetMaster();
     const SfxPoolItem *pItem = NULL;
-    SfxItemState eState = rFmt.GetItemState( RES_PAPER_BIN, sal_False, &pItem );
+    SfxItemState eState = rFmt.GetItemState( RES_PAPER_BIN, false, &pItem );
     const SvxPaperBinItem *pPaperBinItem = dynamic_cast< const SvxPaperBinItem * >(pItem);
     if (eState > SFX_ITEM_DEFAULT && pPaperBinItem)
         nRes = pPaperBinItem->GetValue();
@@ -1301,7 +1301,7 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields)
     }
 
     mpDocStat->nPage     = GetCurrentLayout() ? GetCurrentLayout()->GetPageNum() : 0;
-    mpDocStat->bModified = sal_False;
+    mpDocStat->bModified = false;
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
     sal_Int32 n=0;
@@ -1524,7 +1524,7 @@ void SwDoc::SetModified()
     //  Bit 1:  -> new state
     sal_IntPtr nCall = mbModified ? 3 : 2;
     mbModified = true;
-    mpDocStat->bModified = sal_True;
+    mpDocStat->bModified = true;
     if( maOle2Link.IsSet() )
     {
         mbInCallModified = true;
@@ -1579,7 +1579,7 @@ void SwDoc::ReRead( SwPaM& rPam, const OUString& rGrfName,
 static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
 {
     SwTxtNode *pTxtNode = (SwTxtNode*)rpNd->GetTxtNode();
-    sal_Bool bOnlyWrong = *(sal_Bool*)pArgs;
+    bool bOnlyWrong = *(sal_Bool*)pArgs;
     if( pTxtNode )
     {
         if( bOnlyWrong )
@@ -1699,7 +1699,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
             sal_uInt8 nWish = nPara;
             sal_uLong nNextOutNd = i + 1 < (sal_uInt16)rOutNds.size() ?
                 rOutNds[ i + 1 ]->GetIndex() : GetNodes().Count();
-            sal_Bool bKeep = sal_False;
+            bool bKeep = false;
             while( ( nWish || bKeep ) && nIndex + nEndOfs < nNextOutNd &&
                    GetNodes()[ nIndex + nEndOfs ]->IsTxtNode() )
             {
@@ -2140,23 +2140,23 @@ bool SwDoc::EmbedAllLinks()
     return bRet;
 }
 
-sal_Bool SwDoc::IsInsTblFormatNum() const
+bool SwDoc::IsInsTblFormatNum() const
 {
     return SW_MOD()->IsInsTblFormatNum(get(IDocumentSettingAccess::HTML_MODE));
 }
 
-sal_Bool SwDoc::IsInsTblChangeNumFormat() const
+bool SwDoc::IsInsTblChangeNumFormat() const
 {
     return SW_MOD()->IsInsTblChangeNumFormat(get(IDocumentSettingAccess::HTML_MODE));
 }
 
-sal_Bool SwDoc::IsInsTblAlignNum() const
+bool SwDoc::IsInsTblAlignNum() const
 {
     return SW_MOD()->IsInsTblAlignNum(get(IDocumentSettingAccess::HTML_MODE));
 }
 
 /// Set up the InsertDB as Undo table
-void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable )
+void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable )
 {
     if( bIsTable )
     {
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 27387b04aca8..2f25fdbd49f4 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -169,9 +169,9 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
     }
 
     if( !bNameFound )
-        rTblFmt.SetName( rNewName, sal_True );
+        rTblFmt.SetName( rNewName, true );
     else
-        rTblFmt.SetName( GetUniqueTblName(), sal_True );
+        rTblFmt.SetName( GetUniqueTblName(), true );
 
     SwStartNode *pStNd;
     SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index b54605bad884..2472cab44e9b 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -990,7 +990,7 @@ public:
     SwCompareData( SwDoc& rD ) : rDoc( rD ), pInsRing(0), pDelRing(0) {}
     virtual ~SwCompareData();
 
-    void SetRedlinesToDoc( sal_Bool bUseDocInfo );
+    void SetRedlinesToDoc( bool bUseDocInfo );
 };
 
 SwCompareLine::SwCompareLine( const SwNode& rNd )
@@ -1365,7 +1365,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
 
             if ( nSrcFrom < nSrcTo )
             {
-                sal_Bool bUndo = pDstDoc->GetIDocumentUndoRedo().DoesUndo();
+                bool bUndo = pDstDoc->GetIDocumentUndoRedo().DoesUndo();
                 pDstDoc->GetIDocumentUndoRedo().DoUndo( false );
                 SwPaM aCpyPam( rSrcNd, nSrcFrom );
                 aCpyPam.SetMark();
@@ -1622,7 +1622,7 @@ void SwCompareData::CheckForChangesInLine( const CompareData& rData,
     }
 }
 
-void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
+void SwCompareData::SetRedlinesToDoc( bool bUseDocInfo )
 {
     SwPaM* pTmp = pDelRing;
 
@@ -1683,7 +1683,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
 
             if (rDoc.GetIDocumentUndoRedo().DoesUndo())
             {
-                SwUndo *const pUndo(new SwUndoCompDoc( *pTmp, sal_False )) ;
+                SwUndo *const pUndo(new SwUndoCompDoc( *pTmp, false )) ;
                 rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
             rDoc.AppendRedline( new SwRangeRedline( aRedlnData, *pTmp ), true );
@@ -1750,7 +1750,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
             if( rDoc.AppendRedline( new SwRangeRedline( aRedlnData, *pTmp ), true) &&
                 rDoc.GetIDocumentUndoRedo().DoesUndo())
             {
-                SwUndo *const pUndo(new SwUndoCompDoc( *pTmp, sal_True ));
+                SwUndo *const pUndo(new SwUndoCompDoc( *pTmp, true ));
                 rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
             }
         } while( pInsRing != ( pTmp = (SwPaM*)pTmp->GetNext() ));
@@ -1789,9 +1789,9 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
     }
 
     GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
-    sal_Bool bDocWasModified = IsModified();
+    bool bDocWasModified = IsModified();
     SwDoc& rSrcDoc = (SwDoc&)rDoc;
-    sal_Bool bSrcModified = rSrcDoc.IsModified();
+    bool bSrcModified = rSrcDoc.IsModified();
 
     RedlineMode_t eSrcRedlMode = rSrcDoc.GetRedlineMode();
     rSrcDoc.SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_INSERT );
@@ -2007,7 +2007,7 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
     GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
     SwDoc& rSrcDoc = (SwDoc&)rDoc;
-    sal_Bool bSrcModified = rSrcDoc.IsModified();
+    bool bSrcModified = rSrcDoc.IsModified();
 
     RedlineMode_t eSrcRedlMode = rSrcDoc.GetRedlineMode();
     rSrcDoc.SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_DELETE );
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 997aad907d04..8891e1b12bb0 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -93,12 +93,12 @@ namespace
         const sal_Int32 nCntIdx)
     {
         for(int nb = 0; nb < 2; ++nb)
-            if(&((pPam)->GetBound(sal_Bool(nb)).nNode.GetNode()) == pOldNode)
+            if(&((pPam)->GetBound(bool(nb)).nNode.GetNode()) == pOldNode)
             {
-                (pPam)->GetBound(sal_Bool(nb)).nNode = rNewPos.nNode;
-                (pPam)->GetBound(sal_Bool(nb)).nContent.Assign(
+                (pPam)->GetBound(bool(nb)).nNode = rNewPos.nNode;
+                (pPam)->GetBound(bool(nb)).nContent.Assign(
                     const_cast<SwIndexReg*>(rNewPos.nContent.GetIdxReg()),
-                    nCntIdx + (pPam)->GetBound(sal_Bool(nb)).nContent.GetIndex());
+                    nCntIdx + (pPam)->GetBound(bool(nb)).nContent.GetIndex());
             }
     }
 }
@@ -177,7 +177,7 @@ void PaMCorrAbs( const SwPaM& rRange,
 void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
     const SwPosition& rNewPos,
     const sal_Int32 nOffset,
-    sal_Bool bMoveCrsr)
+    bool bMoveCrsr)
 {
     SwCntntNode *const pCntntNode( rOldNode.GetNode().GetCntntNode() );
     SwPaM const aPam(rOldNode, 0,
@@ -219,7 +219,7 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode,
 void SwDoc::CorrAbs(
     const SwPaM& rRange,
     const SwPosition& rNewPos,
-    sal_Bool bMoveCrsr )
+    bool bMoveCrsr )
 {
     SwPosition aStart(*rRange.Start());
     SwPosition aEnd(*rRange.End());
@@ -235,7 +235,7 @@ void SwDoc::CorrAbs(
     const SwNodeIndex& rStartNode,
     const SwNodeIndex& rEndNode,
     const SwPosition& rNewPos,
-    sal_Bool bMoveCrsr )
+    bool bMoveCrsr )
 {
     _DelBookmarks( rStartNode, rEndNode );
 
@@ -301,7 +301,7 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
 void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
     const SwPosition& rNewPos,
     const sal_Int32 nOffset,
-    sal_Bool bMoveCrsr)
+    bool bMoveCrsr)
 {
     getIDocumentMarkAccess()->correctMarksRelative(rOldNode, rNewPos, nOffset);
 
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 5879372d3191..062fba30165a 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -156,7 +156,7 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
             if( (  bPage && RES_HEADER_FOOTER_EAT_SPACING != nId ) ||
                 ( !bPage && RES_COL != nId && RES_PAPER_BIN != nId ))
             {
-                if( SFX_ITEM_SET == rSource.GetItemState( nId, sal_False, &pItem ))
+                if( SFX_ITEM_SET == rSource.GetItemState( nId, false, &pItem ))
                     rDest.SetFmtAttr( *pItem );
                 else
                     rDest.ResetFmtAttr( nId );
@@ -233,7 +233,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
                 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
                             *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
-                GetNodes()._Copy( aRange, aTmp, sal_False );
+                GetNodes()._Copy( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 CopyFlyInFlyImpl(aRange, 0, aTmp);
 
@@ -309,7 +309,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
                 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
                             *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
-                GetNodes()._Copy( aRange, aTmp, sal_False );
+                GetNodes()._Copy( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 CopyFlyInFlyImpl(aRange, 0, aTmp);
 
@@ -654,7 +654,7 @@ SwPageDesc* SwDoc::FindPageDescByName( const OUString& rName, sal_uInt16* pPos )
 // Initialisation and deinitialisation can be found in init.cxx
 extern std::vector<SvGlobalName*> *pGlobalOLEExcludeList;
 
-void SwDoc::PrtOLENotify( sal_Bool bAll )
+void SwDoc::PrtOLENotify( bool bAll )
 {
     SwFEShell *pShell = 0;
     if ( GetCurrentViewShell() )
@@ -683,7 +683,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
     else
     {
         if ( mbAllOLENotify )
-            bAll = sal_True;
+            bAll = true;
 
         mbOLEPrtNotifyPending = mbAllOLENotify = false;
 
@@ -699,7 +699,7 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
                 ::SetProgressState( i, GetDocShell() );
 
                 SwOLENode* pOLENd = (*pNodes)[i];
-                pOLENd->SetOLESizeInvalid( sal_False );
+                pOLENd->SetOLESizeInvalid( false );
 
                 // At first load the Infos and see if it's not already in the exclude list.
                 SvGlobalName aName;
@@ -757,7 +757,7 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
                 ::SetProgressState( i, GetDocShell() );
 
                 SwOLENode* pOLENd = (*pNodes)[i];
-                pOLENd->SetOLESizeInvalid( sal_False );
+                pOLENd->SetOLESizeInvalid( false );
 
                 // We don't know it, so the object has to be loaded.
                 // If it doesn't want to be informed
@@ -872,7 +872,7 @@ void SwDoc::SetDefaultPageMode(bool bSquaredPageMode)
     }
 }
 
-sal_Bool SwDoc::IsSquaredPageMode() const
+bool SwDoc::IsSquaredPageMode() const
 {
     const SwTextGridItem& rGrid =
                         (const SwTextGridItem&)GetDefault( RES_TEXTGRID );
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index f52f2ccdefbb..bea96c5cf08e 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -808,7 +808,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             // Date field
             pInfo->SetRepresentation(
                 ((const SvxDateField*) pField)->GetFormatted(
-                        *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) );
+                        *GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
         }
         else if (pField && pField->ISA(SvxURLField))
         {
@@ -856,7 +856,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             // Time field
             pInfo->SetRepresentation(
                 ((const SvxExtTimeField*) pField)->GetFormatted(
-                        *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) );
+                        *GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
         }
         else
         {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 4e458d2e15a6..546693bb0f9b 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -695,7 +695,7 @@ void SwDoc::DeleteSection( SwNode *pNode )
     {
         // move all Crsr/StkCrsr/UnoCrsr out of the to-be-deleted area
         SwNodeIndex aMvStt( aSttIdx, 1 );
-        CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), sal_True );
+        CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true );
     }
 
     GetNodes().DelNodes( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() + 1 );
@@ -811,8 +811,8 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const OUString &rStr )
 bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
 {
     SwNodeIndex aIdx( rPaM.Start()->nNode );
-    sal_Bool bJoinTxt = aIdx.GetNode().IsTxtNode();
-    sal_Bool bOneNode = rPaM.GetPoint()->nNode == rPaM.GetMark()->nNode;
+    bool bJoinTxt = aIdx.GetNode().IsTxtNode();
+    bool bOneNode = rPaM.GetPoint()->nNode == rPaM.GetMark()->nNode;
     aIdx--;             // in front of the move area!
 
     bool bRet = MoveRange( rPaM, rPos, eMvFlags );
@@ -826,7 +826,7 @@ bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
         {
             {   // Block so SwIndex into node is deleted before Join
                 CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTxtNd,
-                            pTxtNd->GetTxt().getLength()) ), 0, sal_True );
+                            pTxtNd->GetTxt().getLength()) ), 0, true );
             }
             pTxtNd->JoinNext();
         }
@@ -884,7 +884,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
                                     &pStt->nContent, &pEnd->nContent );
     }
 
-    sal_Bool bSplit = sal_False;
+    bool bSplit = false;
     SwPaM aSavePam( rPos, rPos );
 
     // Move the SPoint to the beginning of the range
@@ -893,7 +893,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
 
     // If there is a TextNode before and after the Move, create a JoinNext in the EditShell.
     SwTxtNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
-    sal_Bool bCorrSavePam = pSrcNd && pStt->nNode != pEnd->nNode;
+    bool bCorrSavePam = pSrcNd && pStt->nNode != pEnd->nNode;
 
     // If one ore more TextNodes are moved, SwNodes::Move will do a SplitNode.
     // However, this does not update the cursor. So we create a TextNode to keep
@@ -902,7 +902,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
     if( pTNd && rPaM.GetPoint()->nNode != rPaM.GetMark()->nNode &&
         ( rPos.nContent.GetIndex() || ( pTNd->Len() && bCorrSavePam  )) )
     {
-        bSplit = sal_True;
+        bSplit = true;
         const sal_Int32 nMkCntnt = rPaM.GetMark()->nContent.GetIndex();
 
         std::vector<sal_uLong> aBkmkArr;
@@ -982,7 +982,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
 
         // Is passed to SwUndoMove, which happens when subsequently calling Undo JoinNext.
         // If it's not possible to call Undo JoinNext here.
-        sal_Bool bJoin = bSplit && pTNd;
+        bool bJoin = bSplit && pTNd;
         bCorrSavePam = bCorrSavePam &&
                         0 != ( pPamTxtNd = rPaM.GetNode()->GetTxtNode() )
                         && pPamTxtNd->CanJoinNext()
@@ -999,7 +999,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
             {
                 aSavePam.GetPoint()->nContent += pPamTxtNd->Len();
             }
-            bJoin = sal_False;
+            bJoin = false;
         }
         else if ( !aSavePam.Move( fnMoveForward, fnGoCntnt ) )
         {
@@ -1140,7 +1140,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
         pSaveInsPos = new SwNodeIndex( rRange.aStart, -1 );
 
     // move the Nodes
-    sal_Bool bNoDelFrms = 0 != (DOC_NO_DELFRMS & eMvFlags);
+    bool bNoDelFrms = 0 != (DOC_NO_DELFRMS & eMvFlags);
     if( GetNodes()._MoveNodes( rRange, GetNodes(), rPos, !bNoDelFrms ) )
     {
         ++aIdx;     // again back to old position
@@ -1242,10 +1242,10 @@ static bool lcl_StrLenOverflow( const SwPaM& rPam )
     return false;
 }
 
-void sw_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev )
+void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev )
 {
-    rJoinTxt = sal_False;
-    rJoinPrev = sal_False;
+    rJoinTxt = false;
+    rJoinPrev = false;
     if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode )
     {
         const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
@@ -1273,7 +1273,7 @@ void sw_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev )
     }
 }
 
-void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
+void sw_JoinText( SwPaM& rPam, bool bJoinPrev )
 {
     SwNodeIndex aIdx( rPam.GetPoint()->nNode );
     SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
@@ -1336,7 +1336,7 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
                 pOldTxtNd->CutText( pTxtNd, aAlphaIdx, SwIndex(pOldTxtNd),
                                     pOldTxtNd->Len() );
                 SwPosition aAlphaPos( aIdx, aAlphaIdx );
-                pDoc->CorrRel( rPam.GetPoint()->nNode, aAlphaPos, 0, sal_True );
+                pDoc->CorrRel( rPam.GetPoint()->nNode, aAlphaPos, 0, true );
 
                 // move all Bookmarks/TOXMarks
                 if( !aBkmkArr.empty() )
@@ -1384,7 +1384,7 @@ void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
                 }
             }
 
-            pDoc->CorrRel( aIdx, *rPam.GetPoint(), 0, sal_True );
+            pDoc->CorrRel( aIdx, *rPam.GetPoint(), 0, true );
             // #i100466# adjust given <rPam>, if it does not belong to the cursors
             if ( pDelNd == rPam.GetBound( true ).nContent.GetIdxReg() )
             {
@@ -1532,12 +1532,12 @@ bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM & rPam, const bool )
 bool SwDoc::DeleteAndJoinImpl( SwPaM & rPam,
                                const bool bForceJoinNext )
 {
-    sal_Bool bJoinTxt, bJoinPrev;
+    bool bJoinTxt, bJoinPrev;
     sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
     // #i100466#
     if ( bForceJoinNext )
     {
-        bJoinPrev = sal_False;
+        bJoinPrev = false;
     }
 
     {
@@ -1662,7 +1662,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
             if ( pStartTxtNode )
             {
                 // now move the Content to the new Node
-                sal_Bool bOneNd = pStt->nNode == pEnd->nNode;
+                bool bOneNd = pStt->nNode == pEnd->nNode;
                 const sal_Int32 nLen = ( bOneNd ? pEnd->nContent.GetIndex()
                                            : pCNd->Len() )
                                         - pStt->nContent.GetIndex();
@@ -2221,7 +2221,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const OUString& rStr,
     if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() )
         return false;
 
-    sal_Bool bJoinTxt, bJoinPrev;
+    bool bJoinTxt, bJoinPrev;
     sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
 
     {
@@ -2237,7 +2237,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const OUString& rStr,
                 ( pStt->nNode.GetIndex() + 1 == pEnd->nNode.GetIndex() &&
                     !pEnd->nContent.GetIndex() ),
                 "invalid range: Point and Mark on different nodes" );
-        sal_Bool bOneNode = pStt->nNode == pEnd->nNode;
+        bool bOneNode = pStt->nNode == pEnd->nNode;
 
         // Own Undo?
         OUString sRepl( rStr );
@@ -2365,7 +2365,7 @@ SetRedlineMode( eOld );
                     *rPam.GetMark() = pBkmk->GetOtherMarkPos();
                 getIDocumentMarkAccess()->deleteMark(pBkmk);
             }
-            bJoinTxt = sal_False;
+            bJoinTxt = false;
         }
         else
         {
@@ -2476,7 +2476,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
     }
 
     // Move hard page brakes to the following Node.
-    sal_Bool bSavePageBreak = sal_False, bSavePageDesc = sal_False;
+    bool bSavePageBreak = false, bSavePageDesc = false;
 
     /* #i9185# This whould lead to a segmentation fault if not caught above. */
     sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1;
@@ -2493,14 +2493,14 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
                 false, &pItem ) )
             {
                 pTableFmt->SetFmtAttr( *pItem );
-                bSavePageDesc = sal_True;
+                bSavePageDesc = true;
             }
 
             if( pSet && SFX_ITEM_SET == pSet->GetItemState( RES_BREAK,
                 false, &pItem ) )
             {
                 pTableFmt->SetFmtAttr( *pItem );
-                bSavePageBreak = sal_True;
+                bSavePageBreak = true;
             }
         }
     }
@@ -2533,7 +2533,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
             ::PaMCorrAbs( aDelPam, aTmpPos );
         }
 
-        SwUndoDelete* pUndo = new SwUndoDelete( aDelPam, sal_True );
+        SwUndoDelete* pUndo = new SwUndoDelete( aDelPam, true );
 
         *rPam.GetPoint() = *aDelPam.GetPoint();
         pUndo->SetPgBrkFlags( bSavePageBreak, bSavePageDesc );
@@ -2559,11 +2559,11 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
         // move bookmarks, redlines etc.
         if (aRg.aStart == aRg.aEnd) // only first CorrAbs variant handles this
         {
-            CorrAbs( aRg.aStart, *rPam.GetPoint(), 0, sal_True );
+            CorrAbs( aRg.aStart, *rPam.GetPoint(), 0, true );
         }
         else
         {
-            CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), sal_True );
+            CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true );
         }
 
             // What's with Flys?
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index e2931d297478..2f1eec5cdfc0 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -191,13 +191,13 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
     switch( nFldWhich )
     {
     case RES_SETEXPFLD:
-        ((SwSetExpFieldType&)rFldTyp).SetDeleted( sal_False );
+        ((SwSetExpFieldType&)rFldTyp).SetDeleted( false );
         break;
     case RES_USERFLD:
         ((SwUserFieldType&)rFldTyp).SetDeleted( false );
         break;
     case RES_DDEFLD:
-        ((SwDDEFieldType&)rFldTyp).SetDeleted( sal_False );
+        ((SwDDEFieldType&)rFldTyp).SetDeleted( false );
         break;
     }
 }
@@ -226,11 +226,11 @@ void SwDoc::RemoveFldType(sal_uInt16 nFld)
             if( pTmp->GetDepends() && !IsUsed( *pTmp ) )
             {
                 if( RES_SETEXPFLD == nWhich )
-                    ((SwSetExpFieldType*)pTmp)->SetDeleted( sal_True );
+                    ((SwSetExpFieldType*)pTmp)->SetDeleted( true );
                 else if( RES_USERFLD == nWhich )
                     ((SwUserFieldType*)pTmp)->SetDeleted( true );
                 else
-                    ((SwDDEFieldType*)pTmp)->SetDeleted( sal_True );
+                    ((SwDDEFieldType*)pTmp)->SetDeleted( true );
                 nWhich = 0;
             }
             break;
@@ -1094,7 +1094,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
     SwDBMgr* pMgr = NULL;
 #else
     SwDBMgr* pMgr = GetDBMgr();
-    pMgr->CloseAll(sal_False);
+    pMgr->CloseAll(false);
 #endif
 
     if( !mpUpdtFlds->GetSortLst()->empty() )
@@ -1106,7 +1106,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
             lcl_CalcFld( *this, rCalc, **it, pMgr );
     }
 #if HAVE_FEATURE_DBCONNECTIVITY
-    pMgr->CloseAll(sal_False);
+    pMgr->CloseAll(false);
 #endif
 }
 
@@ -1120,7 +1120,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
     SwDBMgr* pMgr = NULL;
 #else
     SwDBMgr* pMgr = GetDBMgr();
-    pMgr->CloseAll(sal_False);
+    pMgr->CloseAll(false);
 #endif
 
     for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin();
@@ -1134,7 +1134,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
     }
 
 #if HAVE_FEATURE_DBCONNECTIVITY
-    pMgr->CloseAll(sal_False);
+    pMgr->CloseAll(false);
 #endif
 }
 
@@ -1284,7 +1284,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
 
     // already set the current record number
     SwDBMgr* pMgr = GetDBMgr();
-    pMgr->CloseAll(sal_False);
+    pMgr->CloseAll(false);
 #endif
 
     // Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have.
@@ -1348,7 +1348,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
         {
             SwHiddenTxtField* pHFld = (SwHiddenTxtField*)pFld;
             SwSbxValue aValue = aCalc.Calculate( pHFld->GetPar1() );
-            sal_Bool bValue = !aValue.GetBool();
+            bool bValue = !aValue.GetBool();
             if(!aValue.IsVoidValue())
             {
                 pHFld->SetValue( bValue );
@@ -1361,7 +1361,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
         {
             SwHiddenParaField* pHPFld = (SwHiddenParaField*)pFld;
             SwSbxValue aValue = aCalc.Calculate( pHPFld->GetPar1() );
-            sal_Bool bValue = aValue.GetBool();
+            bool bValue = aValue.GetBool();
             if(!aValue.IsVoidValue())
                 pHPFld->SetHidden( bValue );
         }
@@ -1390,7 +1390,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
 
             SwDBData aTmpDBData(((SwDBField*)pFld)->GetDBData());
 
-            if( pMgr->IsDataSourceOpen(aTmpDBData.sDataSource, aTmpDBData.sCommand, sal_False))
+            if( pMgr->IsDataSourceOpen(aTmpDBData.sDataSource, aTmpDBData.sCommand, false))
                 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType));
 
             const OUString& rName = pFld->GetTyp()->GetName();
@@ -1537,7 +1537,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
     }
 
 #if HAVE_FEATURE_DBCONNECTIVITY
-    pMgr->CloseAll(sal_False);
+    pMgr->CloseAll(false);
 #endif
     // delete hash table
     ::DeleteHashTable( pHashStrTbl, nStrFmtCnt );
@@ -1560,7 +1560,7 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
 
     sal_uInt16 nFldType = rDBFld.Which();
 
-    sal_Bool bPar1 = rCalc.Calculate( rDBFld.GetPar1() ).GetBool();
+    bool bPar1 = rCalc.Calculate( rDBFld.GetPar1() ).GetBool();
 
     if( RES_DBNEXTSETFLD == nFldType )
         ((SwDBNextSetField&)rDBFld).SetCondValid( bPar1 );
@@ -1690,7 +1690,7 @@ const SwDBData& SwDoc::GetDBDesc()
     return maDBData;
 }
 
-void SwDoc::SetInitDBFields( sal_Bool b )
+void SwDoc::SetInitDBFields( bool b )
 {
 #if !HAVE_FEATURE_DBCONNECTIVITY
     (void) b;
@@ -2045,7 +2045,7 @@ bool SwDoc::IsNameInArray( const std::vector<OUString>& rArr, const OUString& rN
 
 void SwDoc::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
 {
-    sal_Bool bIsModified = IsModified();
+    bool bIsModified = IsModified();
 
     sal_Int32 nDate;
     sal_Int64 nTime;
@@ -2374,9 +2374,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
                 {
                     sFormula = pFld->GetPar1();
                     if (sFormula.isEmpty() || sFormula==sFalse)
-                        ((SwHiddenParaField*)pFld)->SetHidden( sal_False );
+                        ((SwHiddenParaField*)pFld)->SetHidden( false );
                     else if (sFormula==sTrue)
-                        ((SwHiddenParaField*)pFld)->SetHidden( sal_True );
+                        ((SwHiddenParaField*)pFld)->SetHidden( true );
                     else
                         break;
 
@@ -2391,9 +2391,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
                 {
                     sFormula = pFld->GetPar1();
                     if (sFormula.isEmpty() || sFormula==sFalse)
-                        ((SwHiddenTxtField*)pFld)->SetValue( sal_True );
+                        ((SwHiddenTxtField*)pFld)->SetValue( true );
                     else if (sFormula==sTrue)
-                        ((SwHiddenTxtField*)pFld)->SetValue( sal_False );
+                        ((SwHiddenTxtField*)pFld)->SetValue( false );
                     else
                         break;
 
@@ -2455,7 +2455,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
     const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, false );
 
     _SetGetExpFld* pNew = NULL;
-    sal_Bool bIsInBody = sal_False;
+    bool bIsInBody = false;
 
     if( !pFrm || pFrm->IsInDocBody() )
     {
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 65a91a0b1136..e306eb831751 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -159,7 +159,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
         case FLY_AS_CHAR:
             if( pFlyFmt && rAnch.GetCntntAnchor() )
             {
-                const SwFrm* pOld = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aRet, sal_False );
+                const SwFrm* pOld = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aRet, false );
                 if( pOld )
                     aRet = pOld->Frm().Pos();
             }
@@ -182,7 +182,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
             {
                 const SwFlyFrmFmt* pFmt = (SwFlyFrmFmt*)rAnch.GetCntntAnchor()->
                                                 nNode.GetNode().GetFlyFmt();
-                const SwFrm* pOld = pFmt ? pFmt->GetFrm( &aRet, sal_False ) : 0;
+                const SwFrm* pOld = pFmt ? pFmt->GetFrm( &aRet, false ) : 0;
                 if( pOld )
                     aRet = pOld->Frm().Pos();
             }
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index c7088f7e0565..f8faae126699 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -621,7 +621,7 @@ static bool lcl_InsAttr(
                                 pStt->nNode, pStt->nContent.GetIndex() );
 
                     if( pUndo )
-                        pUndo->SaveRedlineData( aPam, sal_True );
+                        pUndo->SaveRedlineData( aPam, true );
 
                     if( pDoc->IsRedlineOn() )
                         pDoc->AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aPam ), true);
@@ -658,7 +658,7 @@ static bool lcl_InsAttr(
                                 && !pDoc->GetRedlineTbl().empty())))
                 {
                     // Was text content inserted? (RefMark/TOXMarks without an end)
-                    sal_Bool bTxtIns = nInsCnt != rSt.GetIndex();
+                    bool bTxtIns = nInsCnt != rSt.GetIndex();
                     // Was content inserted or set over the selection?
                     SwPaM aPam( pStt->nNode, bTxtIns ? nInsCnt + 1 : nEnd,
                                 pStt->nNode, nInsCnt );
@@ -842,7 +842,7 @@ static bool lcl_InsAttr(
                 SwPaM aPam( *pNode, nMkPos, *pNode, nPtPos );
 
                 if( pUndo )
-                    pUndo->SaveRedlineData( aPam, sal_False );
+                    pUndo->SaveRedlineData( aPam, false );
                 pDoc->AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_FORMAT, aPam ), true);
             }
         }
@@ -859,7 +859,7 @@ static bool lcl_InsAttr(
     if( pDoc->IsRedlineOn() && pCharSet && pCharSet->Count() )
     {
         if( pUndo )
-            pUndo->SaveRedlineData( rRg, sal_False );
+            pUndo->SaveRedlineData( rRg, false );
         pDoc->AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_FORMAT, rRg ), true);
     }
 
@@ -1181,7 +1181,7 @@ void SwDoc::ResetAttrAtFormat( const sal_uInt16 nWhichId,
         ?   new SwUndoFmtResetAttr( rChangedFormat, nWhichId )
         :   0;
 
-    const sal_Bool bAttrReset = rChangedFormat.ResetFmtAttr( nWhichId );
+    const bool bAttrReset = rChangedFormat.ResetFmtAttr( nWhichId );
 
     if ( bAttrReset )
     {
@@ -1802,7 +1802,7 @@ SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt,
     // #i40550#
     SwFmt* pNewFmt = (this->*fnCopyFmt)( rFmt.GetName(), pParent, false, true );
     pNewFmt->SetAuto( rFmt.IsAuto() );
-    pNewFmt->CopyAttrs( rFmt, sal_True );           // copy the attributes
+    pNewFmt->CopyAttrs( rFmt, true );           // copy the attributes
 
     pNewFmt->SetPoolFmtId( rFmt.GetPoolFmtId() );
     pNewFmt->SetPoolHelpId( rFmt.GetPoolHelpId() );
@@ -1859,7 +1859,7 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
         pNewColl = MakeTxtFmtColl( rColl.GetName(), pParent );
 
     // copy the auto formats or the attributes
-    pNewColl->CopyAttrs( rColl, sal_True );
+    pNewColl->CopyAttrs( rColl, true );
 
     if(rColl.IsAssignedToListLevelOfOutlineStyle())
         pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());
@@ -1877,7 +1877,7 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
     {
         const SfxPoolItem* pItem;
         if( SFX_ITEM_SET == pNewColl->GetItemState( RES_PARATR_NUMRULE,
-            sal_False, &pItem ))
+            false, &pItem ))
         {
             const SwNumRule* pRule;
             const OUString& rName = ((SwNumRuleItem*)pItem)->GetValue();
@@ -1887,7 +1887,7 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
             {
                 SwNumRule* pDestRule = FindNumRulePtr( rName );
                 if( pDestRule )
-                    pDestRule->SetInvalidRule( sal_True );
+                    pDestRule->SetInvalidRule( true );
                 else
                     MakeNumRule( rName, pRule );
             }
@@ -2048,7 +2048,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
     {
         SwFrmFmt* pNewFmt = new SwFrmFmt( GetAttrPool(), "CpyDesc",
                                             GetDfltFrmFmt() );
-        pNewFmt->CopyAttrs( *pOldFmt, sal_True );
+        pNewFmt->CopyAttrs( *pOldFmt, true );
 
         if( SFX_ITEM_SET == pNewFmt->GetAttrSet().GetItemState(
             RES_CNTNT, false, &pItem ))
@@ -2389,8 +2389,8 @@ SwTblNumFmtMerge::SwTblNumFmtMerge( const SwDoc& rSrc, SwDoc& rDest )
 {
     // a different Doc -> Number formatter needs to be merged
     SvNumberFormatter* pN;
-    if( &rSrc != &rDest && 0 != ( pN = ((SwDoc&)rSrc).GetNumberFormatter( sal_False ) ))
-        ( pNFmt = rDest.GetNumberFormatter( sal_True ))->MergeFormatter( *pN );
+    if( &rSrc != &rDest && 0 != ( pN = ((SwDoc&)rSrc).GetNumberFormatter( false ) ))
+        ( pNFmt = rDest.GetNumberFormatter( true ))->MergeFormatter( *pN );
 
     if( &rSrc != &rDest )
         ((SwGetRefFieldType*)rSrc.GetSysFldType( RES_GETREFFLD ))->
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 8d9041daab71..340770beb778 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -56,23 +56,23 @@ enum SwSplitDocType
     SPLITDOC_TO_HTML
 };
 
-sal_Bool SwDoc::GenerateGlobalDoc( const OUString& rPath,
+bool SwDoc::GenerateGlobalDoc( const OUString& rPath,
                                    const SwTxtFmtColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, false, pSplitColl, 0 );
 }
 
-sal_Bool SwDoc::GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel )
+bool SwDoc::GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel )
 {
     return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, true, 0, nOutlineLevel );
 }
 
-sal_Bool SwDoc::GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel )
+bool SwDoc::GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel )
 {
     return SplitDoc( SPLITDOC_TO_HTML, rPath, true, 0, nOutlineLevel );
 }
 
-sal_Bool SwDoc::GenerateHTMLDoc( const OUString& rPath,
+bool SwDoc::GenerateHTMLDoc( const OUString& rPath,
                                  const SwTxtFmtColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_HTML, rPath, false, pSplitColl, 0 );
@@ -302,7 +302,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
 
                     SwNodeRange aRg( *pStartNd, 0, aEndIdx.GetNode() );
                     SwNodeIndex aTmpIdx( pDoc->GetNodes().GetEndOfContent() );
-                    GetNodes()._Copy( aRg, aTmpIdx, sal_False );
+                    GetNodes()._Copy( aRg, aTmpIdx, false );
 
                     // Delete the initial TextNode
                     SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
@@ -369,7 +369,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                                 }
                             }
                             // Move Bookmarks and so forth
-                            CorrAbs( aSIdx, aEIdx, *aTmp.GetPoint(), sal_True);
+                            CorrAbs( aSIdx, aEIdx, *aTmp.GetPoint(), true);
 
                             // If FlyFrames are still around, delete these too
                             for( sal_uInt16 n = 0; n < GetSpzFrmFmts()->size(); ++n )
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 25102d29b2aa..13da404d4a5c 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -114,7 +114,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, sal_uInt16 which)
 SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
 {
     SwFrmFmt *pFmt = 0;
-    const sal_Bool bMod = IsModified();
+    const bool bMod = IsModified();
     bool bHeader = false;
 
     switch ( eRequest )
@@ -443,7 +443,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt(
         //contact object itself. They should be managed by SwUndoInsLayFmt.
         const ::sw::DrawUndoGuard drawUndoGuard(GetIDocumentUndoRedo());
 
-        pSrcDoc->CopyWithFlyInFly( aRg, 0, aIdx, NULL, sal_False, sal_True, sal_True );
+        pSrcDoc->CopyWithFlyInFly( aRg, 0, aIdx, NULL, false, true, true );
     }
     else
     {
@@ -605,7 +605,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         else
         {
             if( eRequestId != aAnch.GetAnchorId() &&
-                SFX_ITEM_SET != pFmt->GetItemState( RES_ANCHOR, sal_True ) )
+                SFX_ITEM_SET != pFmt->GetItemState( RES_ANCHOR, true ) )
             {
                 aAnch.SetType( eRequestId );
             }
@@ -691,7 +691,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
         if( (pFlySet && SFX_ITEM_SET == pFlySet->GetItemState(
                 RES_ANCHOR, false, (const SfxPoolItem**)&pAnch )) ||
             ( pFrmFmt && SFX_ITEM_SET == pFrmFmt->GetItemState(
-                RES_ANCHOR, sal_True, (const SfxPoolItem**)&pAnch )) )
+                RES_ANCHOR, true, (const SfxPoolItem**)&pAnch )) )
         {
             if ( (FLY_AT_PAGE != pAnch->GetAnchorId()) )
             {
@@ -1134,9 +1134,9 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
         SwUndoInsertLabel *const pUndo,
         SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
             const OUString& rNumberingSeparator,
-            const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nNdIdx,
+            const bool bBefore, const sal_uInt16 nId, const sal_uLong nNdIdx,
             const OUString& rCharacterStyle,
-            const sal_Bool bCpyBrd )
+            const bool bCpyBrd )
 {
     ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo());
 
@@ -1372,7 +1372,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     if( pNew )
     {
         // #i61007# order of captions
-        sal_Bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
+        bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
         // Work up OUString
         OUString aTxt;
         if( bOrderNumberingFirst )
@@ -1450,9 +1450,9 @@ SwFlyFrmFmt *
 SwDoc::InsertLabel(
         SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
         OUString const& rNumberingSeparator,
-        sal_Bool const bBefore, sal_uInt16 const nId, sal_uLong const nNdIdx,
+        bool const bBefore, sal_uInt16 const nId, sal_uLong const nNdIdx,
         OUString const& rCharacterStyle,
-        sal_Bool const bCpyBrd )
+        bool const bCpyBrd )
 {
     SwUndoInsertLabel * pUndo(0);
     if (GetIDocumentUndoRedo().DoesUndo())
@@ -1666,7 +1666,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
     if( pNew )
     {
         //#i61007# order of captions
-        sal_Bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
+        bool bOrderNumberingFirst = SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst();
 
         // prepare string
         OUString aTxt;
@@ -1742,8 +1742,8 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
     {
         GetIDocumentUndoRedo().ClearRedo();
         pUndo = new SwUndoInsertLabel(
-            LTYPE_DRAW, rTxt, rSeparator, rNumberSeparator, sal_False,
-            nId, rCharacterStyle, sal_False );
+            LTYPE_DRAW, rTxt, rSeparator, rNumberSeparator, false,
+            nId, rCharacterStyle, false );
     }
 
     SwFlyFrmFmt *const pNewFmt = lcl_InsertDrawLabel(
@@ -1820,8 +1820,8 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
 
         if( pTmpRoot->IsNeedGrammarCheck() )
         {
-            sal_Bool bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell();
-            sal_Bool bIsAutoGrammar = sal_False;
+            bool bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell();
+            bool bIsAutoGrammar = false;
             SvtLinguConfig().GetProperty( OUString(
                         UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar;
 
@@ -1863,8 +1863,8 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
             pTmpRoot->StartAllAction();
 
             // no jump on update of fields #i85168#
-            const sal_Bool bOldLockView = pStartSh->IsViewLocked();
-            pStartSh->LockView( sal_True );
+            const bool bOldLockView = pStartSh->IsViewLocked();
+            pStartSh->LockView( true );
 
             GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 );    // ChapterField
             UpdateExpFlds( 0, false );      // Updates ExpressionFields
@@ -1896,7 +1896,7 @@ IMPL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem*, EMPTYARG )
             {
                 // Make sure to repaint with virtual device
                 pSh->LockPaint();
-                pSh->UnlockPaint( sal_True );
+                pSh->UnlockPaint( true );
             }
             pSh = (SwViewShell*)pSh->GetNext();
         } while( pSh != pStartSh );
@@ -2003,7 +2003,7 @@ void SwDoc::SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName )
             }
         sName = lcl_GetUniqueFlyName( this, nTyp );
     }
-    rFmt.SetName( sName, sal_True );
+    rFmt.SetName( sName, true );
     SetModified();
 }
 
@@ -2222,7 +2222,7 @@ short SwDoc::GetTextDirection( const SwPosition& rPos,
 
             if( !pItem )
             {
-                const SwPageDesc* pPgDsc = pNd->FindPageDesc( sal_False );
+                const SwPageDesc* pPgDsc = pNd->FindPageDesc( false );
                 if( pPgDsc )
                     pItem = &pPgDsc->GetMaster().GetFrmDir();
             }
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index e40d43e9c775..28627bfb4f63 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -108,7 +108,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     mpOutlineRule->SetName(SwNumRule::GetOutlineRuleName(), *this);
 
     // assure that the outline numbering rule is an automatic rule
-    mpOutlineRule->SetAutoRule( sal_True );
+    mpOutlineRule->SetAutoRule( true );
 
     // test whether the optional CharFormats are defined in this Document
     mpOutlineRule->CheckCharFmts( this );
@@ -132,7 +132,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     }
 
     PropagateOutlineRule();
-    mpOutlineRule->SetInvalidRule(sal_True);
+    mpOutlineRule->SetInvalidRule(true);
     UpdateNumRule();
 
     // update if we have foot notes && numbering by chapter
@@ -153,7 +153,7 @@ void SwDoc::PropagateOutlineRule()
         if(pColl->IsAssignedToListLevelOfOutlineStyle())
         {
             // Check only the list style, which is set at the paragraph style
-            const SwNumRuleItem & rCollRuleItem = pColl->GetNumRule( sal_False );
+            const SwNumRuleItem & rCollRuleItem = pColl->GetNumRule( false );
 
             // Check on document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE no longer needed.
             if ( rCollRuleItem.GetValue().isEmpty() )
@@ -786,7 +786,7 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
 
         if ( bInvalidateNumRule )
         {
-            pOld->SetInvalidRule(sal_True);
+            pOld->SetInvalidRule(true);
         }
 
         return ;
@@ -815,7 +815,7 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
             pOld->Set( n, rRule.GetNumFmt( n ) );
 
     pOld->CheckCharFmts( &rDoc );
-    pOld->SetInvalidRule( sal_True );
+    pOld->SetInvalidRule( true );
     pOld->SetContinusNum( rRule.IsContinusNum() );
 
     rDoc.UpdateNumRule();
@@ -955,7 +955,7 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
     }
 }
 
-void SwDoc::SetNumRuleStart( const SwPosition& rPos, sal_Bool bFlag )
+void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool bFlag )
 {
     SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
 
@@ -1330,7 +1330,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
             aRegH.RegisterInModify( pTNd, *pTNd );
 
             if( pUndo )
-                pUndo->AddNode( *pTNd, sal_False );
+                pUndo->AddNode( *pTNd, false );
 
             // directly set list style attribute is reset, otherwise empty
             // list style is applied
@@ -1369,7 +1369,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
 void SwDoc::InvalidateNumRules()
 {
     for (sal_uInt16 n = 0; n < mpNumRuleTbl->size(); ++n)
-        (*mpNumRuleTbl)[n]->SetInvalidRule(sal_True);
+        (*mpNumRuleTbl)[n]->SetInvalidRule(true);
 }
 
 // To the next/preceding Bullet at the same Level
@@ -1562,7 +1562,7 @@ const SwNumRule *  SwDoc::SearchNumRule(const SwPosition & rPos,
                 const SwNumRule * pNumRule = pTxtNd->GetNumRule();
                 if (pNumRule)
                 {
-                    if ( ( pNumRule->IsOutlineRule() == ( bOutline ? sal_True : sal_False ) ) &&
+                    if ( ( pNumRule->IsOutlineRule() == bOutline ) &&
                          ( ( bNum && pNumRule->Get(0).IsEnumeration()) ||
                            ( !bNum && pNumRule->Get(0).IsItemize() ) ) ) // #i22362#, #i29560#
                     {
@@ -1961,7 +1961,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
                         pPos->nContent.Assign( pPos->nNode.GetNode().GetCntntNode(),0);
                     }
                 }
-                CorrRel( aIdx, aInsPos, 0, sal_False );
+                CorrRel( aIdx, aInsPos, 0, false );
 
                 pCNd->JoinNext();
             }
@@ -2054,7 +2054,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
     return true;
 }
 
-bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
+bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
 {
     bool bResult = false;
     SwTxtNode * pTxtNd = rIdx.GetNode().GetTxtNode();
@@ -2064,8 +2064,8 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
     {
         if ( !pTxtNd->IsCountedInList() == !bDel)
         {
-            sal_Bool bOldNum = bDel;
-            sal_Bool bNewNum = bDel ? sal_False : sal_True;
+            bool bOldNum = bDel;
+            bool bNewNum = bDel ? sal_False : sal_True;
             pTxtNd->SetCountedInList(bNewNum ? true : false);
 
             SetModified();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5b4583837245..8b1ef00a800c 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -896,7 +896,7 @@ bool SwDoc::AppendRedline( SwRangeRedline* pNewRedl, bool bCallDelete )
                                     // redline w/out extent loops
                                     if (*pStt != *pEnd)
                                     {
-                                        pNewRedl->PushData( *pRedl, sal_False );
+                                        pNewRedl->PushData( *pRedl, false );
                                         pRedl->SetStart( *pEnd, pRStt );
                                         // re-insert
                                         mpRedlineTbl->Remove( n );
@@ -906,7 +906,7 @@ bool SwDoc::AppendRedline( SwRangeRedline* pNewRedl, bool bCallDelete )
                                 }
                                 else
                                 {
-                                    pNewRedl->PushData( *pRedl, sal_False );
+                                    pNewRedl->PushData( *pRedl, false );
                                     if( *pREnd != *pEnd )
                                     {
                                         pNew = new SwRangeRedline( *pRedl );
@@ -1747,17 +1747,17 @@ const SwRangeRedline* SwDoc::GetRedline( const SwPosition& rPos,
     // To-Do - add 'SwExtraRedlineTbl' also ?
 }
 
-typedef sal_Bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
-                        sal_Bool bCallDelete,
+typedef bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
+                        bool bCallDelete,
                         const SwPosition* pSttRng,
                         const SwPosition* pEndRng);
 
-static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
-                        sal_Bool bCallDelete,
+static bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+                        bool bCallDelete,
                         const SwPosition* pSttRng = 0,
                         const SwPosition* pEndRng = 0 )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     SwRangeRedline* pRedl = rArr[ rPos ];
     SwPosition *pRStt = 0, *pREnd = 0;
     SwComparePosition eCmp = POS_OUTSIDE;
@@ -1811,7 +1811,7 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
                 break;
 
             default:
-                bRet = sal_False;
+                bRet = false;
             }
 
             if( bReplace || ( bCheck && !pRedl->HasValidRange() ))
@@ -1865,7 +1865,7 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
                 }
                 break;
             default:
-                bRet = sal_False;
+                bRet = false;
             }
 
             if( pDelStt && pDelEnd )
@@ -1906,17 +1906,17 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
         break;
 
     default:
-        bRet = sal_False;
+        bRet = false;
     }
     return bRet;
 }
 
-static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
-                        sal_Bool bCallDelete,
+static bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+                        bool bCallDelete,
                         const SwPosition* pSttRng = 0,
                         const SwPosition* pEndRng = 0 )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     SwRangeRedline* pRedl = rArr[ rPos ];
     SwPosition *pRStt = 0, *pREnd = 0;
     SwComparePosition eCmp = POS_OUTSIDE;
@@ -1975,7 +1975,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
                 break;
 
             default:
-                bRet = sal_False;
+                bRet = false;
             }
             if( pDelStt && pDelEnd )
             {
@@ -2083,7 +2083,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
                 break;
 
             default:
-                bRet = sal_False;
+                bRet = false;
             }
 
             if( pNew )
@@ -2110,13 +2110,13 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
         break;
 
     default:
-        bRet = sal_False;
+        bRet = false;
     }
     return bRet;
 }
 
 static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
-                            SwRedlineTbl& rArr, sal_Bool bCallDelete,
+                            SwRedlineTbl& rArr, bool bCallDelete,
                             const SwPaM& rPam)
 {
     sal_uInt16 n = 0;
@@ -2198,7 +2198,7 @@ static void lcl_AdjustRedlineRange( SwPaM& rPam )
 
 bool SwDoc::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // Switch to visible in any case
     if( (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) !=
@@ -2312,7 +2312,7 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
 
 bool SwDoc::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // Switch to visible in any case
     if( (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) !=
@@ -2828,7 +2828,7 @@ bool SwRedlineTbl::InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos
                 {
                     // We want to be before the table
                     *pNew->GetPoint() = SwPosition(*pTab);
-                    pC = GoPreviousNds( &pNew->GetPoint()->nNode, sal_False ); // here we are.
+                    pC = GoPreviousNds( &pNew->GetPoint()->nNode, false ); // here we are.
                     if( pC )
                         pNew->GetPoint()->nContent.Assign( pC, 0 );
                     pTab = pNew->GetPoint()->nNode.GetNode().StartOfSectionNode()->FindTableNode();
@@ -3265,7 +3265,7 @@ SwRedlineData::SwRedlineData( RedlineType_t eT, sal_uInt16 nAut )
 
 SwRedlineData::SwRedlineData(
     const SwRedlineData& rCpy,
-    sal_Bool bCpyNext )
+    bool bCpyNext )
     : pNext( ( bCpyNext && rCpy.pNext ) ? new SwRedlineData( *rCpy.pNext ) : 0 )
     , pExtraData( rCpy.pExtraData ? rCpy.pExtraData->CreateNew() : 0 )
     , sComment( rCpy.sComment )
@@ -3317,8 +3317,8 @@ SwRangeRedline::SwRangeRedline(RedlineType_t eTyp, const SwPaM& rPam )
     pRedlineData( new SwRedlineData( eTyp, GetDoc()->GetRedlineAuthor() ) ),
     pCntntSect( 0 )
 {
-    bDelLastPara = bIsLastParaDelete = sal_False;
-    bIsVisible = sal_True;
+    bDelLastPara = bIsLastParaDelete = false;
+    bIsVisible = true;
     if( !rPam.HasMark() )
         DeleteMark();
 }
@@ -3328,8 +3328,8 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam )
     pRedlineData( new SwRedlineData( rData )),
     pCntntSect( 0 )
 {
-    bDelLastPara = bIsLastParaDelete = sal_False;
-    bIsVisible = sal_True;
+    bDelLastPara = bIsLastParaDelete = false;
+    bIsVisible = true;
     if( !rPam.HasMark() )
         DeleteMark();
 }
@@ -3339,8 +3339,8 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPosition& rP
     pRedlineData( new SwRedlineData( rData )),
     pCntntSect( 0 )
 {
-    bDelLastPara = bIsLastParaDelete = sal_False;
-    bIsVisible = sal_True;
+    bDelLastPara = bIsLastParaDelete = false;
+    bIsVisible = true;
 }
 
 SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
@@ -3348,8 +3348,8 @@ SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
     pRedlineData( new SwRedlineData( *rCpy.pRedlineData )),
     pCntntSect( 0 )
 {
-    bDelLastPara = bIsLastParaDelete = sal_False;
-    bIsVisible = sal_True;
+    bDelLastPara = bIsLastParaDelete = false;
+    bIsVisible = true;
     if( !rCpy.HasMark() )
         DeleteMark();
 }
@@ -3367,7 +3367,7 @@ SwRangeRedline::~SwRangeRedline()
 }
 
 /// Do we have a valid Selection?
-sal_Bool SwRangeRedline::HasValidRange() const
+bool SwRangeRedline::HasValidRange() const
 {
     const SwNode* pPtNd = &GetPoint()->nNode.GetNode(),
                 * pMkNd = &GetMark()->nNode.GetNode();
@@ -3378,8 +3378,8 @@ sal_Bool SwRangeRedline::HasValidRange() const
         ( pPtNd != pMkNd || GetContentIdx() != NULL ||
           pPtNd != &pPtNd->GetNodes().GetEndOfContent() )
         )
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
 void SwRangeRedline::CallDisplayFunc( sal_uInt16 nLoop )
@@ -3410,12 +3410,12 @@ void SwRangeRedline::Show( sal_uInt16 nLoop )
         switch( GetType() )
         {
         case nsRedlineType_t::REDLINE_INSERT:           // Content has been inserted
-            bIsVisible = sal_True;
+            bIsVisible = true;
             MoveFromSection();
             break;
 
         case nsRedlineType_t::REDLINE_DELETE:           // Content has been deleted
-            bIsVisible = sal_True;
+            bIsVisible = true;
             MoveFromSection();
             break;
 
@@ -3440,13 +3440,13 @@ void SwRangeRedline::Hide( sal_uInt16 nLoop )
     switch( GetType() )
     {
     case nsRedlineType_t::REDLINE_INSERT:           // Content has been inserted
-        bIsVisible = sal_True;
+        bIsVisible = true;
         if( 1 <= nLoop )
             MoveFromSection();
         break;
 
     case nsRedlineType_t::REDLINE_DELETE:           // Content has been deleted
-        bIsVisible = sal_False;
+        bIsVisible = false;
         switch( nLoop )
         {
         case 0: MoveToSection();    break;
@@ -3482,7 +3482,7 @@ void SwRangeRedline::ShowOriginal( sal_uInt16 nLoop )
     switch( pCur->eType )
     {
     case nsRedlineType_t::REDLINE_INSERT:           // Content has been inserted
-        bIsVisible = sal_False;
+        bIsVisible = false;
         switch( nLoop )
         {
         case 0: MoveToSection();    break;
@@ -3492,7 +3492,7 @@ void SwRangeRedline::ShowOriginal( sal_uInt16 nLoop )
         break;
 
     case nsRedlineType_t::REDLINE_DELETE:           // Inhalt wurde eingefuegt
-        bIsVisible = sal_True;
+        bIsVisible = true;
         if( 1 <= nLoop )
             MoveFromSection();
         break;
@@ -3621,7 +3621,7 @@ void SwRangeRedline::MoveToSection()
             else
             {
                 if( pCSttNd && !pCEndNd )
-                    bDelLastPara = sal_True;
+                    bDelLastPara = true;
                 pDoc->MoveRange( aPam, aPos,
                     IDocumentContentOperations::DOC_MOVEDEFAULT );
             }
@@ -3660,7 +3660,7 @@ void SwRangeRedline::CopyToSection()
         SwDoc* pDoc = GetDoc();
         SwNodes& rNds = pDoc->GetNodes();
 
-        sal_Bool bSaveCopyFlag = pDoc->IsCopyIsMove(),
+        bool bSaveCopyFlag = pDoc->IsCopyIsMove(),
              bSaveRdlMoveFlg = pDoc->IsRedlineMove();
         pDoc->SetCopyIsMove( true );
 
@@ -3760,7 +3760,7 @@ void SwRangeRedline::DelCopyOfSection()
         else if( pCSttNd || pCEndNd )
         {
             if( pCSttNd && !pCEndNd )
-                bDelLastPara = sal_True;
+                bDelLastPara = true;
             pDoc->DeleteRange( aPam );
 
             if( bDelLastPara )
@@ -3896,7 +3896,7 @@ void SwRangeRedline::MoveFromSection()
             {
                 GetPoint()->nNode++;
                 GetPoint()->nContent.Assign( pCNd = GetCntntNode(), 0 );
-                bDelLastPara = sal_False;
+                bDelLastPara = false;
             }
             else if( pColl )
                 pCNd = GetCntntNode();
@@ -3935,12 +3935,12 @@ void SwRangeRedline::SetContentIdx( const SwNodeIndex* pIdx )
     if( pIdx && !pCntntSect )
     {
         pCntntSect = new SwNodeIndex( *pIdx );
-        bIsVisible = sal_False;
+        bIsVisible = false;
     }
     else if( !pIdx && pCntntSect )
     {
         delete pCntntSect, pCntntSect = 0;
-        bIsVisible = sal_False;
+        bIsVisible = false;
     }
     else
     {
@@ -3948,15 +3948,15 @@ void SwRangeRedline::SetContentIdx( const SwNodeIndex* pIdx )
     }
 }
 
-sal_Bool SwRangeRedline::CanCombine( const SwRangeRedline& rRedl ) const
+bool SwRangeRedline::CanCombine( const SwRangeRedline& rRedl ) const
 {
     return  IsVisible() && rRedl.IsVisible() &&
             pRedlineData->CanCombine( *rRedl.pRedlineData );
 }
 
-void SwRangeRedline::PushData( const SwRangeRedline& rRedl, sal_Bool bOwnAsNext )
+void SwRangeRedline::PushData( const SwRangeRedline& rRedl, bool bOwnAsNext )
 {
-    SwRedlineData* pNew = new SwRedlineData( *rRedl.pRedlineData, sal_False );
+    SwRedlineData* pNew = new SwRedlineData( *rRedl.pRedlineData, false );
     if( bOwnAsNext )
     {
         pNew->pNext = pRedlineData;
@@ -3969,15 +3969,15 @@ void SwRangeRedline::PushData( const SwRangeRedline& rRedl, sal_Bool bOwnAsNext
     }
 }
 
-sal_Bool SwRangeRedline::PopData()
+bool SwRangeRedline::PopData()
 {
     if( !pRedlineData->pNext )
-        return sal_False;
+        return false;
     SwRedlineData* pCur = pRedlineData;
     pRedlineData = pCur->pNext;
     pCur->pNext = 0;
     delete pCur;
-    return sal_True;
+    return true;
 }
 
 sal_uInt16 SwRangeRedline::GetStackCount() const
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 4fe2990869f2..83d2b8aa6ef3 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -179,7 +179,7 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
     return nListEntry;
 }
 
-sal_Bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )
+bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )
 {
     // Point must be the startposition, Mark is optional the end position
     SwPosition* pPos = rPam.GetPoint();
@@ -188,7 +188,7 @@ sal_Bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_
     sal_Int32 nStart = pPos->nContent.GetIndex();
     sal_Int32 nEnd = rTxt.getLength();
 
-    sal_Bool bHasMark = rPam.HasMark();
+    bool bHasMark = rPam.HasMark();
     if( bHasMark )
     {
         // in the same node?
diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx
index bb23ce20e13b..235db23854cc 100644
--- a/sw/source/core/doc/docstat.cxx
+++ b/sw/source/core/doc/docstat.cxx
@@ -30,7 +30,7 @@ SwDocStat::SwDocStat() :
     nAsianWord(0),
     nChar(0),
     nCharExcludingSpaces(0),
-    bModified(sal_True)
+    bModified(true)
 {}
 
 void SwDocStat::Reset()
@@ -45,7 +45,7 @@ void SwDocStat::Reset()
     nAsianWord = 0;
     nChar   = 0;
     nCharExcludingSpaces = 0;
-    bModified = sal_True;
+    bModified = true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 6df64fd9bea0..c16f576eb479 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -212,7 +212,7 @@ public:
 };
 
 const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
-                                    SwTOXSearch eDir, sal_Bool bInReadOnly )
+                                    SwTOXSearch eDir, bool bInReadOnly )
 {
     const SwTxtTOXMark* pMark = rCurTOXMark.GetTxtTOXMark();
     OSL_ENSURE(pMark, "pMark==0 invalid TxtTOXMark");
@@ -566,7 +566,7 @@ bool SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
         if( !bDelNodes )
         {
             SwSections aArr( 0 );
-            sal_uInt16 nCnt = pFmt->GetChildSections( aArr, SORTSECT_NOT, sal_False );
+            sal_uInt16 nCnt = pFmt->GetChildSections( aArr, SORTSECT_NOT, false );
             for( sal_uInt16 n = 0; n < nCnt; ++n )
             {
                 SwSection* pSect = aArr[ n ];
@@ -697,7 +697,7 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
         // then find the "Anchor" (Body) position
         Point aPt;
         SwNode2Layout aNode2Layout( *pNd, pNd->GetIndex() );
-        const SwFrm* pFrm = aNode2Layout.GetFrm( &aPt, 0, sal_False );
+        const SwFrm* pFrm = aNode2Layout.GetFrm( &aPt, 0, false );
 
         if( pFrm )
         {
@@ -786,7 +786,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
             // determine page description of table-of-content
             sal_uInt32 nPgDescNdIdx = pSectNd->GetIndex() + 1;
             sal_uInt32* pPgDescNdIdx = &nPgDescNdIdx;
-            pDefaultPageDesc = pSectNd->FindPageDesc( sal_False, pPgDescNdIdx );
+            pDefaultPageDesc = pSectNd->FindPageDesc( false, pPgDescNdIdx );
             if ( nPgDescNdIdx < pSectNd->GetIndex() )
             {
                 pDefaultPageDesc = 0;
@@ -807,7 +807,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                     eBreak == SVX_BREAK_PAGE_BOTH )
                )
             {
-                pDefaultPageDesc = pNdAfterTOX->FindPageDesc( sal_False );
+                pDefaultPageDesc = pNdAfterTOX->FindPageDesc( false );
             }
         }
         // consider start node of content section in the node array.
@@ -819,7 +819,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
             // determine page description of content before table-of-content
             SwNodeIndex aIdx( *pSectNd );
             pDefaultPageDesc =
-                pSectNd->GetNodes().GoPrevious( &aIdx )->FindPageDesc( sal_False );
+                pSectNd->GetNodes().GoPrevious( &aIdx )->FindPageDesc( false );
 
         }
         if ( !pDefaultPageDesc )
@@ -876,7 +876,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         }
         aEndIdx--;
         SwPosition aPos( aEndIdx, SwIndex( pFirstEmptyNd, 0 ));
-        pDoc->CorrAbs( aSttIdx, aEndIdx, aPos, sal_True );
+        pDoc->CorrAbs( aSttIdx, aEndIdx, aPos, true );
 
         // delete flys in whole range including start node which requires
         // giving the node before start node as Mark parameter, hence -1.
@@ -1001,7 +1001,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         if( !aCorPam.Move( fnMoveForward ) )
             aCorPam.Move( fnMoveBackward );
         SwNodeIndex aEndIdx( aInsPos, 1 );
-        pDoc->CorrAbs( aInsPos, aEndIdx, *aCorPam.GetPoint(), sal_True );
+        pDoc->CorrAbs( aInsPos, aEndIdx, *aCorPam.GetPoint(), true );
 
         // Task 70995 - save and restore PageDesc and Break Attributes
         if( pFirstEmptyNd->HasSwAttrSet() )
@@ -1651,7 +1651,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
                 {
                     const SvxLRSpaceItem& rLR =
                         (SvxLRSpaceItem&)pTOXNd->
-                        SwCntntNode::GetAttr( RES_LR_SPACE, sal_True );
+                        SwCntntNode::GetAttr( RES_LR_SPACE, true );
 
                     long nTabPosition = aToken.nTabStopPosition;
                     if( !GetTOXForm().IsRelTabPos() && rLR.GetTxtLeft() )
@@ -1679,14 +1679,14 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
 
                     SwRect aNdRect;
                     if( bCallFindRect )
-                        aNdRect = pTOXNd->FindLayoutRect( sal_True );
+                        aNdRect = pTOXNd->FindLayoutRect( true );
 
                     if( aNdRect.IsEmpty() )
                     {
                         // Nothing helped so far, so we go via the PageDesc
                         sal_uInt32 nPgDescNdIdx = pTOXNd->GetIndex() + 1;
                         sal_uInt32* pPgDescNdIdx = &nPgDescNdIdx;
-                        pPageDesc = pTOXNd->FindPageDesc( sal_False, pPgDescNdIdx );
+                        pPageDesc = pTOXNd->FindPageDesc( false, pPgDescNdIdx );
                         if ( !pPageDesc ||
                              *pPgDescNdIdx < _nTOXSectNdIdx )
                         {
@@ -1761,7 +1761,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
                             // #i53420#
                             aFld.ChangeExpansion( pFrm,
                                 dynamic_cast<const SwCntntNode*>(pTOXSource->pNd),
-                                sal_True );
+                                true );
                             //---> #i89791#
                             // continue to support CF_NUMBER
                             // and CF_NUM_TITLE in order to handle ODF 1.0/1.1
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index e5acc7b1ce7c..3d1efcc32b78 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -42,8 +42,8 @@ SwExtTextInput::SwExtTextInput( const SwPaM& rPam, Ring* pRing )
     : SwPaM( *rPam.GetPoint(), (SwPaM*)pRing ),
     eInputLanguage(LANGUAGE_DONTKNOW)
 {
-    bIsOverwriteCursor = sal_False;
-    bInsText = sal_True;
+    bIsOverwriteCursor = false;
+    bInsText = true;
 }
 
 SwExtTextInput::~SwExtTextInput()
@@ -202,7 +202,7 @@ void SwExtTextInput::SetInputData( const CommandExtTextInputData& rData )
     }
 }
 
-void SwExtTextInput::SetOverwriteCursor( sal_Bool bFlag )
+void SwExtTextInput::SetOverwriteCursor( bool bFlag )
 {
     bIsOverwriteCursor = bFlag;
     if (!bIsOverwriteCursor)
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 7b7afd7346ff..6843a81617ad 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -58,7 +58,7 @@ namespace TxtFmtCollFunc
         {
             if ( !pNewNumRuleItem )
             {
-                pTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, sal_False, (const SfxPoolItem**)&pNewNumRuleItem );
+                pTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, false, (const SfxPoolItem**)&pNewNumRuleItem );
             }
             if ( pNewNumRuleItem )
             {
@@ -78,7 +78,7 @@ namespace TxtFmtCollFunc
         SwNumRule* pNumRule( 0 );
 
         const SwNumRuleItem* pNumRuleItem( 0 );
-        rTxtFmtColl.GetItemState( RES_PARATR_NUMRULE, sal_False, (const SfxPoolItem**)&pNumRuleItem );
+        rTxtFmtColl.GetItemState( RES_PARATR_NUMRULE, false, (const SfxPoolItem**)&pNumRuleItem );
         if ( pNumRuleItem )
         {
             const OUString sNumRuleName = pNumRuleItem->GetValue();
@@ -206,7 +206,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     bool bContinue = true;
 
     // Check against the own attributes
-    if( pNewLRSpace && SFX_ITEM_SET == GetItemState( RES_LR_SPACE, sal_False,
+    if( pNewLRSpace && SFX_ITEM_SET == GetItemState( RES_LR_SPACE, false,
                                         (const SfxPoolItem**)&pOldLRSpace ))
     {
         bool bChg = false;
@@ -248,7 +248,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     }
 
     if( pNewULSpace && SFX_ITEM_SET == GetItemState(
-            RES_UL_SPACE, sal_False, (const SfxPoolItem**)&pOldULSpace ) &&
+            RES_UL_SPACE, false, (const SfxPoolItem**)&pOldULSpace ) &&
         pOldULSpace != pNewULSpace )    // Avoid recursion (SetAttr!)
     {
         SvxULSpaceItem aNew( *pOldULSpace );
@@ -283,7 +283,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     {
         SvxFontHeightItem *pFSize = aFontSizeArr[ nC ], *pOldFSize;
         if( pFSize && SFX_ITEM_SET == GetItemState(
-            pFSize->Which(), sal_False, (const SfxPoolItem**)&pOldFSize ) &&
+            pFSize->Which(), false, (const SfxPoolItem**)&pOldFSize ) &&
             // Avoid recursion (SetAttr!)
             pFSize != pOldFSize )
         {
@@ -419,12 +419,12 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
         // no list style applied to paragraph style
         bAreListLevelIndentsApplicable = false;
     }
-    else if ( GetItemState( RES_LR_SPACE, sal_False ) == SFX_ITEM_SET )
+    else if ( GetItemState( RES_LR_SPACE, false ) == SFX_ITEM_SET )
     {
         // paragraph style has hard-set indent attributes
         bAreListLevelIndentsApplicable = false;
     }
-    else if ( GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_SET )
+    else if ( GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_SET )
     {
         // list style is directly applied to paragraph style and paragraph
         // style has no hard-set indent attributes
@@ -522,7 +522,7 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
                 if( pColl )
                 {
                     SwCalc aCalc( *pColl->GetDoc() );
-                    nRet = 0 != aCalc.Calculate( *pTmp ).GetBool();
+                    nRet = aCalc.Calculate( *pTmp ).GetBool();
                 }
             }
         }
@@ -638,12 +638,12 @@ void SwTxtFmtColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
     {
         if ( !pDerivedTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
         {
-            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, sal_False ) == SFX_ITEM_DEFAULT )
+            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_NUMRULE, false ) == SFX_ITEM_DEFAULT )
             {
                 SwNumRuleItem aItem(aEmptyOUStr);
                 pDerivedTxtFmtColl->SetFmtAttr( aItem );
             }
-            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_OUTLINELEVEL, sal_False ) == SFX_ITEM_DEFAULT )
+            if ( pDerivedTxtFmtColl->GetItemState( RES_PARATR_OUTLINELEVEL, false ) == SFX_ITEM_DEFAULT )
             {
                 pDerivedTxtFmtColl->SetAttrOutlineLevel( 0 );
             }
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index ff65d941b8e3..428ddad5b44e 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -283,7 +283,7 @@ const SwSectionNode* SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr(
     const SwSectionNode* pNd = rTxtFtn.GetTxtNode().FindSectionNode();
     while( pNd && FTNEND_ATTXTEND_OWNNUMSEQ != ( nVal =
             ((const SwFmtFtnAtTxtEnd&)pNd->GetSection().GetFmt()->
-            GetFmtAttr( nWh, sal_True )).GetValue() ) &&
+            GetFmtAttr( nWh, true )).GetValue() ) &&
             FTNEND_ATTXTEND_OWNNUMANDFMT != nVal )
         pNd = pNd->StartOfSectionNode()->FindSectionNode();
 
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 3abe684217dc..71adadbc683a 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -35,7 +35,7 @@ bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrmFmt& rFmt )
 {
     const SvxBorderLine* pBrd;
     const SfxPoolItem* pItem;
-    if( SFX_ITEM_SET == rFmt.GetItemState( RES_BOX, sal_True, &pItem ) &&
+    if( SFX_ITEM_SET == rFmt.GetItemState( RES_BOX, true, &pItem ) &&
         0 != ( pBrd = ((SvxBoxItem*)pItem)->GetLeft() ) )
     {
         if( *pBrdLn == *pBrd )
@@ -104,7 +104,7 @@ static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
         const SvxBorderLine* pBrd;
         const SwTableBox& rBox = rCollTLB.GetBox( rStt, &nPos );
 
-        if( SFX_ITEM_SET != rBox.GetFrmFmt()->GetItemState(RES_BOX,sal_True, &pItem )
+        if( SFX_ITEM_SET != rBox.GetFrmFmt()->GetItemState(RES_BOX,true, &pItem )
             || 0 == ( pBrd = GetLineTB( (SvxBoxItem*)pItem, bTop ))
             || !( *pBrd == rBrdLn ))
             break;
@@ -117,7 +117,7 @@ static inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBo
                                                 bool bTop,
                                                 const SfxPoolItem** ppItem )
 {
-    return SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState( RES_BOX, sal_True, ppItem )
+    return SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState( RES_BOX, true, ppItem )
             ? GetLineTB( (SvxBoxItem*)*ppItem, bTop )
             : 0;
 }
@@ -184,7 +184,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
             SwTableBox* pBox;
             for( sal_uInt16 i = aBoxes.size(); i; )
                 if( SFX_ITEM_SET == (pBox = aBoxes[ --i ])->GetFrmFmt()->
-                    GetItemState( RES_BOX, sal_True, &pItem ) &&
+                    GetItemState( RES_BOX, true, &pItem ) &&
                     0 != ( pBrd = ((SvxBoxItem*)pItem)->GetRight() ) )
                 {
                     aBPara.SetBorder( *pBrd );
@@ -395,12 +395,12 @@ static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara)
             // Pass the attributes of the to-be-deleted Lines to the "inserted" one
             const SfxPoolItem* pItem;
             if( SFX_ITEM_SET == pLn->GetFrmFmt()->GetItemState(
-                                    RES_BACKGROUND, sal_True, &pItem ))
+                                    RES_BACKGROUND, true, &pItem ))
             {
                 SwTableLines& rBoxLns = pBox->GetTabLines();
                 for( sal_uInt16 nLns = 0; nLns < nLen; ++nLns )
                     if( SFX_ITEM_SET != rBoxLns[ nLns ]->GetFrmFmt()->
-                            GetItemState( RES_BACKGROUND, sal_True ))
+                            GetItemState( RES_BACKGROUND, true ))
                         pGCPara->pShareFmts->SetAttr( *rBoxLns[ nLns ], *pItem );
             }
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 4b0dbed4a606..206e755007b4 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -209,13 +209,13 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pSwTbl,
     , bColTags( bColTgs )
     , bPrcWidthOption( bPrcWdth )
     , bUseRelWidth( false )
-    , bMustResize( sal_True )
-    , bExportable( sal_True )
-    , bBordersChanged( sal_False )
-    , bMayBeInFlyFrame( sal_False )
-    , bDelayedResizeRecalc( sal_False)
-    , bMustNotResize( sal_False )
-    , bMustNotRecalc( sal_False )
+    , bMustResize( true )
+    , bExportable( true )
+    , bBordersChanged( false )
+    , bMayBeInFlyFrame( false )
+    , bDelayedResizeRecalc( false)
+    , bMustNotResize( false )
+    , bMustNotRecalc( false )
 {
     aResizeTimer.SetTimeoutHdl( STATIC_LINK( this, SwHTMLTableLayout,
                                              DelayedResize_Impl ) );
@@ -243,7 +243,7 @@ SwHTMLTableLayout::~SwHTMLTableLayout()
 /// We also need to respect the distance to the content. Even if
 /// only the opposite side has a border.
 sal_uInt16 SwHTMLTableLayout::GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan,
-                                            sal_Bool bSwBorders ) const
+                                            bool bSwBorders ) const
 {
     sal_uInt16 nSpace = nCellSpacing + nCellPadding;
 
@@ -276,7 +276,7 @@ sal_uInt16 SwHTMLTableLayout::GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nCol
 }
 
 sal_uInt16 SwHTMLTableLayout::GetRightCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan,
-                                             sal_Bool bSwBorders ) const
+                                             bool bSwBorders ) const
 {
     sal_uInt16 nSpace = nCellPadding;
 
@@ -302,7 +302,7 @@ sal_uInt16 SwHTMLTableLayout::GetRightCellSpace( sal_uInt16 nCol, sal_uInt16 nCo
 void SwHTMLTableLayout::AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax,
                                         sal_uLong &rAbsMin,
                                         sal_uInt16 nCol, sal_uInt16 nColSpan,
-                                        sal_Bool bSwBorders ) const
+                                        bool bSwBorders ) const
 {
     sal_uLong nAdd = GetLeftCellSpace( nCol, nColSpan, bSwBorders ) +
                  GetRightCellSpace( nCol, nColSpan, bSwBorders );
@@ -626,7 +626,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                 }
 // This code previously came after AddBorderWidth
 
-                sal_Bool bRelWidth = pCell->IsPrcWidthOption();
+                bool bRelWidth = pCell->IsPrcWidthOption();
                 sal_uInt16 nWidth = pCell->GetWidthOption();
 
                 // A NOWRAP option applies to text and tables, but is
@@ -681,7 +681,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                     {
                         sal_uLong nAbsWidth = nWidth, nDummy = 0, nDummy2 = 0;
                         AddBorderWidth( nAbsWidth, nDummy, nDummy2,
-                                        i, nColSpan, sal_False );
+                                        i, nColSpan, false );
 
                         if( nAbsWidth >= nMinNoAlignCell )
                         {
@@ -749,7 +749,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                 // Take over absolute widths as minimal and maximal widths.
                 sal_uLong nAbsWidth = pColumn->GetWidthOption();
                 sal_uLong nDummy = 0, nDummy2 = 0;
-                AddBorderWidth( nAbsWidth, nDummy, nDummy2, i, 1, sal_False );
+                AddBorderWidth( nAbsWidth, nDummy, nDummy2, i, 1, false );
 
                 if( nAbsWidth >= pColumn->GetMinNoAlign() )
                 {
@@ -1572,7 +1572,7 @@ static void lcl_ResizeLine( const SwTableLine* pLine, sal_uInt16 *pWidth )
                  "A box's rows have all a different length" );
 }
 
-void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail,
+void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
                                    sal_uInt16 nRelAvail, sal_uInt16 nAbsLeftSpace,
                                    sal_uInt16 nAbsRightSpace,
                                    sal_uInt16 nParentInhAbsSpace )
@@ -1705,7 +1705,7 @@ void SwHTMLTableLayout::SetWidths( sal_Bool bCallPass2, sal_uInt16 nAbsAvail,
     }
 }
 
-void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc )
+void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc )
 {
     // If bRecalc is set, the table's content changed.
     // We need to execute pass 1 again.
@@ -1717,10 +1717,10 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc )
         pRoot->StartAllAction();
 
     // Else we can set the widths, in which we have to run Pass 2 in each case.
-    SetWidths( sal_True, nAbsAvail );
+    SetWidths( true, nAbsAvail );
 
     if ( pRoot && pRoot->IsCallbackActionEnabled() )
-        pRoot->EndAllAction( sal_True );    //True per VirDev (browsing is calmer)
+        pRoot->EndAllAction( true );    //True per VirDev (browsing is calmer)
 }
 
 IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG )
@@ -1732,20 +1732,20 @@ IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG )
     return 0;
 }
 
-sal_Bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc,
-                                sal_Bool bForce, sal_uLong nDelay )
+bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
+                                bool bForce, sal_uLong nDelay )
 {
     if( 0 == nAbsAvail )
-        return sal_False;
+        return false;
     OSL_ENSURE( IsTopTable(), "Resize must only be called for top tables!" );
 
     // May the table be resized at all? Or is it forced?
     if( bMustNotResize && !bForce )
-        return sal_False;
+        return false;
 
     // May the table be recalculated? Or is it forced?
     if( bMustNotRecalc && !bForce )
-        bRecalc = sal_False;
+        bRecalc = false;
 
     const SwDoc *pDoc = GetDoc();
 
@@ -1766,7 +1766,7 @@ sal_Bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc,
         // a synchronous resize, we only take over the new values.
         bRecalc |= bDelayedResizeRecalc;
         nDelayedResizeAbsAvail = nAbsAvail;
-        return sal_False;
+        return false;
     }
 
     // Optimisation:
@@ -1782,7 +1782,7 @@ sal_Bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc,
                       (nLastResizeAbsAvail==nAbsAvail) ||
                       (nAbsAvail<=nMin && nRelTabWidth==nMin) ||
                       (!bPrcWidthOption && nAbsAvail>=nMax && nRelTabWidth==nMax) ) )
-        return sal_False;
+        return false;
 
     if( nDelay==HTMLTABLE_RESIZE_NOW )
     {
@@ -1802,12 +1802,12 @@ sal_Bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc,
         _Resize( nAbsAvail, bRecalc );
     }
 
-    return sal_True;
+    return true;
 }
 
-void SwHTMLTableLayout::BordersChanged( sal_uInt16 nAbsAvail, sal_Bool bRecalc )
+void SwHTMLTableLayout::BordersChanged( sal_uInt16 nAbsAvail, bool bRecalc )
 {
-    bBordersChanged = sal_True;
+    bBordersChanged = true;
 
     Resize( nAbsAvail, bRecalc );
 }
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index ec449b51faa9..1d69209746b7 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -54,10 +54,10 @@ SwLineNumberInfo::SwLineNumberInfo() :
     nCountBy( 5 ),
     nDividerCountBy( 3 ),
     ePos( LINENUMBER_POS_LEFT ),
-    bPaintLineNumbers( sal_False ),
-    bCountBlankLines( sal_True ),
-    bCountInFlys( sal_False ),
-    bRestartEachPage( sal_False )
+    bPaintLineNumbers( false ),
+    bCountBlankLines( true ),
+    bCountInFlys( false ),
+    bRestartEachPage( false )
 {
 }
 
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index a613267cfcb6..0b0ba9245a9a 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -183,7 +183,7 @@ static void lcl_ClearArea( const SwFrm &rFrm,
         //UUUU
         FillAttributesPtr aFillAttributes;
 
-        if ( rFrm.GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigRect, sal_False ) )
+        if ( rFrm.GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigRect, false ) )
         {
             const bool bDone(::DrawFillAttributes(aFillAttributes, aOrigRect, rPtArea, rOut));
 
@@ -252,7 +252,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     // for paint in order to avoid load of the intrinsic graphic.
     if ( ( !pOut->GetConnectMetaFile() ||
            !pSh->GetWin() ) &&
-         FindFlyFrm()->GetContour( aPoly, sal_True )
+         FindFlyFrm()->GetContour( aPoly, true )
        )
     {
         pOut->SetClipRegion(Region(aPoly));
@@ -472,7 +472,7 @@ void SwNoTxtFrm::MakeAll()
         MakePrtArea( rAttrs );
 
         if ( !mbValidSize )
-        {   mbValidSize = sal_True;
+        {   mbValidSize = true;
             Format();
         }
     }
@@ -792,7 +792,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
     SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
     SwOLENode* pOLENd = rNoTNd.GetOLENode();
 
-    const sal_Bool bPrn = pOut == rNoTNd.getIDocumentDeviceAccess()->getPrinter( false ) ||
+    const bool bPrn = pOut == rNoTNd.getIDocumentDeviceAccess()->getPrinter( false ) ||
                           pOut->GetConnectMetaFile();
 
     const bool bIsChart = pOLENd && ChartHelper::IsChart( pOLENd->GetOLEObj().GetObject() );
@@ -867,7 +867,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
 
         if( bContinue )
         {
-            const sal_Bool bSwapped = rGrfObj.IsSwappedOut();
+            const bool bSwapped = rGrfObj.IsSwappedOut();
             const bool bSwappedIn = pGrfNd->SwapIn( bPrn );
             if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic())
             {
@@ -1022,18 +1022,18 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
     }
 }
 
-sal_Bool SwNoTxtFrm::IsTransparent() const
+bool SwNoTxtFrm::IsTransparent() const
 {
     const SwViewShell* pSh = getRootFrm()->GetCurrShell();
     if ( !pSh || !pSh->GetViewOptions()->IsGraphic() )
-        return sal_True;
+        return true;
 
     const SwGrfNode *pNd;
     if( 0 != (pNd = GetNode()->GetGrfNode()) )
         return pNd->IsTransparent();
 
     //#29381# OLE are always transparent
-    return sal_True;
+    return true;
 }
 
 void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const
@@ -1047,7 +1047,7 @@ void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const
     }
 }
 
-sal_Bool SwNoTxtFrm::HasAnimation() const
+bool SwNoTxtFrm::HasAnimation() const
 {
     const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
     return pGrfNd && pGrfNd->IsAnimated();
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 2397942221a1..f7e773c9110a 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -228,7 +228,7 @@ void SwNumFmt::NotifyGraphicArrived()
 }
 
 // #i22362#
-sal_Bool SwNumFmt::IsEnumeration() const
+bool SwNumFmt::IsEnumeration() const
 {
     // #i30655# native numbering did not work any longer
     // using this code. Therefore HBRINKM and I agreed upon defining
@@ -236,20 +236,20 @@ sal_Bool SwNumFmt::IsEnumeration() const
     return !IsItemize();
 }
 
-sal_Bool SwNumFmt::IsItemize() const
+bool SwNumFmt::IsItemize() const
 {
-    sal_Bool bResult;
+    bool bResult;
 
     switch(GetNumberingType())
     {
     case SVX_NUM_CHAR_SPECIAL:
     case SVX_NUM_BITMAP:
-        bResult = sal_True;
+        bResult = true;
 
         break;
 
     default:
-        bResult = sal_False;
+        bResult = false;
     }
 
     return bResult;
@@ -268,9 +268,9 @@ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
     return *this;
 }
 
-sal_Bool SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
+bool SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
 {
-    sal_Bool bRet = SvxNumberFormat::operator==(rNumFmt) &&
+    bool bRet = SvxNumberFormat::operator==(rNumFmt) &&
         GetRegisteredIn() == rNumFmt.GetRegisteredIn();
     return bRet;
 }
@@ -336,7 +336,7 @@ sal_Int16   SwNumFmt::GetVertOrient() const
 
 void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
 {
-    sal_Bool bDocIsModified = pDoc->IsModified();
+    bool bDocIsModified = pDoc->IsModified();
     bool bFnd = false;
     const SwNumRule* pRule;
     for( sal_uInt16 n = pDoc->GetNumRuleTbl().size(); !bFnd && n; )
@@ -376,7 +376,7 @@ const SwFmtVertOrient*      SwNumFmt::GetGraphicOrientation() const
 SwNumRule::SwNumRule( const OUString& rNm,
                       const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
                       SwNumRuleType eType,
-                      sal_Bool bAutoFlg )
+                      bool bAutoFlg )
   : maTxtNodeList(),
     maParagraphStyleList(),
     mpNumRuleMap(0),
@@ -386,10 +386,10 @@ SwNumRule::SwNumRule( const OUString& rNm,
     mnPoolHelpId( USHRT_MAX ),
     mnPoolHlpFileId( UCHAR_MAX ),
     mbAutoRuleFlag( bAutoFlg ),
-    mbInvalidRuleFlag( sal_True ),
-    mbContinusNum( sal_False ),
-    mbAbsSpaces( sal_False ),
-    mbHidden( sal_False ),
+    mbInvalidRuleFlag( true ),
+    mbContinusNum( false ),
+    mbAbsSpaces( false ),
+    mbHidden( false ),
     mbCountPhantoms( true ),
     meDefaultNumberFormatPositionAndSpaceMode( eDefaultNumberFormatPositionAndSpaceMode ),
     msDefaultListId()
@@ -485,7 +485,7 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       mnPoolHelpId( rNumRule.GetPoolHelpId() ),
       mnPoolHlpFileId( rNumRule.GetPoolHlpFileId() ),
       mbAutoRuleFlag( rNumRule.mbAutoRuleFlag ),
-      mbInvalidRuleFlag( sal_True ),
+      mbInvalidRuleFlag( true ),
       mbContinusNum( rNumRule.mbContinusNum ),
       mbAbsSpaces( rNumRule.mbAbsSpaces ),
       mbHidden( rNumRule.mbHidden ),
@@ -559,7 +559,7 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
         meRuleType = rNumRule.meRuleType;
         msName = rNumRule.msName;
         mbAutoRuleFlag = rNumRule.mbAutoRuleFlag;
-        mbInvalidRuleFlag = sal_True;
+        mbInvalidRuleFlag = true;
         mbContinusNum = rNumRule.mbContinusNum;
         mbAbsSpaces = rNumRule.mbAbsSpaces;
         mbHidden = rNumRule.mbHidden;
@@ -570,9 +570,9 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
     return *this;
 }
 
-sal_Bool SwNumRule::operator==( const SwNumRule& rRule ) const
+bool SwNumRule::operator==( const SwNumRule& rRule ) const
 {
-    sal_Bool bRet = meRuleType == rRule.meRuleType &&
+    bool bRet = meRuleType == rRule.meRuleType &&
                 msName == rRule.msName &&
                 mbAutoRuleFlag == rRule.mbAutoRuleFlag &&
                 mbContinusNum == rRule.mbContinusNum &&
@@ -585,7 +585,7 @@ sal_Bool SwNumRule::operator==( const SwNumRule& rRule ) const
         for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
             if( !( rRule.Get( n ) == Get( n ) ))
             {
-                bRet = sal_False;
+                bRet = false;
                 break;
             }
     }
@@ -601,7 +601,7 @@ void SwNumRule::Set( sal_uInt16 i, const SwNumFmt& rNumFmt )
         {
             delete maFmts[ i ];
             maFmts[ i ] = new SwNumFmt( rNumFmt );
-            mbInvalidRuleFlag = sal_True;
+            mbInvalidRuleFlag = true;
         }
     }
 }
@@ -617,17 +617,17 @@ void SwNumRule::Set( sal_uInt16 i, const SwNumFmt* pNumFmt )
         if( pNumFmt )
         {
             maFmts[ i ] = new SwNumFmt( *pNumFmt );
-            mbInvalidRuleFlag = sal_True;
+            mbInvalidRuleFlag = true;
         }
     }
     else if( !pNumFmt )
-        delete pOld, maFmts[ i ] = 0, mbInvalidRuleFlag = sal_True;
+        delete pOld, maFmts[ i ] = 0, mbInvalidRuleFlag = true;
     else if( *pOld != *pNumFmt )
-        *pOld = *pNumFmt, mbInvalidRuleFlag = sal_True;
+        *pOld = *pNumFmt, mbInvalidRuleFlag = true;
 }
 
-OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, sal_Bool bInclStrings,
-                                sal_Bool bOnlyArabic ) const
+OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, bool bInclStrings,
+                                bool bOnlyArabic ) const
 {
     if (rNum.IsCounted())
         return MakeNumString(rNum.GetNumberVector(),
@@ -637,8 +637,8 @@ OUString SwNumRule::MakeNumString( const SwNodeNum& rNum, sal_Bool bInclStrings,
 }
 
 OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
-                                 const sal_Bool bInclStrings,
-                                 const sal_Bool bOnlyArabic,
+                                 const bool bInclStrings,
+                                 const bool bOnlyArabic,
                                  const unsigned int _nRestrictToThisLevel,
                                  SwNumRule::Extremities* pExtremities ) const
 {
@@ -758,7 +758,7 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
             {
                 Extremities aExtremities;
                 OUString aPrevStr = MakeNumString( pWorkingNodeNum->GetNumberVector(),
-                                                 sal_True, sal_False, MAXLEVEL,
+                                                 true, false, MAXLEVEL,
                                                  &aExtremities);
                 sal_Int32 nStrip = 0;
                 while ( nStrip < aExtremities.nPrefixChars )
@@ -835,7 +835,7 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
     mnPoolFmtId = rNumRule.GetPoolFmtId();
     mnPoolHelpId = rNumRule.GetPoolHelpId();
     mnPoolHlpFileId = rNumRule.GetPoolHlpFileId();
-    mbInvalidRuleFlag = sal_True;
+    mbInvalidRuleFlag = true;
     return *this;
 }
 
@@ -848,7 +848,7 @@ void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
         maFmts[n] = pSvxFmt ? new SwNumFmt(*pSvxFmt, pDoc) : 0;
     }
 
-    mbInvalidRuleFlag = sal_True;
+    mbInvalidRuleFlag = true;
     mbContinusNum = rNumRule.IsContinuousNumbering();
 }
 
@@ -871,7 +871,7 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
     return aRule;
 }
 
-void SwNumRule::SetInvalidRule(sal_Bool bFlag)
+void SwNumRule::SetInvalidRule(bool bFlag)
 {
     if (bFlag)
     {
@@ -931,7 +931,7 @@ void SwNumRule::ChangeIndent( const short nDiff )
         Set( i, aTmpNumFmt );
     }
 
-    SetInvalidRule( sal_True );
+    SetInvalidRule( true );
 }
 
 /// set indent of certain list level to given value
@@ -959,7 +959,7 @@ void SwNumRule::SetIndent( const short nNewIndent,
         aTmpNumFmt.SetIndentAt( nNewIndent );
     }
 
-    SetInvalidRule( sal_True );
+    SetInvalidRule( true );
 }
 
 /// set indent of first list level to given value and change other list level's
@@ -1000,7 +1000,7 @@ void SwNumRule::Validate()
     std::for_each( aLists.begin(), aLists.end(),
                    std::mem_fun( &SwList::ValidateListTree ) );
 
-    SetInvalidRule(sal_False);
+    SetInvalidRule(false);
 }
 
 bool SwNumRule::IsCountPhantoms() const
@@ -1306,7 +1306,7 @@ namespace numfunc
         public:
             static SwNumberingUIBehaviorConfig& getInstance();
 
-            inline sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const
+            inline bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const
             {
                 return mbChangeIndentOnTabAtFirstPosOfFirstListItem;
             }
@@ -1329,7 +1329,7 @@ namespace numfunc
             virtual void Commit() SAL_OVERRIDE;
 
             // configuration data
-            sal_Bool mbChangeIndentOnTabAtFirstPosOfFirstListItem;
+            bool mbChangeIndentOnTabAtFirstPosOfFirstListItem;
     };
 
     namespace
@@ -1344,7 +1344,7 @@ namespace numfunc
 
     SwNumberingUIBehaviorConfig::SwNumberingUIBehaviorConfig()
         : ConfigItem( OUString("Office.Writer/Numbering/UserInterfaceBehavior") ),
-          mbChangeIndentOnTabAtFirstPosOfFirstListItem( sal_True )
+          mbChangeIndentOnTabAtFirstPosOfFirstListItem( true )
     {
         SetToDefault();
         LoadConfig();
@@ -1355,7 +1355,7 @@ namespace numfunc
 
     void SwNumberingUIBehaviorConfig::SetToDefault()
     {
-        mbChangeIndentOnTabAtFirstPosOfFirstListItem = sal_True;
+        mbChangeIndentOnTabAtFirstPosOfFirstListItem = true;
     }
 
     com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames() const
@@ -1407,7 +1407,7 @@ namespace numfunc
         LoadConfig();
     }
 
-    sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem()
+    bool ChangeIndentOnTabAtFirstPosOfFirstListItem()
     {
         return SwNumberingUIBehaviorConfig::getInstance().ChangeIndentOnTabAtFirstPosOfFirstListItem();
     }
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 9d420465afc2..5340ee390bec 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -485,7 +485,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         case RES_POOLCOLL_SIGNATURE:            // Signatures
         case RES_POOLCOLL_TABLE:                // Tabele content
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -575,7 +575,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         case RES_POOLCOLL_FOOTERL:
         case RES_POOLCOLL_FOOTERR:
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
 
                 long nRightMargin = lcl_GetRightMargin( *this );
@@ -592,7 +592,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
             {
                 SetAllScriptItem( aSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) );
                 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -605,7 +605,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
                 aLR.SetTxtLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
                 aSet.Put( aLR );
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -616,7 +616,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
                 aSet.Put( aUL );
                 SetAllScriptItem( aSet, SvxPostureItem( ITALIC_NORMAL, RES_CHRATR_POSTURE ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -632,7 +632,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
             {
                 SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
                 aSet.Put( aUL );
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -646,7 +646,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
                     SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
                     aSet.Put( aUL );
                 }
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -655,7 +655,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         case RES_POOLCOLL_TOX_USERH:            // Header
             lcl_SetRegister( this, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -694,7 +694,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         case RES_POOLCOLL_TOX_IDXH:         // Header
             lcl_SetRegister( this, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -715,7 +715,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         case RES_POOLCOLL_TOX_CNTNTH:       // Header
             lcl_SetRegister( this, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -756,7 +756,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
         case RES_POOLCOLL_TOX_AUTHORITIESH:
             lcl_SetRegister( this, aSet, 0, true, false );
             {
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -1020,7 +1020,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
                 aBox.SetLine( &aNew, BOX_LINE_BOTTOM );
 
                 aSet.Put( aBox );
-                aSet.Put( SwParaConnectBorderItem( sal_False ) );
+                aSet.Put( SwParaConnectBorderItem( false ) );
                 SetAllScriptItem( aSet, SvxFontHeightItem(120, 100, RES_CHRATR_FONTSIZE) );
 
                 SvxULSpaceItem aUL( RES_UL_SPACE );
@@ -1031,7 +1031,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
                 }
                 aUL.SetLower( HTML_PARSPACE );
                 aSet.Put( aUL);
-                SwFmtLineNumber aLN; aLN.SetCountLines( sal_False );
+                SwFmtLineNumber aLN; aLN.SetCountLines( false );
                 aSet.Put( aLN );
             }
             break;
@@ -1367,7 +1367,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
             aProtect.SetPosProtect( true );
             aSet.Put( aProtect );
 
-            pNewFmt->SetAutoUpdateFmt( sal_True );
+            pNewFmt->SetAutoUpdateFmt( true );
         }
         break;
     }
@@ -1563,7 +1563,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
             aSet.Put( aUL );
 
             pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
-            pNewPgDsc->SetLandscape( sal_True );
+            pNewPgDsc->SetLandscape( true );
         }
         break;
 
@@ -1609,7 +1609,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
             aSet.Put( aLR );
             aSet.Put( aUL );
             pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
-            pNewPgDsc->SetLandscape( sal_True );
+            pNewPgDsc->SetLandscape( true );
         }
         break;
 
@@ -1663,7 +1663,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
 
         pNewRule = GetNumRuleTbl()[ n ];
         pNewRule->SetPoolFmtId( nId );
-        pNewRule->SetAutoRule( sal_False );
+        pNewRule->SetAutoRule( false );
 
         if( RES_POOLNUMRULE_NUM1 <= nId && nId <= RES_POOLNUMRULE_NUM5 )
             pNumCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 7d5e534cbc4e..d5e992482bfc 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -87,7 +87,7 @@ bool SwServerObject::GetData( uno::Any & rData,
         {
             // Create stream
             SvMemoryStream aMemStm( 65535, 65535 );
-            SwWriter aWrt( aMemStm, *pPam, sal_False );
+            SwWriter aWrt( aMemStm, *pPam, false );
             if( !IsError( aWrt.Write( xWrt )) )
             {
                 aMemStm.WriteChar( '\0' );        // append a zero char
@@ -102,11 +102,11 @@ bool SwServerObject::GetData( uno::Any & rData,
     return bRet;
 }
 
-sal_Bool SwServerObject::SetData( const OUString & ,
+bool SwServerObject::SetData( const OUString & ,
                     const uno::Any& )
 {
     // set new data into the "server" -> at first nothing to do
-    return sal_False;
+    return false;
 }
 
 void SwServerObject::SendDataChanged( const SwPosition& rPos )
@@ -183,7 +183,7 @@ void SwServerObject::SendDataChanged( const SwPaM& rRange )
     }
 }
 
-sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
+bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
 {
     sal_uLong nSttNd = 0, nEndNd = 0;
     sal_Int32 nStt = 0;
@@ -211,7 +211,7 @@ sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
     case SECTION_SERVER:    pNd = CNTNT_TYPE.pSectNd;   break;
 
     case SECTION_SERVER+1:
-        return sal_True;
+        return true;
     }
 
     if( pNd )
@@ -244,7 +244,7 @@ sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
                         {
                             if( pLnk == pChkLnk ||
                                 ((SwBaseLink*)pLnk)->IsRecursion( pChkLnk ) )
-                                return sal_True;
+                                return true;
                         }
                         else if( ((SwBaseLink*)pLnk)->IsRecursion( (SwBaseLink*)pLnk ) )
                             ((SwBaseLink*)pLnk)->SetNoDataFlag();
@@ -254,7 +254,7 @@ sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
             ((SwServerObject*)this)->eType = eSave;
     }
 
-    return sal_False;
+    return false;
 }
 
 void SwServerObject::SetNoServer()
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index dc0f19fd68ab..851496b5f36f 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -393,7 +393,7 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
     aItem = *(aItemType*)pNew; \
     delete pNew;
 
-sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer )
+bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer )
 {
     SfxPoolItem* pNew;
     SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0);
@@ -488,7 +488,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s
     return 0 == rStream.GetError();
 }
 
-sal_Bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 );
 
@@ -541,7 +541,7 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
     return 0 == rStream.GetError();
 }
 
-sal_Bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     rStream.WriteUInt16( aFont.GetVersion( fileVersion ) );
     rStream.WriteUInt16( aHeight.GetVersion( fileVersion ) );
@@ -586,17 +586,17 @@ SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
     , m_aBreak( SVX_BREAK_NONE, RES_BREAK )
     , m_aKeepWithNextPara( false, RES_KEEP )
     , m_aRepeatHeading( 0 )
-    , m_bLayoutSplit( sal_True )
-    , m_bRowSplit( sal_True )
-    , m_bCollapsingBorders(sal_True)
+    , m_bLayoutSplit( true )
+    , m_bRowSplit( true )
+    , m_bCollapsingBorders(true)
     , m_aShadow( RES_SHADOW )
 {
-    bInclFont = sal_True;
-    bInclJustify = sal_True;
-    bInclFrame = sal_True;
-    bInclBackground = sal_True;
-    bInclValueFormat = sal_True;
-    bInclWidthHeight = sal_True;
+    bInclFont = true;
+    bInclJustify = true;
+    bInclFrame = true;
+    bInclBackground = true;
+    bInclValueFormat = true;
+    bInclWidthHeight = true;
 
     memset( aBoxAutoFmt, 0, sizeof( aBoxAutoFmt ) );
 }
@@ -897,16 +897,16 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
     m_aShadow = static_cast<const SvxShadowItem&>(rSet.Get(RES_SHADOW));
 }
 
-sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
+bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
 {
     sal_uInt16  nVal = 0;
     rStream.ReadUInt16( nVal );
-    sal_Bool bRet = 0 == rStream.GetError();
+    bool bRet = 0 == rStream.GetError();
 
     if( bRet && (nVal == AUTOFORMAT_DATA_ID_X ||
             (AUTOFORMAT_DATA_ID_504 <= nVal && nVal <= AUTOFORMAT_DATA_ID)) )
     {
-        sal_Bool b;
+        bool b;
         // --- from 680/dr25 on: store strings as UTF-8
         rtl_TextEncoding eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
         m_aName = rStream.ReadUniOrByteString( eCharSet );
@@ -922,12 +922,12 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions
             else
                 nStrResId = USHRT_MAX;
         }
-        rStream.ReadUChar( b ); bInclFont = b;
-        rStream.ReadUChar( b ); bInclJustify = b;
-        rStream.ReadUChar( b ); bInclFrame = b;
-        rStream.ReadUChar( b ); bInclBackground = b;
-        rStream.ReadUChar( b ); bInclValueFormat = b;
-        rStream.ReadUChar( b ); bInclWidthHeight = b;
+        rStream.ReadCharAsBool( b ); bInclFont = b;
+        rStream.ReadCharAsBool( b ); bInclJustify = b;
+        rStream.ReadCharAsBool( b ); bInclFrame = b;
+        rStream.ReadCharAsBool( b ); bInclBackground = b;
+        rStream.ReadCharAsBool( b ); bInclValueFormat = b;
+        rStream.ReadCharAsBool( b ); bInclWidthHeight = b;
 
         if (nVal >= AUTOFORMAT_DATA_ID_31005 && WriterSpecificBlockExists(rStream))
         {
@@ -937,7 +937,7 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions
             READ(m_aPageDesc, SwFmtPageDesc, AUTOFORMAT_FILE_VERSION);
             READ(m_aKeepWithNextPara, SvxFmtKeepItem, AUTOFORMAT_FILE_VERSION);
 
-            rStream.ReadUInt16( m_aRepeatHeading ).ReadUChar( m_bLayoutSplit ).ReadUChar( m_bRowSplit ).ReadUChar( m_bCollapsingBorders );
+            rStream.ReadUInt16( m_aRepeatHeading ).ReadCharAsBool( m_bLayoutSplit ).ReadCharAsBool( m_bRowSplit ).ReadCharAsBool( m_bCollapsingBorders );
 
             READ(m_aShadow, SvxShadowItem, AUTOFORMAT_FILE_VERSION);
         }
@@ -960,10 +960,10 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions
     return bRet;
 }
 
-sal_Bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
+bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
 {
     sal_uInt16 nVal = AUTOFORMAT_DATA_ID;
-    sal_Bool b;
+    bool b;
     rStream.WriteUInt16( nVal );
     // --- from 680/dr25 on: store strings as UTF-8
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_aName,
@@ -986,7 +986,7 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
         m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion));
     }
 
-    sal_Bool bRet = 0 == rStream.GetError();
+    bool bRet = 0 == rStream.GetError();
 
     for( int i = 0; bRet && i < 16; ++i )
     {
@@ -1100,9 +1100,9 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
     m_pImpl->m_AutoFormats.push_back(pNew);
 }
 
-sal_Bool SwTableAutoFmtTbl::Load()
+bool SwTableAutoFmtTbl::Load()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     OUString sNm(AUTOTABLE_FORMAT_NAME);
     SvtPathOptions aOpt;
     if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG ))
@@ -1111,11 +1111,11 @@ sal_Bool SwTableAutoFmtTbl::Load()
         bRet = Load( *aStream.GetInStream() );
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
-sal_Bool SwTableAutoFmtTbl::Save() const
+bool SwTableAutoFmtTbl::Save() const
 {
     SvtPathOptions aPathOpt;
     const OUString sNm( aPathOpt.GetUserConfigPath() + "/" + AUTOTABLE_FORMAT_NAME );
@@ -1123,9 +1123,9 @@ sal_Bool SwTableAutoFmtTbl::Save() const
     return Save( *aStream.GetOutStream() ) && aStream.Commit();
 }
 
-sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
+bool SwTableAutoFmtTbl::Load( SvStream& rStream )
 {
-    sal_Bool bRet = 0 == rStream.GetError();
+    bool bRet = 0 == rStream.GetError();
     if (bRet)
     {
         // Attention: We need to read a general Header here
@@ -1192,9 +1192,9 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
     return bRet;
 }
 
-sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
+bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
 {
-    sal_Bool bRet = 0 == rStream.GetError();
+    bool bRet = 0 == rStream.GetError();
     if (bRet)
     {
         rStream.SetVersion(AUTOFORMAT_FILE_VERSION);
@@ -1207,7 +1207,7 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
 
         bRet = 0 == rStream.GetError();
         if (!bRet)
-            return sal_False;
+            return false;
 
         // Write this version number for all attributes
         m_pImpl->m_AutoFormats[0].GetBoxFmt(0).SaveVersionNo(
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 58e8e7c5e82a..3abe33176bb6 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -533,7 +533,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
 
     SwNodeIndex aSavePos( aInsIdx, -1 );
     if( pRg.get() )
-        pCpyDoc->CopyWithFlyInFly( *pRg, 0, aInsIdx, NULL, sal_False );
+        pCpyDoc->CopyWithFlyInFly( *pRg, 0, aInsIdx, NULL, false );
     else
         pDoc->GetNodes().MakeTxtNode( aInsIdx, (SwTxtFmtColl*)pDoc->GetDfltTxtFmtColl() );
     ++aSavePos;
@@ -553,7 +553,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
             SwPosition aMvPos( aInsIdx );
             SwCntntNode* pCNd = pDoc->GetNodes().GoPrevious( &aMvPos.nNode );
             aMvPos.nContent.Assign( pCNd, pCNd->Len() );
-            pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, /*sal_True*/sal_False );
+            pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, /*sal_True*/false );
         }
 
         // If we still have FlyFrames hanging around, delete them too
@@ -640,7 +640,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
             if( aBoxAttrSet.Count() )
             {
                 const SfxPoolItem* pItem;
-                SvNumberFormatter* pN = pDoc->GetNumberFormatter( sal_False );
+                SvNumberFormatter* pN = pDoc->GetNumberFormatter( false );
                 if( pN && pN->HasMergeFmtTbl() && SFX_ITEM_SET == aBoxAttrSet.
                     GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
                 {
@@ -655,7 +655,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
     }
 }
 
-sal_Bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
+bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                         SwUndoTblCpyTbl* pUndo )
 {
     SwDoc* pDoc = GetFrmFmt()->GetDoc();
@@ -712,7 +712,7 @@ sal_Bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBox
     // make frames
     aFndBox.MakeFrms( *this );
 
-    return sal_True;
+    return true;
 }
 
 /** Copy Table into this Box.
@@ -720,7 +720,7 @@ sal_Bool SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBox
     deleted by doing this.
     If no Box is left the remaining content goes to the Box of a "BaseLine".
     If there's no Line anymore, put it also into the last Box of a "BaseLine". */
-sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
+bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
                         SwUndoTblCpyTbl* pUndo )
 {
     SetHTMLTableLayout( 0 );    // Delete HTML Layout
@@ -797,10 +797,10 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
     }
 
     aFndBox.MakeFrms( pTblNd->GetTable() );     // Create the Frames anew
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
+bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                         SwUndoTblCpyTbl* pUndo )
 {
     OSL_ENSURE( !rSelBoxes.empty(), "Missing selection" );
@@ -838,7 +838,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
 
         sal_uInt16 nFndCnt = aFndBox.GetLines().size();
         if( !nFndCnt )
-            return sal_False;
+            return false;
 
         // Check if we have enough space for all Lines and Boxes
         sal_uInt16 nTstLns = 0;
@@ -856,7 +856,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 // new ones to reach our goal. But only if the SSelection
                 // contains a Box!
                 if( 1 < rSelBoxes.size() )
-                    return sal_False;
+                    return false;
 
                 sal_uInt16 nNewLns = rCpyTbl.GetTabLines().size() -
                                 (GetTabLines().size() - nSttLine );
@@ -874,13 +874,13 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                     if( pLastLn->GetTabBoxes().size() < nSttBox ||
                         ( pLastLn->GetTabBoxes().size() - nSttBox ) <
                             pCpyLn->GetTabBoxes().size() )
-                        return sal_False;
+                        return false;
 
                     // Test for nesting
                     for( nBx = 0; nBx < pCpyLn->GetTabBoxes().size(); ++nBx )
                         if( !( pTmpBox = pLastLn->GetTabBoxes()[ nSttBox + nBx ])
                                     ->GetSttNd() )
-                            return sal_False;
+                            return false;
                 }
                 // We have enough space for the to-be-copied, so insert new
                 // rows accordingly.
@@ -894,7 +894,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                                 aBoxes, true ), nNewLns )
                     : !InsertRow( pDoc, SelLineFromBox( pInsBox,
                                 aBoxes, true ), nNewLns, true ) )
-                    return sal_False;
+                    return false;
             }
 
             nTstLns = rCpyTbl.GetTabLines().size();        // copy this many
@@ -902,7 +902,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
         else if( 0 == (nFndCnt % rCpyTbl.GetTabLines().size()) )
             nTstLns = nFndCnt;
         else
-            return sal_False;       // not enough space for the rows
+            return false;       // not enough space for the rows
 
         for( nLn = 0; nLn < nTstLns; ++nLn )
         {
@@ -931,7 +931,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                     pFLine->GetBoxes().size() )
                 {
                     delete pInsFLine;
-                    return sal_False;
+                    return false;
                 }
 
                 // Test for nesting
@@ -941,7 +941,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                         ->GetSttNd() )
                     {
                         delete pInsFLine;
-                        return sal_False;
+                        return false;
                     }
                     // if Ok, insert the Box into the FndLine
                     pFndBox = new _FndBox( pTmpBox, pInsFLine );
@@ -954,14 +954,14 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 if( pLine->GetTabBoxes().size() < nSttBox  ||
                     ( pLine->GetTabBoxes().size() - nSttBox ) <
                     pCpyLn->GetTabBoxes().size() )
-                    return sal_False;
+                    return false;
 
                 // Test for nesting
                 for( nBx = 0; nBx < pCpyLn->GetTabBoxes().size(); ++nBx )
                 {
                     if( !( pTmpBox = pLine->GetTabBoxes()[ nSttBox + nBx ])
                         ->GetSttNd() )
-                        return sal_False;
+                        return false;
                     // if Ok, insert the Box into the FndLine
                     if( nBx == pFLine->GetBoxes().size() )
                     {
@@ -976,17 +976,17 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 // (n times)
                 if( 0 != ( pFLine->GetBoxes().size() %
                             pCpyLn->GetTabBoxes().size() ))
-                    return sal_False;
+                    return false;
 
                 // Test for nesting
                 for( nBx = 0; nBx < pFLine->GetBoxes().size(); ++nBx )
                     if (!pFLine->GetBoxes()[nBx].GetBox()->GetSttNd())
-                        return sal_False;
+                        return false;
             }
         }
 
         if( aFndBox.GetLines().empty() )
-            return sal_False;
+            return false;
     }
 
     {
@@ -999,7 +999,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
     // Delete the Frames
     aFndBox.SetTableLines( *this );
     //Not dispose accessible table
-    aFndBox.DelFrms( *this,sal_False );
+    aFndBox.DelFrms( *this,false );
 
     if( 1 == rCpyTbl.GetTabSortBoxes().size() )
     {
@@ -1026,7 +1026,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
         }
 
     aFndBox.MakeFrms( *this );
-    return sal_True;
+    return true;
 }
 
 static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara );
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index a64c886ba99f..71e05690b544 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1157,7 +1157,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
                         SwNodeRange aRg( *pLastBox->GetSttNd(), +2, *pEndNd );
                         pLastBox = pNewLine->GetTabBoxes()[0];  // reset
                         SwNodeIndex aInsPos( *pLastBox->GetSttNd(), 1 );
-                        pDoc->GetNodes()._MoveNodes(aRg, pDoc->GetNodes(), aInsPos, sal_False);
+                        pDoc->GetNodes()._MoveNodes(aRg, pDoc->GetNodes(), aInsPos, false);
                         pDoc->GetNodes().Delete( aInsPos, 1 ); // delete the empty one
                     }
                 }
@@ -1968,7 +1968,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
                     if( aBoxAttrSet.Count() )
                     {
                         const SfxPoolItem* pItem;
-                        SvNumberFormatter* pN = pCpyPara->pDoc->GetNumberFormatter( sal_False );
+                        SvNumberFormatter* pN = pCpyPara->pDoc->GetNumberFormatter( false );
                         if( pN && pN->HasMergeFmtTbl() && SFX_ITEM_SET == aBoxAttrSet.
                             GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
                         {
@@ -1985,7 +1985,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
                         *rFndBox.GetBox()->GetSttNd()->EndOfSectionNode() );
                 SwNodeIndex aInsIdx( *pBox->GetSttNd(), 1 );
 
-                pFromDoc->CopyWithFlyInFly( aCpyRg, 0, aInsIdx, NULL, sal_False );
+                pFromDoc->CopyWithFlyInFly( aCpyRg, 0, aInsIdx, NULL, false );
                 // Delete the initial TextNode
                 pCpyPara->pDoc->GetNodes().Delete( aInsIdx, 1 );
             }
@@ -2142,7 +2142,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
     SwTable* pNewTbl = (SwTable*)pInsDoc->InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
             rPos, 1, 1, GetFrmFmt()->GetHoriOrient().GetHoriOrient(),
-            0, 0, sal_False, IsNewModel() );
+            0, 0, false, IsNewModel() );
     if( !pNewTbl )
         return false;
 
@@ -2164,7 +2164,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
         // Change the Table Pointer at the Node
         pNewTbl = new SwDDETable( *pNewTbl,
                                  (SwDDEFieldType*)pFldType );
-        pTblNd->SetNewTable( pNewTbl, sal_False );
+        pTblNd->SetNewTable( pNewTbl, false );
     }
 
     pNewTbl->GetFrmFmt()->CopyAttrs( *GetFrmFmt() );
@@ -3570,7 +3570,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, sal_True );
+                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
 
                 long nFrmWidth = LONG_MAX;
                 LockModify();
@@ -3765,7 +3765,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, sal_True );
+                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
 
                 if( bInsDel
                     ? ( TBLFIX_CHGABS == eTblChgMode ? bLeft : bLeft )
@@ -3878,7 +3878,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                                                        : UNDO_TABLE_INSCOL );
                 }
                 else if( ppUndo )
-                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, sal_True );
+                    *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
 
                 if( bInsDel
                     ? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger && bLeft) : bLeft )
@@ -4265,7 +4265,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                                 : UNDO_ROW_DELETE );
                     }
                     else if( ppUndo )
-                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, sal_True );
+                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
 
                     (*fnSelLine)( (*pLines)[ nBaseLinePos ], aParam,
                                     nAbsDiff, false );
@@ -4342,7 +4342,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                                 : UNDO_ROW_DELETE );
                     }
                     else if( ppUndo )
-                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, sal_True );
+                        *ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
 
                     CR_SetLineHeight aParam1( aParam );
                     if( TBLFIX_CHGPROP == eTblChgMode && !bBigger &&
@@ -4432,11 +4432,11 @@ SwFrmFmt* SwShareBoxFmt::GetFormat( const SfxPoolItem& rItem ) const
     const SfxPoolItem* pItem;
     sal_uInt16 nWhich = rItem.Which();
     SwFrmFmt *pRet = 0, *pTmp;
-    const SfxPoolItem& rFrmSz = pOldFmt->GetFmtAttr( RES_FRM_SIZE, sal_False );
+    const SfxPoolItem& rFrmSz = pOldFmt->GetFmtAttr( RES_FRM_SIZE, false );
     for( sal_uInt16 n = aNewFmts.size(); n; )
         if( SFX_ITEM_SET == ( pTmp = aNewFmts[ --n ])->
-            GetItemState( nWhich, sal_False, &pItem ) && *pItem == rItem &&
-            pTmp->GetFmtAttr( RES_FRM_SIZE, sal_False ) == rFrmSz )
+            GetItemState( nWhich, false, &pItem ) && *pItem == rItem &&
+            pTmp->GetFmtAttr( RES_FRM_SIZE, false ) == rFrmSz )
         {
             pRet = pTmp;
             break;
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 22850eabc0a7..4c08fd7dba30 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -73,7 +73,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
                             pESh->StartAllAction();
                             bAction = true;
                             bUnLockView = !pESh->IsViewLocked();
-                            pESh->LockView( sal_True );
+                            pESh->LockView( true );
                         }
                         const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisitedValid( false );
                         const SwTxtAttr* pAttr = pTxtAttr;
@@ -89,7 +89,7 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
         if( bAction )
             pESh->EndAllAction();
         if( bUnLockView )
-            pESh->LockView( sal_False );
+            pESh->LockView( false );
     }
 }
 
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 01dc51279c33..fc3965598838 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -327,7 +327,7 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable* pCT )
     if( pBoxFmt == pBox->GetFrmFmt() ) // Create a new one?
     {
         const SfxPoolItem* pItem;
-        if( SFX_ITEM_SET == pBoxFmt->GetItemState( RES_BOXATR_FORMULA, sal_False,
+        if( SFX_ITEM_SET == pBoxFmt->GetItemState( RES_BOXATR_FORMULA, false,
             &pItem ) && ((SwTblBoxFormula*)pItem)->IsIntrnlName() )
         {
             ((SwTblBoxFormula*)pItem)->PtrToBoxNm( pCT->pOldTable );
@@ -338,9 +338,9 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable* pCT )
 
         if( pBox->GetSttIdx() )
         {
-            SvNumberFormatter* pN = pCT->pDoc->GetNumberFormatter( sal_False );
+            SvNumberFormatter* pN = pCT->pDoc->GetNumberFormatter( false );
             if( pN && pN->HasMergeFmtTbl() && SFX_ITEM_SET == pBoxFmt->
-                GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem ) )
+                GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
             {
                 sal_uLong nOldIdx = ((SwTblBoxNumFormat*)pItem)->GetValue();
                 sal_uLong nNewIdx = pN->GetMergeFmtIndex( nOldIdx );
@@ -460,7 +460,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
 
         // Swap the table pointers in the node
         SwDDETable* pNewTable = new SwDDETable( pTblNd->GetTable(), pDDEType );
-        pTblNd->SetNewTable( pNewTable, sal_False );
+        pTblNd->SetNewTable( pNewTable, false );
     }
     // First copy the content of the tables, we will later assign the
     // boxes/lines and create the frames
@@ -472,7 +472,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     // We have to make sure that the table node of the SwTable is accessible, even
     // without any content in m_TabSortContentBoxes. #i26629#
     pTblNd->GetTable().SetTableNode( pTblNd );
-    rNds._Copy( aRg, aInsPos, sal_False );
+    rNds._Copy( aRg, aInsPos, false );
     pTblNd->GetTable().SetTableNode( 0 );
 
     // Special case for a single box
@@ -529,7 +529,7 @@ void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
 
 // Copy method from SwDoc
 // Prevent copying in Flys that are anchored in the area
-static sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
+static bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
                         sal_uLong nInsNd )
 {
     const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
@@ -556,16 +556,16 @@ static sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
             if( pSNd->GetIndex() < nInsNd &&
                 nInsNd < pSNd->EndOfSectionIndex() )
                 // Do not copy !
-                return sal_True;
+                return true;
 
             if( lcl_ChkFlyFly( pDoc, pSNd->GetIndex(),
                         pSNd->EndOfSectionIndex(), nInsNd ) )
                 // Do not copy !
-                return sal_True;
+                return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 static void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
@@ -1230,13 +1230,13 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             if( aInsPos == pEnd->nNode )
             {
                 SwNodeIndex aSaveIdx( aInsPos, -1 );
-                CopyWithFlyInFly( aRg, 0,aInsPos, &rPam, bMakeNewFrms, sal_False );
+                CopyWithFlyInFly( aRg, 0,aInsPos, &rPam, bMakeNewFrms, false );
                 ++aSaveIdx;
                 pEnd->nNode = aSaveIdx;
                 pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
             }
             else
-                CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam, bMakeNewFrms, sal_False );
+                CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam, bMakeNewFrms, false );
 
             bCopyBookmarks = false;
 
@@ -1323,9 +1323,9 @@ void SwDoc::CopyWithFlyInFly(
     const sal_Int32 nEndContentIndex,
     const SwNodeIndex& rInsPos,
     const SwPaM* pCopiedPaM,
-    const sal_Bool bMakeNewFrms,
-    const sal_Bool bDelRedlines,
-    const sal_Bool bCopyFlyAtFly ) const
+    const bool bMakeNewFrms,
+    const bool bDelRedlines,
+    const bool bCopyFlyAtFly ) const
 {
     SwDoc* pDest = rInsPos.GetNode().GetDoc();
 
@@ -1333,7 +1333,7 @@ void SwDoc::CopyWithFlyInFly(
 
     SwNodeIndex aSavePos( rInsPos, -1 );
     bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
-    GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrms, sal_True );
+    GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrms, true );
     ++aSavePos;
     if( bEndIsEqualEndPos )
         ((SwNodeIndex&)rRg.aEnd) = aSavePos;
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 46286b6f573b..940757bf7e7f 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -41,9 +41,9 @@ SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
                   SwAttrSet* pAutoAttr ) :
     SwCntntNode( rWhere, nNdType, pGrfColl ),
     pContour( 0 ),
-    bAutomaticContour( sal_False ),
-    bContourMapModeValid( sal_True ),
-    bPixelContour( sal_False )
+    bAutomaticContour( false ),
+    bContourMapModeValid( true ),
+    bPixelContour( false )
 {
     // Should this set a hard attribute?
     if( pAutoAttr )
@@ -85,7 +85,7 @@ bool SwNoTxtNode::SavePersistentData()
     return true;
 }
 
-void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, sal_Bool bAutomatic )
+void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, bool bAutomatic )
 {
     delete pContour;
     if ( pPoly )
@@ -93,17 +93,17 @@ void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, sal_Bool bAutomatic )
     else
         pContour = 0;
     bAutomaticContour = bAutomatic;
-    bContourMapModeValid = sal_True;
-    bPixelContour = sal_False;
+    bContourMapModeValid = true;
+    bPixelContour = false;
 }
 
 void SwNoTxtNode::CreateContour()
 {
     OSL_ENSURE( !pContour, "Contour available." );
     pContour = new PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic()));
-    bAutomaticContour = sal_True;
-    bContourMapModeValid = sal_True;
-    bPixelContour = sal_False;
+    bAutomaticContour = true;
+    bContourMapModeValid = true;
+    bPixelContour = false;
 }
 
 const PolyPolygon *SwNoTxtNode::HasContour() const
@@ -171,8 +171,8 @@ const PolyPolygon *SwNoTxtNode::HasContour() const
                 }
             }
         }
-        ((SwNoTxtNode *)this)->bContourMapModeValid = sal_True;
-        ((SwNoTxtNode *)this)->bPixelContour = sal_False;
+        ((SwNoTxtNode *)this)->bContourMapModeValid = true;
+        ((SwNoTxtNode *)this)->bPixelContour = false;
     }
 
     return pContour;
@@ -191,13 +191,13 @@ void SwNoTxtNode::SetContourAPI( const PolyPolygon *pPoly )
         pContour = new PolyPolygon( *pPoly );
     else
         pContour = 0;
-    bContourMapModeValid = sal_False;
+    bContourMapModeValid = false;
 }
 
-sal_Bool SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const
+bool SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const
 {
     if( !pContour )
-        return sal_False;
+        return false;
 
     rContour = *pContour;
     if( bContourMapModeValid )
@@ -227,12 +227,12 @@ sal_Bool SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const
         }
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwNoTxtNode::IsPixelContour() const
+bool SwNoTxtNode::IsPixelContour() const
 {
-    sal_Bool bRet;
+    bool bRet;
     if( bContourMapModeValid )
     {
         const MapMode aGrfMap( GetGraphic().GetPrefMapMode() );
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index c3e1eb8131dd..f66f4eb71685 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -343,7 +343,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
         rNewSect.SetCondHidden( aCalc.Calculate( rNewSect.GetCondition() ).GetBool() );
     }
 
-    sal_Bool bUpdateFtn = sal_False;
+    bool bUpdateFtn = false;
     if( GetFtnIdxs().size() && pAttr )
     {
         sal_uInt16 nVal = ((SwFmtFtnAtTxtEnd&)pAttr->Get(
@@ -354,7 +354,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
                             pAttr->Get( RES_END_AT_TXTEND )).GetValue() ) ||
               FTNEND_ATTXTEND_OWNNUMANDFMT == nVal ))
         {
-            bUpdateFtn = sal_True;
+            bUpdateFtn = true;
         }
     }
 
@@ -517,12 +517,12 @@ void SwDoc::DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes )
 
     if( mpSectionFmtTbl->end() != itFmtPos )
     {
-        const SwNodeIndex* pIdx = pFmt->GetCntnt( sal_False ).GetCntntIdx();
+        const SwNodeIndex* pIdx = pFmt->GetCntnt( false ).GetCntntIdx();
         const SfxPoolItem* pFtnEndAtTxtEnd;
         if( SFX_ITEM_SET != pFmt->GetItemState(
-                            RES_FTN_AT_TXTEND, sal_True, &pFtnEndAtTxtEnd ) ||
+                            RES_FTN_AT_TXTEND, true, &pFtnEndAtTxtEnd ) ||
             SFX_ITEM_SET != pFmt->GetItemState(
-                            RES_END_AT_TXTEND, sal_True, &pFtnEndAtTxtEnd ))
+                            RES_END_AT_TXTEND, true, &pFtnEndAtTxtEnd ))
             pFtnEndAtTxtEnd = 0;
 
         const SwSectionNode* pSectNd;
@@ -1029,7 +1029,7 @@ SwSectionNode::~SwSectionNode()
 {
     // mba: test if iteration works as clients will be removed in callback
     // use hint which allows to specify, if the content shall be saved or not
-    m_pSection->GetFmt()->CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( sal_True ) );
+    m_pSection->GetFmt()->CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( true ) );
     SwSectionFmt* pFmt = m_pSection->GetFmt();
     if( pFmt )
     {
@@ -1267,7 +1267,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
         pNewSect->SetEditInReadonly( true );
 
     SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // Where am I?
-    rNds._Copy( aRg, aInsPos, sal_False );
+    rNds._Copy( aRg, aInsPos, false );
 
     // Delete all Frames from the copied Area. They are created when creating
     // the SectionFrames.
@@ -1291,7 +1291,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     return pSectNd;
 }
 
-sal_Bool SwSectionNode::IsCntntHidden() const
+bool SwSectionNode::IsCntntHidden() const
 {
     OSL_ENSURE( !m_pSection->IsHidden(),
             "That's simple: Hidden Section => Hidden Content" );
@@ -1309,12 +1309,12 @@ sal_Bool SwSectionNode::IsCntntHidden() const
         else
         {
             if( aTmp.GetNode().IsCntntNode() || aTmp.GetNode().IsTableNode() )
-                return sal_False; // We found non-hidden content
+                return false; // We found non-hidden content
             OSL_ENSURE( aTmp.GetNode().IsEndNode(), "EndNode expected" );
         }
         ++aTmp;
     }
-    return sal_True; // Hide everything
+    return true; // Hide everything
 }
 
 void SwSectionNode::NodesArrChgd()
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4dbd16079149..c10acd5cb0b7 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -100,7 +100,7 @@ const sal_Unicode T2T_PARA = 0x0a;
 
 static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
 {
-    sal_Bool bTop = false, bBottom = false, bLeft = false, bRight = false;
+    bool bTop = false, bBottom = false, bLeft = false, bRight = false;
     switch ( nId )
     {
     case 0: bTop = bBottom = bLeft = true;          break;
@@ -109,7 +109,7 @@ static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
     case 3: bBottom = bLeft = bRight = true;        break;
     }
 
-    const sal_Bool bHTML = rFmt.getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE);
+    const bool bHTML = rFmt.getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE);
     Color aCol( bHTML ? COL_GRAY : COL_BLACK );
     SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
     if ( bHTML )
@@ -160,7 +160,7 @@ lcl_SetDfltBoxAttr(SwTableBox& rBox, DfltBoxAttrList_t & rBoxFmtArr,
         if( pAutoFmt )
             pAutoFmt->UpdateToSet( nId, (SfxItemSet&)pNewTableBoxFmt->GetAttrSet(),
                                     SwTableAutoFmt::UPDATE_BOX,
-                                    pDoc->GetNumberFormatter( sal_True ) );
+                                    pDoc->GetNumberFormatter( true ) );
         else
             ::lcl_SetDfltBoxAttr( *pNewTableBoxFmt, nId );
 
@@ -193,7 +193,7 @@ static SwTableBoxFmt *lcl_CreateAFmtBoxFmt( SwDoc &rDoc, std::vector<SwTableBoxF
         SwTableBoxFmt* pBoxFmt = rDoc.MakeTableBoxFmt();
         rAutoFmt.UpdateToSet( nId, (SfxItemSet&)pBoxFmt->GetAttrSet(),
                                 SwTableAutoFmt::UPDATE_BOX,
-                                rDoc.GetNumberFormatter( sal_True ) );
+                                rDoc.GetNumberFormatter( true ) );
         if( USHRT_MAX != nCols )
             pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
                                             USHRT_MAX / nCols, 0 ));
@@ -219,7 +219,7 @@ SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
 /**
  * Insert a new Box before the InsPos
  */
-sal_Bool SwNodes::InsBoxen( SwTableNode* pTblNd,
+bool SwNodes::InsBoxen( SwTableNode* pTblNd,
                         SwTableLine* pLine,
                         SwTableBoxFmt* pBoxFmt,
                         SwTxtFmtColl* pTxtColl,
@@ -228,7 +228,7 @@ sal_Bool SwNodes::InsBoxen( SwTableNode* pTblNd,
                         sal_uInt16 nCnt )
 {
     if( !nCnt )
-        return sal_False;
+        return false;
     OSL_ENSURE( pLine, "No valid Line" );
 
     // Move Index after the Line's last Box
@@ -313,7 +313,7 @@ sal_Bool SwNodes::InsBoxen( SwTableNode* pTblNd,
             pTNd->ChgFmtColl( pTxtColl );
         }
     }
-    return sal_True;
+    return true;
 }
 
 /**
@@ -324,8 +324,8 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
                                    sal_uInt16 nCols, sal_Int16 eAdjust,
                                    const SwTableAutoFmt* pTAFmt,
                                    const std::vector<sal_uInt16> *pColArr,
-                                   sal_Bool bCalledFromShell,
-                                   sal_Bool bNewModel )
+                                   bool bCalledFromShell,
+                                   bool bNewModel )
 {
     OSL_ENSURE( nRows, "Table without line?" );
     OSL_ENSURE( nCols, "Table without rows?" );
@@ -426,7 +426,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
     }
     pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nWidth ));
     if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( sal_False ));
+        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( false ));
 
     // Move the hard PageDesc/PageBreak Attributes if needed
     SwCntntNode* pNextNd = GetNodes()[ pTblNd->EndOfSectionIndex()+1 ]
@@ -694,7 +694,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     // The Table's SSize is USHRT_MAX
     pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
     if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( sal_False ));
+        pTableFmt->SetFmtAttr( SwFmtLayoutSplit( false ));
 
     /* If the first node in the selection is a context node and if it
        has an item FRAMEDIR set (no default) propagate the item to the
@@ -847,7 +847,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     {
         for (size_t nBoxes = pNdTbl->GetTabSortBoxes().size(); nBoxes; )
         {
-            ChkBoxNumFmt( *pNdTbl->GetTabSortBoxes()[ --nBoxes ], sal_False );
+            ChkBoxNumFmt( *pNdTbl->GetTabSortBoxes()[ --nBoxes ], false );
         }
     }
 
@@ -1408,10 +1408,10 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
 /**
  * Table to Text
  */
-sal_Bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
+bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
 {
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     // #i34471#
     // If this is trigged by SwUndoTblToTxt::Repeat() nobody ever deleted
@@ -1434,7 +1434,7 @@ sal_Bool SwDoc::TableToText( const SwTableNode* pTblNd, sal_Unicode cCh )
     aMsgHnt.eFlags = TBL_BOXNAME;
     UpdateTblFlds( &aMsgHnt );
 
-    sal_Bool bRet = GetNodes().TableToText( aRg, cCh, pUndo );
+    bool bRet = GetNodes().TableToText( aRg, cCh, pUndo );
     if( pUndoRg )
     {
         pUndoRg->aStart++;
@@ -1547,7 +1547,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
     }
 }
 
-sal_Bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
+bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
                             SwUndoTblToTxt* pUndo )
 {
     // Is a Table selected?
@@ -1555,7 +1555,7 @@ sal_Bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
     if( rRange.aStart.GetIndex() >= rRange.aEnd.GetIndex() ||
         0 == ( pTblNd = rRange.aStart.GetNode().GetTableNode()) ||
         &rRange.aEnd.GetNode() != pTblNd->EndOfSectionNode() )
-        return sal_False;
+        return false;
 
     // If the Table was alone in a Section, create the Frames via the Table's Upper
     SwNode2Layout* pNode2Layout = 0;
@@ -1657,7 +1657,7 @@ sal_Bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 /**
@@ -1694,7 +1694,7 @@ bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         pUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSCOL, rBoxes, *pTblNd,
-                                     0, 0, nCnt, bBehind, sal_False );
+                                     0, 0, nCnt, bBehind, false );
         aTmpLst.insert( rTbl.GetTabSortBoxes() );
     }
 
@@ -1756,7 +1756,7 @@ bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         pUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW,rBoxes, *pTblNd,
-                                     0, 0, nCnt, bBehind, sal_False );
+                                     0, 0, nCnt, bBehind, false );
         aTmpLst.insert( rTbl.GetTabSortBoxes() );
     }
 
@@ -1794,13 +1794,13 @@ bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
 /**
  * Deleting Columns/Rows
  */
-sal_Bool SwDoc::DeleteRow( const SwCursor& rCursor )
+bool SwDoc::DeleteRow( const SwCursor& rCursor )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
     GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
     if( ::HasProtectedCells( aBoxes ))
-        return sal_False;
+        return false;
 
     // Remove the Crsr from the to-be-deleted Section.
     // The Cursor is placed after the table, except for
@@ -1810,7 +1810,7 @@ sal_Bool SwDoc::DeleteRow( const SwCursor& rCursor )
         SwTableNode* pTblNd = rCursor.GetNode()->FindTableNode();
 
         if( pTblNd->GetTable().ISA( SwDDETable ))
-            return sal_False;
+            return false;
 
         // Find all Boxes/Lines
         _FndBox aFndBox( 0, 0 );
@@ -1820,7 +1820,7 @@ sal_Bool SwDoc::DeleteRow( const SwCursor& rCursor )
         }
 
         if( !aFndBox.GetLines().size() )
-            return sal_False;
+            return false;
 
         SwEditShell* pESh = GetEditShell();
         if( pESh )
@@ -1890,19 +1890,19 @@ sal_Bool SwDoc::DeleteRow( const SwCursor& rCursor )
 
     // Thus delete the Rows
     GetIDocumentUndoRedo().StartUndo(UNDO_ROW_DELETE, NULL);
-    sal_Bool bResult = DeleteRowCol( aBoxes );
+    bool bResult = DeleteRowCol( aBoxes );
     GetIDocumentUndoRedo().EndUndo(UNDO_ROW_DELETE, NULL);
 
     return bResult;
 }
 
-sal_Bool SwDoc::DeleteCol( const SwCursor& rCursor )
+bool SwDoc::DeleteCol( const SwCursor& rCursor )
 {
     // Find the Boxes via the Layout
     SwSelBoxes aBoxes;
     GetTblSel( rCursor, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
     if( ::HasProtectedCells( aBoxes ))
-        return sal_False;
+        return false;
 
     // The Cursors need to be removed from the to-be-deleted range.
     // Always place them after/on top of the Table; they are always set
@@ -1916,24 +1916,24 @@ sal_Bool SwDoc::DeleteCol( const SwCursor& rCursor )
 
     // Thus delete the Columns
     GetIDocumentUndoRedo().StartUndo(UNDO_COL_DELETE, NULL);
-    sal_Bool bResult = DeleteRowCol( aBoxes, true );
+    bool bResult = DeleteRowCol( aBoxes, true );
     GetIDocumentUndoRedo().EndUndo(UNDO_COL_DELETE, NULL);
 
     return bResult;
 }
 
-sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
+bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
 {
     if( ::HasProtectedCells( rBoxes ))
-        return sal_False;
+        return false;
 
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     if( pTblNd->GetTable().ISA( SwDDETable ))
-        return sal_False;
+        return false;
 
     ::ClearFEShellTabCols();
     SwSelBoxes aSelBoxes( rBoxes );
@@ -1972,7 +1972,7 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
                     {
                         // That's the FlyFormat we're looking for
                         DelLayoutFmt( pFmt );
-                        return sal_True;
+                        return true;
                     }
                 }
                 // No Fly? Thus Header or Footer: always leave a TextNode
@@ -2008,7 +2008,7 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
             }
 
             // Move hard PageBreaks to the succeeding Node
-            sal_Bool bSavePageBreak = sal_False, bSavePageDesc = sal_False;
+            bool bSavePageBreak = false, bSavePageDesc = false;
             sal_uLong nNextNd = pTblNd->EndOfSectionIndex()+1;
             SwCntntNode* pNextNd = GetNodes()[ nNextNd ]->GetCntntNode();
             if( pNextNd )
@@ -2017,17 +2017,17 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
                     SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
                     const SfxPoolItem *pItem;
                     if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_PAGEDESC,
-                        sal_False, &pItem ) )
+                        false, &pItem ) )
                     {
                         pNextNd->SetAttr( *pItem );
-                        bSavePageDesc = sal_True;
+                        bSavePageDesc = true;
                     }
 
                     if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_BREAK,
-                        sal_False, &pItem ) )
+                        false, &pItem ) )
                     {
                         pNextNd->SetAttr( *pItem );
-                        bSavePageBreak = sal_True;
+                        bSavePageBreak = true;
                     }
                 }
             }
@@ -2066,11 +2066,11 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
                 SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
                 const SfxPoolItem *pItem;
                 if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_PAGEDESC,
-                    sal_False, &pItem ) )
+                    false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
 
                 if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_BREAK,
-                    sal_False, &pItem ) )
+                    false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
             }
 
@@ -2079,14 +2079,14 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         }
         SetModified();
         SetFieldsDirty( true, NULL, 0 );
-        return sal_True;
+        return true;
     }
 
     SwUndoTblNdsChg* pUndo = 0;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         pUndo = new SwUndoTblNdsChg( UNDO_TABLE_DELBOX, aSelBoxes, *pTblNd,
-                                     nMin, nMax, 0, sal_False, sal_False );
+                                     nMin, nMax, 0, false, false );
     }
 
     bool bRet(false);
@@ -2129,17 +2129,17 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
 /**
  * Split up/merge Boxes in the Table
  */
-sal_Bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, sal_uInt16 nCnt,
-                      sal_Bool bSameHeight )
+bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
+                      bool bSameHeight )
 {
     OSL_ENSURE( !rBoxes.empty() && nCnt, "No valid Box list" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     SwTable& rTbl = pTblNd->GetTable();
     if( rTbl.ISA( SwDDETable ))
-        return sal_False;
+        return false;
 
     std::vector<sal_uLong> aNdsCnts;
     SwTableSortBoxes aTmpLst;
@@ -2272,7 +2272,7 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
             SwPaM* pTmp = &rPam;
             while( &rPam != ( pTmp = (SwPaM*)pTmp->GetNext() ))
                 for( int i = 0; i < 2; ++i )
-                    pTmp->GetBound( (sal_Bool)i ) = *rPam.GetPoint();
+                    pTmp->GetBound( (bool)i ) = *rPam.GetPoint();
         }
 
         // Merge them
@@ -2437,7 +2437,7 @@ void SwTableNode::DelFrms()
     }
 }
 
-void SwTableNode::SetNewTable( SwTable* pNewTable, sal_Bool bNewFrames )
+void SwTableNode::SetNewTable( SwTable* pNewTable, bool bNewFrames )
 {
     DelFrms();
     delete pTable;
@@ -2675,7 +2675,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
     rFill.SetLastRowAllowedToChange( !pTab->HasFollowFlowLine() );
 }
 
-void SwDoc::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
+void SwDoc::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
                         const SwCursor* pCrsr, const SwCellFrm* pBoxFrm )
 {
     const SwTableBox* pBox = 0;
@@ -2751,7 +2751,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
     SetTabCols(rTab, rNew, aOld, pBox, bCurRowOnly );
 }
 
-void SwDoc::SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor*,
+void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor*,
                         const SwCellFrm* pBoxFrm )
 {
     SwTabFrm *pTab;
@@ -2879,12 +2879,12 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCur
  * Direct access for UNO
  */
 void SwDoc::SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld,
-                                const SwTableBox *pStart, sal_Bool bCurRowOnly )
+                                const SwTableBox *pStart, bool bCurRowOnly )
 {
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoAttrTbl( *rTab.GetTableNode(), sal_True ));
+            new SwUndoAttrTbl( *rTab.GetTableNode(), true ));
     }
     rTab.SetTabCols( rNew, rOld, pStart, bCurRowOnly );
       ::ClearFEShellTabCols();
@@ -3091,16 +3091,16 @@ sal_uInt16 aTableSplitBoxSetRange[] = {
  *                     Boxes' Max; but only if Size is using absolute
  *                     values (USHRT_MAX)
  */
-sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
-                        sal_Bool bCalcNewSize )
+bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
+                        bool bCalcNewSize )
 {
     SwNode* pNd = &rPos.nNode.GetNode();
     SwTableNode* pTNd = pNd->FindTableNode();
     if( !pTNd || pNd->IsTableNode() )
-        return 0;
+        return false;
 
     if( pTNd->GetTable().ISA( SwDDETable ))
-        return sal_False;
+        return false;
 
     SwTable& rTbl = pTNd->GetTable();
     rTbl.SetHTMLTableLayout( 0 ); // Delete HTML Layout
@@ -3139,7 +3139,7 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
     aFndBox.SetTableLines( rTbl );
     aFndBox.DelFrms( rTbl );
 
-    SwTableNode* pNew = GetNodes().SplitTable( rPos.nNode, sal_False, bCalcNewSize );
+    SwTableNode* pNew = GetNodes().SplitTable( rPos.nNode, false, bCalcNewSize );
 
     if( pNew )
     {
@@ -3329,8 +3329,8 @@ static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara )
             lcl_SplitTable_CpyLine( pLine, pPara );
 }
 
-SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, sal_Bool bAfter,
-                                    sal_Bool bCalcNewSize )
+SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, bool bAfter,
+                                    bool bCalcNewSize )
 {
     SwNode* pNd = &rPos.GetNode();
     SwTableNode* pTNd = pNd->FindTableNode();
@@ -3447,11 +3447,11 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, sal_Bool bAfter,
  * @param bWithPrev  merge the current Table with the preceeding
  *                   or succeeding one
  */
-sal_Bool SwDoc::MergeTable( const SwPosition& rPos, sal_Bool bWithPrev, sal_uInt16 nMode )
+bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode )
 {
     SwTableNode* pTblNd = rPos.nNode.GetNode().FindTableNode(), *pDelTblNd;
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     SwNodes& rNds = GetNodes();
     if( bWithPrev )
@@ -3459,11 +3459,11 @@ sal_Bool SwDoc::MergeTable( const SwPosition& rPos, sal_Bool bWithPrev, sal_uInt
     else
         pDelTblNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
     if( !pDelTblNd )
-        return sal_False;
+        return false;
 
     if( pTblNd->GetTable().ISA( SwDDETable ) ||
         pDelTblNd->GetTable().ISA( SwDDETable ))
-        return sal_False;
+        return false;
 
     // Delete HTML Layout
     pTblNd->GetTable().SetHTMLTableLayout( 0 );
@@ -3488,7 +3488,7 @@ sal_Bool SwDoc::MergeTable( const SwPosition& rPos, sal_Bool bWithPrev, sal_uInt
 
     // The actual merge
     SwNodeIndex aIdx( bWithPrev ? *pTblNd : *pDelTblNd );
-    sal_Bool bRet = rNds.MergeTable( aIdx, !bWithPrev, nMode, pHistory );
+    bool bRet = rNds.MergeTable( aIdx, !bWithPrev, nMode, pHistory );
 
     if( pHistory )
     {
@@ -3504,7 +3504,7 @@ sal_Bool SwDoc::MergeTable( const SwPosition& rPos, sal_Bool bWithPrev, sal_uInt
     return bRet;
 }
 
-sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
+bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
                             sal_uInt16 nMode, SwHistory* )
 {
     SwTableNode* pDelTblNd = rPos.GetNode().GetTableNode();
@@ -3514,7 +3514,7 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
     OSL_ENSURE( pTblNd, "Where did the TableNode go?" );
 
     if( !pDelTblNd || !pTblNd )
-        return sal_False;
+        return false;
 
     pDelTblNd->DelFrms();
 
@@ -3605,7 +3605,7 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
     // Update Layout
     aFndBox.MakeFrms( rTbl );
 
-    return sal_True;
+    return true;
 }
 
 // Use the PtrArray's ForEach method
@@ -3659,7 +3659,7 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
                                         SwTableAutoFmt::UPDATE_CHAR, 0 );
         pSetPara->rTblFmt.UpdateToSet( nPos, aBoxSet,
                                         SwTableAutoFmt::UPDATE_BOX,
-                                        pDoc->GetNumberFormatter( sal_True ) );
+                                        pDoc->GetNumberFormatter( true ) );
         if( aCharSet.Count() )
         {
             sal_uLong nSttNd = pSetBox->GetSttIdx()+1;
@@ -3693,12 +3693,12 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
 /**
  * AutoFormat for the Table/TableSelection
  */
-sal_Bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew )
+bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     // Find all Boxes/Lines
     _FndBox aFndBox( 0, 0 );
@@ -3707,7 +3707,7 @@ sal_Bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt&
         ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
-        return sal_False;
+        return false;
 
     SwTable &table = pTblNd->GetTable();
     table.SetHTMLTableLayout( 0 );
@@ -3774,18 +3774,18 @@ sal_Bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt&
     SetModified();
     SetFieldsDirty( true, NULL, 0 );
 
-    return sal_True;
+    return true;
 }
 
 /**
  * Find out who has the Attributes
  */
-sal_Bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
+bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
 {
     OSL_ENSURE( !rBoxes.empty(), "No valid Box list" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
-        return sal_False;
+        return false;
 
     // Find all Boxes/Lines
     _FndBox aFndBox( 0, 0 );
@@ -3794,7 +3794,7 @@ sal_Bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet
         ForEach_FndLineCopyCol( pTblNd->GetTable().GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
-        return sal_False;
+        return false;
 
     // Store table properties
     SwTable &table = pTblNd->GetTable();
@@ -3846,11 +3846,11 @@ sal_Bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet
                                     SwTableAutoFmt::UPDATE_CHAR, 0 );
             rGet.UpdateFromSet( nPos, pFBox->GetFrmFmt()->GetAttrSet(),
                                 SwTableAutoFmt::UPDATE_BOX,
-                                GetNumberFormatter( sal_True ) );
+                                GetNumberFormatter( true ) );
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 OUString SwDoc::GetUniqueTblName() const
@@ -3894,7 +3894,7 @@ OUString SwDoc::GetUniqueTblName() const
     return aName + OUString::number( ++nNum );
 }
 
-SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, sal_Bool bAll ) const
+SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, bool bAll ) const
 {
     const SwFmt* pRet = 0;
     if( bAll )
@@ -3916,21 +3916,21 @@ SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, sal_Bool bAll ) cons
     return (SwTableFmt*)pRet;
 }
 
-sal_Bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
+bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                                     SwTwips nAbsDiff, SwTwips nRelDiff )
 {
     SwTableNode* pTblNd = (SwTableNode*)rAktBox.GetSttNd()->FindTableNode();
     SwUndo* pUndo = 0;
 
     if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType && pTblNd->GetTable().ISA( SwDDETable ))
-        return sal_False;
+        return false;
 
     SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
     aMsgHnt.eFlags = TBL_BOXPTR;
     UpdateTblFlds( &aMsgHnt );
 
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     switch( eType & 0xff )
     {
     case nsTblChgWidthHeightType::WH_COL_LEFT:
@@ -3968,18 +3968,18 @@ sal_Bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     return bRet;
 }
 
-void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
+void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, bool bCallUpdate )
 {
     // Optimization: If the Box says it's Text, it remains Text
     const SfxPoolItem* pNumFmtItem = 0;
     if( SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT,
-        sal_False, &pNumFmtItem ) && GetNumberFormatter()->IsTextFormat(
+        false, &pNumFmtItem ) && GetNumberFormatter()->IsTextFormat(
             ((SwTblBoxNumFormat*)pNumFmtItem)->GetValue() ))
         return ;
 
     SwUndoTblNumFmt* pUndo = 0;
 
-    sal_Bool bIsEmptyTxtNd;
+    bool bIsEmptyTxtNd;
     bool bChgd = true;
     sal_uInt32 nFmtIdx;
     double fNumber;
@@ -4058,9 +4058,9 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
         const SfxPoolItem* pValueItem = 0, *pFmtItem = 0;
         SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
         if( SFX_ITEM_SET == pBoxFmt->GetItemState( RES_BOXATR_FORMAT,
-                sal_False, &pFmtItem ) ||
+                false, &pFmtItem ) ||
             SFX_ITEM_SET == pBoxFmt->GetItemState( RES_BOXATR_VALUE,
-                sal_False, &pValueItem ))
+                false, &pValueItem ))
         {
             if (GetIDocumentUndoRedo().DoesUndo())
             {
@@ -4165,7 +4165,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition & rPos )
                 SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
                 aRegH.RegisterInModify( pTxtNode , *pTxtNode );
                 if ( pUndo )
-                    pUndo->AddNode( *pTxtNode , sal_False );
+                    pUndo->AddNode( *pTxtNode , false );
                 SfxStringItem * pNewItem = (SfxStringItem*)pFmtItem->Clone();
                 pNewItem->SetValue(OUString());
                 rSet.Put( *pNewItem );
@@ -4222,10 +4222,10 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
  *
  * This method is called by edglss.cxx/fecopy.cxx
  */
-sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
-                        const SwTable* pCpyTbl, sal_Bool bCpyName, sal_Bool bCorrPos )
+bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
+                        const SwTable* pCpyTbl, bool bCpyName, bool bCorrPos )
 {
-    sal_Bool bRet;
+    bool bRet;
 
     const SwTableNode* pSrcTblNd = pCpyTbl
             ? pCpyTbl->GetTableNode()
@@ -4302,7 +4302,7 @@ sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
                     delete pUndo;
                     pUndo = 0;
                 }
-                return sal_False;
+                return false;
             }
             aPos.nNode -= 1; // Set to the Table's EndNode
             pSrcTblNd = aPos.nNode.GetNode().FindTableNode();
@@ -4376,7 +4376,7 @@ sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
     return bRet;
 }
 
-sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
+bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
 {
     bool bChgd = false;
     SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
@@ -4406,9 +4406,9 @@ sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
     return bChgd;
 }
 
-sal_Bool SwDoc::UnProtectCells( const OUString& rName )
+bool SwDoc::UnProtectCells( const OUString& rName )
 {
-    sal_Bool bChgd = sal_False;
+    bool bChgd = false;
     SwTableFmt* pFmt = FindTblFmtByName( rName );
     if( pFmt )
     {
@@ -4420,9 +4420,9 @@ sal_Bool SwDoc::UnProtectCells( const OUString& rName )
     return bChgd;
 }
 
-sal_Bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
+bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
 {
-    sal_Bool bChgd = sal_False;
+    bool bChgd = false;
     if( !rBoxes.empty() )
     {
         SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
@@ -4447,7 +4447,7 @@ sal_Bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
                     pNewBoxFmt->ResetFmtAttr( RES_PROTECT );
                     aFmtsMap.insert(std::make_pair(pBoxFmt, pNewBoxFmt));
                 }
-                bChgd = sal_True;
+                bChgd = true;
             }
         }
 
@@ -4464,11 +4464,11 @@ sal_Bool SwDoc::UnProtectCells( const SwSelBoxes& rBoxes )
     return bChgd;
 }
 
-sal_Bool SwDoc::UnProtectTbls( const SwPaM& rPam )
+bool SwDoc::UnProtectTbls( const SwPaM& rPam )
 {
     GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
-    sal_Bool bChgd = sal_False, bHasSel = rPam.HasMark() ||
+    bool bChgd = false, bHasSel = rPam.HasMark() ||
                                     rPam.GetNext() != (SwPaM*)&rPam;
     SwFrmFmts& rFmts = *GetTblFrmFmts();
     SwTable* pTbl;
@@ -4507,11 +4507,11 @@ sal_Bool SwDoc::UnProtectTbls( const SwPaM& rPam )
     return bChgd;
 }
 
-sal_Bool SwDoc::HasTblAnyProtection( const SwPosition* pPos,
+bool SwDoc::HasTblAnyProtection( const SwPosition* pPos,
                                  const OUString* pTblName,
-                                 sal_Bool* pFullTblProtection )
+                                 bool* pFullTblProtection )
 {
-    sal_Bool bHasProtection = sal_False;
+    bool bHasProtection = false;
     SwTable* pTbl = 0;
     if( pTblName )
         pTbl = SwTable::FindTable( FindTblFmtByName( *pTblName ) );
@@ -4532,15 +4532,15 @@ sal_Bool SwDoc::HasTblAnyProtection( const SwPosition* pPos,
             {
                 if( !bHasProtection )
                 {
-                    bHasProtection = sal_True;
+                    bHasProtection = true;
                     if( !pFullTblProtection )
                         break;
-                    *pFullTblProtection = sal_True;
+                    *pFullTblProtection = true;
                 }
             }
             else if( bHasProtection && pFullTblProtection )
             {
-                *pFullTblProtection = sal_False;
+                *pFullTblProtection = false;
                 break;
             }
         }
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index a28133029c6d..aa267de1e22c 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -407,9 +407,9 @@ void SwDoc::GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const
     }
 }
 
-sal_Bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly )
+bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     if( pTblNd )
     {
@@ -449,7 +449,7 @@ sal_Bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, sal_Bool bTstOnly )
 
                 SetModified();
             }
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
@@ -482,9 +482,9 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew
     }
 }
 
-sal_Bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const
+bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     if( pTblNd )
     {
@@ -495,11 +495,11 @@ sal_Bool SwDoc::GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill
         {
             rToFill = aRowArr[0]->GetFrmFmt()->GetBackground();
 
-            bRet = sal_True;
+            bRet = true;
             for ( sal_uInt16 i = 1; i < aRowArr.size(); ++i )
                 if ( rToFill != aRowArr[i]->GetFrmFmt()->GetBackground() )
                 {
-                    bRet = sal_False;
+                    bRet = false;
                     break;
                 }
         }
@@ -568,9 +568,9 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
         const SvxBorderLine* pBottom = 0;
         const SvxBorderLine* pHori = 0;
         const SvxBorderLine* pVert = 0;
-        sal_Bool bHoriValid = sal_True, bVertValid = sal_True,
-             bTopValid = sal_True, bBottomValid = sal_True,
-             bLeftValid = sal_True, bRightValid = sal_True;
+        bool bHoriValid = true, bVertValid = true,
+             bTopValid = true, bBottomValid = true,
+             bLeftValid = true, bRightValid = true;
 
         // The Flags in the BoxInfo Item decide whether a BorderLine is valid!
         if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, false,
@@ -600,7 +600,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
         else
         {
             // Not set, thus not valid values
-            bTopValid = bBottomValid = bLeftValid = bRightValid = sal_False;
+            bTopValid = bBottomValid = bLeftValid = bRightValid = false;
             pSetBox = 0;
         }
 
@@ -627,9 +627,9 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
             for ( sal_uInt16 j = 0; j < aCellArr.size(); ++j )
             {
                 SwCellFrm *pCell = aCellArr[j];
-                const sal_Bool bVert = pTab->IsVertical();
-                const sal_Bool bRTL = pTab->IsRightToLeft();
-                sal_Bool bTopOver, bLeftOver, bRightOver, bBottomOver;
+                const bool bVert = pTab->IsVertical();
+                const bool bRTL = pTab->IsRightToLeft();
+                bool bTopOver, bLeftOver, bRightOver, bBottomOver;
                 if ( bVert )
                 {
                     bTopOver = pCell->Frm().Right() >= rUnion.Right();
@@ -647,7 +647,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
 
                 if ( bRTL )
                 {
-                    sal_Bool bTmp = bRightOver;
+                    bool bTmp = bRightOver;
                     bRightOver = bLeftOver;
                     bLeftOver = bTmp;
                 }
@@ -797,7 +797,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->BordersChanged(
-                pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), sal_True );
+                pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
         SwTblFmtCmp::Delete( aFmtCmp );
         ::ClearFEShellTabCols();
@@ -824,7 +824,7 @@ static void lcl_SetLineStyle( SvxBorderLine *pToSet,
 }
 
 void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
-                             const Color* pColor, sal_Bool bSetLine,
+                             const Color* pColor, bool bSetLine,
                              const SvxBorderLine* pBorderLine )
 {
     SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
@@ -894,7 +894,7 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->BordersChanged(
-                pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), sal_True );
+                pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
         ::ClearFEShellTabCols();
         SetModified();
@@ -919,14 +919,14 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
         SvxBoxItem     aSetBox    ((const SvxBoxItem    &) rSet.Get(RES_BOX    ));
         SvxBoxInfoItem aSetBoxInfo((const SvxBoxInfoItem&) rSet.Get(SID_ATTR_BORDER_INNER));
 
-        sal_Bool bTopSet      = sal_False,
-             bBottomSet   = sal_False,
-             bLeftSet     = sal_False,
-             bRightSet    = sal_False,
-             bHoriSet     = sal_False,
-             bVertSet     = sal_False,
-             bDistanceSet = sal_False,
-             bRTLTab      = sal_False;
+        bool bTopSet      = false,
+             bBottomSet   = false,
+             bLeftSet     = false,
+             bRightSet    = false,
+             bHoriSet     = false,
+             bVertSet     = false,
+             bDistanceSet = false,
+             bRTLTab      = false;
 
         aSetBoxInfo.ResetFlags();
 
@@ -945,9 +945,9 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
             for ( sal_uInt16 j = 0; j < aCellArr.size(); ++j )
             {
                 SwCellFrm *pCell = aCellArr[j];
-                const sal_Bool bVert = pTab->IsVertical();
-                const sal_Bool bRTL = bRTLTab = pTab->IsRightToLeft();
-                sal_Bool bTopOver, bLeftOver, bRightOver, bBottomOver;
+                const bool bVert = pTab->IsVertical();
+                const bool bRTL = bRTLTab = pTab->IsRightToLeft();
+                bool bTopOver, bLeftOver, bRightOver, bBottomOver;
                 if ( bVert )
                 {
                     bTopOver = pCell->Frm().Right() >= rUnion.Right();
@@ -965,7 +965,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
 
                 if ( bRTL )
                 {
-                    sal_Bool bTmp = bRightOver;
+                    bool bTmp = bRightOver;
                     bRightOver = bLeftOver;
                     bLeftOver = bTmp;
                 }
@@ -979,7 +979,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                     if (aSetBoxInfo.IsValid(VALID_TOP))
                     {
                         if ( !bTopSet )
-                        {   bTopSet = sal_True;
+                        {   bTopSet = true;
                             aSetBox.SetLine( rBox.GetTop(), BOX_LINE_TOP );
                         }
                         else if ((aSetBox.GetTop() && rBox.GetTop() &&
@@ -998,7 +998,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                     if (aSetBoxInfo.IsValid(VALID_LEFT))
                     {
                         if ( !bLeftSet )
-                        {   bLeftSet = sal_True;
+                        {   bLeftSet = true;
                             aSetBox.SetLine( rBox.GetLeft(), BOX_LINE_LEFT );
                         }
                         else if ((aSetBox.GetLeft() && rBox.GetLeft() &&
@@ -1015,7 +1015,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                     if (aSetBoxInfo.IsValid(VALID_VERT))
                     {
                         if ( !bVertSet )
-                        {   bVertSet = sal_True;
+                        {   bVertSet = true;
                             aSetBoxInfo.SetLine( rBox.GetLeft(), BOXINFO_LINE_VERT );
                         }
                         else if ((aSetBoxInfo.GetVert() && rBox.GetLeft() &&
@@ -1031,7 +1031,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                 if ( aSetBoxInfo.IsValid(VALID_RIGHT) && bRightOver )
                 {
                     if ( !bRightSet )
-                    {   bRightSet = sal_True;
+                    {   bRightSet = true;
                         aSetBox.SetLine( rBox.GetRight(), BOX_LINE_RIGHT );
                     }
                     else if ((aSetBox.GetRight() && rBox.GetRight() &&
@@ -1048,7 +1048,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                     if ( aSetBoxInfo.IsValid(VALID_BOTTOM) )
                     {
                         if ( !bBottomSet )
-                        {   bBottomSet = sal_True;
+                        {   bBottomSet = true;
                             aSetBox.SetLine( rBox.GetBottom(), BOX_LINE_BOTTOM );
                         }
                         else if ((aSetBox.GetBottom() && rBox.GetBottom() &&
@@ -1066,7 +1066,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                     if (aSetBoxInfo.IsValid(VALID_HORI))
                     {
                         if ( !bHoriSet )
-                        {   bHoriSet = sal_True;
+                        {   bHoriSet = true;
                             aSetBoxInfo.SetLine( rBox.GetBottom(), BOXINFO_LINE_HORI );
                         }
                         else if ((aSetBoxInfo.GetHori() && rBox.GetBottom() &&
@@ -1089,7 +1089,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
 
                     if( !bDistanceSet ) // Set on first iteration
                     {
-                        bDistanceSet = sal_True;
+                        bDistanceSet = true;
                         for( int k = 0; k < 4; ++k, ++pBrd )
                             aSetBox.SetDistance( rBox.GetDistance( *pBrd ), *pBrd );
                     }
@@ -1165,21 +1165,21 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const SfxPoolItem &rNew )
             SwTabFrm* pTabFrm = pFrm->ImplFindTabFrm();
 
             pTableLayout->Resize(
-                pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), sal_True );
+                pTableLayout->GetBrowseWidthByTabFrm( *pTabFrm ), true );
         }
         SwTblFmtCmp::Delete( aFmtCmp );
         SetModified();
     }
 }
 
-sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) const
+bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
     SwSelBoxes aBoxes;
     if( pTblNd && lcl_GetBoxSel( rCursor, aBoxes ))
     {
-        bRet = sal_True;
+        bRet = true;
         bool bOneFound = false;
         const sal_uInt16 nWhich = rToFill.Which();
         for (size_t i = 0; i < aBoxes.size(); ++i)
@@ -1196,7 +1196,7 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) cons
                         bOneFound = true;
                     }
                     else if( rToFill != rBack )
-                        bRet = sal_False;
+                        bRet = false;
                 }
                 break;
 
@@ -1210,11 +1210,11 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) cons
                         bOneFound = true;
                     }
                     else if( rToFill != rDir )
-                        bRet = sal_False;
+                        bRet = false;
                 }
             }
 
-            if ( sal_False == bRet )
+            if ( false == bRet )
                 break;
         }
     }
@@ -1296,7 +1296,7 @@ static sal_uInt16 lcl_CalcCellFit( const SwLayoutFrm *pCell )
  */
 static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rCols,
                               const SwLayoutFrm *pCell, const SwLayoutFrm *pTab,
-                              sal_Bool bWishValues )
+                              bool bWishValues )
 {
     const sal_uInt16 nWish = bWishValues ?
                     ::lcl_CalcCellFit( pCell ) :
@@ -1357,7 +1357,7 @@ static void lcl_CalcSubColValues( std::vector<sal_uInt16> &rToFill, const SwTabC
  */
 static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols &rCols,
                            const SwLayoutFrm *pStart, const SwLayoutFrm *pEnd,
-                           sal_Bool bWishValues )
+                           bool bWishValues )
 {
     SwSelUnions aUnions;
     ::MakeSelUnions( aUnions, pStart, pEnd,
@@ -1370,7 +1370,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
         const SwRect &rUnion = pSelUnion->GetUnion();
 
         SWRECTFN( pTab )
-        sal_Bool bRTL = pTab->IsRightToLeft();
+        bool bRTL = pTab->IsRightToLeft();
 
         const SwLayoutFrm *pCell = pTab->FirstCell();
         if (!pCell)
@@ -1440,7 +1440,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
     }
 }
 
-void SwDoc::AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance )
+void SwDoc::AdjustCellWidth( const SwCursor& rCursor, bool bBalance )
 {
     // Check whether the current Crsr has it's Point/Mark in a Table
     SwCntntNode* pCntNd = rCursor.GetPoint()->nNode.GetNode().GetCntntNode();
@@ -1468,7 +1468,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance )
     std::vector<sal_uInt16> aWish(aTabCols.Count() + 1);
     std::vector<sal_uInt16> aMins(aTabCols.Count() + 1);
 
-    ::lcl_CalcColValues( aWish, aTabCols, pStart, pEnd, sal_True  );
+    ::lcl_CalcColValues( aWish, aTabCols, pStart, pEnd, true  );
 
     // It's more robust if we calculate the minimum values for the whole Table
     const SwTabFrm *pTab = pStart->ImplFindTabFrm();
@@ -1476,7 +1476,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance )
     pEnd   = (SwLayoutFrm*)pTab->FindLastCntnt()->GetUpper();
     while( !pEnd->IsCellFrm() )
         pEnd = pEnd->GetUpper();
-    ::lcl_CalcColValues( aMins, aTabCols, pStart, pEnd, sal_False );
+    ::lcl_CalcColValues( aMins, aTabCols, pStart, pEnd, false );
 
     if( bBalance )
     {
@@ -1559,7 +1559,7 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance )
     const sal_Int16 nOriHori = pFmt->GetHoriOrient().GetHoriOrient();
 
     // We can leave the "real" work to the SwTable now
-    SetTabCols( aTabCols, sal_False, 0, (SwCellFrm*)pBoxFrm );
+    SetTabCols( aTabCols, false, 0, (SwCellFrm*)pBoxFrm );
 
     // Alignment might have been changed in SetTabCols; restore old value
     const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index b20053c13234..1cda0150cfb3 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -363,9 +363,9 @@ SwTableNode* SwNode::FindTableNode()
 }
 
 /// Is the node located in the visible area of the Shell?
-sal_Bool SwNode::IsInVisibleArea( SwViewShell* pSh ) const
+bool SwNode::IsInVisibleArea( SwViewShell* pSh ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwCntntNode* pNd;
 
     if( ND_STARTNODE & nNodeType )
@@ -400,7 +400,7 @@ sal_Bool SwNode::IsInVisibleArea( SwViewShell* pSh ) const
                 } while ( pFrm && !pFrm->IsValid() );
 
             if( !pFrm || pSh->VisArea().IsOver( pFrm->Frm() ) )
-                bRet = sal_True;
+                bRet = true;
         }
     }
 
@@ -417,12 +417,12 @@ bool SwNode::IsInProtectSect() const
 /// Does the node contain anything protected?
 /// I.e.: Area/Frame/Table rows/... including the Anchor for
 /// Frames/Footnotes/...
-sal_Bool SwNode::IsProtect() const
+bool SwNode::IsProtect() const
 {
     const SwNode* pNd = ND_SECTIONNODE == nNodeType ? pStartOfSection : this;
     const SwStartNode* pSttNd = pNd->FindSectionNode();
     if( pSttNd && ((SwSectionNode*)pSttNd)->GetSection().IsProtectFlag() )
-        return sal_True;
+        return true;
 
     if( 0 != ( pSttNd = FindTableBoxStartNode() ) )
     {
@@ -434,14 +434,14 @@ sal_Bool SwNode::IsProtect() const
                                         GetTblBox( pSttNd->GetIndex() );
         //Robust #149568
         if( pBox && pBox->GetFrmFmt()->GetProtect().IsCntntProtected() )
-            return sal_True;
+            return true;
     }
 
     SwFrmFmt* pFlyFmt = GetFlyFmt();
     if( pFlyFmt )
     {
         if( pFlyFmt->GetProtect().IsCntntProtected() )
-            return sal_True;
+            return true;
         const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
         return rAnchor.GetCntntAnchor()
                 ? rAnchor.GetCntntAnchor()->nNode.GetNode().IsProtect()
@@ -456,12 +456,12 @@ sal_Bool SwNode::IsProtect() const
             return pTFtn->GetTxtNode().IsProtect();
     }
 
-    return sal_False;
+    return false;
 }
 
 /// Find the PageDesc that is used to format this node. If the Layout is available,
 /// we search through that. Else we can only do it the hard way by searching onwards through the nodes.
-const SwPageDesc* SwNode::FindPageDesc( sal_Bool bCalcLay,
+const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
                                         sal_uInt32* pPgDescNdIdx ) const
 {
     if ( !GetNodes().IsDocNodes() )
@@ -912,7 +912,7 @@ SwCntntNode::~SwCntntNode()
     // The base class SwClient of SwFrm excludes itself from the dependency list!
     // Thus, we need to delete all Frames in the dependency list.
     if( GetDepends() )
-        DelFrms(sal_True, sal_False);
+        DelFrms(true, false);
 
     delete pCondColl;
 
@@ -1001,17 +1001,17 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
     NotifyClients( pOldValue, pNewValue );
 }
 
-sal_Bool SwCntntNode::InvalidateNumRule()
+bool SwCntntNode::InvalidateNumRule()
 {
     SwNumRule* pRule = 0;
     const SfxPoolItem* pItem;
     if( GetNodes().IsDocNodes() &&
-        0 != ( pItem = GetNoCondAttr( RES_PARATR_NUMRULE, sal_True )) &&
+        0 != ( pItem = GetNoCondAttr( RES_PARATR_NUMRULE, true )) &&
         !((SwNumRuleItem*)pItem)->GetValue().isEmpty() &&
         0 != (pRule = GetDoc()->FindNumRulePtr(
                                 ((SwNumRuleItem*)pItem)->GetValue() ) ) )
     {
-        pRule->SetInvalidRule( sal_True );
+        pRule->SetInvalidRule( true );
     }
     return 0 != pRule;
 }
@@ -1023,8 +1023,8 @@ SwCntntFrm *SwCntntNode::getLayoutFrm( const SwRootFrm* _pRoot,
                                             pPoint, pPos, bCalcFrm );
 }
 
-SwRect SwCntntNode::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
-                                    const sal_Bool bCalcFrm ) const
+SwRect SwCntntNode::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
+                                    const bool bCalcFrm ) const
 {
     SwRect aRet;
     SwCntntFrm* pFrm = (SwCntntFrm*)::GetFrmOfModify( 0, *(SwModify*)this,
@@ -1034,8 +1034,8 @@ SwRect SwCntntNode::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint
     return aRet;
 }
 
-SwRect SwCntntNode::FindPageFrmRect( const sal_Bool bPrtArea, const Point* pPoint,
-                                    const sal_Bool bCalcFrm ) const
+SwRect SwCntntNode::FindPageFrmRect( const bool bPrtArea, const Point* pPoint,
+                                    const bool bCalcFrm ) const
 {
     SwRect aRet;
     SwFrm* pFrm = ::GetFrmOfModify( 0, *(SwModify*)this,
@@ -1078,14 +1078,14 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
     return pOldColl;
 }
 
-sal_Bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
+bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if( pIdx->GetIndex() < Len() )
     {
         if( !IsTxtNode() )
@@ -1117,22 +1117,22 @@ sal_Bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
                 if( 1 == nDone )
                     *pIdx = nPos;
                 else
-                    bRet = sal_False;
+                    bRet = false;
             }
             else if (nPos < rTNd.GetTxt().getLength())
                 ++(*pIdx);
             else
-                bRet = sal_False;
+                bRet = false;
         }
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
-sal_Bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
+bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if( pIdx->GetIndex() > 0 )
     {
         if( !IsTxtNode() )
@@ -1164,16 +1164,16 @@ sal_Bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
                 if( 1 == nDone )
                     *pIdx = nPos;
                 else
-                    bRet = sal_False;
+                    bRet = false;
             }
             else if( nPos )
                 (*pIdx)--;
             else
-                bRet = sal_False;
+                bRet = false;
         }
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
@@ -1227,7 +1227,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
  * flag(bNeedDel) to indicate whether to del corresponding frm even in doc
  * loading process,
  */
-void SwCntntNode::DelFrms( sal_Bool /*bNeedDel*/, sal_Bool bIsDisposeAccTable )
+void SwCntntNode::DelFrms( bool /*bNeedDel*/, bool bIsDisposeAccTable )
 {
     if( !GetDepends() )
         return;
@@ -1342,7 +1342,7 @@ bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
 }
 
 /// @param rAttr the attribute to set
-sal_Bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
+bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
 {
     if( !GetpSwAttrSet() ) // Have the Nodes created by the corresponding AttrSets
         NewAttrSet( GetDoc()->GetAttrPool() );
@@ -1352,10 +1352,10 @@ sal_Bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     // If Modify is locked, we do not send any Modifys
     if( IsModifyLocked() ||
         ( !GetDepends() &&  RES_PARATR_NUMRULE != rAttr.Which() ))
@@ -1366,7 +1366,7 @@ sal_Bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
     {
         SwAttrSet aOld( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() ),
                   aNew( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() );
-        if( 0 != ( bRet = AttrSetHandleHelper::Put_BC( mpAttrSet, *this, rAttr, &aOld, &aNew ) ))
+        if( ( bRet = AttrSetHandleHelper::Put_BC( mpAttrSet, *this, rAttr, &aOld, &aNew ) ) )
         {
             SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
             SwAttrSetChg aChgNew( *GetpSwAttrSet(), aNew );
@@ -1378,12 +1378,12 @@ sal_Bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
 
 #include <svl/itemiter.hxx>
 
-sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
+bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
 {
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
 
     const SfxPoolItem* pFnd = 0;
@@ -1423,13 +1423,13 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
                 const_cast<SfxItemSet*>(mpAttrSet.get())->SetParent( &GetFmtColl()->GetAttrSet() );
         }
 
-        return sal_True;
+        return true;
     }
 
     if( !GetpSwAttrSet() ) // Have the AttrsSets created by the corresponding Nodes
         NewAttrSet( GetDoc()->GetAttrPool() );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     // If Modify is locked, do not send any Modifys
     if ( IsModifyLocked() ||
          ( !GetDepends() &&
@@ -1442,7 +1442,7 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
     {
         SwAttrSet aOld( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() ),
                   aNew( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() );
-        if( 0 != (bRet = AttrSetHandleHelper::Put_BC( mpAttrSet, *this, rSet, &aOld, &aNew )) )
+        if( (bRet = AttrSetHandleHelper::Put_BC( mpAttrSet, *this, rSet, &aOld, &aNew )) )
         {
             // Some special treatment for Attributes
             SwAttrSetChg aChgOld( *GetpSwAttrSet(), aOld );
@@ -1454,15 +1454,15 @@ sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
 }
 
 // With nWhich it takes the Hint from the Delta array
-sal_Bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     if( !GetpSwAttrSet() )
-        return sal_False;
+        return false;
 
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
 
     // If Modify is locked, do not send out any Modifys
@@ -1489,7 +1489,7 @@ sal_Bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 
     SwAttrSet aOld( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() ),
               aNew( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() );
-    sal_Bool bRet = 0 != AttrSetHandleHelper::ClearItem_BC( mpAttrSet, *this, nWhich1, nWhich2, &aOld, &aNew );
+    bool bRet = 0 != AttrSetHandleHelper::ClearItem_BC( mpAttrSet, *this, nWhich1, nWhich2, &aOld, &aNew );
 
     if( bRet )
     {
@@ -1503,15 +1503,15 @@ sal_Bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
     return bRet;
 }
 
-sal_Bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
+bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
 {
     if( !GetpSwAttrSet() )
-        return sal_False;
+        return false;
 
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
 
     // If Modify is locked, do not send out any Modifys
@@ -1551,7 +1551,7 @@ sal_uInt16 SwCntntNode::ResetAllAttr()
     if ( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
 
     // If Modify is locked, do not send out any Modifys
@@ -1567,7 +1567,7 @@ sal_uInt16 SwCntntNode::ResetAllAttr()
 
     SwAttrSet aOld( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() ),
               aNew( *GetpSwAttrSet()->GetPool(), GetpSwAttrSet()->GetRanges() );
-    sal_Bool bRet = 0 != AttrSetHandleHelper::ClearItem_BC( mpAttrSet, *this, 0, &aOld, &aNew );
+    bool bRet = 0 != AttrSetHandleHelper::ClearItem_BC( mpAttrSet, *this, 0, &aOld, &aNew );
 
     if( bRet )
     {
@@ -1581,7 +1581,7 @@ sal_uInt16 SwCntntNode::ResetAllAttr()
     return aNew.Count();
 }
 
-sal_Bool SwCntntNode::GetAttr( SfxItemSet& rSet, sal_Bool bInParent ) const
+bool SwCntntNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const
 {
     if( rSet.Count() )
         rSet.ClearItem();
@@ -1615,7 +1615,7 @@ sal_uInt16 SwCntntNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rW
 }
 
 const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich,
-                                                sal_Bool bInParents ) const
+                                               bool bInParents ) const
 {
     const SfxPoolItem* pFnd = 0;
     if( pCondColl && pCondColl->GetRegisteredIn() )
@@ -1725,12 +1725,12 @@ void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
         if( IsInCache() )
         {
             SwFrm::GetCache().Delete( this );
-            SetInCache( sal_False );
+            SetInCache( false );
         }
     }
 }
 
-sal_Bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
+bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
 {
     const SwNodes& rNds = GetNodes();
     {
@@ -1784,7 +1784,7 @@ sal_Bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
             if( nCond )
             {
                 rTmp.SetCondition( (Master_CollConditions)nCond, 0 );
-                return sal_True;
+                return true;
             }
             pSttNd = pSttNd->GetIndex()
                         ? pSttNd->StartOfSectionNode()
@@ -1807,13 +1807,13 @@ sal_Bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
                 if( pOutlNd->IsOutline())
                 {
                     rTmp.SetCondition( PARA_IN_OUTLINE, pOutlNd->GetAttrOutlineLevel() - 1 );
-                    return sal_True;
+                    return true;
                 }
             }
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 void SwCntntNode::ChkCondColl()
@@ -1932,10 +1932,10 @@ IDocumentListItems& SwNode::getIDocumentListItems() { return *GetDoc(); } // #i8
 const IDocumentMarkAccess* SwNode::getIDocumentMarkAccess() const { return GetDoc()->getIDocumentMarkAccess(); }
 IStyleAccess& SwNode::getIDocumentStyleAccess() { return GetDoc()->GetIStyleAccess(); }
 
-sal_Bool SwNode::IsInRedlines() const
+bool SwNode::IsInRedlines() const
 {
     const SwDoc * pDoc = GetDoc();
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if (pDoc != NULL)
         bResult = pDoc->IsInRedlines(*this);
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 45b904a84e8b..201e3bdcc7fb 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -54,7 +54,7 @@ public:
 
     SwFrm* GetFrm( const Point* pDocPos = 0,
                     const SwPosition *pPos = 0,
-                    const sal_Bool bCalcFrm = sal_True ) const;
+                    const bool bCalcFrm = true ) const;
 };
 
 SwNode* GoNextWithFrm(const SwNodes& rNodes, SwNodeIndex *pIdx)
@@ -389,7 +389,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
                     ((SwSectionFrm*)pNxt)->UnlockJoin();
                 pUp = (SwLayoutFrm*)(*pUpperFrms)[x++];
                 OSL_ENSURE( pUp->GetUpper() || pUp->IsFlyFrm(), "Lost Upper" );
-                ::_InsertCnt( pUp, pDoc, pNd->GetIndex(), sal_False, nStt+1, pNxt );
+                ::_InsertCnt( pUp, pDoc, pNd->GetIndex(), false, nStt+1, pNxt );
                 pNxt = pUp->GetLastLower();
                 (*pUpperFrms)[x-2] = pNxt;
             }
@@ -415,7 +415,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong
 
 SwFrm* SwNode2LayImpl::GetFrm( const Point* pDocPos,
                                 const SwPosition *pPos,
-                                const sal_Bool bCalcFrm ) const
+                                const bool bCalcFrm ) const
 {
     // test if change of member pIter -> pMod broke anything
     return pMod ? ::GetFrmOfModify( 0, *pMod, USHRT_MAX, pDocPos, pPos, bCalcFrm ) : 0;
@@ -454,8 +454,8 @@ SwNode2Layout::~SwNode2Layout()
 }
 
 SwFrm* SwNode2Layout::GetFrm( const Point* pDocPos,
-                                const SwPosition *pPos,
-                                const sal_Bool bCalcFrm ) const
+                              const SwPosition *pPos,
+                              const bool bCalcFrm ) const
 {
     return pImpl->GetFrm( pDocPos, pPos, bCalcFrm );
 }
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index a2ffd3ce5924..6a53433d2901 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -597,7 +597,7 @@ void SwNumRule::dumpAsXml(xmlTextWriterPtr w)
      writer.startElement("swnumrule");
      OString aName = OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8);
      writer.writeFormatAttribute("name", "%s", BAD_CAST(aName.getStr()));
-     writer.writeFormatAttribute("isautorule", TMP_FORMAT, IsAutoRule());
+     writer.writeFormatAttribute("isautorule", TMP_FORMAT, IsAutoRule() ? 1 : 0);
      if (GetPoolFmtId() != USHRT_MAX)
          writer.writeFormatAttribute("poolfmtid", TMP_FORMAT, GetPoolFmtId());
      writer.endElement();
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 2bb922d13cbd..c8cc236de3c8 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -55,7 +55,7 @@ sal_uInt16 HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange );
 SwNodes::SwNodes( SwDoc* pDocument )
     : pRoot( 0 ), pMyDoc( pDocument )
 {
-    bInNodesDel = bInDelUpdOutl = bInDelUpdNum = sal_False;
+    bInNodesDel = bInDelUpdOutl = bInDelUpdNum = false;
 
     OSL_ENSURE( pMyDoc, "in which Doc am I?" );
 
@@ -110,7 +110,7 @@ SwNodes::~SwNodes()
 }
 
 void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
-                        SwNodeIndex& rInsPos, sal_Bool bNewFrms )
+                        SwNodeIndex& rInsPos, bool bNewFrms )
 {
     // no need for frames in the UndoArea
     SwNodes& rNds = rInsPos.GetNodes();
@@ -222,7 +222,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                         sNumRule = pNumRule->GetName();
                         SwNumRule* pDestRule = pDestDoc->FindNumRulePtr( sNumRule );
                         if( pDestRule )
-                            pDestRule->SetInvalidRule( sal_True );
+                            pDestRule->SetInvalidRule( true );
                         else
                             pDestDoc->MakeNumRule( sNumRule, pNumRule );
                     }
@@ -234,7 +234,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                 pTxtNd->RemoveFromList();
             }
 
-            RemoveNode( rDelPos.GetIndex(), 1, sal_False ); // move indices
+            RemoveNode( rDelPos.GetIndex(), 1, false ); // move indices
             SwCntntNode * pCNd = pNd->GetCntntNode();
             rNds.InsertNode( pNd, aInsPos );
 
@@ -405,14 +405,14 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
  * @param bNewFrms
  * @return
  */
-sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
-                    const SwNodeIndex& aIndex, sal_Bool bNewFrms )
+bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
+                    const SwNodeIndex& aIndex, bool bNewFrms )
 {
     SwNode * pAktNode;
     if( aIndex == 0 ||
         ( (pAktNode = &aIndex.GetNode())->GetStartNode() &&
           !pAktNode->StartOfSectionIndex() ))
-        return sal_False;
+        return false;
 
     SwNodeRange aRg( aRange );
 
@@ -434,14 +434,14 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
     // if in same array, check insertion position
     if( aRg.aStart >= aRg.aEnd )
-        return sal_False;
+        return false;
 
     if( this == &rNodes )
     {
         if( ( aIndex.GetIndex()-1 >= aRg.aStart.GetIndex() &&
               aIndex.GetIndex()-1 < aRg.aEnd.GetIndex()) ||
             ( aIndex.GetIndex()-1 == aRg.aEnd.GetIndex() ) )
-            return sal_False;
+            return false;
     }
 
     sal_uInt16 nLevel = 0; // level counter
@@ -460,7 +460,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
     // call DelFrms/MakeFrms for the upmost SectionNode
     sal_uInt16 nSectNdCnt = 0;
-    sal_Bool bSaveNewFrms = bNewFrms;
+    bool bSaveNewFrms = bNewFrms;
 
     // continue until everything has been moved
     while( aRg.aStart < aRg.aEnd )
@@ -553,7 +553,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                             if( bOutlNd )
                                 pOutlineNds->erase( pNd );
 
-                            RemoveNode( aMvIdx.GetIndex(), 1, sal_False );
+                            RemoveNode( aMvIdx.GetIndex(), 1, false );
                             pNd->pStartOfSection = pSttNode;
                             rNodes.InsertNode( pNd, aIdx );
 
@@ -652,14 +652,14 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                     if( bNewFrms && pSctNd )
                         pSctNd->DelFrms();
 
-                    RemoveNode( aRg.aEnd.GetIndex(), 1, sal_False ); // EndNode loeschen
+                    RemoveNode( aRg.aEnd.GetIndex(), 1, false ); // EndNode loeschen
                     sal_uLong nSttPos = pSttNd->GetIndex();
 
                     // this StartNode will be removed later
                     SwStartNode* pTmpSttNd = new SwStartNode( *this, nSttPos+1 );
                     pTmpSttNd->pStartOfSection = pSttNd->pStartOfSection;
 
-                    RemoveNode( nSttPos, 1, sal_False ); // SttNode loeschen
+                    RemoveNode( nSttPos, 1, false ); // SttNode loeschen
 
                     pSttNd->pStartOfSection = aIdx.GetNode().pStartOfSection;
                     rNodes.InsertNode( pSttNd, aIdx  );
@@ -677,7 +677,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                     {
                         pSctNd->NodesArrChgd();
                         ++nSectNdCnt;
-                        bNewFrms = sal_False;
+                        bNewFrms = false;
                     }
                 }
             }
@@ -769,7 +769,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                     nInsPos = 0;
 
                     // remove pointer from node array
-                    RemoveNode( aRg.aEnd.GetIndex(), 1, sal_True );
+                    RemoveNode( aRg.aEnd.GetIndex(), 1, true );
                     aRg.aEnd--;
 
                     SwSectionNode* pSectNd = aSttNdStack[ nLevel ]->GetSectionNode();
@@ -799,7 +799,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
             //Add special function to text node.
             {
                 if( bNewFrms && pAktNode->GetCntntNode() )
-                    ((SwCntntNode*)pAktNode)->DelFrms( sal_False );
+                    ((SwCntntNode*)pAktNode)->DelFrms( false );
                 pAktNode->pStartOfSection = aSttNdStack[ nLevel ];
                 nInsPos++;
                 aRg.aEnd--;
@@ -885,7 +885,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
         rNodes.UpdtOutlineIdx( aOrigInsPos.aStart.GetNode() );
     }
 
-    return sal_True;
+    return true;
 }
 
 /** create a start/end section pair
@@ -976,8 +976,8 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
         {
             // there was a pairwise reset, adjust only those in the range
             SwStartNode* pTmpSttNd = pAktNode->pStartOfSection;
-            RemoveNode( pRange->aStart.GetIndex(), 1, sal_True );
-            RemoveNode( pRange->aEnd.GetIndex(), 1, sal_True );
+            RemoveNode( pRange->aStart.GetIndex(), 1, true );
+            RemoveNode( pRange->aEnd.GetIndex(), 1, true );
 
             SwNodeIndex aTmpIdx( pRange->aStart );
             while( aTmpIdx < pRange->aEnd )
@@ -1104,8 +1104,8 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
     // problems if aEnd == aStart and aEnd is deleted, so aEnd <= aStart)
     aRg.aStart--;
 
-    sal_Bool bSaveInNodesDel = bInNodesDel;
-    bInNodesDel = sal_True;
+    bool bSaveInNodesDel = bInNodesDel;
+    bInNodesDel = true;
     bool bUpdateOutline = false;
 
     // loop until everything is deleted
@@ -1150,7 +1150,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
             }
             else
             {
-                RemoveNode( aRg.aEnd.GetIndex()+1, nCnt, sal_True ); // delete
+                RemoveNode( aRg.aEnd.GetIndex()+1, nCnt, true ); // delete
                 nCnt = 0;
                 aRg.aEnd--; // before the EndNode
                 nLevel++;
@@ -1164,13 +1164,13 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
                 {
                     // now delete array
                     aRg.aEnd++;
-                    RemoveNode( aRg.aEnd.GetIndex(), nCnt, sal_True );
+                    RemoveNode( aRg.aEnd.GetIndex(), nCnt, true );
                     nCnt = 0;
                 }
             }
             else // remove all nodes between start and end node (incl. both)
             {
-                RemoveNode( aRg.aEnd.GetIndex(), nCnt + 2, sal_True ); // delete array
+                RemoveNode( aRg.aEnd.GetIndex(), nCnt + 2, true ); // delete array
                 nCnt = 0;
                 nLevel--;
             }
@@ -1212,7 +1212,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
 
     aRg.aEnd++;
     if( nCnt != 0 )
-        RemoveNode( aRg.aEnd.GetIndex(), nCnt, sal_True ); // delete the rest
+        RemoveNode( aRg.aEnd.GetIndex(), nCnt, true ); // delete the rest
 
     // delete all empty start/end node pairs
     while( aRg.aEnd.GetNode().GetEndNode() &&
@@ -1232,14 +1232,14 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
         if( bUpdateOutline || bInDelUpdOutl )
         {
             UpdtOutlineIdx( aRg.aEnd.GetNode() );
-            bInDelUpdOutl = sal_False;
+            bInDelUpdOutl = false;
         }
 
     }
     else
     {
         if( bUpdateOutline )
-            bInDelUpdOutl = sal_True;
+            bInDelUpdOutl = true;
     }
 }
 
@@ -1290,7 +1290,7 @@ SwCntntNode* SwNodes::GoNext(SwNodeIndex *pIdx) const
 
     SwNodeIndex aTmp(*pIdx, +1);
     SwNode* pNd = 0;
-    while( aTmp < Count()-1 && 0 == ( pNd = &aTmp.GetNode())->IsCntntNode() )
+    while( aTmp < Count()-1 && false == ( pNd = &aTmp.GetNode())->IsCntntNode() )
         ++aTmp;
 
     if( aTmp == Count()-1 )
@@ -1307,7 +1307,7 @@ SwCntntNode* SwNodes::GoPrevious(SwNodeIndex *pIdx) const
 
     SwNodeIndex aTmp( *pIdx, -1 );
     SwNode* pNd = 0;
-    while( aTmp.GetIndex() && 0 == ( pNd = &aTmp.GetNode())->IsCntntNode() )
+    while( aTmp.GetIndex() && false == ( pNd = &aTmp.GetNode())->IsCntntNode() )
         aTmp--;
 
     if( !aTmp.GetIndex() )
@@ -1331,21 +1331,21 @@ inline bool TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, sal_uLong nStt, sal_uL
  * @param rEnd end index of the range
  * @return <true> if valid range
  */
-sal_Bool SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const
+bool SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const
 {
     sal_uLong nStt = rStt.GetIndex(), nEnd = rEnd.GetIndex();
     if( TstIdx( nStt, nEnd, pEndOfContent->StartOfSectionIndex(),
-                pEndOfContent->GetIndex() )) return sal_True;
+                pEndOfContent->GetIndex() )) return true;
     if( TstIdx( nStt, nEnd, pEndOfAutotext->StartOfSectionIndex(),
-                pEndOfAutotext->GetIndex() )) return sal_True;
+                pEndOfAutotext->GetIndex() )) return true;
     if( TstIdx( nStt, nEnd, pEndOfPostIts->StartOfSectionIndex(),
-                pEndOfPostIts->GetIndex() )) return sal_True;
+                pEndOfPostIts->GetIndex() )) return true;
     if( TstIdx( nStt, nEnd, pEndOfInserts->StartOfSectionIndex(),
-                pEndOfInserts->GetIndex() )) return sal_True;
+                pEndOfInserts->GetIndex() )) return true;
     if( TstIdx( nStt, nEnd, pEndOfRedlines->StartOfSectionIndex(),
-                pEndOfRedlines->GetIndex() )) return sal_True;
+                pEndOfRedlines->GetIndex() )) return true;
 
-    return sal_False;       // is somewhere in the middle, ERROR
+    return false;       // is somewhere in the middle, ERROR
 }
 
 /** Delete a number of nodes
@@ -1374,7 +1374,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
             sal_uLong nEndIdx = (*ppEndNdArr)->GetIndex();
 
             if( nSttIdx != nEndIdx )
-                RemoveNode( nSttIdx, nEndIdx - nSttIdx, sal_True );
+                RemoveNode( nSttIdx, nEndIdx - nSttIdx, true );
 
             ++ppEndNdArr;
         }
@@ -1402,7 +1402,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
                 ((SwCntntNode*)pNd)->DelFrms();
             }
         }
-        RemoveNode( nSttIdx, nCnt, sal_True );
+        RemoveNode( nSttIdx, nCnt, true );
 
         // update numbering
         if( bUpdateNum )
@@ -1684,7 +1684,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
 
 ///@see SwNodes::_MoveNodes (TODO: seems to be C&P programming here)
 void SwNodes::_CopyNodes( const SwNodeRange& rRange,
-            const SwNodeIndex& rIndex, sal_Bool bNewFrms, sal_Bool bTblInsDummyNode ) const
+            const SwNodeIndex& rIndex, bool bNewFrms, bool bTblInsDummyNode ) const
 {
     SwDoc* pDoc = rIndex.GetNode().GetDoc();
 
@@ -1773,7 +1773,7 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                     SwStartNode* pSttNd = aRg.aStart.GetNode().GetStartNode();
                     _CopyNodes( SwNodeRange( *pSttNd, + 1,
                                             *pSttNd->EndOfSectionNode() ),
-                                aInsPos, bNewFrms, sal_False );
+                                aInsPos, bNewFrms, false );
 
                     // insert a DummyNode for the box-EndNode?
                     if( bTblInsDummyNode )
@@ -1896,7 +1896,7 @@ void SwNodes::_DelDummyNodes( const SwNodeRange& rRg )
     while( aIdx.GetIndex() < rRg.aEnd.GetIndex() )
     {
         if( ND_SECTIONDUMMY == aIdx.GetNode().GetNodeType() )
-            RemoveNode( aIdx.GetIndex(), 1, sal_True );
+            RemoveNode( aIdx.GetIndex(), 1, true );
         else
             ++aIdx;
     }
@@ -2195,7 +2195,7 @@ struct TempBigPtrEntry : public BigPtrEntry
 
 }
 
-void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, sal_Bool bDel )
+void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel )
 {
     sal_uLong nEnd = nDelPos + nSz;
     SwNode* pNew = (*this)[ nEnd ];
@@ -2350,7 +2350,7 @@ SwNode * SwNodes::DocumentSectionEndNode(SwNode * pNode) const
     return DocumentSectionStartNode(pNode)->EndOfSectionNode();
 }
 
-sal_Bool SwNodes::IsDocNodes() const
+bool SwNodes::IsDocNodes() const
 {
     return this == &pMyDoc->GetNodes();
 }
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 0ff975263f62..3c864965ee08 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -64,7 +64,7 @@ SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::R
 void SwRetrievedInputStreamDataManager::PushData(
         const tDataKey nDataKey,
         com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
-        const sal_Bool bIsStreamReadOnly )
+        const bool bIsStreamReadOnly )
 {
     osl::MutexGuard aGuard(maMutex);
 
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 5895eb478a0a..6ef9a0d604f6 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -333,15 +333,15 @@ void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
     }
 }
 
-sal_Bool SwSection::CalcHiddenFlag() const
+bool SwSection::CalcHiddenFlag() const
 {
     const SwSection* pSect = this;
     do {
         if( pSect->IsHidden() && pSect->IsCondHidden() )
-            return sal_True;
+            return true;
     } while( 0 != ( pSect = pSect->GetParent()) );
 
-    return sal_False;
+    return false;
 }
 
 bool SwSection::IsProtect() const
@@ -379,7 +379,7 @@ void SwSection::SetProtect(bool const bFlag)
     if (pFormat)
     {
         SvxProtectItem aItem( RES_PROTECT );
-        aItem.SetCntntProtect( (sal_Bool)bFlag );
+        aItem.SetCntntProtect( bFlag );
         pFormat->SetFmtAttr( aItem );
         // note: this will call m_Data.SetProtectFlag via Modify!
     }
@@ -397,7 +397,7 @@ void SwSection::SetEditInReadonly(bool const bFlag)
     if (pFormat)
     {
         SwFmtEditInReadonly aItem;
-        aItem.SetValue( (sal_Bool)bFlag );
+        aItem.SetValue( bFlag );
         pFormat->SetFmtAttr( aItem );
         // note: this will call m_Data.SetEditInReadonlyFlag via Modify!
     }
@@ -639,7 +639,7 @@ SwSectionFmt::~SwSectionFmt()
     if( !GetDoc()->IsInDtor() )
     {
         SwSectionNode* pSectNd;
-        const SwNodeIndex* pIdx = GetCntnt( sal_False ).GetCntntIdx();
+        const SwNodeIndex* pIdx = GetCntnt( false ).GetCntntIdx();
         if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
             0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
         {
@@ -661,7 +661,7 @@ SwSectionFmt::~SwSectionFmt()
             }
             // mba: test iteration; objects are removed while iterating
             // use hint which allows to specify, if the content shall be saved or not
-            CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( sal_True ) );
+            CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( true ) );
 
             // Raise the Section up
             SwNodeRange aRg( *pSectNd, 0, *pSectNd->EndOfSectionNode() );
@@ -684,14 +684,14 @@ extern void sw_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd );
 void SwSectionFmt::DelFrms()
 {
     SwSectionNode* pSectNd;
-    const SwNodeIndex* pIdx = GetCntnt(sal_False).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
     if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
         0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
     {
         // First delete the <SwSectionFrm> of the <SwSectionFmt> instance
         // mba: test iteration as objects are removed in iteration
         // use hint which allows to specify, if the content shall be saved or not
-        CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( sal_False ) );
+        CallSwClientNotify( SwSectionFrmMoveAndDeleteHint( false ) );
 
         // Then delete frames of the nested <SwSectionFmt> instances
         SwIterator<SwSectionFmt,SwSectionFmt> aIter( *this );
@@ -725,7 +725,7 @@ void SwSectionFmt::DelFrms()
 void SwSectionFmt::MakeFrms()
 {
     SwSectionNode* pSectNd;
-    const SwNodeIndex* pIdx = GetCntnt(sal_False).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
 
     if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
         0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
@@ -880,11 +880,11 @@ static bool lcl_SectionCmpPos( const SwSection *pFirst, const SwSection *pSecond
     const SwSectionFmt* pFSectFmt = pFirst->GetFmt();
     const SwSectionFmt* pSSectFmt = pSecond->GetFmt();
     OSL_ENSURE( pFSectFmt && pSSectFmt &&
-            pFSectFmt->GetCntnt(sal_False).GetCntntIdx() &&
-            pSSectFmt->GetCntnt(sal_False).GetCntntIdx(),
+            pFSectFmt->GetCntnt(false).GetCntntIdx() &&
+            pSSectFmt->GetCntnt(false).GetCntntIdx(),
                 "ungueltige Sections" );
-    return pFSectFmt->GetCntnt(sal_False).GetCntntIdx()->GetIndex() <
-                  pSSectFmt->GetCntnt(sal_False).GetCntntIdx()->GetIndex();
+    return pFSectFmt->GetCntnt(false).GetCntntIdx()->GetIndex() <
+                  pSSectFmt->GetCntnt(false).GetCntntIdx()->GetIndex();
 }
 
 static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
@@ -896,7 +896,7 @@ static bool lcl_SectionCmpNm( const SwSection *pFSect, const SwSection *pSSect)
 // get all Sections that have been derived from this one
 sal_uInt16 SwSectionFmt::GetChildSections( SwSections& rArr,
                                         SectionSort eSort,
-                                        sal_Bool bAllSections ) const
+                                        bool bAllSections ) const
 {
     rArr.clear();
 
@@ -906,7 +906,7 @@ sal_uInt16 SwSectionFmt::GetChildSections( SwSections& rArr,
         const SwNodeIndex* pIdx;
         for( SwSectionFmt* pLast = aIter.First(); pLast; pLast = aIter.Next() )
             if( bAllSections ||
-                ( 0 != ( pIdx = pLast->GetCntnt(sal_False).
+                ( 0 != ( pIdx = pLast->GetCntnt(false).
                 GetCntntIdx()) && &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
             {
                 SwSection* pDummy = pLast->GetSection();
@@ -931,9 +931,9 @@ sal_uInt16 SwSectionFmt::GetChildSections( SwSections& rArr,
 }
 
 // See whether the Section is within the Nodes or the UndoNodes array
-sal_Bool SwSectionFmt::IsInNodesArr() const
+bool SwSectionFmt::IsInNodesArr() const
 {
-    const SwNodeIndex* pIdx = GetCntnt(sal_False).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
     return pIdx && &pIdx->GetNodes() == &GetDoc()->GetNodes();
 }
 
@@ -1022,7 +1022,7 @@ void SwSectionFmt::UpdateParent()
 
 SwSectionNode* SwSectionFmt::GetSectionNode(bool const bAlways)
 {
-    const SwNodeIndex* pIdx = GetCntnt(sal_False).GetCntntIdx();
+    const SwNodeIndex* pIdx = GetCntnt(false).GetCntntIdx();
     if( pIdx && ( bAlways || &pIdx->GetNodes() == &GetDoc()->GetNodes() ))
         return pIdx->GetNode().GetSectionNode();
     return 0;
@@ -1060,7 +1060,7 @@ bool SwSectionFmt::IsInUndo() const
 
 bool SwSectionFmt::IsInContent() const
 {
-    SwNodeIndex const*const pIdx = GetCntnt(sal_False).GetCntntIdx();
+    SwNodeIndex const*const pIdx = GetCntnt(false).GetCntntIdx();
     OSL_ENSURE(pIdx, "SwSectionFmt::IsInContent: no index?");
     return (pIdx) ? !GetDoc()->IsInHeaderFooter(*pIdx) : true;
 }
@@ -1190,7 +1190,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     // Always switch off Undo
     bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
     pDoc->GetIDocumentUndoRedo().DoUndo(false);
-    sal_Bool bWasVisibleLinks = pDoc->IsVisibleLinks();
+    bool bWasVisibleLinks = pDoc->IsVisibleLinks();
     pDoc->SetVisibleLinks( false );
 
     SwPaM* pPam;
@@ -1211,7 +1211,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 
         SwPosition aPos( aIdx, SwIndex( pNewNd, 0 ));
         aPos.nNode--;
-        pDoc->CorrAbs( aIdx, aEndIdx, aPos, sal_True );
+        pDoc->CorrAbs( aIdx, aEndIdx, aPos, true );
 
         pPam = new SwPaM( aPos );
 
@@ -1341,7 +1341,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
                 if( pCpyRg )
                 {
                     SwNodeIndex& rInsPos = pPam->GetPoint()->nNode;
-                    sal_Bool bCreateFrm = rInsPos.GetIndex() <=
+                    bool bCreateFrm = rInsPos.GetIndex() <=
                                 pDoc->GetNodes().GetEndOfExtras().GetIndex() ||
                                 rInsPos.GetNode().FindTableNode();
 
@@ -1361,7 +1361,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
                         pPam->Move( fnMoveBackward, fnGoNode );
                         pPam->SetMark(); // Rewire both SwPositions
 
-                        pDoc->CorrAbs( aSave, *pPam->GetPoint(), 0, sal_True );
+                        pDoc->CorrAbs( aSave, *pPam->GetPoint(), 0, true );
                         pDoc->GetNodes().Delete( aSave, 1 );
                     }
                     delete pCpyRg;
@@ -1411,7 +1411,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
 
         if( pESh )
         {
-            pESh->Pop( sal_False );
+            pESh->Pop( false );
             pPam = 0; // pam was deleted earlier
         }
     }
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index d451b927667d..8c2bafe50760 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -270,7 +270,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         if( pESh )
         {
             const bool bEndActionByVirDev = pESh->IsEndActionByVirDev();
-            pESh->SetEndActionByVirDev( sal_True );
+            pESh->SetEndActionByVirDev( true );
             pESh->EndAllAction();
             pESh->SetEndActionByVirDev( bEndActionByVirDev );
         }
@@ -348,7 +348,7 @@ static bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pG
                                     pLayout->GetBrowseWidthByTable( *pDoc );
                         if ( nBrowseWidth )
                         {
-                            pLayout->Resize( nBrowseWidth, sal_True, sal_True,
+                            pLayout->Resize( nBrowseWidth, true, true,
                                              bLastGrf ? HTMLTABLE_RESIZE_NOW
                                                       : 500 );
                         }
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 8467814d3dd9..7abc1f83bfed 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -112,7 +112,7 @@ SwFrmFmt *FindFrmFmt( SdrObject *pObj )
     return pRetval;
 }
 
-sal_Bool HasWrap( const SdrObject* pObj )
+bool HasWrap( const SdrObject* pObj )
 {
     if ( pObj )
     {
@@ -123,7 +123,7 @@ sal_Bool HasWrap( const SdrObject* pObj )
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 /// returns the BoundRect _inclusive_ distance of the object.
@@ -155,7 +155,7 @@ SwContact* GetUserCall( const SdrObject* pObj )
 }
 
 /// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text)
-sal_Bool IsMarqueeTextObj( const SdrObject& rObj )
+bool IsMarqueeTextObj( const SdrObject& rObj )
 {
     SdrTextAniKind eTKind;
     return SdrInventor == rObj.GetObjInventor() &&
@@ -209,7 +209,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
             if ( pAnchoredObj->GetPageFrm() )
             {
                 ::Notify_Background( _pDrawObj, pAnchoredObj->GetPageFrm(),
-                                     pAnchoredObj->GetObjRect(), PREP_FLY_ARRIVE, sal_True );
+                                     pAnchoredObj->GetObjRect(), PREP_FLY_ARRIVE, true );
             }
 
             pAnchoredObj->InvalidateObjPos();
@@ -236,7 +236,7 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
         if ( pAnchoredObj && pAnchoredObj->GetPageFrm() )
         {
             ::Notify_Background( _pDrawObj, pAnchoredObj->GetPageFrm(),
-                                 pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, sal_True );
+                                 pAnchoredObj->GetObjRect(), PREP_FLY_LEAVE, true );
         }
     }
 }
@@ -988,7 +988,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
                 aOldRect.Pos() += pDrawVirtObj->GetOffset();
                 if( aOldRect.HasArea() )
                     ::Notify_Background( pDrawVirtObj, pPage,
-                                         aOldRect, PREP_FLY_LEAVE,sal_True);
+                                         aOldRect, PREP_FLY_LEAVE,true);
             }
             // #i34640# - include spacing for wrapping
             SwRect aRect( pDrawVirtObj->GetAnchoredObj()->GetObjRectWithSpaces() );
@@ -997,7 +997,7 @@ void SwDrawContact::NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect )
                 SwPageFrm* pPg = (SwPageFrm*)::FindPage( aRect, pPage );
                 if ( pPg )
                     ::Notify_Background( pDrawVirtObj, pPg, aRect,
-                                         PREP_FLY_ARRIVE, sal_True );
+                                         PREP_FLY_ARRIVE, true );
             }
             ::ClrContourCache( pDrawVirtObj );
         }
@@ -1024,7 +1024,7 @@ static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
                 // #i34640# - determine correct page frame
                 SwPageFrm* pOldPageFrm = (SwPageFrm*)::FindPage( aOldRect, pPageFrm );
                 ::Notify_Background( &_rObj, pOldPageFrm, aOldRect,
-                                     PREP_FLY_LEAVE, sal_True);
+                                     PREP_FLY_LEAVE, true);
             }
         }
         // #i34640# - include spacing for wrapping
@@ -1033,7 +1033,7 @@ static void lcl_NotifyBackgroundOfObj( SwDrawContact& _rDrawContact,
         {
             pPageFrm = (SwPageFrm*)::FindPage( aNewRect, pPageFrm );
             ::Notify_Background( &_rObj, pPageFrm, aNewRect,
-                                 PREP_FLY_ARRIVE, sal_True );
+                                 PREP_FLY_ARRIVE, true );
         }
         ClrContourCache( &_rObj );
     }
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 7c190ead3e6b..c7b57fe5f519 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -735,7 +735,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
         pTmpFrm = GetFlyFrm();
     const bool bVertX = pTmpFrm->IsVertical();
 
-    const sal_Bool bRTL = pTmpFrm->IsRightToLeft();
+    const bool bRTL = pTmpFrm->IsRightToLeft();
 
     const bool bVertL2RX = pTmpFrm->IsVertLR();
     const Point aNewPos( ( bVertX && !bVertL2RX ) || bRTL ?
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 51c4a3c44d56..64692a8d6f0c 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::frame;
 
-SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) :
+SwDPage::SwDPage(SwDrawDocument& rNewModel, bool bMasterPage) :
     FmFormPage(rNewModel, bMasterPage),
     pGridLst( 0 ),
     rDoc(rNewModel.GetDoc())
@@ -121,10 +121,10 @@ const SdrPageGridFrameList*  SwDPage::GetGridFrameList(
     return pGridLst;
 }
 
-sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
+bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
                            const HelpEvent& rEvt )
 {
-    sal_Bool bContinue = sal_True;
+    bool bContinue = true;
 
     if( rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ))
     {
@@ -175,7 +175,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
             if ( !sTxt.isEmpty() )
             {
                 // #i80029#
-                sal_Bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly();
+                bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly();
                 if ( !bExecHyperlinks )
                 {
                     SvtSecurityOptions aSecOpts;
@@ -197,7 +197,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
                     Rectangle aRect( rEvt.GetMousePosPixel(), Size(1,1) );
                     Help::ShowQuickHelp( pWindow, aRect, sTxt );
                 }
-                bContinue = sal_False;
+                bContinue = false;
             }
         }
     }
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index a1b4eea820ae..09b8acf329b7 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -71,7 +71,7 @@ bool SwSdrHdl::IsFocusHdl() const
     return SdrHdl::IsFocusHdl();
 }
 
-static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, sal_Bool bAll )
+static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, bool bAll )
 {
     const SwVirtFlyDrawObj *pVirt = pObj->ISA(SwVirtFlyDrawObj) ?
                                             (SwVirtFlyDrawObj*)pObj : 0;
@@ -120,7 +120,7 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
 }
 
 // #i99665#
-sal_Bool SwDrawView::IsAntiAliasing() const
+bool SwDrawView::IsAntiAliasing() const
 {
     return getOptionsDrawinglayer().IsAntiAliasing();
 }
@@ -246,7 +246,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
 {
     if ( GetUserCall(pObj) )
     {
-        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False );
+        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, false );
         if ( pAnch )
         {
             //The topmost Obj within the anchor must not be overtaken.
@@ -264,7 +264,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
 
                         if ( pO->GetOrdNumDirect() > nOrdNum )
                         {
-                            const SwFrm *pTmpAnch = ::lcl_FindAnchor( pO, sal_False );
+                            const SwFrm *pTmpAnch = ::lcl_FindAnchor( pO, false );
                             if ( pFly->IsAnLower( pTmpAnch ) )
                             {
                                 nOrdNum = pO->GetOrdNumDirect();
@@ -291,7 +291,7 @@ SdrObject* SwDrawView::GetMaxToBtmObj(SdrObject* pObj) const
 {
     if ( GetUserCall(pObj) )
     {
-        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, sal_False );
+        const SwFrm *pAnch = ::lcl_FindAnchor( pObj, false );
         if ( pAnch )
         {
             //The Fly of the anchor must not be "flying under".
@@ -328,7 +328,7 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
         }
 
         if ( pObj->GetOrdNum() > nMaxChildOrdNum &&
-             _rParentObj.IsAnLower( lcl_FindAnchor( pObj, sal_True ) ) )
+             _rParentObj.IsAnLower( lcl_FindAnchor( pObj, true ) ) )
         {
             nMaxChildOrdNum = pObj->GetOrdNum();
             break;
@@ -547,7 +547,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_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, sal_True );
+            const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, true );
             const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm
                                             ? pTmpAnchorFrm->FindFlyFrm() : 0L;
             if ( pTmpParentObj &&
@@ -600,7 +600,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_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, sal_True );
+            const SwFrm* pTmpAnchorFrm = lcl_FindAnchor( pTmpObj, true );
             const SwFlyFrm* pTmpParentObj = pTmpAnchorFrm
                                             ? pTmpAnchorFrm->FindFlyFrm() : 0L;
             if ( pTmpParentObj &&
@@ -678,7 +678,7 @@ const SwFrm* SwDrawView::CalcAnchor()
     //current anchor. Search only if we currently drag.
     const SwFrm* pAnch;
     Rectangle aMyRect;
-    const sal_Bool bFly = pObj->ISA(SwVirtFlyDrawObj);
+    const bool bFly = pObj->ISA(SwVirtFlyDrawObj);
     if ( bFly )
     {
         pAnch = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetAnchorFrm();
@@ -700,7 +700,7 @@ const SwFrm* SwDrawView::CalcAnchor()
         aMyRect = pObj->GetSnapRect();
     }
 
-    const sal_Bool bTopRight = pAnch && ( ( pAnch->IsVertical() &&
+    const bool bTopRight = pAnch && ( ( pAnch->IsVertical() &&
                                             !pAnch->IsVertLR() ) ||
                                              pAnch->IsRightToLeft() );
     const Point aMyPt = bTopRight ? aMyRect.TopRight() : aMyRect.TopLeft();
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index d9313c36f97f..d21ba64ce960 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -306,7 +306,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
     SwTxtNode* pTxtNd = rCrsr.GetNode()->GetTxtNode();
     OSL_ENSURE( pTxtNd, "where is the TextNode?" );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( nEndPos == rSttPos )
         return bRet;
 
@@ -335,7 +335,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
             {
                 // replace the selection
                 pDoc->ReplaceRange( aPam, pFnd->GetLong(), false);
-                bRet = sal_True;
+                bRet = true;
             }
         }
         else
@@ -383,7 +383,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
                     ++(*pIdx);
                     pTxtNd = pIdx->GetNode().GetTxtNode();
                 }
-                bRet = sal_True;
+                bRet = true;
             }
             aTBlks.EndGetDoc();
         }
@@ -443,12 +443,12 @@ void SwAutoCorrExceptWord::CheckChar( const SwPosition& rPos, sal_Unicode cChr )
     }
 }
 
-sal_Bool SwAutoCorrExceptWord::CheckDelChar( const SwPosition& rPos )
+bool SwAutoCorrExceptWord::CheckDelChar( const SwPosition& rPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !bDeleted && rPos.nNode.GetIndex() == nNode &&
         rPos.nContent.GetIndex() == nCntnt )
-        bDeleted = bRet = sal_True;
+        bDeleted = bRet = true;
     return bRet;
 }
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index f6890c637e04..bd5b88b9d668 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -159,11 +159,11 @@ class SwAutoFormat
         {   return rNd.GetTxt().isEmpty() ||
                 rNd.GetTxt().getLength() == GetLeadingBlanks( rNd.GetTxt() ); }
 
-    sal_Bool IsOneLine( const SwTxtNode& ) const;
-    sal_Bool IsFastFullLine( const SwTxtNode& ) const;
-    sal_Bool IsNoAlphaLine( const SwTxtNode&) const;
-    sal_Bool IsEnumericChar( const SwTxtNode&) const;
-    sal_Bool IsBlanksInString( const SwTxtNode&) const;
+    bool IsOneLine( const SwTxtNode& ) const;
+    bool IsFastFullLine( const SwTxtNode& ) const;
+    bool IsNoAlphaLine( const SwTxtNode&) const;
+    bool IsEnumericChar( const SwTxtNode&) const;
+    bool IsBlanksInString( const SwTxtNode&) const;
     sal_uInt16 CalcLevel( const SwTxtNode&, sal_uInt16 *pDigitLvl = 0 ) const;
     sal_Int32 GetBigIndent( sal_Int32& rAktSpacePos ) const;
 
@@ -363,15 +363,15 @@ const SwTxtNode* SwAutoFormat::GetNextNode() const
     return m_pDoc->GetNodes()[ m_aNdIdx.GetIndex() + 1 ]->GetTxtNode();
 }
 
-sal_Bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
 {
     SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
     return aFInfo.IsOneLine();
 }
 
-sal_Bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
 {
-    sal_Bool bRet = m_aFlags.bRightMargin;
+    bool bRet = m_aFlags.bRightMargin;
     if( bRet )
     {
         SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
@@ -380,30 +380,30 @@ sal_Bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
     return bRet;
 }
 
-sal_Bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
 {
     const OUString& rTxt = rNd.GetTxt();
     sal_Int32 nBlnks = GetLeadingBlanks( rTxt );
     const sal_Int32 nLen = rTxt.getLength() - nBlnks;
     if( !nLen )
-        return sal_False;
+        return false;
 
     // -, +, * separated by blank ??
     if (2 < nLen && IsSpace(rTxt[nBlnks + 1]))
     {
         if (StrChr(pBulletChar, rTxt[nBlnks]))
-            return sal_True;
+            return true;
         // Should there be a symbol font at the position?
         SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
         if( aFInfo.IsBullet( nBlnks ))
-            return sal_True;
+            return true;
     }
 
     // 1.) / 1. / 1.1.1 / (1). / (1) / ....
     return USHRT_MAX != GetDigitLevel( rNd, nBlnks );
 }
 
-sal_Bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const
 {
     // Search more than 5 consecutive blanks/tabs in the string.
     OUString sTmp( DelLeadingBlanks(rNd.GetTxt()) );
@@ -414,15 +414,15 @@ sal_Bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const
         // Skip non-blanks
         while (nIdx < nLen && !IsSpace(sTmp[nIdx])) ++nIdx;
         if (nIdx == nLen)
-            return sal_False;
+            return false;
         // Then count consecutive blanks
         const sal_Int32 nFirst = nIdx;
         while (nIdx < nLen && IsSpace(sTmp[nIdx])) ++nIdx;
         // And exit if enough consecutive blanks were found
         if (nIdx-nFirst > 5)
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
 sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl ) const
@@ -480,11 +480,11 @@ sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const
     return aFInfo.GetBigIndent( rAktSpacePos, pNxtFrm );
 }
 
-sal_Bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
+bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
 {
     const OUString& rStr = rNd.GetTxt();
     if( rStr.isEmpty() )
-        return sal_False;
+        return false;
     // or better: determine via number of AlphaNum and !AlphaNum characters
     sal_Int32 nANChar = 0, nBlnk = 0;
 
@@ -569,7 +569,7 @@ bool SwAutoFormat::DoUnderline()
                     RES_PARATR_CONNECT_BORDER, RES_PARATR_CONNECT_BORDER,
                     RES_BOX, RES_BOX,
                     0);
-        aSet.Put( SwParaConnectBorderItem( sal_False ) );
+        aSet.Put( SwParaConnectBorderItem( false ) );
         SvxBoxItem aBox( RES_BOX );
         aBox.SetLine( &aLine, BOX_LINE_BOTTOM );
         aBox.SetDistance( 42 );     // ~0,75 mm
@@ -1373,7 +1373,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         bBreak = !IsFastFullLine( *m_pCurTxtNd ) ||
                     IsBlanksInString( *m_pCurTxtNd ) ||
                     IsSentenceAtEnd( *m_pCurTxtNd );
-    sal_Bool bRTL = m_pEditShell->IsInRightToLeftText();
+    bool bRTL = m_pEditShell->IsInRightToLeftText();
     DeleteCurrentParagraph( true, true );
 
     bool bChgBullet = false, bChgEnum = false;
@@ -1809,7 +1809,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
     SwTxtFrmInfo aFInfo( 0 );
 
     sal_Int32 nSttPos, nLastBlank = nPos;
-    sal_Bool bFirst = m_aFlags.bCptlSttSntnc, bFirstSent = bFirst;
+    bool bFirst = m_aFlags.bCptlSttSntnc, bFirstSent = bFirst;
     sal_Unicode cChar = 0;
 
     CharClass& rAppCC = GetAppCharClass();
@@ -1974,7 +1974,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
             case '!':
             case '?':
                 if( m_aFlags.bCptlSttSntnc )
-                    bFirstSent = sal_True;
+                    bFirstSent = true;
                 /* fallthrough */
             default:
                 if( !( rAppCC.isLetterNumeric( *pTxt, nPos )
@@ -2050,11 +2050,11 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
                 {
                     SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_SENT );
                     pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, true, nSttPos, nPos, eLang);
-                    bFirst = sal_False;
+                    bFirst = false;
                 }
 
                 bFirst = bFirstSent;
-                bFirstSent = sal_False;
+                bFirstSent = false;
 
                 if( m_aFlags.bWithRedlining )
                 {
@@ -2091,7 +2091,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
 
     const SwTxtNode* pNxtNd = 0;
     bool bNxtEmpty = false;
-    sal_Bool bNxtAlpha = sal_False;
+    bool bNxtAlpha = false;
     sal_uInt16 nNxtLevel = 0;
 
     // set area for autoformatting
@@ -2183,7 +2183,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 if( m_aFlags.bAFmtByInput && m_aFlags.bCreateTable && DoTable() )
                 {
                     //JP 30.09.96: DoTable() builds on PopCrsr and MoveCrsr after AutoFormat!
-                    pEdShell->Pop( sal_False );
+                    pEdShell->Pop( false );
                     *pEdShell->GetCrsr() = m_aDelPam;
                     pEdShell->Push();
 
@@ -2291,7 +2291,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 else
                 {
                     bNxtEmpty = false;
-                    bNxtAlpha = sal_False;
+                    bNxtAlpha = false;
                     nNxtLevel = 0;
                 }
                 m_eStat = !m_bMoreLines ? IS_ONE_LINE : TST_ENUMERIC;
@@ -2593,7 +2593,7 @@ void SwEditShell::AutoFmtBySplitNode()
                                     &pCrsr->GetPoint()->nNode );
 
             //JP 30.09.96: DoTable() builds on PopCrsr and MoveCrsr!
-            Pop( sal_False );
+            Pop( false );
             pCrsr = GetCrsr();
         }
         pCrsr->DeleteMark();
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index 79f5377f9156..6f37e417c408 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -103,7 +103,7 @@ void SwEditShell::SetAttrItem( const SfxPoolItem& rHint, sal_uInt16 nFlags )
     SwPaM* pCrsr = GetCrsr();
     if( pCrsr->GetNext() != pCrsr )     // Ring of Cursors
     {
-        sal_Bool bIsTblMode = IsTableMode();
+        bool bIsTblMode = IsTableMode();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
         FOREACHPAM_START(GetCrsr())
@@ -133,7 +133,7 @@ void SwEditShell::SetAttrSet( const SfxItemSet& rSet, sal_uInt16 nFlags, SwPaM*
     StartAllAction();
     if( pCrsr->GetNext() != pCrsr )     // Ring of Cursors
     {
-        sal_Bool bIsTblMode = IsTableMode();
+        bool bIsTblMode = IsTableMode();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_INSATTR, NULL);
 
         SwPaM* pTmpCrsr = pCrsr;
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 7f04523ebf08..0e52b380075e 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -59,14 +59,14 @@ const sal_uInt16& getMaxLookup()
     return nMaxLookup;
 }
 
-sal_Bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
+bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
                               const bool bMergeIndentValuesOfNumRule ) const
 {
     // ??? pPaM can be different from the Cursor ???
     if( GetCrsrCnt() > getMaxLookup() )
     {
         rSet.InvalidateAllItems();
-        return sal_False;
+        return false;
     }
 
     SfxItemSet aSet( *rSet.GetPool(), rSet.GetRanges() );
@@ -122,7 +122,7 @@ sal_Bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
         {
             rSet.ClearItem();
             rSet.InvalidateAllItems();
-            return sal_False;
+            return false;
         }
 
         // at first node the node enter his values into the GetSet (Initial)
@@ -166,21 +166,21 @@ sal_Bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
 
     } while ( ( pPaM = (SwPaM*)pPaM->GetNext() ) != pStartPaM );
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwEditShell::GetCurAttr( SfxItemSet& rSet,
+bool SwEditShell::GetCurAttr( SfxItemSet& rSet,
                               const bool bMergeIndentValuesOfNumRule ) const
 {
     return GetPaMAttr( GetCrsr(), rSet, bMergeIndentValuesOfNumRule );
 }
 
-sal_Bool SwEditShell::GetCurParAttr( SfxItemSet& rSet) const
+bool SwEditShell::GetCurParAttr( SfxItemSet& rSet) const
 {
     return GetPaMParAttr( GetCrsr(), rSet );
 }
 
-sal_Bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
+bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
 {
     // number of nodes the function has explored so far
     sal_uInt16 numberOfLookup = 0;
@@ -225,11 +225,11 @@ sal_Bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
 
             // if the maximum number of node that can be inspected has been reached
             if (numberOfLookup >= getMaxLookup())
-                return sal_False;
+                return false;
         }
     } while ( ( pPaM = static_cast<SwPaM*>(pPaM->GetNext()) ) != pStartPaM );
 
-    return sal_True;
+    return true;
 }
 
 SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl( ) const
@@ -281,13 +281,13 @@ SwTxtFmtColl* SwEditShell::GetPaMTxtFmtColl( SwPaM* pPaM ) const
     return NULL;
 }
 
-sal_Bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
+bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
 {
     // The cursor must be positioned on the current footnotes anchor:
     SwPaM* pCrsr = GetCrsr();
     SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
     if( !pTxtNd )
-        return sal_False;
+        return false;
 
     SwTxtAttr *const pFtn = pTxtNd->GetTxtAttrForCharAt(
         pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index c7af9a70764a..47614f2c925b 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -33,7 +33,7 @@
 #include <comcore.hrc>
 #include <list>
 
-void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
+void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
 {
     bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false);
     // only for selections
@@ -53,7 +53,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
         if( pUndo && !*pUndo )
         {
             GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
-            *pUndo = sal_True;
+            *pUndo = true;
         }
         SwPaM aDelPam( *rPam.Start() );
         const SwPosition* pEndSelPos = rPam.End();
@@ -111,7 +111,7 @@ long SwEditShell::Delete()
     {
         StartAllAction();
 
-        sal_Bool bUndo = GetCrsr()->GetNext() != GetCrsr();
+        bool bUndo = GetCrsr()->GetNext() != GetCrsr();
         if( bUndo ) // more than one selection?
         {
             SwRewriter aRewriter;
@@ -190,7 +190,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
 
     pDestShell->StartAllAction();
     SwPosition *pPos = 0;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     bool bFirstMove = true;
     SwNodeIndex aSttNdIdx( pDestShell->GetDoc()->GetNodes() );
     sal_Int32 nSttCntIdx = 0;
@@ -242,7 +242,7 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
         SwPaM aInsertPaM(*pPos, SwPosition(aSttNdIdx));
         pDestShell->GetDoc()->MakeUniqueNumRules(aInsertPaM);
 
-        bRet = sal_True;
+        bRet = true;
     FOREACHPAM_END()
 
     // Maybe nothing has been moved?
@@ -291,11 +291,11 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
  * @param bRegExpRplc if <true> replace tabs (\\t) and replace with found string (not \&).
  *                    E.g. [Fnd: "zzz", Repl: "xx\t\\t..&..\&"] --> "xx\t<Tab>..zzz..&"
  */
-sal_Bool SwEditShell::Replace( const OUString& rNewStr, sal_Bool bRegExpRplc )
+bool SwEditShell::Replace( const OUString& rNewStr, bool bRegExpRplc )
 {
     SET_CURR_SHELL( this );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !HasReadonlySel() )
     {
         StartAllAction();
@@ -318,9 +318,9 @@ sal_Bool SwEditShell::Replace( const OUString& rNewStr, sal_Bool bRegExpRplc )
 }
 
 /// special method for JOE's wizards
-sal_Bool SwEditShell::DelFullPara()
+bool SwEditShell::DelFullPara()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !IsTableMode() )
     {
         SwPaM* pCrsr = GetCrsr();
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 0bc3fd85257f..313195616803 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -84,7 +84,7 @@ SwTxtFmtColl* SwEditShell::MakeTxtFmtColl(const OUString& rFmtCollName,
 
 }
 
-void SwEditShell::FillByEx(SwTxtFmtColl* pColl, sal_Bool bReset)
+void SwEditShell::FillByEx(SwTxtFmtColl* pColl, bool bReset)
 {
     if( bReset )
     {
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index a136c120ad0b..c9fe702c56c8 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -38,7 +38,7 @@
 #include <fieldhint.hxx>
 
 /// count field types with a ResId, if 0 count all
-sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, sal_Bool bUsed ) const
+sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, bool bUsed ) const
 {
     const SwFldTypes* pFldTypes = GetDoc()->GetFldTypes();
     const sal_uInt16 nSize = pFldTypes->size();
@@ -71,7 +71,7 @@ sal_uInt16 SwEditShell::GetFldTypeCount(sal_uInt16 nResId, sal_Bool bUsed ) cons
 }
 
 /// get field types with a ResId, if 0 get all
-SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, sal_Bool bUsed ) const
+SwFieldType* SwEditShell::GetFldType(sal_uInt16 nFld, sal_uInt16 nResId, bool bUsed ) const
 {
     const SwFldTypes* pFldTypes = GetDoc()->GetFldTypes();
     const sal_uInt16 nSize = pFldTypes->size();
@@ -184,7 +184,7 @@ void SwEditShell::FieldToText( SwFieldType* pType )
         pClient->SwClientNotifyCall( *pType, aHint );
      }
 
-    Pop( sal_False );
+    Pop( false );
     EndAllAction();
     EndUndo( UNDO_DELETE );
 }
@@ -275,7 +275,7 @@ void SwEditShell::UpdateFlds( SwField &rFld )
         // 1) if only one PaM has more than one field or
         // 2) if there are mixed field types
         bool bOkay = true;
-        sal_Bool bTblSelBreak = sal_False;
+        bool bTblSelBreak = false;
 
         SwMsgPoolItem aFldHint( RES_TXTATR_FIELD );  // Search-Hint
         SwMsgPoolItem aAnnotationFldHint( RES_TXTATR_ANNOTATION );
@@ -361,7 +361,7 @@ void SwEditShell::ChangeDBFields( const std::vector<OUString>& rOldNames,
 }
 
 /// Update all expression fields
-void SwEditShell::UpdateExpFlds(sal_Bool bCloseDB)
+void SwEditShell::UpdateExpFlds(bool bCloseDB)
 {
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -405,17 +405,17 @@ void SwEditShell::SetFldUpdateFlags( SwFldUpdateFlags eFlags )
     getIDocumentSettingAccess()->setFieldUpdateFlags( eFlags );
 }
 
-SwFldUpdateFlags SwEditShell::GetFldUpdateFlags(sal_Bool bDocSettings) const
+SwFldUpdateFlags SwEditShell::GetFldUpdateFlags(bool bDocSettings) const
 {
     return getIDocumentSettingAccess()->getFieldUpdateFlags( !bDocSettings );
 }
 
-void SwEditShell::SetLabelDoc( sal_Bool bFlag )
+void SwEditShell::SetLabelDoc( bool bFlag )
 {
     GetDoc()->set(IDocumentSettingAccess::LABEL_DOCUMENT, bFlag );
 }
 
-sal_Bool SwEditShell::IsLabelDoc() const
+bool SwEditShell::IsLabelDoc() const
 {
     return getIDocumentSettingAccess()->get(IDocumentSettingAccess::LABEL_DOCUMENT);
 }
@@ -425,7 +425,7 @@ void SwEditShell::ChangeAuthorityData(const SwAuthEntry* pNewData)
     GetDoc()->ChangeAuthorityData(pNewData);
 }
 
-sal_Bool SwEditShell::IsAnyDatabaseFieldInDoc()const
+bool SwEditShell::IsAnyDatabaseFieldInDoc()const
 {
     const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes();
     const sal_uInt16 nSize = pFldTypes->size();
@@ -447,7 +447,7 @@ sal_Bool SwEditShell::IsAnyDatabaseFieldInDoc()const
                     while(pFld)
                     {
                         if(pFld->IsFldInDoc())
-                            return sal_True;
+                            return true;
                         pFld = aIter.Next();
                     }
                 }
@@ -455,7 +455,7 @@ sal_Bool SwEditShell::IsAnyDatabaseFieldInDoc()const
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 7a7b207880c2..e24e66b67db4 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -34,7 +34,7 @@
 
 using namespace com::sun::star;
 
-sal_Bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
+bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const
 {
     const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes();
     const sal_uInt16 nSize = pFldTypes->size();
@@ -65,7 +65,7 @@ sal_Bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) cons
                             catch(uno::Exception const &)
                             {
                                 rUsedDataSource = rData.sDataSource;
-                                return sal_False;
+                                return false;
                             }
                         }
                         pFmtFld = aIter.Next();
@@ -75,7 +75,7 @@ sal_Bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) cons
             }
         }
     }
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index 510f55ea0302..576cb02a65ee 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -51,7 +51,7 @@ SwCharFmt* SwEditShell::GetCurCharFmt() const
     return pFmt;
 }
 
-void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset)
+void SwEditShell::FillByEx(SwCharFmt* pCharFmt, bool bReset)
 {
     if ( bReset )
     {
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index ee85aec3e7b4..b0f259a1f5a9 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -29,12 +29,12 @@
 #include <doctxm.hxx>
 #include <edglbldc.hxx>
 
-sal_Bool SwEditShell::IsGlobalDoc() const
+bool SwEditShell::IsGlobalDoc() const
 {
     return getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT);
 }
 
-void SwEditShell::SetGlblDocSaveLinks( sal_Bool bFlag )
+void SwEditShell::SetGlblDocSaveLinks( bool bFlag )
 {
     getIDocumentSettingAccess()->set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bFlag);
     if( !GetDoc()->IsModified() )   // Bug 57028
@@ -44,7 +44,7 @@ void SwEditShell::SetGlblDocSaveLinks( sal_Bool bFlag )
     GetDoc()->SetModified();
 }
 
-sal_Bool SwEditShell::IsGlblDocSaveLinks() const
+bool SwEditShell::IsGlblDocSaveLinks() const
 {
     return getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS);
 }
@@ -133,11 +133,11 @@ sal_uInt16 SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
     return rArr.size();
 }
 
-sal_Bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
+bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
         SwSectionData & rNew)
 {
     if( !getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -171,14 +171,14 @@ sal_Bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
     }
     EndAllAction();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
+bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
                                             const SwTOXBase& rTOX )
 {
     if( !getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -212,13 +212,13 @@ sal_Bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos,
     }
     EndAllAction();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos )
+bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos )
 {
     if( !getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -234,14 +234,14 @@ sal_Bool SwEditShell::InsertGlobalDocContent( const SwGlblDocContent& rInsPos )
     SwDoc* pMyDoc = GetDoc();
     pMyDoc->AppendTxtNode( rPos );
     EndAllAction();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
+bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
                                             size_t nDelPos )
 {
     if( !getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -299,10 +299,10 @@ sal_Bool SwEditShell::DeleteGlobalDocContent( const SwGlblDocContents& rArr ,
 
     EndUndo( UNDO_END );
     EndAllAction();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwEditShell::MoveGlobalDocContent( const SwGlblDocContents& rArr ,
+bool SwEditShell::MoveGlobalDocContent( const SwGlblDocContents& rArr ,
                                         size_t nFromPos, size_t nToPos,
                                         size_t nInsPos )
 {
@@ -310,7 +310,7 @@ sal_Bool SwEditShell::MoveGlobalDocContent( const SwGlblDocContents& rArr ,
         nFromPos >= rArr.size() || nToPos > rArr.size() ||
         nInsPos > rArr.size() || nFromPos >= nToPos ||
         ( nFromPos <= nInsPos && nInsPos <= nToPos ) )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -341,10 +341,10 @@ sal_Bool SwEditShell::MoveGlobalDocContent( const SwGlblDocContents& rArr ,
     return bRet;
 }
 
-sal_Bool SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos )
+bool SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos )
 {
     if( !getIDocumentSettingAccess()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
     SttCrsrMove();
@@ -364,7 +364,7 @@ sal_Bool SwEditShell::GotoGlobalDocContent( const SwGlblDocContent& rPos )
     rCrsrPos.nContent.Assign( pCNd, 0 );
 
     EndCrsrMove();
-    return sal_True;
+    return true;
 }
 
 SwGlblDocContent::SwGlblDocContent( sal_uLong nPos )
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index ac634cfe8f7b..6e23c62bf82f 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -43,7 +43,7 @@ void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const OUString& rStr
 
 /// convert current selection into text block and add to the text block document, incl. templates
 sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName, const OUString& rShortName,
-                                    sal_Bool bSaveRelFile, const OUString* pOnlyTxt )
+                                    bool bSaveRelFile, const OUString* pOnlyTxt )
 {
     SwDoc* pGDoc = rBlks.GetDoc();
 
@@ -79,8 +79,8 @@ sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName
 sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
                                     const OUString& rName,
                                     const OUString& rShortName,
-                                    sal_Bool bSaveRelFile,
-                                    sal_Bool bOnlyTxt )
+                                    bool bSaveRelFile,
+                                    bool bOnlyTxt )
 {
     StartAllAction();
 
@@ -153,7 +153,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
 }
 
 /// copy all selections to the doc
-sal_Bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
+bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
 {
     OSL_ENSURE( pInsDoc, "no Ins.Document"  );
 
@@ -170,7 +170,7 @@ sal_Bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
         (*pSttNd)--;
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SET_CURR_SHELL( this );
 
     pInsDoc->LockExpFlds();
@@ -188,7 +188,7 @@ sal_Bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
             ->GetSttNd()->FindTableNode() ))
         {
             // check if the table name can be copied
-            sal_Bool bCpyTblNm = aBoxes.size() == pTblNd->GetTable().GetTabSortBoxes().size();
+            bool bCpyTblNm = aBoxes.size() == pTblNd->GetTable().GetTabSortBoxes().size();
             if( bCpyTblNm )
             {
                 const OUString rTblName = pTblNd->GetTable().GetFrmFmt()->GetName();
@@ -196,14 +196,14 @@ sal_Bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
                 for( sal_uInt16 n = rTblFmts.size(); n; )
                     if( rTblFmts[ --n ]->GetName() == rTblName )
                     {
-                        bCpyTblNm = sal_False;
+                        bCpyTblNm = false;
                         break;
                     }
             }
-            bRet = pInsDoc->InsCopyOfTbl( aPos, aBoxes, 0, bCpyTblNm, sal_False );
+            bRet = pInsDoc->InsCopyOfTbl( aPos, aBoxes, 0, bCpyTblNm, false );
         }
         else
-            bRet = sal_False;
+            bRet = false;
     }
     else
     {
@@ -260,7 +260,7 @@ sal_Bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
  *
  * @return sal_False if the selected area is too big for being copied into the string buffer
  */
-sal_Bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
+bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
 {
     GetCrsr();  // creates all cursors if needed
     if( IsSelOnePara() )
@@ -294,18 +294,18 @@ sal_Bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
         {
             // write selected areas into a ASCII document
             SwWriter aWriter( aStream, *this);
-            xWrt->SetShowProgress( sal_False );
+            xWrt->SetShowProgress( false );
 
             switch( nHndlParaBrk )
             {
             case GETSELTXT_PARABRK_TO_BLANK:
-                xWrt->bASCII_ParaAsBlanc = sal_True;
-                xWrt->bASCII_NoLastLineEnd = sal_True;
+                xWrt->bASCII_ParaAsBlanc = true;
+                xWrt->bASCII_NoLastLineEnd = true;
                 break;
 
             case GETSELTXT_PARABRK_TO_ONLYCR:
-                xWrt->bASCII_ParaAsCR = sal_True;
-                xWrt->bASCII_NoLastLineEnd = sal_True;
+                xWrt->bASCII_ParaAsCR = true;
+                xWrt->bASCII_NoLastLineEnd = true;
                 break;
             }
 
@@ -336,7 +336,7 @@ sal_Bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk )
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index dde9409d7499..53a086da73e2 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -60,7 +60,7 @@
 
 using namespace com::sun::star;
 
-void SwEditShell::Insert( sal_Unicode c, sal_Bool bOnlyCurrCrsr )
+void SwEditShell::Insert( sal_Unicode c, bool bOnlyCurrCrsr )
 {
     StartAllAction();
     FOREACHPAM_START(GetCrsr())
@@ -172,7 +172,7 @@ void SwEditShell::Overwrite(const OUString &rStr)
     EndAllAction();
 }
 
-long SwEditShell::SplitNode( sal_Bool bAutoFormat, sal_Bool bCheckTableStart )
+long SwEditShell::SplitNode( bool bAutoFormat, bool bCheckTableStart )
 {
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
@@ -194,9 +194,9 @@ long SwEditShell::SplitNode( sal_Bool bAutoFormat, sal_Bool bCheckTableStart )
     return(1L);
 }
 
-sal_Bool SwEditShell::AppendTxtNode()
+bool SwEditShell::AppendTxtNode()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
@@ -227,7 +227,7 @@ SwGrfNode * SwEditShell::_GetGrfNode() const
 
 // returns a Graphic pointer if CurCrsr->GetPoint() points to a SwGrfNode and
 // GetMark is not set or points to the same Graphic
-const Graphic* SwEditShell::GetGraphic( sal_Bool bWait ) const
+const Graphic* SwEditShell::GetGraphic( bool bWait ) const
 {
     SwGrfNode* pGrfNode = _GetGrfNode();
     const Graphic* pGrf( 0L );
@@ -259,7 +259,7 @@ const Graphic* SwEditShell::GetGraphic( sal_Bool bWait ) const
     return pGrf;
 }
 
-sal_Bool SwEditShell::IsGrfSwapOut( sal_Bool bOnlyLinked ) const
+bool SwEditShell::IsGrfSwapOut( bool bOnlyLinked ) const
 {
     SwGrfNode *pGrfNode = _GetGrfNode();
     return pGrfNode &&
@@ -283,7 +283,7 @@ sal_uInt16 SwEditShell::GetGraphicType() const
 
 // returns the size of a graphic in <rSz> if CurCrsr->GetPoint() points to a SwGrfNode and
 // GetMark is not set or points to the same graphic
-sal_Bool SwEditShell::GetGrfSize(Size& rSz) const
+bool SwEditShell::GetGrfSize(Size& rSz) const
 {
     SwNoTxtNode* pNoTxtNd;
     SwPaM* pCurrentCrsr = GetCrsr();
@@ -292,9 +292,9 @@ sal_Bool SwEditShell::GetGrfSize(Size& rSz) const
          && 0 != ( pNoTxtNd = pCurrentCrsr->GetNode()->GetNoTxtNode() ) )
     {
         rSz = pNoTxtNd->GetTwipSize();
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 
 }
 
@@ -348,7 +348,7 @@ void SwEditShell::ClearAutomaticContour()
     if( pNd->HasAutomaticContour() )
     {
         StartAllAction();
-        pNd->SetContour( NULL, sal_False );
+        pNd->SetContour( NULL, false );
         SwFlyFrm *pFly = (SwFlyFrm*)pNd->getLayoutFrm(GetLayout())->GetUpper();
         const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround();
         pFly->GetFmt()->NotifyClients( (SwFmtSurround*)&rSur, (SwFmtSurround*)&rSur );
@@ -377,7 +377,7 @@ svt::EmbeddedObjectRef& SwEditShell::GetOLEObject() const
     return rOObj.GetObject();
 }
 
-sal_Bool SwEditShell::HasOLEObj( const OUString &rName ) const
+bool SwEditShell::HasOLEObj( const OUString &rName ) const
 {
     SwStartNode *pStNd;
     SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -388,11 +388,11 @@ sal_Bool SwEditShell::HasOLEObj( const OUString &rName ) const
         if( rNd.IsOLENode() &&
             rName == ((SwOLENode&)rNd).GetChartTblName() &&
             ((SwOLENode&)rNd).getLayoutFrm( GetLayout() ) )
-            return sal_True;
+            return true;
 
         aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
     }
-    return sal_False;
+    return false;
 }
 
 void SwEditShell::SetChartName( const OUString &rName )
@@ -630,11 +630,11 @@ Graphic SwEditShell::GetIMapGraphic() const
     return aRet;
 }
 
-sal_Bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, sal_Bool bKeepSelection )
+bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr, bool bKeepSelection )
 {
     // URL and hint text (directly or via selection) necessary
     if( rFmt.GetValue().isEmpty() || ( rStr.isEmpty() && !HasSelection() ) )
-        return sal_False;
+        return false;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_UI_INSERT_URLTXT, NULL);
     bool bInsTxt = true;
@@ -666,7 +666,7 @@ sal_Bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr,
         {
             Insert2( rStr );
             SetMark();
-            ExtendSelection( sal_False, rStr.getLength() );
+            ExtendSelection( false, rStr.getLength() );
         }
     }
     else
@@ -681,7 +681,7 @@ sal_Bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr,
         DontExpandFmt();
     GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_UI_INSERT_URLTXT, NULL );
     EndAllAction();
-    return sal_True;
+    return true;
 }
 
 sal_uInt16 SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
@@ -718,9 +718,9 @@ sal_uInt16 SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
 
 /// If the cursor is in a INetAttribute then it will be deleted completely (incl. hint text, the
 /// latter is needed for drag & drop)
-sal_Bool SwEditShell::DelINetAttrWithText()
+bool SwEditShell::DelINetAttrWithText()
 {
-    sal_Bool bRet = SelectTxtAttr( RES_TXTATR_INETFMT, sal_False );
+    bool bRet = SelectTxtAttr( RES_TXTATR_INETFMT, false );
     if( bRet )
         DeleteSel( *GetCrsr() );
     return bRet;
@@ -743,10 +743,10 @@ SvNumberFormatter* SwEditShell::GetNumberFormatter()
     return GetDoc()->GetNumberFormatter();
 }
 
-sal_Bool SwEditShell::RemoveInvisibleContent()
+bool SwEditShell::RemoveInvisibleContent()
 {
     StartAllAction();
-    sal_Bool bRet = GetDoc()->RemoveInvisibleContent();
+    bool bRet = GetDoc()->RemoveInvisibleContent();
     EndAllAction();
     return bRet;
 }
@@ -820,7 +820,7 @@ void SwEditShell::SetNumberingRestart()
                             {
                                 // now set a the start value as attribute
                                 SwPosition aCurrentNode(*pNd);
-                                GetDoc()->SetNumRuleStart( aCurrentNode, sal_True );
+                                GetDoc()->SetNumRuleStart( aCurrentNode, true );
                             }
                         }
                     }
@@ -842,11 +842,11 @@ void SwEditShell::SetNumberingRestart()
         }
     }
 
-    Pop(sal_False);
+    Pop(false);
     EndAllAction();
 }
 
-sal_uInt16 SwEditShell::GetLineCount( sal_Bool bActPos )
+sal_uInt16 SwEditShell::GetLineCount( bool bActPos )
 {
     sal_uInt16 nRet = 0;
     CalcLayout();
@@ -960,7 +960,7 @@ void SwEditShell::SetLineNumberInfo(const SwLineNumberInfo& rInfo)
     EndAllAction();
 }
 
-sal_uInt16 SwEditShell::GetLinkUpdMode(sal_Bool bDocSettings) const
+sal_uInt16 SwEditShell::GetLinkUpdMode(bool bDocSettings) const
 {
     return getIDocumentSettingAccess()->getLinkUpdateMode( !bDocSettings );
 }
@@ -979,7 +979,7 @@ SwExtTextInput* SwEditShell::CreateExtTextInput(LanguageType eInputLanguage)
     return pRet;
 }
 
-OUString SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, sal_Bool bInsText )
+OUString SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, bool bInsText )
 {
     if( !pDel )
     {
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index f9f5b94ef78e..713f6519ba18 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -152,11 +152,11 @@ public:
 
 class SwHyphIter : public SwLinguIter
 {
-    sal_Bool bOldIdle;
+    bool bOldIdle;
     void DelSoftHyph( SwPaM &rPam );
 
 public:
-    SwHyphIter() : bOldIdle(sal_False) {}
+    SwHyphIter() : bOldIdle(false) {}
 
     void Start( SwEditShell *pSh, SwDocPositions eStart, SwDocPositions eEnd );
     void End();
@@ -165,7 +165,7 @@ public:
 
     uno::Any    Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
 
-    sal_Bool IsAuto();
+    bool IsAuto();
     void InsertSoftHyph( const sal_Int32 nHyphPos );
     void ShowSelection();
 };
@@ -221,7 +221,7 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
             pSh->Push();
             pSh->DestroyCrsr();
         }
-        pSh->Pop( sal_False );
+        pSh->Pop( false );
     }
     else
     {
@@ -260,7 +260,7 @@ void SwLinguIter::_End(bool bRestoreSelection)
     if(bRestoreSelection)
     {
         while( nCrsrCnt-- )
-            pSh->Pop( sal_False );
+            pSh->Pop( false );
 
         pSh->KillPams();
         pSh->ClearMark();
@@ -323,7 +323,7 @@ uno::Any SwSpellIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
         }
         if( bGoOn )
         {
-            pMySh->Pop( sal_False );
+            pMySh->Pop( false );
             pCrsr = pMySh->GetCrsr();
             if ( *pCrsr->GetPoint() > *pCrsr->GetMark() )
                 pCrsr->Exchange();
@@ -391,7 +391,7 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
         }
         if( bGoOn )
         {
-            pMySh->Pop( sal_False );
+            pMySh->Pop( false );
             pCrsr = pMySh->GetCrsr();
             if ( *pCrsr->GetPoint() > *pCrsr->GetMark() )
                 pCrsr->Exchange();
@@ -410,7 +410,7 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
     return makeAny( aConvText );
 }
 
-sal_Bool SwHyphIter::IsAuto()
+bool SwHyphIter::IsAuto()
 {
     uno::Reference< beans::XPropertySet >  xProp( ::GetLinguPropertySet() );
     return xProp.is() ? *(sal_Bool*)xProp->getPropertyValue(
@@ -441,7 +441,7 @@ void SwHyphIter::Start( SwEditShell *pShell, SwDocPositions eStart, SwDocPositio
 
     // nothing to do (at least not in the way as in the "else" part)
     bOldIdle = pShell->GetViewOptions()->IsIdle();
-    ((SwViewOption*)pShell->GetViewOptions())->SetIdle( sal_False );
+    ((SwViewOption*)pShell->GetViewOptions())->SetIdle( false );
     _Start( pShell, eStart, eEnd );
 }
 
@@ -496,7 +496,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
 
         if( bGoOn )
         {
-            pMySh->Pop( sal_False );
+            pMySh->Pop( false );
             pCrsr = pMySh->GetCrsr();
             if ( *pCrsr->GetPoint() > *pCrsr->GetMark() )
                 pCrsr->Exchange();
@@ -588,12 +588,12 @@ bool SwEditShell::HasLastSentenceGotGrammarChecked() const
     return bTextWasGrammarChecked;
 }
 
-sal_Bool SwEditShell::HasConvIter() const
+bool SwEditShell::HasConvIter() const
 {
     return 0 != pConvIter;
 }
 
-sal_Bool SwEditShell::HasHyphIter() const
+bool SwEditShell::HasHyphIter() const
 {
     return 0 != pHyphIter;
 }
@@ -879,7 +879,7 @@ uno::Reference< XSpellAlternatives >
                 const sal_Int32 nLineStart = GetCrsr()->GetPoint()->nContent.GetIndex();
                 RightMargin();
                 const sal_Int32 nLineEnd = GetCrsr()->GetPoint()->nContent.GetIndex();
-                Pop(sal_False);
+                Pop(false);
 
                 // make sure the selection build later from the data below does
                 // not "in word" character to the left and right in order to
@@ -898,7 +898,7 @@ uno::Reference< XSpellAlternatives >
                 pCrsr = GetCrsr();
                 *pCrsr->GetPoint() = aPos;
                 pCrsr->SetMark();
-                ExtendSelection( sal_True, nLen - nLeft - nRight );
+                ExtendSelection( true, nLen - nLeft - nRight );
                 // don't determine the rectangle in the current line
                 const sal_Int32 nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft;
                 // take one less than the line end - otherwise the next line would be calculated
@@ -910,7 +910,7 @@ uno::Reference< XSpellAlternatives >
                 rContent = nWordStart;
                 SwRect aStartRect;
                 SwCrsrMoveState aState;
-                aState.bRealWidth = sal_True;
+                aState.bRealWidth = true;
                 SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
                 SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
 
@@ -919,7 +919,7 @@ uno::Reference< XSpellAlternatives >
                 SwRect aEndRect;
                 pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
                 rSelectRect = aStartRect.Union( aEndRect );
-                Pop(sal_False);
+                Pop(false);
             }
         }
     }
@@ -1003,7 +1003,7 @@ bool SwEditShell::GetGrammarCorrection(
                 const sal_Int32 nLineStart = GetCrsr()->GetPoint()->nContent.GetIndex();
                 RightMargin();
                 const sal_Int32 nLineEnd = GetCrsr()->GetPoint()->nContent.GetIndex();
-                Pop(sal_False);
+                Pop(false);
 
                 // make sure the selection build later from the data below does
                 // not include "in word" character to the left and right in
@@ -1022,7 +1022,7 @@ bool SwEditShell::GetGrammarCorrection(
                 pCrsr = GetCrsr();
                 *pCrsr->GetPoint() = aPos;
                 pCrsr->SetMark();
-                ExtendSelection( sal_True, nLen - nLeft - nRight );
+                ExtendSelection( true, nLen - nLeft - nRight );
                 // don't determine the rectangle in the current line
                 const sal_Int32 nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft;
                 // take one less than the line end - otherwise the next line would be calculated
@@ -1034,7 +1034,7 @@ bool SwEditShell::GetGrammarCorrection(
                 rContent = nWordStart;
                 SwRect aStartRect;
                 SwCrsrMoveState aState;
-                aState.bRealWidth = sal_True;
+                aState.bRealWidth = true;
                 SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
                 SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
 
@@ -1043,7 +1043,7 @@ bool SwEditShell::GetGrammarCorrection(
                 SwRect aEndRect;
                 pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
                 rSelectRect = aStartRect.Union( aEndRect );
-                Pop(sal_False);
+                Pop(false);
             }
         }
     }
@@ -1232,7 +1232,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
         // restore cursor to the end of the sentence
         // (will work also if the sentence length has changed,
         // since cursors get updated automatically!)
-        Pop( sal_False );
+        Pop( false );
 
         // collapse cursor to the end of the modified sentence
         *pCrsr->Start() = *pCrsr->End();
@@ -1373,7 +1373,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
         }
         if( bGoOn )
         {
-            pMySh->Pop( sal_False );
+            pMySh->Pop( false );
             pCrsr = pMySh->GetCrsr();
             if ( *pCrsr->GetPoint() > *pCrsr->GetMark() )
                 pCrsr->Exchange();
@@ -1401,7 +1401,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
         // the cursor has to be collapsed on the left to go to the start of the sentence - if sentence ends inside of the error
         pCrsr->DeleteMark();
         pCrsr->SetMark();
-        bool bStartSent = 0 != pMySh->GoStartSentence();
+        bool bStartSent = pMySh->GoStartSentence();
         SpellContentPositions aDeletedRedlines = lcl_CollectDeletedRedlines(pMySh);
         if(bStartSent)
         {
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 409ac7c22b24..c86790175399 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -148,9 +148,9 @@ bool SwEditShell::NoNum()
     return bRet;
 }
 
-sal_Bool SwEditShell::SelectionHasNumber() const
+bool SwEditShell::SelectionHasNumber() const
 {
-    sal_Bool bResult = HasNumber();
+    bool bResult = HasNumber();
     const SwTxtNode * pTxtNd =
         GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
     if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
@@ -178,9 +178,9 @@ sal_Bool SwEditShell::SelectionHasNumber() const
                             pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
                             !pTxtNd->IsCountedInList() )
                         {
-                            bResult = sal_False;
+                            bResult = false;
                         }
-                        if (bResult==sal_False) {
+                        if (bResult==false) {
                             break;
                         }
                     }
@@ -194,9 +194,9 @@ sal_Bool SwEditShell::SelectionHasNumber() const
 }
 
 // add a new function to determine number on/off status
-sal_Bool SwEditShell::SelectionHasBullet() const
+bool SwEditShell::SelectionHasBullet() const
 {
-    sal_Bool bResult = HasBullet();
+    bool bResult = HasBullet();
     const SwTxtNode * pTxtNd =
         GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
     if (!bResult && pTxtNd && pTxtNd->Len()==0 && !pTxtNd->GetNumRule()) {
@@ -219,7 +219,7 @@ sal_Bool SwEditShell::SelectionHasBullet() const
                     {
                         bResult = pTxtNd->HasBullet();
 
-                        if (bResult==sal_False) {
+                        if (bResult==false) {
                             break;
                         }
                     }
@@ -232,9 +232,9 @@ sal_Bool SwEditShell::SelectionHasBullet() const
 }
 
 // -> #i29560#
-sal_Bool SwEditShell::HasNumber() const
+bool SwEditShell::HasNumber() const
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     const SwTxtNode * pTxtNd =
         GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
@@ -248,16 +248,16 @@ sal_Bool SwEditShell::HasNumber() const
              pTxtNd->GetNumRule() == GetDoc()->GetOutlineNumRule() &&
              !pTxtNd->IsCountedInList() )
         {
-            bResult = sal_False;
+            bResult = false;
         }
     }
 
     return bResult;
 }
 
-sal_Bool SwEditShell::HasBullet() const
+bool SwEditShell::HasBullet() const
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     const SwTxtNode * pTxtNd =
         GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode();
@@ -442,7 +442,7 @@ bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
     if( pCrsr->HasMark() )
         *aCrsr.GetPoint() = *pCrsr->End();
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt8 nUpperLevel, nLowerLevel;
     if( GetDoc()->GotoNextNum( *aCrsr.GetPoint(), false,
                                 &nUpperLevel, &nLowerLevel ))
@@ -555,9 +555,9 @@ bool SwEditShell::MoveOutlinePara( short nOffset )
 }
 
 // Outlines and SubOutline are ReadOnly?
-sal_Bool SwEditShell::IsProtectedOutlinePara() const
+bool SwEditShell::IsProtectedOutlinePara() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwNode& rNd = GetCrsr()->Start()->nNode.GetNode();
     if( rNd.IsTxtNode() )
     {
@@ -588,7 +588,7 @@ sal_Bool SwEditShell::IsProtectedOutlinePara() const
 
             if( pTmpNd->IsProtect() )
             {
-                bRet = sal_True;
+                bRet = true;
                 break;
             }
         }
@@ -609,7 +609,7 @@ sal_Bool SwEditShell::IsProtectedOutlinePara() const
  * 2) outline must not be within table
  * 3) if bCopy is set, outline must not be write protected
  */
-static sal_Bool lcl_IsOutlineMoveAndCopyable( const SwDoc* pDoc, sal_uInt16 nIdx, bool bCopy )
+static bool lcl_IsOutlineMoveAndCopyable( const SwDoc* pDoc, sal_uInt16 nIdx, bool bCopy )
 {
     const SwNodes& rNds = pDoc->GetNodes();
     const SwNode* pNd = rNds.GetOutLineNds()[ nIdx ];
@@ -618,12 +618,12 @@ static sal_Bool lcl_IsOutlineMoveAndCopyable( const SwDoc* pDoc, sal_uInt16 nIdx
             ( bCopy || !pNd->IsProtect() );                         // 3) write
 }
 
-sal_Bool SwEditShell::IsOutlineMovable( sal_uInt16 nIdx ) const
+bool SwEditShell::IsOutlineMovable( sal_uInt16 nIdx ) const
 {
     return lcl_IsOutlineMoveAndCopyable( GetDoc(), nIdx, false );
 }
 
-sal_Bool SwEditShell::IsOutlineCopyable( sal_uInt16 nIdx ) const
+bool SwEditShell::IsOutlineCopyable( sal_uInt16 nIdx ) const
 {
     return lcl_IsOutlineMoveAndCopyable( GetDoc(), nIdx, true );
 }
@@ -645,10 +645,10 @@ bool SwEditShell::NumOrNoNum(
     return bRet;
 }
 
-sal_Bool SwEditShell::IsNoNum( sal_Bool bChkStart ) const
+bool SwEditShell::IsNoNum( bool bChkStart ) const
 {
     // a Backspace in the paragraph without number becomes a Delete
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if ( !IsMultiSelection()
          && !HasSelection()
@@ -788,7 +788,7 @@ bool SwEditShell::ReplaceNumRule( const OUString& rOldRule, const OUString& rNew
     return bRet;
 }
 
-void SwEditShell::SetNumRuleStart( sal_Bool bFlag, SwPaM* pPaM )
+void SwEditShell::SetNumRuleStart( bool bFlag, SwPaM* pPaM )
 {
     StartAllAction();
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr();
@@ -807,9 +807,9 @@ void SwEditShell::SetNumRuleStart( sal_Bool bFlag, SwPaM* pPaM )
     EndAllAction();
 }
 
-sal_Bool SwEditShell::IsNumRuleStart( SwPaM* pPaM ) const
+bool SwEditShell::IsNumRuleStart( SwPaM* pPaM ) const
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
     SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( );
     const SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
     if( pTxtNd )
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index e0fad1901f50..96beac334783 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -42,7 +42,7 @@ void SwEditShell::SetRedlineMode( sal_uInt16 eMode )
     }
 }
 
-sal_Bool SwEditShell::IsRedlineOn() const
+bool SwEditShell::IsRedlineOn() const
 {
     return GetDoc()->IsRedlineOn();
 }
@@ -69,22 +69,22 @@ static void lcl_InvalidateAll( SwViewShell* pSh )
     } while ( pSh != pStop );
 }
 
-sal_Bool SwEditShell::AcceptRedline( sal_uInt16 nPos )
+bool SwEditShell::AcceptRedline( sal_uInt16 nPos )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    sal_Bool bRet = GetDoc()->AcceptRedline( nPos, true );
+    bool bRet = GetDoc()->AcceptRedline( nPos, true );
     if( !nPos && !::IsExtraData( GetDoc() ) )
         lcl_InvalidateAll( this );
     EndAllAction();
     return bRet;
 }
 
-sal_Bool SwEditShell::RejectRedline( sal_uInt16 nPos )
+bool SwEditShell::RejectRedline( sal_uInt16 nPos )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
-    sal_Bool bRet = GetDoc()->RejectRedline( nPos, true );
+    bool bRet = GetDoc()->RejectRedline( nPos, true );
     if( !nPos && !::IsExtraData( GetDoc() ) )
         lcl_InvalidateAll( this );
     EndAllAction();
@@ -110,9 +110,9 @@ bool SwEditShell::RejectRedlinesInSelection()
 }
 
 // Set the comment at the Redline
-sal_Bool SwEditShell::SetRedlineComment( const OUString& rS )
+bool SwEditShell::SetRedlineComment( const OUString& rS )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     FOREACHPAM_START(GetCrsr())
         bRet = bRet || GetDoc()->SetRedlineComment( *PCURCRSR, rS );
     FOREACHPAM_END()
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index bee6c3c0fcca..246fc351d61d 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -53,17 +53,17 @@ SwEditShell::InsertSection(
     return pRet;
 }
 
-sal_Bool SwEditShell::IsInsRegionAvailable() const
+bool SwEditShell::IsInsRegionAvailable() const
 {
     if( IsTableMode() )
-        return sal_False;
+        return false;
     SwPaM* pCrsr = GetCrsr();
     if( pCrsr->GetNext() != pCrsr )
-        return sal_False;
+        return false;
     if( pCrsr->HasMark() )
         return 0 != GetDoc()->IsInsRegionAvailable( *pCrsr );
 
-    return sal_True;
+    return true;
 }
 
 const SwSection* SwEditShell::GetCurrSection() const
@@ -78,7 +78,7 @@ const SwSection* SwEditShell::GetCurrSection() const
  *
  * In footnotes it may not be the area within the footnote.
  */
-const SwSection* SwEditShell::GetAnySection( sal_Bool bOutOfTab, const Point* pPt ) const
+const SwSection* SwEditShell::GetAnySection( bool bOutOfTab, const Point* pPt ) const
 {
     SwFrm *pFrm;
     if ( pPt )
@@ -90,7 +90,7 @@ const SwSection* SwEditShell::GetAnySection( sal_Bool bOutOfTab, const Point* pP
         pFrm = pNd->getLayoutFrm( GetLayout(), pPt );
     }
     else
-        pFrm = GetCurrFrm( sal_False );
+        pFrm = GetCurrFrm( false );
 
     if( bOutOfTab && pFrm )
         pFrm = pFrm->FindTabFrm();
@@ -113,7 +113,7 @@ sal_uInt16 SwEditShell::GetSectionFmtCount() const
     return GetDoc()->GetSections().size();
 }
 
-sal_Bool SwEditShell::IsAnySectionInDoc( sal_Bool bChkReadOnly, sal_Bool bChkHidden, sal_Bool bChkTOX ) const
+bool SwEditShell::IsAnySectionInDoc( bool bChkReadOnly, bool bChkHidden, bool bChkTOX ) const
 {
     const SwSectionFmts& rFmts = GetDoc()->GetSections();
     sal_uInt16 nCnt = rFmts.size();
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index e650d51fd526..fec6777ae923 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 //Added for bug #i119954# Application crashed if undo/redo covert nest table to text
-sal_Bool ConvertTableToText( const SwTableNode *pTableNode, sal_Unicode cCh );
+bool ConvertTableToText( const SwTableNode *pTableNode, sal_Unicode cCh );
 
 void    ConvertNestedTablesToText( const SwTableLines &rTableLines, sal_Unicode cCh )
 {
@@ -79,7 +79,7 @@ void    ConvertNestedTablesToText( const SwTableLines &rTableLines, sal_Unicode
     }
 }
 
-sal_Bool ConvertTableToText( const SwTableNode *pConstTableNode, sal_Unicode cCh )
+bool ConvertTableToText( const SwTableNode *pConstTableNode, sal_Unicode cCh )
 {
     SwTableNode *pTableNode = const_cast< SwTableNode* >( pConstTableNode );
     ConvertNestedTablesToText( pTableNode->GetTable().GetTabLines(), cCh );
@@ -107,7 +107,7 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
     const SwTable *pTable = GetDoc()->InsertTable( rInsTblOpts, *pPos,
                                                    nRows, nCols,
                                                    eAdj, pTAFmt,
-                                                   0, sal_True );
+                                                   0, true );
     if( bEndUndo )
         EndUndo( UNDO_END );
 
@@ -115,7 +115,7 @@ const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts
     return *pTable;
 }
 
-sal_Bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
+bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                                sal_Unicode cCh,
                                sal_Int16 eAdj,
                                const SwTableAutoFmt* pTAFmt )
@@ -132,10 +132,10 @@ sal_Bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     return bRet;
 }
 
-sal_Bool SwEditShell::TableToText( sal_Unicode cCh )
+bool SwEditShell::TableToText( sal_Unicode cCh )
 {
     SwWait aWait( *GetDoc()->GetDocShell(), true );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwPaM* pCrsr = GetCrsr();
     const SwTableNode* pTblNd =
             GetDoc()->IsIdxInTbl( pCrsr->GetPoint()->nNode );
@@ -179,13 +179,13 @@ sal_Bool SwEditShell::TableToText( sal_Unicode cCh )
     return bRet;
 }
 
-sal_Bool SwEditShell::IsTextToTableAvailable() const
+bool SwEditShell::IsTextToTableAvailable() const
 {
-    sal_Bool bOnlyText = sal_False;
+    bool bOnlyText = false;
     FOREACHPAM_START(GetCrsr())
         if( PCURCRSR->HasMark() && *PCURCRSR->GetPoint() != *PCURCRSR->GetMark() )
         {
-            bOnlyText = sal_True;
+            bOnlyText = true;
 
             // check if selection is in listing
             sal_uLong nStt = PCURCRSR->GetMark()->nNode.GetIndex(),
@@ -195,7 +195,7 @@ sal_Bool SwEditShell::IsTextToTableAvailable() const
             for( ; nStt <= nEnd; ++nStt )
                 if( !GetDoc()->GetNodes()[ nStt ]->IsTxtNode() )
                 {
-                    bOnlyText = sal_False;
+                    bOnlyText = false;
                     break;
                 }
 
@@ -287,7 +287,7 @@ void SwEditShell::SetTblChgMode( TblChgMode eMode )
     }
 }
 
-sal_Bool SwEditShell::GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const
+bool SwEditShell::GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const
 {
     SwSelBoxes aBoxes;
     if( IsTableMode() )
@@ -363,10 +363,10 @@ void SwEditShell::SetTblBoxFormulaAttrs( const SfxItemSet& rSet )
     EndAllAction();
 }
 
-sal_Bool SwEditShell::IsTableBoxTextFormat() const
+bool SwEditShell::IsTableBoxTextFormat() const
 {
     if( IsTableMode() )
-        return sal_False;
+        return false;
 
     SwTableBox *pBox = 0;
     {
@@ -379,7 +379,7 @@ sal_Bool SwEditShell::IsTableBoxTextFormat() const
     }
 
     if( !pBox )
-        return sal_False;
+        return false;
 
     sal_uInt32 nFmt = 0;
     const SfxPoolItem* pItem;
@@ -393,11 +393,11 @@ sal_Bool SwEditShell::IsTableBoxTextFormat() const
 
     sal_uLong nNd = pBox->IsValidNumTxtNd();
     if( ULONG_MAX == nNd )
-        return sal_True;
+        return true;
 
     const OUString& rTxt = GetDoc()->GetNodes()[ nNd ]->GetTxtNode()->GetTxt();
     if( rTxt.isEmpty() )
-        return sal_False;
+        return false;
 
     double fVal;
     return !GetDoc()->GetNumberFormatter()->IsNumberFormat( rTxt, nFmt, fVal );
@@ -425,16 +425,16 @@ OUString SwEditShell::GetTableBoxText() const
     return sRet;
 }
 
-sal_Bool SwEditShell::SplitTable( sal_uInt16 eMode )
+bool SwEditShell::SplitTable( sal_uInt16 eMode )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwPaM *pCrsr = GetCrsr();
     if( pCrsr->GetNode()->FindTableNode() )
     {
         StartAllAction();
         GetDoc()->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
-        bRet = GetDoc()->SplitTable( *pCrsr->GetPoint(), eMode, sal_True );
+        bRet = GetDoc()->SplitTable( *pCrsr->GetPoint(), eMode, true );
 
         GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
         ClearFEShellTabCols();
@@ -443,9 +443,9 @@ sal_Bool SwEditShell::SplitTable( sal_uInt16 eMode )
     return bRet;
 }
 
-sal_Bool SwEditShell::MergeTable( sal_Bool bWithPrev, sal_uInt16 nMode )
+bool SwEditShell::MergeTable( bool bWithPrev, sal_uInt16 nMode )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwPaM *pCrsr = GetCrsr();
     if( pCrsr->GetNode()->FindTableNode() )
     {
@@ -461,14 +461,14 @@ sal_Bool SwEditShell::MergeTable( sal_Bool bWithPrev, sal_uInt16 nMode )
     return bRet;
 }
 
-sal_Bool SwEditShell::CanMergeTable( sal_Bool bWithPrev, sal_Bool* pChkNxtPrv ) const
+bool SwEditShell::CanMergeTable( bool bWithPrev, bool* pChkNxtPrv ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwPaM *pCrsr = GetCrsr();
     const SwTableNode* pTblNd = pCrsr->GetNode()->FindTableNode();
     if( pTblNd && !pTblNd->GetTable().ISA( SwDDETable ))
     {
-        sal_Bool bNew = pTblNd->GetTable().IsNewModel();
+        bool bNew = pTblNd->GetTable().IsNewModel();
         const SwNodes& rNds = GetDoc()->GetNodes();
         if( pChkNxtPrv )
         {
@@ -477,13 +477,13 @@ sal_Bool SwEditShell::CanMergeTable( sal_Bool bWithPrev, sal_Bool* pChkNxtPrv )
                 bNew == pChkNd->GetTable().IsNewModel() &&
                 // Consider table in table case
                 pChkNd->EndOfSectionIndex() == pTblNd->GetIndex() - 1 )
-                *pChkNxtPrv = sal_True, bRet = sal_True;        // using Prev is possible
+                *pChkNxtPrv = true, bRet = true;        // using Prev is possible
             else
             {
                 pChkNd = rNds[ pTblNd->EndOfSectionIndex() + 1 ]->GetTableNode();
                 if( pChkNd && !pChkNd->GetTable().ISA( SwDDETable ) &&
                     bNew == pChkNd->GetTable().IsNewModel() )
-                    *pChkNxtPrv = sal_False, bRet = sal_True;   // using Next is possible
+                    *pChkNxtPrv = false, bRet = true;   // using Next is possible
             }
         }
         else
@@ -508,7 +508,7 @@ sal_Bool SwEditShell::CanMergeTable( sal_Bool bWithPrev, sal_Bool* pChkNxtPrv )
 }
 
 /** create InsertDB as table Undo */
-void SwEditShell::AppendUndoForInsertFromDB( sal_Bool bIsTable )
+void SwEditShell::AppendUndoForInsertFromDB( bool bIsTable )
 {
     GetDoc()->AppendUndoForInsertFromDB( *GetCrsr(), bIsTable );
 }
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 999567e3f580..940e71352f26 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::util;
 
 void SwEditShell::Insert(const SwTOXMark& rMark)
 {
-    sal_Bool bInsAtPos = rMark.IsAlternativeText();
+    bool bInsAtPos = rMark.IsAlternativeText();
     StartAllAction();
     FOREACHPAM_START(GetCrsr())
 
@@ -95,14 +95,14 @@ sal_uInt16 SwEditShell::GetCurTOXMarks(SwTOXMarks& rMarks) const
     return GetDoc()->GetCurTOXMark( *GetCrsr()->Start(), rMarks );
 }
 
-sal_Bool SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const
+bool SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
     return  rTOXSect.IsProtect();
 }
 
-void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, sal_Bool bReadonly)
+void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly)
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
@@ -154,9 +154,9 @@ void SwEditShell::InsertTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
 }
 
 /// update tables of content
-sal_Bool SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
+bool SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     OSL_ENSURE( rTOX.ISA( SwTOXBaseSection ),  "no TOXBaseSection!" );
     SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOX;
@@ -253,12 +253,12 @@ const SwTOXBase* SwEditShell::GetTOX( sal_uInt16 nPos ) const
 }
 
 /** Update of all listings after reading-in a file */
-void SwEditShell::SetUpdateTOX( sal_Bool bFlag )
+void SwEditShell::SetUpdateTOX( bool bFlag )
 {
     GetDoc()->SetUpdateTOX( bFlag );
 }
 
-sal_Bool SwEditShell::IsUpdateTOX() const
+bool SwEditShell::IsUpdateTOX() const
 {
     return GetDoc()->IsUpdateTOX();
 }
@@ -276,8 +276,8 @@ void SwEditShell::SetTOIAutoMarkURL(const OUString& rSet)
 void SwEditShell::ApplyAutoMark()
 {
     StartAllAction();
-    sal_Bool bDoesUndo = DoesUndo();
-    DoUndo(sal_False);
+    bool bDoesUndo = DoesUndo();
+    DoUndo(false);
     //1. remove all automatic generated index entries if AutoMarkURL has a
     //   length and the file exists
     //2. load file
@@ -368,12 +368,12 @@ void SwEditShell::ApplyAutoMark()
                     aSearchOpt.searchString = sToSelect;
 
                     KillPams();
-                    sal_Bool bCancel;
+                    bool bCancel;
 
                     // todo/mba: assuming that notes shouldn't be searched
-                    sal_Bool bSearchInNotes = sal_False;
+                    bool bSearchInNotes = false;
                     sal_uLong nRet = Find( aSearchOpt,  bSearchInNotes, DOCPOS_START, DOCPOS_END, bCancel,
-                                    (FindRanges)(FND_IN_SELALL), sal_False );
+                                    (FindRanges)(FND_IN_SELALL), false );
 
                     if(nRet)
                     {
@@ -386,8 +386,8 @@ void SwEditShell::ApplyAutoMark()
                         }
                         if( !sAlternative.isEmpty() )
                             pTmpMark->SetAlternativeText(sAlternative);
-                        pTmpMark->SetMainEntry(sal_False);
-                        pTmpMark->SetAutoGenerated(sal_True);
+                        pTmpMark->SetMainEntry(false);
+                        pTmpMark->SetAutoGenerated(true);
                         //4.
                         SwEditShell::Insert(*pTmpMark);
                     }
@@ -395,7 +395,7 @@ void SwEditShell::ApplyAutoMark()
             }
         }
         KillPams();
-        Pop(sal_False);
+        Pop(false);
     }
     DoUndo(bDoesUndo);
     EndAllAction();
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 28e1364c49d7..4d6f493a0db1 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -46,7 +46,7 @@ SwEditShell::~SwEditShell() // USED
 {
 }
 
-sal_Bool SwEditShell::IsModified() const
+bool SwEditShell::IsModified() const
 {
     return GetDoc()->IsModified();
 }
@@ -129,24 +129,24 @@ sal_uInt16 SwEditShell::GetCntType() const
     return nRet;
 }
 
-sal_Bool SwEditShell::HasOtherCnt() const
+bool SwEditShell::HasOtherCnt() const
 
 {
     if ( !GetDoc()->GetSpzFrmFmts()->empty() )
-        return sal_True;
+        return true;
 
     const SwNodes &rNds = GetDoc()->GetNodes();
     const SwNode *pNd;
 
     pNd = &rNds.GetEndOfInserts();
     if ( 1 != (pNd->GetIndex() - pNd->StartOfSectionIndex()) )
-        return sal_True;
+        return true;
 
     pNd = &rNds.GetEndOfAutotext();
     if ( 1 != (pNd->GetIndex() - pNd->StartOfSectionIndex()) )
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
 // access controll functions for file name handling
@@ -190,16 +190,16 @@ void SwEditShell::InsertTOXType(const SwTOXType& rTyp)
     mpDoc->InsertTOXType(rTyp);
 }
 
-void SwEditShell::DoUndo( sal_Bool bOn )
+void SwEditShell::DoUndo( bool bOn )
 { GetDoc()->GetIDocumentUndoRedo().DoUndo( bOn ); }
 
-sal_Bool SwEditShell::DoesUndo() const
+bool SwEditShell::DoesUndo() const
 { return GetDoc()->GetIDocumentUndoRedo().DoesUndo(); }
 
-void SwEditShell::DoGroupUndo( sal_Bool bOn )
+void SwEditShell::DoGroupUndo( bool bOn )
 { GetDoc()->GetIDocumentUndoRedo().DoGroupUndo( bOn ); }
 
-sal_Bool SwEditShell::DoesGroupUndo() const
+bool SwEditShell::DoesGroupUndo() const
 { return GetDoc()->GetIDocumentUndoRedo().DoesGroupUndo(); }
 
 void SwEditShell::DelAllUndoObj()
@@ -238,7 +238,7 @@ SwUndoId SwEditShell::GetRepeatInfo(OUString *const o_pStr) const
 { return GetDoc()->GetIDocumentUndoRedo().GetRepeatInfo(o_pStr); }
 
 /** Auto correction */
-void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsert,
+void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, bool bInsert,
                                 sal_Unicode cChar )
 {
     SET_CURR_SHELL( this );
@@ -259,16 +259,16 @@ void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsert,
     EndAllAction();
 }
 
-void SwEditShell::SetNewDoc(sal_Bool bNew)
+void SwEditShell::SetNewDoc(bool bNew)
 {
     GetDoc()->SetNewDoc(bNew);
 }
 
-sal_Bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord )
+bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord )
 {
     SET_CURR_SHELL( this );
 
-    sal_Bool bRet;
+    bool bRet;
     SwPaM* pCrsr = getShellCrsr( true );
     const sal_Int32 nPos = pCrsr->GetPoint()->nContent.GetIndex();
     SwTxtNode* pTNd = pCrsr->GetNode()->GetTxtNode();
@@ -279,7 +279,7 @@ sal_Bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWo
                                             pTNd->GetTxt(), nPos, rWord );
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 76fb0f9e12d3..62e05ac34343 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -51,12 +51,12 @@ SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
         aAuthFields[i] = rCopy.aAuthFields[i];
 }
 
-sal_Bool    SwAuthEntry::operator==(const SwAuthEntry& rComp)
+bool    SwAuthEntry::operator==(const SwAuthEntry& rComp)
 {
     for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
         if(aAuthFields[i] != rComp.aAuthFields[i])
-            return sal_False;
-    return sal_True;
+            return false;
+    return true;
 }
 
 SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
@@ -66,8 +66,8 @@ SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
     m_SortKeyArr(3),
     m_cPrefix('['),
     m_cSuffix(']'),
-    m_bIsSequence(sal_False),
-    m_bSortByDocument(sal_True),
+    m_bIsSequence(false),
+    m_bSortByDocument(true),
     m_eLanguage(::GetAppLanguage())
 {
 }
@@ -140,16 +140,16 @@ sal_IntPtr SwAuthorityFieldType::AddField(const OUString& rFieldContents)
     return nRet;
 }
 
-sal_Bool SwAuthorityFieldType::AddField(sal_IntPtr nHandle)
+bool SwAuthorityFieldType::AddField(sal_IntPtr nHandle)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     for( sal_uInt16 j = 0; j < m_DataArr.size(); j++ )
     {
         SwAuthEntry* pTemp = &m_DataArr[j];
         sal_IntPtr nTmp = (sal_IntPtr)(void*)pTemp;
         if( nTmp == nHandle )
         {
-            bRet = sal_True;
+            bRet = true;
             pTemp->AddRef();
             //re-generate positions of the fields
             DelSequenceArray();
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 3f142e5ed5bd..796a18e82709 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -103,7 +103,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
 
         const SfxPoolItem* pItem;
         if( SFX_ITEM_SET == GetFrmFmt()->GetItemState(
-                                RES_BOXATR_FORMULA, sal_False, &pItem ) )
+                                RES_BOXATR_FORMULA, false, &pItem ) )
         {
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
             if( !((SwTblBoxFormula*)pItem)->IsValid() )
@@ -130,7 +130,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
             break;
         }
         else if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
-                                RES_BOXATR_VALUE, sal_False, &pItem ) )
+                                RES_BOXATR_VALUE, false, &pItem ) )
         {
             rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
             nRet = ((SwTblBoxValue*)pItem)->GetValue();
@@ -252,7 +252,7 @@ SwTblCalcPara::~SwTblCalcPara()
     delete pBoxStk;
 }
 
-sal_Bool SwTblCalcPara::CalcWithStackOverflow()
+bool SwTblCalcPara::CalcWithStackOverflow()
 {
     // If a stack overflow was detected, redo with last box.
     sal_uInt16 nSaveMaxSize = nMaxSize;
@@ -345,7 +345,7 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
                     rNewStr += OUString(cListDelim);
                 bDelim = true;
                 rNewStr += pCalcPara->rCalc.GetStrResult(
-                            pTblBox->GetValue( *pCalcPara ), sal_False );
+                            pTblBox->GetValue( *pCalcPara ), false );
             }
         }
         rNewStr += ")";
@@ -357,7 +357,7 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, OUString& rNewStr,
         if ( pSttBox->getRowSpan() >= 1 )
         {
             rNewStr += pCalcPara->rCalc.GetStrResult(
-                            pSttBox->GetValue( *pCalcPara ), sal_False );
+                            pSttBox->GetValue( *pCalcPara ), false );
         }
     }
     else
@@ -839,8 +839,8 @@ static OUString lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
     // If the formula is spanning over a table then keep external presentation
     if( &rTbl == &rTblNd.GetTable() )
     {
-        long nBox = SwTable::_GetBoxNum( sTmp, sal_True );
-        nBox -= SwTable::_GetBoxNum( sRefBoxNm, sal_True );
+        long nBox = SwTable::_GetBoxNum( sTmp, true );
+        nBox -= SwTable::_GetBoxNum( sRefBoxNm, true );
         long nLine = SwTable::_GetBoxNum( sTmp );
         nLine -= SwTable::_GetBoxNum( sRefBoxNm );
 
@@ -1064,13 +1064,13 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
                 {
                     if( rTblUpd.pTbl != &rTbl ) // not the current one
                         rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() + "."; // set new table name
-                    rTblUpd.bModified = sal_True;
+                    rTblUpd.bModified = true;
                 }
                 else if( pFnd != rTblUpd.pTbl ||
                     ( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
                     rNewStr += sTblNm + "."; // keep table name
                 else
-                    rTblUpd.bModified = sal_True;
+                    rTblUpd.bModified = true;
             }
             else
                 rNewStr += sTblNm + ".";     // keep table name
@@ -1133,7 +1133,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
             else
             {
                 // this is definitely an invalid formula, also mark as modified for Undo
-                rTblUpd.bModified = sal_True;
+                rTblUpd.bModified = true;
                 if( pEndBox )
                     bInNewTbl = USHRT_MAX != nEndLnPos &&
                                     rTblUpd.nSplitLine <= nEndLnPos &&
@@ -1154,7 +1154,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
         {
             if( !bInNewTbl )
             {
-                rTblUpd.bModified = sal_True;
+                rTblUpd.bModified = true;
                 rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() + ".";
             }
             else if( !sTblNm.isEmpty() )
@@ -1162,7 +1162,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, OUString& rNewStr,
         }
         else if( bInNewTbl )
         {
-            rTblUpd.bModified = sal_True;
+            rTblUpd.bModified = true;
             rNewStr += *rTblUpd.DATA.pNewTblNm + ".";
         }
         else if( !sTblNm.isEmpty() )
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index d001deb3b357..475efa76e532 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -102,7 +102,7 @@ SwField* SwChapterField::Copy() const
 // #i53420#
 void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
                                       const SwCntntNode* pCntntNode,
-                                      sal_Bool bSrchNum )
+                                      bool bSrchNum )
 {
     OSL_ENSURE( pFrm, "In which frame am I?" );
     SwDoc* pDoc = (SwDoc*)pCntntNode->GetDoc();
@@ -120,7 +120,7 @@ void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
     }
 }
 
-void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
+void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, bool bSrchNum)
 {
     //i120759,this function is for both the reference chapter field and normal chapter field
     //bSrchNum can distinguish the two types,to the latter type,the outline num rule is must...
@@ -261,7 +261,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
 
 bool SwChapterField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     switch( nWhichId )
     {
     case FIELD_PROP_BYTE1:
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index a47506138a62..aab43b29f565 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -272,7 +272,7 @@ void SwDBField::Evaluate()
     double nValue = DBL_MAX;
     const SwDBData& aTmpData = GetDBData();
 
-    if(!pMgr || !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True))
+    if(!pMgr || !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, true))
         return ;
 
     sal_uInt32 nFmt;
@@ -383,7 +383,7 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     case FIELD_PROP_BOOL2:
     {
         sal_uInt16 nSubTyp = GetSubType();
-        sal_Bool bVisible = sal_False;
+        bool bVisible = false;
         if(!(rAny >>= bVisible))
             return false;
         if(bVisible)
@@ -507,7 +507,7 @@ bool SwDBNameInfField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     case FIELD_PROP_BOOL2:
     {
         sal_uInt16 nSubTyp = GetSubType();
-        sal_Bool bVisible = sal_False;
+        bool bVisible = false;
         if(!(rAny >>= bVisible))
             return false;
         if(bVisible)
@@ -574,7 +574,7 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc)
     SwDBMgr* pMgr = pDoc->GetDBMgr();
     const SwDBData& rData = GetDBData();
     if( !bCondValid ||
-            !pMgr || !pMgr->IsDataSourceOpen(rData.sDataSource, rData.sCommand, sal_False))
+            !pMgr || !pMgr->IsDataSourceOpen(rData.sDataSource, rData.sCommand, false))
         return ;
     pMgr->ToNextRecord(rData.sDataSource, rData.sCommand);
 }
@@ -664,7 +664,7 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
     const SwDBData& aTmpData = GetDBData();
 
     if( bCondValid && pMgr && pMgr->IsInMerge() &&
-                        pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True))
+                        pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, true))
     {   // condition OK -> adjust current Set
         pMgr->ToRecordId(std::max((sal_uInt16)aPar2.toInt32(), sal_uInt16(1))-1);
     }
@@ -818,7 +818,7 @@ void SwDBSetNumberField::Evaluate(SwDoc* pDoc)
 
     const SwDBData& aTmpData = GetDBData();
     if (!pMgr || !pMgr->IsInMerge() ||
-        !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_False))
+        !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, false))
         return;
     nNumber = pMgr->GetSelectedRecordId();
 }
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 3aa9947058b9..f6dbf1b91ca0 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -74,7 +74,7 @@ public:
             if( n && 0x0d == sStr[ n-1 ] )
                 --n;
 
-            sal_Bool bDel = n != sStr.getLength();
+            bool bDel = n != sStr.getLength();
             if( bDel )
                 sStr = sStr.copy( 0, n );
 
@@ -232,7 +232,7 @@ SwDDEFieldType::SwDDEFieldType(const OUString& rName,
     : SwFieldType( RES_DDEFLD ),
     aName( rName ), pDoc( 0 ), nRefCnt( 0 )
 {
-    bCRLFFlag = bDeleted = sal_False;
+    bCRLFFlag = bDeleted = false;
     refLink = new SwIntrnlRefLink( *this, nUpdateType, FORMAT_STRING );
     SetCmd( rCmd );
 }
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index bbcf16976fc3..99a5d6d8a7e8 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -34,7 +34,7 @@ TYPEINIT1( SwDDETable, SwTable );
 
 /// Ctor moves all lines/boxes from a SwTable into itself.
 /// Afterwards the SwTable is empty and must be deleted.
-SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, sal_Bool bUpdate )
+SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, bool bUpdate )
     : SwTable( rTable ), aDepend( this, pDDEType )
 {
     // copy the table data
@@ -140,7 +140,7 @@ SwDDEFieldType* SwDDETable::GetDDEFldType()
     return (SwDDEFieldType*)aDepend.GetRegisteredIn();
 }
 
-sal_Bool SwDDETable::NoDDETable()
+bool SwDDETable::NoDDETable()
 {
     // search table node
     OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
@@ -148,11 +148,11 @@ sal_Bool SwDDETable::NoDDETable()
 
     // Is this the correct NodesArray? (because of UNDO)
     if( aLines.empty() )
-        return sal_False;
+        return false;
     OSL_ENSURE( !GetTabSortBoxes().empty(), "Table without content?" );
     SwNode* pNd = (SwNode*)GetTabSortBoxes()[0]->GetSttNd();
     if( !pNd->GetNodes().IsDocNodes() )
-        return sal_False;
+        return false;
 
     SwTableNode* pTblNd = pNd->FindTableNode();
     OSL_ENSURE( pTblNd, "Where is the table?");
@@ -172,7 +172,7 @@ sal_Bool SwDDETable::NoDDETable()
 
     pTblNd->SetNewTable( pNewTbl );       // replace table
 
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index c90c68cb6d1c..e955a0633881 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -137,7 +137,7 @@ SwFieldType* SwPageNumberFieldType::Copy() const
 }
 
 void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
-                                            sal_Bool bVirt,
+                                            bool bVirt,
                                             const sal_Int16* pNumFmt )
 {
     if( pNumFmt )
@@ -552,7 +552,7 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
             //              here only a int16
             sal_Int32 nType = 0;
             rAny >>= nType;
-            sal_Bool bFixed = IsFixed();
+            bool bFixed = IsFixed();
             switch( nType )
             {
                 case text::FilenameDisplayFormat::PATH:
@@ -1283,7 +1283,7 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
 
 // SwHiddenTxtFieldType
 
-SwHiddenTxtFieldType::SwHiddenTxtFieldType( sal_Bool bSetHidden )
+SwHiddenTxtFieldType::SwHiddenTxtFieldType( bool bSetHidden )
     : SwFieldType( RES_HIDDENTXTFLD ), bHidden( bSetHidden )
 {
 }
@@ -1293,7 +1293,7 @@ SwFieldType* SwHiddenTxtFieldType::Copy() const
     return new SwHiddenTxtFieldType( bHidden );
 }
 
-void SwHiddenTxtFieldType::SetHiddenFlag( sal_Bool bSetHidden )
+void SwHiddenTxtFieldType::SetHiddenFlag( bool bSetHidden )
 {
     if( bHidden != bSetHidden )
     {
@@ -1303,13 +1303,13 @@ void SwHiddenTxtFieldType::SetHiddenFlag( sal_Bool bSetHidden )
 }
 
 SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
-                                    sal_Bool    bConditional,
+                                    bool    bConditional,
                                     const OUString& rCond,
                                     const OUString& rStr,
-                                    sal_Bool    bHidden,
+                                    bool    bHidden,
                                     sal_uInt16  nSub) :
     SwField( pFldType ), aCond(rCond), nSubType(nSub),
-    bCanToggle(bConditional), bIsHidden(bHidden), bValid(sal_False)
+    bCanToggle(bConditional), bIsHidden(bHidden), bValid(false)
 {
     if(nSubType == TYP_CONDTXTFLD)
     {
@@ -1322,7 +1322,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
             if(nPos != -1)
             {
                 aContent = rStr.getToken(0, '|', nPos);
-                bValid = sal_True;
+                bValid = true;
             }
         }
     }
@@ -1336,7 +1336,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
                                     const OUString& rFalse,
                                     sal_uInt16 nSub)
     : SwField( pFldType ), aTRUETxt(rTrue), aFALSETxt(rFalse), aCond(rCond), nSubType(nSub),
-      bIsHidden(sal_True), bValid(sal_False)
+      bIsHidden(true), bValid(false)
 {
     bCanToggle = !aCond.isEmpty();
 }
@@ -1373,7 +1373,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
 #else
         SwDBMgr* pMgr = pDoc->GetDBMgr();
 #endif
-        bValid = sal_False;
+        bValid = false;
         OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUETxt : aFALSETxt;
 
         // Database expressions need to be different from normal text. Therefore, normal text is set
@@ -1384,7 +1384,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
             sTmpName.endsWith("\""))
         {
             aContent = sTmpName.copy(1, sTmpName.getLength() - 2);
-            bValid = sal_True;
+            bValid = true;
         }
         else if(sTmpName.indexOf('\"')<0 &&
             comphelper::string::getTokenCount(sTmpName, '.') > 2)
@@ -1402,17 +1402,17 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
                 OUString sDataTableOrQuery(sDBName.getToken(1, DB_DELIM));
                 if( pMgr->IsInMerge() && !sDBName.isEmpty() &&
                     pMgr->IsDataSourceOpen( sDataSource,
-                                                sDataTableOrQuery, sal_False))
+                                                sDataTableOrQuery, false))
                 {
                     double fNumber;
                     sal_uInt32 nTmpFormat;
                     pMgr->GetMergeColumnCnt(GetColumnName( sTmpName ),
                         GetLanguage(), aContent, &fNumber, &nTmpFormat );
-                    bValid = sal_True;
+                    bValid = true;
                 }
                 else if( !sDBName.isEmpty() && !sDataSource.isEmpty() &&
                          !sDataTableOrQuery.isEmpty() )
-                    bValid = sal_True;
+                    bValid = true;
             }
 #endif
         }
@@ -1539,7 +1539,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
         break;
     case FIELD_PROP_PAR4:
         rAny >>= aContent;
-        bValid = sal_True;
+        bValid = true;
     break;
     default:
         OSL_FAIL("illegal property");
@@ -1593,7 +1593,7 @@ SwFieldType* SwHiddenParaFieldType::Copy() const
 SwHiddenParaField::SwHiddenParaField(SwHiddenParaFieldType* pTyp, const OUString& rStr)
     : SwField(pTyp), aCond(rStr)
 {
-    bIsHidden = sal_False;
+    bIsHidden = false;
 }
 
 OUString SwHiddenParaField::Expand() const
@@ -2047,7 +2047,7 @@ void SwRefPageSetFieldType::Modify( const SfxPoolItem*, const SfxPoolItem * )
 // field for relative page numbers
 
 SwRefPageSetField::SwRefPageSetField( SwRefPageSetFieldType* pTyp,
-                    short nOff, sal_Bool bFlag )
+                    short nOff, bool bFlag )
     : SwField( pTyp ), nOffset( nOff ), bOn( bFlag )
 {
 }
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 7ddaac824e85..9667bfff21f8 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -244,7 +244,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
             {
                 Point aPt( pLayout->Frm().Pos() );
                 aPt.Y()++;      // aus dem Header raus
-                pCntFrm = pPgFrm->GetCntntPos( aPt, sal_False, sal_True, sal_False );
+                pCntFrm = pPgFrm->GetCntntPos( aPt, false, true, false );
                 pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
             }
         }
@@ -492,10 +492,10 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const OUString& rName, sal_uIn
     pOutlChgNd( 0 ),
     sDelim( "." ),
     nType(nTyp), nLevel( UCHAR_MAX ),
-    bDeleted( sal_False )
+    bDeleted( false )
 {
     if( ( nsSwGetSetExpType::GSE_SEQ | nsSwGetSetExpType::GSE_STRING ) & nType )
-        EnableFormat(sal_False);    // do not use Numberformatter
+        EnableFormat(false);    // do not use Numberformatter
 }
 
 SwFieldType* SwSetExpFieldType::Copy() const
@@ -610,7 +610,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
                 const SwNodeNum & aNum = *(pTxtNd->GetNum());
 
                 // only get the number, without pre-/post-fixstrings
-                OUString sNumber( pRule->MakeNumString(aNum, sal_False ));
+                OUString sNumber( pRule->MakeNumString(aNum, false ));
 
                 if( !sNumber.isEmpty() )
                     rFld.ChgExpStr( sNumber + sDelim + rFld.GetExpStr() );
@@ -718,7 +718,7 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP ) const
         const OUString rTmp2 = rNew.sDlgEntry;
         sal_Int32 nFndPos2 = 0;
         const OUString sNum2( rTmp2.getToken( 0, ' ', nFndPos2 ));
-        sal_Bool bIsNum2IsNumeric = rCC.isAsciiNumeric( sNum2 );
+        bool bIsNum2IsNumeric = rCC.isAsciiNumeric( sNum2 );
         sal_Int32 nNum2 = bIsNum2IsNumeric ? sNum2.toInt32() : 0;
 
         nO--;
@@ -767,7 +767,7 @@ SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const OUString& rFormel,
 {
     SetFormula(rFormel);
     // ignore SubType
-    bInput = sal_False;
+    bInput = false;
     if( IsSequenceFld() )
     {
         SwValueField::SetValue(1.0);
@@ -904,7 +904,7 @@ sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc,
             LanguageTag aLanguageTag( eLang);
             CharClass aCC( aLanguageTag);
             sal_Unicode c0 = sNodeText[0];
-            sal_Bool bIsAlphaNum = aCC.isAlphaNumeric( sNodeText, 0 );
+            bool bIsAlphaNum = aCC.isAlphaNumeric( sNodeText, 0 );
             if( !bIsAlphaNum ||
                 (c0 == ' ' || c0 == '\t'))
             {
@@ -994,7 +994,7 @@ bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
             //I18N - if the formula contains only "TypeName+1"
             //and it's one of the initially created sequence fields
             //then the localized names has to be replaced by a programmatic name
-            OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, uTmp, sal_False);
+            OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, uTmp, false);
             SetFormula( sMyFormula );
         }
         break;
@@ -1062,7 +1062,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
             //I18N - if the formula contains only "TypeName+1"
             //and it's one of the initially created sequence fields
             //then the localized names has to be replaced by a programmatic name
-            OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, GetFormula(), sal_True);
+            OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, GetFormula(), true);
             rAny <<= OUString( sMyFormula );
         }
         break;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 8f0abbc0e7d0..90600e2edf9e 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -160,7 +160,7 @@ SwField::SwField(
     : m_Cache()
     , m_bUseFieldValueCache( bUseFieldValueCache )
     , nLang( nLng )
-    , bIsAutomaticLanguage( sal_True )
+    , bIsAutomaticLanguage( true )
     , nFormat( nFmt )
     , pType( pTyp )
 {
@@ -295,7 +295,7 @@ bool SwField::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
     {
         case FIELD_PROP_BOOL4:
         {
-            sal_Bool bFixed = sal_False;
+            bool bFixed = false;
             if(rVal >>= bFixed)
                 bIsAutomaticLanguage = !bFixed;
         }
@@ -324,9 +324,9 @@ SwFieldType* SwField::ChgTyp( SwFieldType* pNewType )
 }
 
 /// Does the field have an action on a ClickHandler? (E.g. INetFields,...)
-sal_Bool SwField::HasClickHdl() const
+bool SwField::HasClickHdl() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     switch( pType->Which() )
     {
     case RES_INTERNETFLD:
@@ -335,7 +335,7 @@ sal_Bool SwField::HasClickHdl() const
     case RES_MACROFLD:
     case RES_INPUTFLD:
     case RES_DROPDOWN :
-        bRet = sal_True;
+        bRet = true;
         break;
 
     case RES_SETEXPFLD:
@@ -355,14 +355,14 @@ void SwField::ChangeFormat(sal_uInt32 n)
     nFormat = n;
 }
 
-sal_Bool SwField::IsFixed() const
+bool SwField::IsFixed() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     switch( pType->Which() )
     {
     case RES_FIXDATEFLD:
     case RES_FIXTIMEFLD:
-        bRet = sal_True;
+        bRet = true;
         break;
 
     case RES_DATETIMEFLD:
@@ -432,7 +432,7 @@ OUString FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat)
 SwValueFieldType::SwValueFieldType( SwDoc* pDocPtr, sal_uInt16 nWhichId )
     : SwFieldType(nWhichId),
     pDoc(pDocPtr),
-    bUseFormat(sal_True)
+    bUseFormat(true)
 {
 }
 
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 04cbcbd7cb41..c410395b7d1b 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -133,7 +133,7 @@ double SwDateTimeField::GetValue() const
         return GetDateTime(GetDoc(), DateTime( DateTime::SYSTEM ));
 }
 
-Date SwDateTimeField::GetDate(sal_Bool bUseOffset) const
+Date SwDateTimeField::GetDate(bool bUseOffset) const
 {
     SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
     Date* pNullDate = pFormatter->GetNullDate();
@@ -148,7 +148,7 @@ Date SwDateTimeField::GetDate(sal_Bool bUseOffset) const
     return aDate;
 }
 
-Time SwDateTimeField::GetTime(sal_Bool bUseOffset) const
+Time SwDateTimeField::GetTime(bool bUseOffset) const
 {
     double fDummy;
     double fFract = modf(GetValue(), &fDummy);
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index d81d1d8fd3a0..0a6cd7e3bfde 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -152,7 +152,7 @@ OUString SwDropDownField::GetToolTip() const
     return aToolTip;
 }
 
-sal_Bool SwDropDownField::SetSelectedItem(const OUString & rItem)
+bool SwDropDownField::SetSelectedItem(const OUString & rItem)
 {
     vector<OUString>::const_iterator aIt =
         std::find(aValues.begin(), aValues.end(), rItem);
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 11857f798aaa..ef548b4dcf17 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -31,7 +31,7 @@
 
 // sort input values
 
-SwInputFieldList::SwInputFieldList( SwEditShell* pShell, sal_Bool bBuildTmpLst )
+SwInputFieldList::SwInputFieldList( SwEditShell* pShell, bool bBuildTmpLst )
     : pSh(pShell)
 {
     // create sorted list of all  input fields
@@ -105,7 +105,7 @@ void SwInputFieldList::PushCrsr()
 /// get cursor
 void SwInputFieldList::PopCrsr()
 {
-    pSh->Pop(sal_False);
+    pSh->Pop(false);
 }
 
 /// go to position of a field
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 087efd6ff901..1303ba6ad197 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -42,7 +42,7 @@ SwFieldType* SwMacroFieldType::Copy() const
 
 SwMacroField::SwMacroField(SwMacroFieldType* pInitType,
                            const OUString& rLibAndName, const OUString& rTxt) :
-    SwField(pInitType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(sal_False)
+    SwField(pInitType), aMacro(rLibAndName), aText(rTxt), bIsScriptURL(false)
 {
     bIsScriptURL = isScriptURL(aMacro);
 }
@@ -206,7 +206,7 @@ void SwMacroField::CreateMacroString(
     rMacro += rMacroName;
 }
 
-sal_Bool SwMacroField::isScriptURL( const OUString& str )
+bool SwMacroField::isScriptURL( const OUString& str )
 {
     uno::Reference< uno::XComponentContext > xContext =
         ::comphelper::getProcessComponentContext();
@@ -219,9 +219,9 @@ sal_Bool SwMacroField::isScriptURL( const OUString& str )
 
     if ( xUrl.is() )
     {
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ad19f9fbd76c..17a1dba7a5bf 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -107,8 +107,8 @@ bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
     ::lcl_GetLayTree( pMyFrm, aArr );
 
     size_t nRefCnt = aRefArr.size() - 1, nCnt = aArr.size() - 1;
-    sal_Bool bVert = sal_False;
-    sal_Bool bR2L = sal_False;
+    bool bVert = false;
+    bool bR2L = false;
 
     // Loop as long as a frame does not equal?
     while( nRefCnt && nCnt && aRefArr[ nRefCnt ] == aArr[ nCnt ] )
@@ -443,7 +443,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
                 SwChapterFieldType aFldTyp;
                 SwChapterField aFld( &aFldTyp, 0 );
                 aFld.SetLevel( MAXLEVEL - 1 );
-                aFld.ChangeExpansion( pFrm, pTxtNd, sal_True );
+                aFld.ChangeExpansion( pFrm, pTxtNd, true );
                 sTxt = aFld.GetNumber();
             }
         }
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index fa014b87d12b..7b55f13f2808 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -35,7 +35,7 @@ SwFieldType* SwScriptFieldType::Copy() const
 
 SwScriptField::SwScriptField( SwScriptFieldType* pInitType,
                                 const OUString& rType, const OUString& rCode,
-                                sal_Bool bURL )
+                                bool bURL )
     : SwField( pInitType ), sType( rType ), sCode( rCode ), bCodeURL( bURL )
 {
 }
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 008035eba9f9..b58306a5c0d9 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -164,18 +164,18 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const OUString& aNam )
     aName = aNam;
 
     if (nType & nsSwGetSetExpType::GSE_STRING)
-        EnableFormat(sal_False);    // Do not use a Numberformatter
+        EnableFormat(false);    // Do not use a Numberformatter
 }
 
 OUString SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng)
 {
     if((nType & nsSwGetSetExpType::GSE_EXPR) && !(nSubType & nsSwExtendedSubType::SUB_CMD))
     {
-        EnableFormat(sal_True);
+        EnableFormat(true);
         return ExpandValue(nValue, nFmt, nLng);
     }
 
-    EnableFormat(sal_False);    // Do not use a Numberformatter
+    EnableFormat(false);    // Do not use a Numberformatter
     return aContent;
 }
 
@@ -268,7 +268,7 @@ void SwUserFieldType::SetContent( const OUString& rStr, sal_uInt32 nFmt )
             }
         }
 
-        sal_Bool bModified = GetDoc()->IsModified();
+        bool bModified = GetDoc()->IsModified();
         GetDoc()->SetModified();
         if( !bModified )    // Bug 57028
         {
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index d1ca9d1b2ddb..9bf9f4fb0520 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -77,7 +77,7 @@
 using namespace ::com::sun::star;
 
 // Copy for the internal clipboard. Copies all selections to the clipboard.
-sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
+bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
 {
     OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument"  );
 
@@ -110,12 +110,12 @@ sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
     if( pNewClpTxt )
     {
         pTxtNd->InsertText( *pNewClpTxt, SwIndex( pTxtNd ) );
-        return sal_True;                // das wars.
+        return true;                // das wars.
     }
 
     pClpDoc->LockExpFlds();
     pClpDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES );
-    sal_Bool bRet;
+    bool bRet;
 
     // do we want to copy a FlyFrame?
     if( IsFrmSelected() )
@@ -167,7 +167,7 @@ sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
                 pTxtNd->EraseText( rIdx, 1 );
             }
         }
-        bRet = sal_True;
+        bRet = true;
     }
     else if ( IsObjSelected() )
     {
@@ -208,7 +208,7 @@ sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt )
                 pClpDoc->CopyLayoutFmt( *pFmt, aAnchor, true, true );
             }
         }
-        bRet = sal_True;
+        bRet = true;
     }
     else
         bRet = _CopySelToDoc( pClpDoc, 0 );     // copy the selections
@@ -237,17 +237,17 @@ static const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt )
         return pFrm->Frm().Pos();
 }
 
-static sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly,
+static bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly,
                 const Point& rInsPt, SwFEShell& rDestShell, SwFmtAnchor& rAnchor,
                 Point& rNewPos, bool bCheckFlyRecur )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     rAnchor.SetAnchor( &rPos );
     SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, false );
     SwFlyFrm *pTmpFly = pTmpFrm->FindFlyFrm();
     if( pTmpFly && bCheckFlyRecur && pFly->IsUpperOf( *pTmpFly ) )
     {
-        bRet = sal_False;
+        bRet = false;
     }
     else if ( FLY_AT_FLY == rAnchor.GetAnchorId() )
     {
@@ -271,10 +271,10 @@ static sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyF
     return bRet;
 }
 
-sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
-                    const Point& rInsPt, sal_Bool bIsMove, sal_Bool bSelectInsert )
+bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
+                    const Point& rInsPt, bool bIsMove, bool bSelectInsert )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
     // The list should be copied, because below new objects will be selected
     const SdrMarkList aMrkList( Imp()->GetDrawView()->GetMarkedObjectList() );
@@ -339,7 +339,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                     GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
                     const SwNode *pNd;
                     if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
-                        bRet = sal_False;
+                        bRet = false;
                     else
                         bRet = ::lcl_SetAnchor( aPos, *pNd, 0, rInsPt,
                                 *pDestShell, aAnchor, aNewAnch, false );
@@ -348,7 +348,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
                 {
                     SwPaM *pCrsr = pDestShell->GetCrsr();
                     if( pCrsr->GetNode()->IsNoTxtNode() )
-                        bRet = sal_False;
+                        bRet = false;
                     else
                         bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(),
                                                 *pCrsr->GetNode(), 0, rInsPt,
@@ -435,10 +435,10 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
     return bRet;
 }
 
-sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
-                    const Point& rInsPt, sal_Bool bIsMove, sal_Bool bSelectInsert )
+bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
+                    const Point& rInsPt, bool bIsMove, bool bSelectInsert )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     OSL_ENSURE( pDestShell, "Copy without DestShell." );
     OSL_ENSURE( this == pDestShell || !pDestShell->IsObjSelected(),
@@ -450,7 +450,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     pDestShell->GetDoc()->LockExpFlds();
 
     // Shift references
-    sal_Bool bCopyIsMove = mpDoc->IsCopyIsMove();
+    bool bCopyIsMove = mpDoc->IsCopyIsMove();
     if( bIsMove )
         // set a flag in Doc, handled in TextNodes
         mpDoc->SetCopyIsMove( true );
@@ -468,7 +468,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
         SwFlyFrm* pFly = FindFlyFrm();
         SwFrmFmt* pFlyFmt = pFly->GetFmt();
         SwFmtAnchor aAnchor( pFlyFmt->GetAnchor() );
-        bRet = sal_True;
+        bRet = true;
         Point aNewAnch;
 
         if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
@@ -487,7 +487,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 GetLayout()->GetCrsrOfst( &aPos, aPt, &aState );
                 const SwNode *pNd;
                 if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() )
-                    bRet = sal_False;
+                    bRet = false;
                 else
                 {
                     // do not copy in itself
@@ -495,7 +495,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                     if ( aPos.nNode > *pTmp && aPos.nNode <
                         pTmp->GetNode().EndOfSectionIndex() )
                     {
-                        bRet = sal_False;
+                        bRet = false;
                     }
                     else
                         bRet = ::lcl_SetAnchor( aPos, *pNd, pFly, rInsPt,
@@ -506,7 +506,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             {
                 const SwPaM *pCrsr = pDestShell->GetCrsr();
                 if( pCrsr->GetNode()->IsNoTxtNode() )
-                    bRet = sal_False;
+                    bRet = false;
                 else
                     bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(), *pCrsr->GetNode(),
                                             pFly, rInsPt, *pDestShell, aAnchor,
@@ -547,12 +547,12 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             // only select if it can be shifted/copied in the same shell
             if( bSelectInsert )
             {
-                SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aPt, sal_False );
+                SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aPt, false );
                 if( pFlyFrm )
                 {
                     //JP 12.05.98: should this be in SelectFlyFrm???
                     pDestShell->Imp()->GetDrawView()->UnmarkAll();
-                    pDestShell->SelectFlyFrm( *pFlyFrm, sal_True );
+                    pDestShell->SelectFlyFrm( *pFlyFrm, true );
                 }
             }
 
@@ -584,12 +584,12 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 Point aPt( rInsPt );
                 GetLayout()->GetCrsrOfst( pDstPos, aPt );
                 if( !pDstPos->nNode.GetNode().IsNoTxtNode() )
-                    bRet = sal_True;
+                    bRet = true;
             }
             else if( !pDestShell->GetCrsr()->GetNode()->IsNoTxtNode() )
             {
                 pDstPos = new SwPosition( *pDestShell->GetCrsr()->GetPoint() );
-                bRet = sal_True;
+                bRet = true;
             }
 
             if( bRet )
@@ -620,7 +620,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
     }
     else
     {
-        bRet = sal_True;
+        bRet = true;
         if( this == pDestShell )
         {
             // same shell? then request the position
@@ -631,7 +631,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
             bRet = !aPos.nNode.GetNode().IsNoTxtNode();
         }
         else if( pDestShell->GetCrsr()->GetNode()->IsNoTxtNode() )
-            bRet = sal_False;
+            bRet = false;
 
         if( bRet )
             bRet = 0 != SwEditShell::Copy( pDestShell );
@@ -667,7 +667,7 @@ namespace {
     typedef std::pair< PaMPtr, PositionPtr > Insertion;
 }
 
-sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
+bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames )
 {
     SET_CURR_SHELL( this );
     OSL_ENSURE( pClpDoc, "no clipboard document"  );
@@ -694,7 +694,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
     aCpyPam.SetMark();
     aCpyPam.Move( fnMoveForward, fnGoDoc );
 
-    sal_Bool bRet = sal_True, bDelTbl = sal_True;
+    bool bRet = true, bDelTbl = true;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
     GetDoc()->LockExpFlds();
@@ -853,7 +853,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
             }
 
             bRet = GetDoc()->InsCopyOfTbl( aDestPos, aBoxes, &pSrcNd->GetTable(),
-                                            sal_False, sal_False );
+                                            false, false );
 
             if( bParkTblCrsr )
                 GetCrsr();
@@ -967,9 +967,9 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
                         {
                             const Point aPt( GetCrsrDocPos() );
                             SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pNew)->
-                                                        GetFrm( &aPt, sal_False );
+                                                        GetFrm( &aPt, false );
                             if( pFlyFrm )
-                                SelectFlyFrm( *pFlyFrm, sal_True );
+                                SelectFlyFrm( *pFlyFrm, true );
                             // always pick the first FlyFrame only; the others
                             // were copied to the clipboard via Fly in Fly
                             break;
@@ -1003,7 +1003,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
             if( bDelTbl && IsTableMode() )
             {
                 SwEditShell::Delete();
-                bDelTbl = sal_False;
+                bDelTbl = false;
             }
 
             SwPosition& rInsPos = *PCURCRSR->GetPoint();
@@ -1108,25 +1108,25 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
     return bRet;
 }
 
-sal_Bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage)
+bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage)
 {
     Push();
     if(!GotoPage(nStartPage))
     {
-        Pop(sal_False);
-        return sal_False;
+        Pop(false);
+        return false;
     }
     MovePage( fnPageCurr, fnPageStart );
     SwPaM aCpyPam( *GetCrsr()->GetPoint() );
     OUString sStartingPageDesc = GetPageDesc( GetCurPageDesc()).GetName();
-    SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, sal_True );
+    SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, true );
     if( pDesc )
         rToFill.ChgCurPageDesc( *pDesc );
 
     if(!GotoPage(nEndPage))
     {
-        Pop(sal_False);
-        return sal_False;
+        Pop(false);
+        return false;
     }
     //if the page starts with a table a paragraph has to be inserted before
     SwNode* pTableNode = aCpyPam.GetNode()->FindTableNode();
@@ -1189,17 +1189,17 @@ sal_Bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_u
     }
     GetDoc()->UnlockExpFlds();
     GetDoc()->UpdateFlds(NULL, false);
-    Pop(sal_False);
+    Pop(false);
     EndAllAction();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
+bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
 {
     OSL_ENSURE( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
-    sal_Bool bConvert = sal_True;
+    bool bConvert = true;
     if( rMrkList.GetMarkCount() )
     {
         if( rMrkList.GetMarkCount() == 1 &&
@@ -1217,7 +1217,7 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
                         if( GRAPHIC_BITMAP != aGrf.GetType() )
                         {
                             rGrf = aGrf;
-                            bConvert = sal_False;
+                            bConvert = false;
                         }
                         else if( GetWin() )
                         {
@@ -1244,7 +1244,7 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
                     else if( GRAPHIC_BITMAP == aGrf.GetType() )
                     {
                         rGrf = aGrf;
-                        bConvert = sal_False;
+                        bConvert = false;
                     }
                     else
                     {
@@ -1264,7 +1264,7 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
                         else
                         {
                             rGrf = aGrf;
-                            bConvert = sal_False;
+                            bConvert = false;
                         }
                     }
                 }
@@ -1496,7 +1496,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
     {
         ::sw::DrawUndoGuard drawUndoGuard(GetDoc()->GetIDocumentUndoRedo());
 
-        sal_Bool bDesignMode = pView->IsDesignMode();
+        bool bDesignMode = pView->IsDesignMode();
         if( !bDesignMode )
             pView->SetDesignMode( true );
 
@@ -1522,7 +1522,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
             if( pObj->ISA( SdrUnoObj ) )
             {
                 pObj->SetLayer( GetDoc()->GetControlsId() );
-                bDesignMode = sal_True;
+                bDesignMode = true;
             }
             else
                 pObj->SetLayer( GetDoc()->GetHeavenId() );
@@ -1545,7 +1545,7 @@ bool SwFEShell::Paste(const Graphic &rGrf, const OUString& rURL)
     SdrObject* pObj = 0;
     SdrView *pView = Imp()->GetDrawView();
 
-    sal_Bool bRet = 1 == pView->GetMarkedObjectList().GetMarkCount() &&
+    bool bRet = 1 == pView->GetMarkedObjectList().GetMarkCount() &&
         (pObj = pView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj())->IsClosedObj() &&
         !pObj->ISA( SdrOle2Obj );
 
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index d374699e5c08..50c757141d77 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -121,7 +121,7 @@ const SwPageDesc& SwFEShell::GetPageDesc( sal_uInt16 i ) const
 }
 
 SwPageDesc* SwFEShell::FindPageDescByName( const OUString& rName,
-                                            sal_Bool bGetFromPool,
+                                            bool bGetFromPool,
                                             sal_uInt16* pPos )
 {
     SwPageDesc* pDesc = GetDoc()->FindPageDescByName( rName, pPos );
@@ -158,7 +158,7 @@ sal_uInt16 SwFEShell::GetMousePageDesc( const Point &rPt ) const
     return 0;
 }
 
-sal_uInt16 SwFEShell::GetCurPageDesc( const sal_Bool bCalcFrm ) const
+sal_uInt16 SwFEShell::GetCurPageDesc( const bool bCalcFrm ) const
 {
     const SwFrm *pFrm = GetCurrFrm( bCalcFrm );
     if ( pFrm )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index d46ba5a71c88..d7300e0f0310 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -95,14 +95,14 @@ static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
     return bRet;
 }
 
-static sal_Bool lcl_FindAnchorPos(
+static bool lcl_FindAnchorPos(
     SwEditShell& rEditShell,
     SwDoc& rDoc,
     const Point& rPt,
     const SwFrm& rFrm,
     SfxItemSet& rSet )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     SwFmtAnchor aNewAnch( (SwFmtAnchor&)rSet.Get( RES_ANCHOR ) );
     RndStdIds nNew = aNewAnch.GetAnchorId();
     const SwFrm *pNewAnch;
@@ -122,7 +122,7 @@ static sal_Bool lcl_FindAnchorPos(
             pNewAnch = ::FindAnchor( pFrm, aTmpPnt );
             if( pNewAnch->IsProtected() )
             {
-                bRet = sal_False;
+                bRet = false;
                 break;
             }
 
@@ -192,7 +192,7 @@ static sal_Bool lcl_FindAnchorPos(
 
 //! also used in unoframe.cxx
 
-sal_Bool sw_ChkAndSetNewAnchor(
+bool sw_ChkAndSetNewAnchor(
     SwEditShell& rEditShell,
     const SwFlyFrm& rFly,
     SfxItemSet& rSet )
@@ -204,7 +204,7 @@ sal_Bool sw_ChkAndSetNewAnchor(
     RndStdIds nNew = ((SwFmtAnchor&)rSet.Get( RES_ANCHOR )).GetAnchorId();
 
     if( nOld == nNew )
-        return sal_False;
+        return false;
 
     SwDoc* pDoc = (SwDoc*)rFmt.GetDoc();
 
@@ -218,7 +218,7 @@ sal_Bool sw_ChkAndSetNewAnchor(
     return ::lcl_FindAnchorPos( rEditShell, *pDoc, rFly.Frm().Pos(), rFly, rSet );
 }
 
-void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
+void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, bool bNew )
 {
     SET_CURR_SHELL( this );
 
@@ -280,7 +280,7 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
     if ( !rMrkList.GetMarkCount() )
     {
-        SwCntntFrm *pCntnt = GetCurrFrm( sal_False );
+        SwCntntFrm *pCntnt = GetCurrFrm( false );
         if( !pCntnt )
             return NULL;
         SwFlyFrm *pFly = pCntnt->FindFlyFrm();
@@ -331,7 +331,7 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos )
     SET_CURR_SHELL( this );
 
     // Determine reference point in document coordinates
-    SwCntntFrm *pCntnt = GetCurrFrm( sal_False );
+    SwCntntFrm *pCntnt = GetCurrFrm( false );
     if( !pCntnt )
         return;
     SwFlyFrm *pFly = pCntnt->FindFlyFrm();
@@ -360,7 +360,7 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos )
     CallChgLnk();       // call the AttrChangeNotify on the UI-side.
 }
 
-Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
+Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt )
 {
     Point aRet;
 
@@ -383,7 +383,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
     if ( FLY_AS_CHAR == nAnchorId )
         return aRet;
 
-    sal_Bool bFlyFrame = pObj->ISA(SwVirtFlyDrawObj);
+    bool bFlyFrame = pObj->ISA(SwVirtFlyDrawObj);
 
     SwFlyFrm* pFly = 0L;
     const SwFrm* pOldAnch;
@@ -392,7 +392,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
     if( bFlyFrame )
     {
         // Calculate reference point in document coordinates
-        SwCntntFrm *pCntnt = GetCurrFrm( sal_False );
+        SwCntntFrm *pCntnt = GetCurrFrm( false );
         if( !pCntnt )
             return aRet;
         pFly = pCntnt->FindFlyFrm();
@@ -411,7 +411,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
     // Necessary for moving 'anchor symbol' at the user interface inside header/footer.
     else if ( !::CheckControlLayer( pObj ) )
     {
-        SwCntntFrm *pCntnt = GetCurrFrm( sal_False );
+        SwCntntFrm *pCntnt = GetCurrFrm( false );
         if( !pCntnt )
             return aRet;
         pFooterOrHeader = pCntnt->FindFooterOrHeader();
@@ -564,7 +564,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
     return aRet;
 }
 
-const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchValid,
+const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, bool bAnchValid,
                            SwFrmFmt *pParent )
 {
     SET_CURR_SHELL( this );
@@ -574,7 +574,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
     const Point aPt( GetCrsrDocPos() );
 
     SwSelBoxes aBoxes;
-    sal_Bool bMoveCntnt = sal_True;
+    bool bMoveCntnt = true;
     if( IsTableMode() )
     {
         GetTblSel( *this, aBoxes );
@@ -592,10 +592,10 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
             pCrsr = GetCrsr();
         }
         else
-            bMoveCntnt = sal_False;
+            bMoveCntnt = false;
     }
     else if( !pCrsr->HasMark() && pCrsr->GetNext() == pCrsr )
-        bMoveCntnt = sal_False;
+        bMoveCntnt = false;
 
     const SwPosition& rPos = *pCrsr->Start();
 
@@ -678,7 +678,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
                 //              chaos::anchor should not lie in the shifted area
                 pRet->DelFrms();
 
-                const SwFrm* pAnch = ::FindAnchor( GetLayout(), aPt, sal_False );
+                const SwFrm* pAnch = ::FindAnchor( GetLayout(), aPt, false );
                 SwPosition aPos( *((SwCntntFrm*)pAnch)->GetNode() );
                 if ( FLY_AS_CHAR == eRndId )
                 {
@@ -725,7 +725,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
     {
         SwFlyFrm* pFrm = pRet->GetFrm( &aPt );
         if( pFrm )
-            SelectFlyFrm( *pFrm, sal_True );
+            SelectFlyFrm( *pFrm, true );
         else
         {
             GetLayout()->SetAssertFlyPages();
@@ -814,7 +814,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName,
             pPageFrm->InvalidateFlyLayout();
             pPageFrm->InvalidateCntnt();
 
-            SelectFlyFrm( *pFrm, sal_True );
+            SelectFlyFrm( *pFrm, true );
         }
         else
             GetLayout()->SetAssertFlyPages();
@@ -843,7 +843,7 @@ SwFlyFrmFmt* SwFEShell::InsertObject( const svt::EmbeddedObjectRef&  xObj,
         SwFlyFrm* pFrm = pFmt->GetFrm( &aPt );
 
         if( pFrm )
-            SelectFlyFrm( *pFrm, sal_True );
+            SelectFlyFrm( *pFrm, true );
         else
             GetLayout()->SetAssertFlyPages();
     }
@@ -963,7 +963,7 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
 // All attributes in the "baskets" will be filled with the attributes of the
 // current FlyFrms. Attributes which cannot be filled due to being at the
 // wrong place or which are ambiguous (multiple selections) will be removed.
-sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
+bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
 {
     SwFlyFrm *pFly = FindFlyFrm();
     if ( !pFly )
@@ -972,20 +972,20 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
         if ( !pCurrFrm )
         {
             OSL_FAIL( "<SwFEShell::GetFlyFrmAttr(..)> - missing current frame. This is a serious defect, please inform OD." );
-            return sal_False;
+            return false;
         }
         pFly = GetCurrFrm()->FindFlyFrm();
         if ( !pFly )
         {
             OSL_ENSURE( !this, "GetFlyFrmAttr, no Fly selected." );
-            return sal_False;
+            return false;
         }
     }
 
     SET_CURR_SHELL( (SwViewShell*)this );
 
     if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), true ) )
-        return sal_False;
+        return false;
 
     // now examine all attributes. Remove forbidden attributes, then
     // get all remaining attributes and enter them
@@ -1012,7 +1012,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
     rSet.ClearItem( RES_CNTNT );
     //MA: remove first (Template by example etc.)
     rSet.ClearItem( RES_CHAIN );
-    return sal_True;
+    return true;
 }
 
 // Attributes of the current fly will change.
@@ -1044,7 +1044,7 @@ bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
                 bRet = true;
                 SwFlyFrm* pFrm = pFlyFmt->GetFrm( &aPt );
                 if( pFrm )
-                    SelectFlyFrm( *pFrm, sal_True );
+                    SelectFlyFrm( *pFrm, true );
                 else
                     GetLayout()->SetAssertFlyPages();
             }
@@ -1055,9 +1055,9 @@ bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
     return bRet;
 }
 
-sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
+bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SET_CURR_SHELL( this );
     if ( !rSet.Count() ||
             !Imp()->HasDrawView() )
@@ -1085,7 +1085,7 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
 
     if( GetDoc()->SetFlyFrmAttr( *pFmt, rSet ))
     {
-        bRet = sal_True;
+        bRet = true;
         Point aTmp;
         SelectObj( aTmp, 0, pObj );
     }
@@ -1095,9 +1095,9 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
 }
 
 // Reset requested attributes or the ones contained in the set.
-sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
+bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( RES_ANCHOR != nWhich && RES_CHAIN != nWhich && RES_CNTNT != nWhich )
     {
@@ -1131,7 +1131,7 @@ sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
             else
                 pFly->GetFmt()->ResetFmtAttr( nWhich );
 
-            bRet = sal_True;
+            bRet = true;
             EndAllActionAndCall();
             GetDoc()->SetModified();
         }
@@ -1173,7 +1173,7 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
 
         SfxItemSet* pSet = 0;
         const SfxPoolItem* pItem;
-        if( SFX_ITEM_SET == pNewFmt->GetItemState( RES_ANCHOR, sal_False, &pItem ))
+        if( SFX_ITEM_SET == pNewFmt->GetItemState( RES_ANCHOR, false, &pItem ))
         {
             pSet = new SfxItemSet( GetDoc()->GetAttrPool(), aFrmFmtSetRange );
             pSet->Put( *pItem );
@@ -1185,7 +1185,7 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
         {
             SwFlyFrm* pFrm = pFlyFmt->GetFrm( &aPt );
             if( pFrm )
-                SelectFlyFrm( *pFrm, sal_True );
+                SelectFlyFrm( *pFrm, true );
             else
                 GetLayout()->SetAssertFlyPages();
         }
@@ -1223,7 +1223,7 @@ SwFrmFmt* SwFEShell::GetFlyFrmFmt()
 
 SwRect SwFEShell::GetFlyRect() const
 {
-    SwCntntFrm *pCntnt = GetCurrFrm( sal_False );
+    SwCntntFrm *pCntnt = GetCurrFrm( false );
     SwFlyFrm *pFly = pCntnt ? pCntnt->FindFlyFrm() : 0;
     if ( !pFly )
     {
@@ -1267,8 +1267,8 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
 
     aResult = pFly->Prt().SSize();
 
-    sal_Bool bPosProt = pFly->GetFmt()->GetProtect().IsPosProtected();
-    sal_Bool bSizeProt = pFly->GetFmt()->GetProtect().IsSizeProtected();
+    bool bPosProt = pFly->GetFmt()->GetProtect().IsPosProtected();
+    bool bSizeProt = pFly->GetFmt()->GetProtect().IsSizeProtected();
 
     StartAllAction();
 
@@ -1395,7 +1395,7 @@ SwFrmFmt* SwFEShell::WizzardGetFly()
         for( sal_uInt16 n = 0; n < nCnt; ++n )
         {
             SwFrmFmt* pFmt = rSpzArr[ n ];
-            const SwNodeIndex* pIdx = pFmt->GetCntnt( sal_False ).GetCntntIdx();
+            const SwNodeIndex* pIdx = pFmt->GetCntnt( false ).GetCntntIdx();
             SwStartNode* pSttNd;
             if( pIdx &&
                 0 != ( pSttNd = pIdx->GetNode().GetStartNode() ) &&
@@ -1522,7 +1522,7 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
 }
 
 const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
-                                       OUString &rName, sal_Bool &rbLink ) const
+                                       OUString &rName, bool &rbLink ) const
 {
     if( !Imp()->HasDrawView() )
         return 0;
@@ -1545,7 +1545,7 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
                     ::sfx2::SvLinkSource* pLnkObj = pNd->GetLink()->GetObj();
                     if( pLnkObj && pLnkObj->IsPending() )
                         return 0;
-                    rbLink = sal_True;
+                    rbLink = true;
                 }
 
                 pNd->GetFileFilterNms( &rName, 0 );
@@ -1735,12 +1735,12 @@ ObjCntType SwFEShell::GetObjCntTypeOfSelection( SdrObject** ppObj ) const
     return eType;
 }
 
-sal_Bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltName,
+bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltName,
                                 const Graphic* pGrf )
 {
     SET_CURR_SHELL( this );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SdrMarkList *pMrkList;
     if( Imp()->HasDrawView() &&  1 ==
         ( pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList())->GetMarkCount() )
@@ -1786,7 +1786,7 @@ sal_Bool SwFEShell::ReplaceSdrObj( const OUString& rGrfName, const OUString& rFl
 
         EndUndo();
         EndAllAction();
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
@@ -1811,7 +1811,7 @@ static sal_uInt16 SwFmtGetPageNum(const SwFlyFrmFmt * pFmt)
 
 void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
                                       const OUString & rReference,
-                                      sal_Bool bSuccessors,
+                                      bool bSuccessors,
                                       ::std::vector< OUString > & aPrevPageVec,
                                       ::std::vector< OUString > & aThisPageVec,
                                       ::std::vector< OUString > & aNextPageVec,
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index d551c8e210ad..e7f34c580e67 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -108,13 +108,13 @@ void SwFEShell::MakeObjVisible( const uno::Reference < embed::XEmbeddedObject >&
     }
 }
 
-sal_Bool SwFEShell::FinishOLEObj()                      // Server is terminated
+bool SwFEShell::FinishOLEObj()                      // Server is terminated
 {
     SfxInPlaceClient* pIPClient = GetSfxViewShell()->GetIPClient();
     if ( !pIPClient )
-        return sal_False;
+        return false;
 
-    sal_Bool bRet = pIPClient->IsObjectInPlaceActive();
+    bool bRet = pIPClient->IsObjectInPlaceActive();
     if( bRet )
     {
         uno::Reference < embed::XEmbeddedObject > xObj = pIPClient->GetObject();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 60bfeb07630c..367b64c95d3e 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -123,23 +123,23 @@ extern bool bNoInterrupt;       // in swapp.cxx
         // --> assure consistent cursor
         pSh->KillPams();
         pSh->ClearMark();
-        pSh->SetCrsr( pSh->Imp()->GetDrawView()->GetAllMarkedRect().TopLeft(), sal_True);
+        pSh->SetCrsr( pSh->Imp()->GetDrawView()->GetAllMarkedRect().TopLeft(), true);
     }
 }
 
-sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
+bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj )
 {
     SwDrawView *pDView = Imp()->GetDrawView();
     if(!pDView)
-        return sal_False;
+        return false;
     SET_CURR_SHELL( this );
     StartAction();    // action is necessary to assure only one AttrChgdNotify
                       // (e.g. due to Unmark->MarkListHasChgd) arrives
 
     const SdrMarkList &rMrkList = pDView->GetMarkedObjectList();
     const bool bHadSelection = rMrkList.GetMarkCount();
-    const sal_Bool bAddSelect = 0 != (SW_ADD_SELECT & nFlag);
-    const sal_Bool bEnterGroup = 0 != (SW_ENTER_GROUP & nFlag);
+    const bool bAddSelect = 0 != (SW_ADD_SELECT & nFlag);
+    const bool bEnterGroup = 0 != (SW_ENTER_GROUP & nFlag);
     SwFlyFrm* pOldSelFly = 0;
     const Point aOldPos( pDView->GetAllMarkedRect().TopLeft() );
 
@@ -167,10 +167,10 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
                     Point aPt( pOldSelFly->Frm().Pos() );
                     aPt.setX(aPt.getX() - 1);
                     bool bUnLockView = !IsViewLocked();
-                    LockView( sal_True );
-                    SetCrsr( aPt, sal_True );
+                    LockView( true );
+                    SetCrsr( aPt, true );
                     if( bUnLockView )
-                        LockView( sal_False );
+                        LockView( false );
                 }
                 if ( nType & CNT_GRF &&
                      ((SwNoTxtFrm*)pOldSelFly->Lower())->HasAnimation() )
@@ -199,7 +199,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
         pDView->MarkObj( rPt, MINMOVE, bAddSelect, bEnterGroup );
     }
 
-    const sal_Bool bRet = 0 != rMrkList.GetMarkCount();
+    const bool bRet = 0 != rMrkList.GetMarkCount();
 
     if ( rMrkList.GetMarkCount() > 1 )
     {
@@ -208,7 +208,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
         for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i )
         {
             SdrObject *pTmpObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
-            sal_Bool bForget = pTmpObj->ISA(SwVirtFlyDrawObj);
+            bool bForget = pTmpObj->ISA(SwVirtFlyDrawObj);
             if( bForget )
             {
                 pDView->UnmarkAll();
@@ -230,7 +230,7 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
         }
     }
     else if ( !pOldSelFly && bHadSelection )
-        SetCrsr( aOldPos, sal_True);
+        SetCrsr( aOldPos, true);
 
     if( bRet || !bHadSelection )
         CallChgLnk();
@@ -264,13 +264,13 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
         ( aPt1.getY() == aPt2.getY() && ( aPt1.getX() < aPt2.getX() || \
         ( aPt1.getX() == aPt2.getX() && bOld ) ) ) )
 
-sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
+bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
 {
     const SdrMarkList* pMrkList;
     if( !Imp()->GetDrawView() ||
         0 == (pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList()) ||
         1 != pMrkList->GetMarkCount())
-        return sal_False;
+        return false;
     SwFrm* pOld;
     SwFlyFrm* pFly = NULL;
     SdrObject *pObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
@@ -281,7 +281,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
     }
     else
         pOld = ((SwDrawContact*)GetUserCall(pObj))->GetAnchorFrm( pObj );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( pOld )
     {
         SwFrm* pNew = pOld;
@@ -291,7 +291,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
         SwFmtAnchor aAnch( rFmt.GetAnchor() );
         RndStdIds nAnchorId = aAnch.GetAnchorId();
         if ( FLY_AS_CHAR == nAnchorId )
-            return sal_False;
+            return false;
         if( pOld->IsVertical() )
         {
             if( pOld->IsTxtFrm() )
@@ -322,7 +322,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
                 if( pNew && pNew != pOld )
                 {
                     aAnch.SetPageNum( ((SwPageFrm*)pNew)->GetPhyPageNum() );
-                    bRet = sal_True;
+                    bRet = true;
                 }
                 break;
             }
@@ -336,7 +336,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
                     const sal_Int32 nAct = pPos->nContent.GetIndex();
                     if( SW_MOVE_LEFT == nDir )
                     {
-                        bRet = sal_True;
+                        bRet = true;
                         if( nAct )
                         {
                             pPos->nContent.Assign( pTxtNd, nAct-1 );
@@ -350,7 +350,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
                             static_cast<SwTxtFrm*>(pOld)->GetTxtNode()->GetTxt().getLength();
                         if( nAct < nMax )
                         {
-                            bRet = sal_True;
+                            bRet = true;
                             pPos->nContent.Assign( pTxtNd, nAct+1 );
                         }
                         else
@@ -378,10 +378,10 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
                             --nTmp;
                     }
                     pPos->nContent.Assign( pTxtNd, nTmp );
-                    bRet = sal_True;
+                    bRet = true;
                 }
                 else if( SW_MOVE_UP == nDir || SW_MOVE_DOWN == nDir )
-                    bRet = sal_False;
+                    bRet = false;
                 break;
             }
             case FLY_AT_FLY:
@@ -468,7 +468,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
                     SwPosition aPos( *pNewFly->GetFmt()->
                                         GetCntnt().GetCntntIdx());
                     aAnch.SetAnchor( &aPos );
-                    bRet = sal_True;
+                    bRet = true;
                 }
                 break;
             }
@@ -580,7 +580,7 @@ void SwFEShell::SetDragMode( sal_uInt16 eDragMode )
         Imp()->GetDrawView()->SetDragMode( (SdrDragMode)eDragMode );
 }
 
-long SwFEShell::BeginDrag( const Point* pPt, sal_Bool )
+long SwFEShell::BeginDrag( const Point* pPt, bool )
 {
     SdrView *pView = Imp()->GetDrawView();
     if ( pView && pView->AreObjectsMarked() )
@@ -594,7 +594,7 @@ long SwFEShell::BeginDrag( const Point* pPt, sal_Bool )
     return 0;
 }
 
-long SwFEShell::Drag( const Point *pPt, sal_Bool )
+long SwFEShell::Drag( const Point *pPt, bool )
 {
     OSL_ENSURE( Imp()->HasDrawView(), "Drag without DrawView?" );
     if ( Imp()->GetDrawView()->IsDragObj() )
@@ -608,7 +608,7 @@ long SwFEShell::Drag( const Point *pPt, sal_Bool )
     return 0;
 }
 
-long SwFEShell::EndDrag( const Point *, sal_Bool )
+long SwFEShell::EndDrag( const Point *, bool )
 {
     OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" );
     SdrView *pView = Imp()->GetDrawView();
@@ -772,7 +772,7 @@ static void lcl_NotifyNeighbours( const SdrMarkList *pLst )
     }
 }
 
-void SwFEShell::SelectionToTop( sal_Bool bTop )
+void SwFEShell::SelectionToTop( bool bTop )
 {
     OSL_ENSURE( Imp()->HasDrawView(), "SelectionToTop without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
@@ -792,7 +792,7 @@ void SwFEShell::SelectionToTop( sal_Bool bTop )
     EndAllAction();
 }
 
-void SwFEShell::SelectionToBottom( sal_Bool bBottom )
+void SwFEShell::SelectionToBottom( bool bBottom )
 {
     OSL_ENSURE( Imp()->HasDrawView(), "SelectionToBottom without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
@@ -898,42 +898,42 @@ sal_uInt16 SwFEShell::IsObjSelected() const
         return sal_uInt16( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() );
 }
 
-sal_Bool SwFEShell::IsFrmSelected() const
+bool SwFEShell::IsFrmSelected() const
 {
     if ( !Imp()->HasDrawView() )
-        return sal_False;
+        return false;
     else
         return 0 != ::GetFlyFromMarked( &Imp()->GetDrawView()->GetMarkedObjectList(),
                                         (SwViewShell*)this );
 }
 
-sal_Bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const
+bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const
 {
     if ( IsFrmSelected() || !Imp()->HasDrawView() )
-        return sal_False;
+        return false;
     else
         return Imp()->GetDrawView()
                     ->IsObjMarked( const_cast< SdrObject * >( &rObj ) );
 }
 
-sal_Bool SwFEShell::IsObjSameLevelWithMarked(const SdrObject* pObj) const
+bool SwFEShell::IsObjSameLevelWithMarked(const SdrObject* pObj) const
 {
     if (pObj)
     {
         const SdrMarkList& aMarkList = Imp()->GetDrawView()->GetMarkedObjectList();
         if (aMarkList.GetMarkCount() == 0)
         {
-            return sal_True;
+            return true;
         }
         SdrMark* pM=aMarkList.GetMark(0);
         if (pM)
         {
             SdrObject* pMarkObj = pM->GetMarkedSdrObj();
             if (pMarkObj && pMarkObj->GetUpGroup() == pObj->GetUpGroup())
-                return sal_True;
+                return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 void SwFEShell::EndTextEdit()
@@ -1039,11 +1039,11 @@ SdrObject* SwFEShell::GetObjAt( const Point& rPt )
 }
 
 // Test if there is a object at that position and if it should be selected.
-sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
+bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
 {
     SET_CURR_SHELL(this);
     SwDrawView *pDrawView = Imp()->GetDrawView();
-    sal_Bool bRet(sal_False);
+    bool bRet(false);
 
     if(pDrawView)
     {
@@ -1098,14 +1098,14 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
                                     {
                                         if ( aCursorCharRect.IsOver( SwRect( pObj->GetLastBoundRect() ) ) )
                                         {
-                                            bRet = sal_False;
+                                            bRet = false;
                                         }
                                     }
                                 }
                             }
                             else
                             {
-                                bRet = sal_False;
+                                bRet = false;
                             }
                             break;
                         }
@@ -1124,7 +1124,7 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
                 if ( ( IsHeaderFooterEdit() && !bInHdrFtr ) ||
                      ( !IsHeaderFooterEdit() && bInHdrFtr ) )
                 {
-                    bRet = sal_False;
+                    bRet = false;
                 }
             }
 
@@ -1138,7 +1138,7 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
                     if (pCandidate->ISA(SwVirtFlyDrawObj) &&
                        ( (SwVirtFlyDrawObj*)pCandidate)->GetCurrentBoundRect().IsInside(rPt) )
                     {
-                        bRet = sal_False;
+                        bRet = false;
                     }
                 }
             }
@@ -1190,7 +1190,7 @@ namespace
     };
 }
 
-const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, sal_Bool bFlat, const ::svx::ISdrObjectFilter* pFilter )
+const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, bool bFlat, const ::svx::ISdrObjectFilter* pFilter )
 {
     if( !Imp()->HasDrawView() )
         return NULL;
@@ -1208,7 +1208,7 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
 
     if( !bNoFly && bNoDraw )
     {
-        SwFlyFrm *pFly = GetCurrFrm( sal_False )->FindFlyFrm();
+        SwFlyFrm *pFly = GetCurrFrm( false )->FindFlyFrm();
         if( pFly )
             pBest = pFly->GetVirtDrawObj();
     }
@@ -1260,7 +1260,7 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
         while ( aObjIter.IsMore() )
         {
             SdrObject* pObj = aObjIter.Next();
-            sal_Bool bFlyFrm = pObj->ISA(SwVirtFlyDrawObj);
+            bool bFlyFrm = pObj->ISA(SwVirtFlyDrawObj);
             if( ( bNoFly && bFlyFrm ) ||
                 ( bNoDraw && !bFlyFrm ) ||
                 ( eType == GOTOOBJ_DRAW_SIMPLE && lcl_IsControlGroup( pObj ) ) ||
@@ -1366,14 +1366,14 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
     return pBest;
 }
 
-sal_Bool SwFEShell::GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType )
+bool SwFEShell::GotoObj( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType )
 {
     const SdrObject* pBest = GetBestObject( bNext, eType );
 
     if ( !pBest )
-        return sal_False;
+        return false;
 
-    sal_Bool bFlyFrm = pBest->ISA(SwVirtFlyDrawObj);
+    bool bFlyFrm = pBest->ISA(SwVirtFlyDrawObj);
     if( bFlyFrm )
     {
         SwVirtFlyDrawObj *pO = (SwVirtFlyDrawObj*)pBest;
@@ -1389,12 +1389,12 @@ sal_Bool SwFEShell::GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType )
             MakeVisible( pBest->GetCurrentBoundRect() );
     }
     CallChgLnk();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/  eSdrObjectKind, const Point &rPos )
+bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/  eSdrObjectKind, const Point &rPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if ( !Imp()->HasDrawView() )
         Imp()->MakeDrawView();
@@ -1416,10 +1416,10 @@ sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/  eSdrObjectKind, co
     return bRet;
 }
 
-sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/  eSdrObjectKind, sal_uInt32 eObjInventor,
+bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/  eSdrObjectKind, sal_uInt32 eObjInventor,
                              const Point &rPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if ( !Imp()->HasDrawView() )
         Imp()->MakeDrawView();
@@ -1445,7 +1445,7 @@ void SwFEShell::MoveCreate( const Point &rPos )
     }
 }
 
-sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd )
+bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd )
 {
     // To assure undo-object from the DrawEngine is not stored,
     // (we create our own undo-object!), temporarily switch-off Undo
@@ -1454,25 +1454,25 @@ sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd )
     {
         GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(false);
     }
-    sal_Bool bCreate = Imp()->GetDrawView()->EndCreateObj(
+    bool bCreate = Imp()->GetDrawView()->EndCreateObj(
                                     SdrCreateCmd( eSdrCreateCmd ) );
     GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(true);
 
     if ( !bCreate )
     {
         ::FrameNotify( this, FLY_DRAG_END );
-        return sal_False;
+        return false;
     }
 
     if ( (SdrCreateCmd)eSdrCreateCmd == SDRCREATE_NEXTPOINT )
     {
         ::FrameNotify( this, FLY_DRAG );
-        return sal_True;
+        return true;
     }
     return ImpEndCreate();
 }
 
-sal_Bool SwFEShell::ImpEndCreate()
+bool SwFEShell::ImpEndCreate()
 {
     OSL_ENSURE( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 1,
             "New object not selected." );
@@ -1485,7 +1485,7 @@ sal_Bool SwFEShell::ImpEndCreate()
         Imp()->GetDrawView()->DeleteMarked();
         Imp()->GetDrawView()->UnmarkAll();
         ::FrameNotify( this, FLY_DRAG_END );
-        return sal_False;
+        return false;
     }
 
     if( rSdrObj.GetUpGroup() )
@@ -1496,7 +1496,7 @@ sal_Bool SwFEShell::ImpEndCreate()
         rSdrObj.NbcSetRelativePos( aTmpPos - aNewAnchor );
         rSdrObj.NbcSetAnchorPos( aNewAnchor );
         ::FrameNotify( this, FLY_DRAG );
-        return sal_True;
+        return true;
     }
 
     LockPaint();
@@ -1694,7 +1694,7 @@ sal_Bool SwFEShell::ImpEndCreate()
         GetDoc()->GetIDocumentUndoRedo().DoDrawUndo(true);
 
         SwFlyFrm* pFlyFrm;
-        if( NewFlyFrm( aSet, sal_True ) &&
+        if( NewFlyFrm( aSet, true ) &&
             ::GetHtmlMode( GetDoc()->GetDocShell() ) &&
             0 != ( pFlyFrm = FindFlyFrm() ))
         {
@@ -1804,7 +1804,7 @@ sal_Bool SwFEShell::ImpEndCreate()
     KillPams();
     EndAllActionAndCall();
     UnlockPaint();
-    return sal_True;
+    return true;
 }
 
 void SwFEShell::BreakCreate()
@@ -1819,7 +1819,7 @@ bool SwFEShell::IsDrawCreate() const
     return Imp()->HasDrawView() ? Imp()->GetDrawView()->IsCreateObj() : false;
 }
 
-sal_Bool SwFEShell::BeginMark( const Point &rPos )
+bool SwFEShell::BeginMark( const Point &rPos )
 {
     if ( !Imp()->HasDrawView() )
         Imp()->MakeDrawView();
@@ -1834,7 +1834,7 @@ sal_Bool SwFEShell::BeginMark( const Point &rPos )
             return pDView->BegMarkObj( rPos );
     }
     else
-        return sal_False;
+        return false;
 }
 
 void SwFEShell::MoveMark( const Point &rPos )
@@ -1855,9 +1855,9 @@ void SwFEShell::MoveMark( const Point &rPos )
     }
 }
 
-sal_Bool SwFEShell::EndMark()
+bool SwFEShell::EndMark()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     OSL_ENSURE( Imp()->HasDrawView(), "EndMark without DrawView?" );
 
     if (Imp()->GetDrawView()->IsMarkObj())
@@ -1897,7 +1897,7 @@ sal_Bool SwFEShell::EndMark()
             if ( rMrkList.GetMarkCount() )
                 ::lcl_GrabCursor(this, pOldSelFly);
             else
-                bRet = sal_False;
+                bRet = false;
         }
         if ( bRet )
             ::FrameNotify( this, FLY_DRAG_START );
@@ -2027,7 +2027,7 @@ Point SwFEShell::GetObjAbsPos() const
     return Imp()->GetDrawView()->GetDragStat().GetActionRect().TopLeft();
 }
 
-sal_Bool SwFEShell::IsGroupSelected()
+bool SwFEShell::IsGroupSelected()
 {
     if ( IsObjSelected() )
     {
@@ -2043,11 +2043,11 @@ sal_Bool SwFEShell::IsGroupSelected()
                  FLY_AS_CHAR != ((SwDrawContact*)GetUserCall(pObj))->
                                       GetFmt()->GetAnchor().GetAnchorId() )
             {
-                return sal_True;
+                return true;
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 // Change return type.
@@ -2171,9 +2171,9 @@ void SwFEShell::MirrorSelection( bool bHorizontal )
 
 // jump to named frame (Graphic/OLE)
 
-sal_Bool SwFEShell::GotoFly( const OUString& rName, FlyCntType eType, sal_Bool bSelFrm )
+bool SwFEShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFrm )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     static sal_uInt8 const aChkArr[ 4 ] = {
              /* FLYCNTTYPE_ALL */   0,
              /* FLYCNTTYPE_FRM */   ND_TEXTNODE,
@@ -2213,7 +2213,7 @@ sal_Bool SwFEShell::GotoFly( const OUString& rName, FlyCntType eType, sal_Bool b
                     GetCrsrDocPos() = rChrRect.Pos();
                 }
             }
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
@@ -2305,10 +2305,10 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const
     return static_cast<sal_uInt8>(nChk);
 }
 
-sal_Bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const
+bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const
 {
     if ( !IsObjSelected() )
-        return sal_False;
+        return false;
 
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
     for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i )
@@ -2325,16 +2325,16 @@ sal_Bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const
                 rSet.Put( pContact->GetFmt()->GetAttrSet() );
         }
     }
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwFEShell::SetObjAttr( const SfxItemSet& rSet )
+bool SwFEShell::SetObjAttr( const SfxItemSet& rSet )
 {
     SET_CURR_SHELL( this );
 
     if ( !rSet.Count() )
     { OSL_ENSURE( !this, "SetObjAttr, empty set." );
-        return sal_False;
+        return false;
     }
 
     StartAllAction();
@@ -2351,15 +2351,15 @@ sal_Bool SwFEShell::SetObjAttr( const SfxItemSet& rSet )
     EndUndo( UNDO_INSATTR );
     EndAllActionAndCall();
     GetDoc()->SetModified();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwFEShell::IsAlignPossible() const
+bool SwFEShell::IsAlignPossible() const
 {
     sal_uInt16 nCnt;
     if ( 0 < (nCnt = IsObjSelected()) )
     {
-        sal_Bool bRet = sal_True;
+        bool bRet = true;
         if ( nCnt == 1 )
         {
             SdrObject *pO = Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
@@ -2371,7 +2371,7 @@ sal_Bool SwFEShell::IsAlignPossible() const
         if ( bRet )
             return Imp()->GetDrawView()->IsAlignPossible();
     }
-    return sal_False;
+    return false;
 }
 
 // temporary fix till  SS of JOE is available
@@ -2407,7 +2407,7 @@ void SwFEShell::CheckUnboundObjects()
 
             SwFmtAnchor aAnch;
             {
-            const SwFrm *pAnch = ::FindAnchor( pPage, aPt, sal_True );
+            const SwFrm *pAnch = ::FindAnchor( pPage, aPt, true );
             SwPosition aPos( *((SwCntntFrm*)pAnch)->GetNode() );
             aAnch.SetType( FLY_AT_PARA );
             aAnch.SetAnchor( &aPos );
@@ -2737,7 +2737,7 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const
         }
         else if(pObj->ISA(SdrCaptionObj))
         {
-            sal_Bool bVerticalText = ( SID_DRAW_TEXT_VERTICAL == nSlotId ||
+            bool bVerticalText = ( SID_DRAW_TEXT_VERTICAL == nSlotId ||
                                             SID_DRAW_CAPTION_VERTICAL == nSlotId );
             ((SdrTextObj*)pObj)->SetVerticalWriting(bVerticalText);
             if(bVerticalText)
@@ -2757,7 +2757,7 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const
             SdrTextObj* pText = (SdrTextObj*)pObj;
             pText->SetLogicRect(aRect);
 
-            sal_Bool bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotId);
+            bool bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotId);
             bool bMarquee = (SID_DRAW_TEXT_MARQUEE == nSlotId);
 
             pText->SetVerticalWriting(bVertical);
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 7abc15200ad0..b12762b31d12 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -260,11 +260,11 @@ bool SwFEShell::InsertCol( sal_uInt16 nCnt, bool bBehind )
 }
 
 //  Determines if the current cursor is in the last row of the table.
-sal_Bool SwFEShell::IsLastCellInRow() const
+bool SwFEShell::IsLastCellInRow() const
 {
     SwTabCols aTabCols;
     GetTabCols( aTabCols );
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if (IsTableRightToLeft())
         /* If the table is right-to-left the last row is the most left one. */
@@ -276,25 +276,25 @@ sal_Bool SwFEShell::IsLastCellInRow() const
     return bResult;
 }
 
-sal_Bool SwFEShell::DeleteCol()
+bool SwFEShell::DeleteCol()
 {
     // check if Point/Mark of current cursor are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     if( pFrm->ImplFindTabFrm()->GetTable()->ISA( SwDDETable ))
     {
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
-        return sal_False;
+        return false;
     }
 
     SET_CURR_SHELL( this );
     StartAllAction();
 
     // search boxes via the layout
-    sal_Bool bRet;
+    bool bRet;
     SwSelBoxes aBoxes;
     GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_COL );
     if ( !aBoxes.empty() )
@@ -316,36 +316,36 @@ sal_Bool SwFEShell::DeleteCol()
 
     }
     else
-        bRet = sal_False;
+        bRet = false;
 
     EndAllActionAndCall();
     return bRet;
 }
 
-sal_Bool SwFEShell::DeleteTable()
+bool SwFEShell::DeleteTable()
 {
     return DeleteRow(true);
 }
 
-sal_Bool SwFEShell::DeleteRow(bool bCompleteTable)
+bool SwFEShell::DeleteRow(bool bCompleteTable)
 {
     // check if Point/Mark of current cursor are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     if( pFrm->ImplFindTabFrm()->GetTable()->ISA( SwDDETable ))
     {
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
-        return sal_False;
+        return false;
     }
 
     SET_CURR_SHELL( this );
     StartAllAction();
 
     // search for boxes via the layout
-    sal_Bool bRet;
+    bool bRet;
     SwSelBoxes aBoxes;
     GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
 
@@ -371,7 +371,7 @@ sal_Bool SwFEShell::DeleteRow(bool bCompleteTable)
             if( aFndBox.GetLines().empty() )
             {
                 EndAllActionAndCall();
-                return sal_False;
+                return false;
             }
 
             KillPams();
@@ -439,7 +439,7 @@ sal_Bool SwFEShell::DeleteRow(bool bCompleteTable)
         EndUndo(bCompleteTable ? UNDO_UI_TABLE_DELETE : UNDO_ROW_DELETE);
     }
     else
-        bRet = sal_False;
+        bRet = false;
 
     EndAllActionAndCall();
     return bRet;
@@ -477,18 +477,18 @@ sal_uInt16 SwFEShell::MergeTab()
     return nRet;
 }
 
-sal_Bool SwFEShell::SplitTab( sal_Bool bVert, sal_uInt16 nCnt, sal_Bool bSameHeight )
+bool SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight )
 {
     // check if Point/Mark of current cursor are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     if( pFrm->ImplFindTabFrm()->GetTable()->ISA( SwDDETable ))
     {
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
-        return sal_False;
+        return false;
     }
 
     SET_CURR_SHELL( this );
@@ -497,11 +497,11 @@ sal_Bool SwFEShell::SplitTab( sal_Bool bVert, sal_uInt16 nCnt, sal_Bool bSameHei
     {
         ErrorHandler::HandleError( ERR_TBLSPLIT_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
-        return sal_False;
+        return false;
     }
     StartAllAction();
     // search boxes via the layout
-    sal_Bool bRet;
+    bool bRet;
     SwSelBoxes aBoxes;
     GetTblSel( *this, aBoxes );
     if( !aBoxes.empty() )
@@ -515,7 +515,7 @@ sal_Bool SwFEShell::SplitTab( sal_Bool bVert, sal_uInt16 nCnt, sal_Bool bSameHei
         DELETEZ( pLastRows );
     }
     else
-        bRet = sal_False;
+        bRet = false;
     EndAllActionAndCall();
     return bRet;
 }
@@ -562,7 +562,7 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const
                 if ( pColumnCacheLastCellFrm != pBox )
                 {
                     pTab->GetTable()->GetTabCols( *pLastCols,
-                                        ((SwCellFrm*)pBox)->GetTabBox(), sal_True);
+                                        ((SwCellFrm*)pBox)->GetTabBox(), true);
                     pColumnCacheLastCellFrm = pBox;
                 }
                 rToFill = *pLastCols;
@@ -640,7 +640,7 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const
     }
 }
 
-void SwFEShell::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly )
+void SwFEShell::SetTabCols( const SwTabCols &rNew, bool bCurRowOnly )
 {
     SwFrm *pBox = GetCurrFrm();
     if( !pBox || !pBox->IsInTab() )
@@ -681,7 +681,7 @@ void SwFEShell::GetTabRows( SwTabCols &rToFill ) const
     _GetTabRows( rToFill, pFrm );
 }
 
-void SwFEShell::SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly )
+void SwFEShell::SetTabRows( const SwTabCols &rNew, bool bCurColOnly )
 {
     SwFrm *pBox = GetCurrFrm();
     if( !pBox || !pBox->IsInTab() )
@@ -705,7 +705,7 @@ void SwFEShell::GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const
         _GetTabRows( rToFill, pBox );
 }
 
-void SwFEShell::SetMouseTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const Point &rPt )
+void SwFEShell::SetMouseTabRows( const SwTabCols &rNew, bool bCurColOnly, const Point &rPt )
 {
     const SwFrm *pBox = GetBox( rPt );
     if( pBox )
@@ -743,12 +743,12 @@ void SwFEShell::GetRowHeight( SwFmtFrmSize *& rpSz ) const
     GetDoc()->GetRowHeight( *getShellCrsr( false ), rpSz );
 }
 
-sal_Bool SwFEShell::BalanceRowHeight( sal_Bool bTstOnly )
+bool SwFEShell::BalanceRowHeight( bool bTstOnly )
 {
     SET_CURR_SHELL( this );
     if( !bTstOnly )
         StartAllAction();
-    sal_Bool bRet = GetDoc()->BalanceRowHeight( *getShellCrsr( false ), bTstOnly );
+    bool bRet = GetDoc()->BalanceRowHeight( *getShellCrsr( false ), bTstOnly );
     if( !bTstOnly )
         EndAllActionAndCall();
     return bRet;
@@ -762,7 +762,7 @@ void SwFEShell::SetRowBackground( const SvxBrushItem &rNew )
     EndAllActionAndCall();
 }
 
-sal_Bool SwFEShell::GetRowBackground( SvxBrushItem &rToFill ) const
+bool SwFEShell::GetRowBackground( SvxBrushItem &rToFill ) const
 {
     return GetDoc()->GetRowBackground( *getShellCrsr( false ), rToFill );
 }
@@ -775,7 +775,7 @@ void SwFEShell::SetTabBorders( const SfxItemSet& rSet )
     EndAllActionAndCall();
 }
 
-void SwFEShell::SetTabLineStyle( const Color* pColor, sal_Bool bSetLine,
+void SwFEShell::SetTabLineStyle( const Color* pColor, bool bSetLine,
                                  const editeng::SvxBorderLine* pBorderLine )
 {
     SET_CURR_SHELL( this );
@@ -798,7 +798,7 @@ void SwFEShell::SetBoxBackground( const SvxBrushItem &rNew )
     EndAllActionAndCall();
 }
 
-sal_Bool SwFEShell::GetBoxBackground( SvxBrushItem &rToFill ) const
+bool SwFEShell::GetBoxBackground( SvxBrushItem &rToFill ) const
 {
     return GetDoc()->GetBoxAttr( *getShellCrsr( false ), rToFill );
 }
@@ -811,7 +811,7 @@ void SwFEShell::SetBoxDirection( const SvxFrameDirectionItem& rNew )
     EndAllActionAndCall();
 }
 
-sal_Bool SwFEShell::GetBoxDirection( SvxFrameDirectionItem&  rToFill ) const
+bool SwFEShell::GetBoxDirection( SvxFrameDirectionItem&  rToFill ) const
 {
     return GetDoc()->GetBoxAttr( *getShellCrsr( false ), rToFill );
 }
@@ -849,7 +849,7 @@ void SwFEShell::GetTabBackground( SvxBrushItem &rToFill ) const
         rToFill = pFrm->ImplFindTabFrm()->GetFmt()->GetBackground();
 }
 
-sal_Bool SwFEShell::HasWholeTabSelection() const
+bool SwFEShell::HasWholeTabSelection() const
 {
     // whole table selected?
     if ( IsTableMode() )
@@ -864,16 +864,16 @@ sal_Bool SwFEShell::HasWholeTabSelection() const
                 aBoxes.back()->GetSttNd()->EndOfSectionIndex() + 1 == pTblNd->EndOfSectionIndex();
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwFEShell::HasBoxSelection() const
+bool SwFEShell::HasBoxSelection() const
 {
     if(!IsCrsrInTbl())
-        return sal_False;
+        return false;
     // whole table selected?
     if( IsTableMode() )
-        return sal_True;
+        return true;
     SwPaM* pPam = GetCrsr();
         // empty boxes are also selected as the absence of selection
     bool bChg = false;
@@ -900,12 +900,12 @@ sal_Bool SwFEShell::HasBoxSelection() const
             {
                 if( bChg )
                     pPam->Exchange();
-                return sal_True;
+                return true;
             }
     }
     if( bChg )
         pPam->Exchange();
-    return sal_False;
+    return false;
 }
 
 void SwFEShell::ProtectCells()
@@ -963,16 +963,16 @@ void SwFEShell::UnProtectTbls()
     EndAllActionAndCall();
 }
 
-sal_Bool SwFEShell::HasTblAnyProtection( const OUString* pTblName,
-                                    sal_Bool* pFullTblProtection )
+bool SwFEShell::HasTblAnyProtection( const OUString* pTblName,
+                                     bool* pFullTblProtection )
 {
     return GetDoc()->HasTblAnyProtection( GetCrsr()->GetPoint(), pTblName,
                                         pFullTblProtection );
 }
 
-sal_Bool SwFEShell::CanUnProtectCells() const
+bool SwFEShell::CanUnProtectCells() const
 {
-    sal_Bool bUnProtectAvailable = sal_False;
+    bool bUnProtectAvailable = false;
     const SwTableNode *pTblNd = IsCrsrInTbl();
     if( pTblNd && !pTblNd->IsProtect() )
     {
@@ -1090,9 +1090,9 @@ sal_uInt16 SwFEShell::GetRowSelectionFromTop() const
  * returns true if the current frame is localed inside a table headline OR
  * inside the first line of a table!!!
  */
-sal_Bool SwFEShell::CheckHeadline( bool bRepeat ) const
+bool SwFEShell::CheckHeadline( bool bRepeat ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( !IsTableMode() )
     {
         SwFrm *pFrm = GetCurrFrm();  // DONE MULTIIHEADER
@@ -1113,7 +1113,7 @@ sal_Bool SwFEShell::CheckHeadline( bool bRepeat ) const
     return bRet;
 }
 
-void SwFEShell::AdjustCellWidth( sal_Bool bBalance )
+void SwFEShell::AdjustCellWidth( bool bBalance )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -1127,13 +1127,13 @@ void SwFEShell::AdjustCellWidth( sal_Bool bBalance )
     EndAllActionAndCall();
 }
 
-sal_Bool SwFEShell::IsAdjustCellWidthAllowed( sal_Bool bBalance ) const
+bool SwFEShell::IsAdjustCellWidthAllowed( bool bBalance ) const
 {
     // at least one row with content should be contained in the selection
 
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     SwSelBoxes aBoxes;
     ::GetTblSelCrs( *this, aBoxes );
@@ -1163,21 +1163,21 @@ sal_Bool SwFEShell::IsAdjustCellWidthAllowed( sal_Bool bBalance ) const
             while ( pCNd )
             {
                 if (!pCNd->GetTxt().isEmpty())
-                    return sal_True;
+                    return true;
                 ++aIdx;
                 pCNd = aIdx.GetNode().GetTxtNode();
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
     // AutoFormat for the table/table selection
-sal_Bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
+bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
 {
     SwTableNode *pTblNd = (SwTableNode*)IsCrsrInTbl();
     if( !pTblNd || pTblNd->GetTable().IsTblComplex() )
-        return sal_False;
+        return false;
 
     SwSelBoxes aBoxes;
 
@@ -1197,7 +1197,7 @@ sal_Bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
         }
     }
 
-    sal_Bool bRet;
+    bool bRet;
     if( !aBoxes.empty() )
     {
         SET_CURR_SHELL( this );
@@ -1208,15 +1208,15 @@ sal_Bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
         EndAllActionAndCall();
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
-sal_Bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
+bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
 {
     const SwTableNode *pTblNd = IsCrsrInTbl();
     if( !pTblNd || pTblNd->GetTable().IsTblComplex() )
-        return sal_False;
+        return false;
 
     SwSelBoxes aBoxes;
 
@@ -1239,25 +1239,25 @@ sal_Bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet )
     return GetDoc()->GetTableAutoFmt( aBoxes, rGet );
 }
 
-sal_Bool SwFEShell::DeleteTblSel()
+bool SwFEShell::DeleteTblSel()
 {
     // check if SPoint/Mark of current cursor are in a table
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     if( pFrm->ImplFindTabFrm()->GetTable()->ISA( SwDDETable ))
     {
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
-        return sal_False;
+        return false;
     }
 
     SET_CURR_SHELL( this );
     StartAllAction();
 
     // search boxes via the layout
-    sal_Bool bRet;
+    bool bRet;
     SwSelBoxes aBoxes;
     GetTblSelCrs( *this, aBoxes );
     if( !aBoxes.empty() )
@@ -1277,7 +1277,7 @@ sal_Bool SwFEShell::DeleteTblSel()
         DELETEZ( pLastRows );
     }
     else
-        bRet = sal_False;
+        bRet = false;
     EndAllActionAndCall();
     return bRet;
 }
@@ -1797,7 +1797,7 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag
         *pCrsr->GetPoint() = *ppPos[0];
         pCrsr->GetPtPos() = paPt[0];
 
-        if ( !pCrsr->IsInProtectTable( sal_False, sal_True ) )
+        if ( !pCrsr->IsInProtectTable( false, true ) )
         {
             bool bNewSelection = true;
 
@@ -1811,7 +1811,7 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag
                     *pCrsr->GetPoint() = *ppPos[1];
                     pCrsr->GetPtPos() = paPt[1];
 
-                    if ( pCrsr->IsInProtectTable( sal_False, sal_False ) )
+                    if ( pCrsr->IsInProtectTable( false, false ) )
                     {
                         pCrsr->RestoreSavePos();
                         bNewSelection = false;
@@ -1941,9 +1941,9 @@ SwTxtNode * SwFEShell::GetNumRuleNodeAtPos( const Point &rPt)
     return pResult;
 }
 
-sal_Bool SwFEShell::IsNumLabel( const Point &rPt, int nMaxOffset )
+bool SwFEShell::IsNumLabel( const Point &rPt, int nMaxOffset )
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     SwContentAtPos aCntntAtPos
         (SwContentAtPos::SW_NUMLABEL);
@@ -1952,7 +1952,7 @@ sal_Bool SwFEShell::IsNumLabel( const Point &rPt, int nMaxOffset )
     {
         if ((nMaxOffset >= 0 && aCntntAtPos.nDist <= nMaxOffset) ||
             (nMaxOffset < 0))
-            bResult = sal_True;
+            bResult = true;
     }
 
     return bResult;
@@ -1994,7 +1994,7 @@ void SwFEShell::GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const
         _GetTabCols( rToFill, pBox );
 }
 
-void SwFEShell::SetMouseTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
+void SwFEShell::SetMouseTabCols( const SwTabCols &rNew, bool bCurRowOnly,
                                  const Point &rPt )
 {
     const SwFrm *pBox = GetBox( rPt );
@@ -2098,18 +2098,18 @@ static bool lcl_GoTableRow( SwCrsrShell* pShell, bool bUp )
 }
 
     // aender eine  Zellenbreite/-Hoehe/Spaltenbreite/Zeilenhoehe
-sal_Bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
+bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
 {
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     if( nsTblChgWidthHeightType::WH_FLAG_INSDEL & eType &&
         pFrm->ImplFindTabFrm()->GetTable()->ISA( SwDDETable ))
     {
         ErrorHandler::HandleError( ERR_TBLDDECHG_ERROR,
                         ERRCODE_MSG_INFO | ERRCODE_BUTTON_DEF_OK );
-        return sal_False;
+        return false;
     }
 
     SET_CURR_SHELL( this );
@@ -2169,7 +2169,7 @@ sal_Bool SwFEShell::SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff )
     nLogDiff /= nPrtWidth;
 
     /** The cells are destroyed in here */
-    sal_Bool bRet = GetDoc()->SetColRowWidthHeight(
+    bool bRet = GetDoc()->SetColRowWidthHeight(
                     *(SwTableBox*)((SwCellFrm*)pFrm)->GetTabBox(),
                     eType, nDiff, nLogDiff );
 
@@ -2227,12 +2227,12 @@ static bool lcl_IsFormulaSelBoxes( const SwTable& rTbl, const SwTblBoxFormula& r
 }
 
     // ask formula for auto-sum
-sal_Bool SwFEShell::GetAutoSum( OUString& rFml ) const
+bool SwFEShell::GetAutoSum( OUString& rFml ) const
 {
     SwFrm *pFrm = GetCurrFrm();
     SwTabFrm *pTab = pFrm ? pFrm->ImplFindTabFrm() : 0;
     if( !pTab )
-        return sal_False;
+        return false;
 
     SwCellFrms aCells;
     OUString sFields;
@@ -2322,19 +2322,19 @@ sal_Bool SwFEShell::GetAutoSum( OUString& rFml ) const
         rFml += "(" + sFields + ")";
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwFEShell::IsTableRightToLeft() const
+bool SwFEShell::IsTableRightToLeft() const
 {
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     return pFrm->ImplFindTabFrm()->IsRightToLeft();
 }
 
-sal_Bool SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const
+bool SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const
 {
     SwFrm *pFrm = (SwFrm *)GetBox( rPt );
     const SwTabFrm*  pTabFrm = pFrm ? pFrm->ImplFindTabFrm() : 0;
@@ -2342,11 +2342,11 @@ sal_Bool SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const
     return pTabFrm ? pTabFrm->IsRightToLeft() : sal_False;
 }
 
-sal_Bool SwFEShell::IsTableVertical() const
+bool SwFEShell::IsTableVertical() const
 {
     SwFrm *pFrm = GetCurrFrm();
     if( !pFrm || !pFrm->IsInTab() )
-        return sal_False;
+        return false;
 
     return pFrm->ImplFindTabFrm()->IsVertical();
 }
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 5f2cc60af410..7231e01d1756 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -68,7 +68,7 @@ void SwFEShell::EndAllActionAndCall()
 }
 
 // Determine the Cntnt's nearest to the point
-Point SwFEShell::GetCntntPos( const Point& rPoint, sal_Bool bNext ) const
+Point SwFEShell::GetCntntPos( const Point& rPoint, bool bNext ) const
 {
     SET_CURR_SHELL( (SwViewShell*)this );
     return GetLayout()->GetNextPrevCntntPos( rPoint, bNext );
@@ -96,10 +96,10 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
         {
             const bool bOldCallbackActionEnabled = GetLayout()->IsCallbackActionEnabled();
             if( bOldCallbackActionEnabled )
-                GetLayout()->SetCallbackActionEnabled( sal_False );
+                GetLayout()->SetCallbackActionEnabled( false );
             pFrm = GetCurrFrm();
             if( bOldCallbackActionEnabled )
-                GetLayout()->SetCallbackActionEnabled( sal_True );
+                GetLayout()->SetCallbackActionEnabled( true );
         }
     }
 
@@ -167,13 +167,13 @@ sal_uInt16 SwFEShell::GetPageNumber( const Point &rPoint ) const
         return 0;
 }
 
-sal_Bool SwFEShell::GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay) const
+bool SwFEShell::GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay) const
 {
     const SwFrm *pPage;
 
     if ( bAtCrsrPos )                   // get page of Crsr
     {
-        pPage = GetCurrFrm( sal_False );
+        pPage = GetCurrFrm( false );
         if ( pPage )
             pPage = pPage->FindPageFrm();
     }
@@ -204,11 +204,11 @@ sal_Bool SwFEShell::GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16&
 
 bool SwFEShell::IsDirectlyInSection() const
 {
-    SwFrm* pFrm = GetCurrFrm( sal_False );
+    SwFrm* pFrm = GetCurrFrm( false );
     return pFrm && pFrm->GetUpper() && pFrm->GetUpper()->IsSctFrm();
 }
 
-sal_uInt16 SwFEShell::GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const
+sal_uInt16 SwFEShell::GetFrmType( const Point *pPt, bool bStopAtFly ) const
 {
     sal_uInt16 nReturn = FRMTYPE_NONE;
     const SwFrm *pFrm;
@@ -221,7 +221,7 @@ sal_uInt16 SwFEShell::GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const
         pFrm = pNd->getLayoutFrm( GetLayout(), pPt );
     }
     else
-        pFrm = GetCurrFrm( sal_False );
+        pFrm = GetCurrFrm( false );
     while ( pFrm )
     {
         switch ( pFrm->GetType() )
@@ -275,7 +275,7 @@ sal_uInt16 SwFEShell::GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const
     return nReturn;
 }
 
-void SwFEShell::ShGetFcs( sal_Bool bUpdate )
+void SwFEShell::ShGetFcs( bool bUpdate )
 {
     ::SetShell( this );
     SwCrsrShell::ShGetFcs( bUpdate );
@@ -307,7 +307,7 @@ sal_uInt16 SwFEShell::GetPhyPageNum()
     return 0;
 }
 
-sal_uInt16 SwFEShell::GetVirtPageNum( const sal_Bool bCalcFrm )
+sal_uInt16 SwFEShell::GetVirtPageNum( const bool bCalcFrm )
 {
     SwFrm *pFrm = GetCurrFrm( bCalcFrm );
     if ( pFrm )
@@ -324,7 +324,7 @@ static void lcl_SetAPageOffset( sal_uInt16 nOffset, SwPageFrm* pPage, SwFEShell*
     SwFmtPageDesc aDesc( pPage->GetPageDesc() );
     aDesc.SetNumOffset( nOffset );
 
-    SwFrm *pFrm = pThis->GetCurrFrm( sal_False );
+    SwFrm *pFrm = pThis->GetCurrFrm( false );
     if ( pFrm->IsInTab() )
         pThis->GetDoc()->SetAttr( aDesc, *pFrm->FindTabFrm()->GetFmt() );
     else
@@ -337,14 +337,14 @@ static void lcl_SetAPageOffset( sal_uInt16 nOffset, SwPageFrm* pPage, SwFEShell*
 
 void SwFEShell::SetNewPageOffset( sal_uInt16 nOffset )
 {
-    GetLayout()->SetVirtPageNum( sal_True );
-    const SwPageFrm *pPage = GetCurrFrm( sal_False )->FindPageFrm();
+    GetLayout()->SetVirtPageNum( true );
+    const SwPageFrm *pPage = GetCurrFrm( false )->FindPageFrm();
     lcl_SetAPageOffset( nOffset, (SwPageFrm*)pPage, this );
 }
 
 void SwFEShell::SetPageOffset( sal_uInt16 nOffset )
 {
-    const SwPageFrm *pPage = GetCurrFrm( sal_False )->FindPageFrm();
+    const SwPageFrm *pPage = GetCurrFrm( false )->FindPageFrm();
     const SwRootFrm* pDocLayout = GetLayout();
     while ( pPage )
     {
@@ -356,7 +356,7 @@ void SwFEShell::SetPageOffset( sal_uInt16 nOffset )
             const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc();
             if ( rPgDesc.GetNumOffset() )
             {
-                pDocLayout->SetVirtPageNum( sal_True );
+                pDocLayout->SetVirtPageNum( true );
                 lcl_SetAPageOffset( nOffset, (SwPageFrm*)pPage, this );
                 break;
             }
@@ -386,12 +386,12 @@ sal_uInt16 SwFEShell::GetPageOffset() const
 
 void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
                              const OUString& rNumberSeparator,
-                             const sal_Bool bBefore, const sal_uInt16 nId,
+                             const bool bBefore, const sal_uInt16 nId,
                              const OUString& rCharacterStyle,
-                             const sal_Bool bCpyBrd )
+                             const bool bCpyBrd )
 {
     // get node index of cursor position, SwDoc can do everything else itself
-    SwCntntFrm *pCnt = LTYPE_DRAW==eType ? 0 : GetCurrFrm( sal_False );
+    SwCntntFrm *pCnt = LTYPE_DRAW==eType ? 0 : GetCurrFrm( false );
     if( LTYPE_DRAW==eType || pCnt )
     {
         StartAllAction();
@@ -466,25 +466,25 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons
         SwFlyFrm* pFrm;
         const Point aPt( GetCrsrDocPos() );
         if( pFlyFmt && 0 != ( pFrm = pFlyFmt->GetFrm( &aPt )))
-            SelectFlyFrm( *pFrm, sal_True );
+            SelectFlyFrm( *pFrm, true );
 
         EndAllActionAndCall();
     }
 }
 
-sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt)
+bool SwFEShell::Sort(const SwSortOptions& rOpt)
 {
     if( !HasSelection() )
-        return sal_False;
+        return false;
 
     SET_CURR_SHELL( this );
-    sal_Bool bRet;
+    bool bRet;
     StartAllAction();
     if(IsTableMode())
     {
         // Sort table
         // check if Point/Mark of current Crsr are in one table
-        SwFrm *pFrm = GetCurrFrm( sal_False );
+        SwFrm *pFrm = GetCurrFrm( false );
         OSL_ENSURE( pFrm->FindTabFrm(), "Crsr not in table." );
 
         // search boxes via the layout
@@ -609,13 +609,13 @@ sal_uInt16 SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const
 
 SwFEShell::SwFEShell( SwDoc& rDoc, Window *pWindow, const SwViewOption *pOptions )
     : SwEditShell( rDoc, pWindow, pOptions ),
-    pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( sal_False )
+    pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false )
 {
 }
 
 SwFEShell::SwFEShell( SwEditShell& rShell, Window *pWindow )
     : SwEditShell( rShell, pWindow ),
-    pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( sal_False )
+    pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false )
 {
 }
 
@@ -656,7 +656,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
         pFrm = pFly ? pFly->GetAnchorFrm() : GetCurrFrm();
     }
 
-    sal_Bool bWrapThrough = sal_False;
+    bool bWrapThrough = false;
     if ( pFly )
     {
         SwFlyFrmFmt* pFmt = (SwFlyFrmFmt*)pFly->GetFmt();
@@ -669,7 +669,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
 
     Point aPos;
     bool bVertic = false;
-    sal_Bool bRTL = sal_False;
+    bool bRTL = false;
     bool bVerticalL2R = false;
 
     if ((FLY_AT_PAGE == _nAnchorId) || (FLY_AT_FLY == _nAnchorId)) // LAYER_IMPL
@@ -1197,11 +1197,11 @@ Size SwFEShell::GetGraphicDefaultSize() const
     return aRet;
 }
 
-sal_Bool SwFEShell::IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRTL, sal_Bool& bVertL2R) const
+bool SwFEShell::IsFrmVertical(const bool bEnvironment, bool& bRTL, bool& bVertL2R) const
 {
-    sal_Bool bVert = sal_False;
-    bRTL = sal_False;
-    bVertL2R = sal_False;
+    bool bVert = false;
+    bRTL = false;
+    bVertL2R = false;
 
     if ( Imp()->HasDrawView() )
     {
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 8448a13f19b7..ce5ad303dd9a 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -413,11 +413,11 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
     OSL_ENSURE( nLoopMax, "Table layout is still invalid!" );
 }
 
-sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
+bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
 {
     const SwTableNode* pTNd = rSttNd.FindTableNode();
     if( !pTNd )
-        return sal_False;
+        return false;
 
     Point aNullPos;
     SwNodeIndex aIdx( rSttNd );
@@ -432,7 +432,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
     //                          invisible - e.g. in a hidden section
     // Robust: check, if content was found (e.g. empty table cells)
     if ( !pCNd || pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) == NULL )
-            return sal_False;
+            return false;
 
     const SwLayoutFrm *pStart = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aNullPos )->GetUpper();
     OSL_ENSURE( pStart, "without frame nothing works" );
@@ -445,7 +445,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
     // #i22135# - Robust: check, if content was found and if it's visible
     if ( !pCNd || pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) == NULL )
     {
-        return sal_False;
+        return false;
     }
 
     const SwLayoutFrm *pEnd = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aNullPos )->GetUpper();
@@ -474,7 +474,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
             const SwTabFrm *pTable = pUnion->GetTable();
 
             SWRECTFN( pTable )
-            sal_Bool bRTL = pTable->IsRightToLeft();
+            bool bRTL = pTable->IsRightToLeft();
 
             if( !pTable->IsValid() && nLoopMax  )
             {
@@ -645,7 +645,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd )
     return bValidChartSel ? sal_True : sal_False;
 }
 
-sal_Bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell )
+bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell )
 {
     OSL_ENSURE( pCell->IsCellFrm(), "Frame without Gazelle" );
 
@@ -668,7 +668,7 @@ sal_Bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell )
            rUnion.Right() < pCell->Frm().Right() )) ? sal_True : sal_False );
 }
 
-sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
+bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
 {
     SwShellCrsr* pCrsr = rShell.m_pCurCrsr;
     if ( rShell.IsTableMode() )
@@ -825,14 +825,14 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
     return bFound ? sal_True : sal_False;
 }
 
-sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes )
+bool HasProtectedCells( const SwSelBoxes& rBoxes )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     for (size_t n = 0; n < rBoxes.size(); ++n)
     {
         if( rBoxes[ n ]->GetFrmFmt()->GetProtect().IsCntntProtected() )
         {
-            bRet = sal_True;
+            bRet = true;
             break;
         }
     }
@@ -862,14 +862,14 @@ static void lcl_InsTblBox( SwTableNode* pTblNd, SwDoc* pDoc, SwTableBox* pBox,
                 nInsPos, nCnt );
 }
 
-sal_Bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
+bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
 {
     rPam.GetPoint()->nNode = *rBox.GetSttNd()->EndOfSectionNode();
     rPam.Move( fnMoveBackward, fnGoCntnt );
     rPam.SetMark();
     rPam.GetPoint()->nNode = *rBox.GetSttNd();
     rPam.Move( fnMoveForward, fnGoCntnt );
-    sal_Bool bRet = *rPam.GetMark() == *rPam.GetPoint()
+    bool bRet = *rPam.GetMark() == *rPam.GetPoint()
         && ( rBox.GetSttNd()->GetIndex() + 1 == rPam.GetPoint()->nNode.GetIndex() );
 
     if( bRet )
@@ -890,7 +890,7 @@ sal_Bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
                 nSttIdx <= ( nIdx = pAPos->nNode.GetIndex() ) &&
                 nIdx < nEndIdx )
             {
-                bRet = sal_False;
+                bRet = false;
                 break;
             }
         }
@@ -1136,7 +1136,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 
 #if defined( DEL_ONLY_EMPTY_LINES )
         nWidth = pFirstBox->GetFrmFmt()->GetFrmSize().GetWidth();
-        sal_Bool bEmptyLine = sal_True;
+        bool bEmptyLine = sal_True;
         sal_uInt16 n, nSttPos = 0;
 
         for( n = 0; n < aPosArr.Count(); ++n )
@@ -1188,7 +1188,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
             const _CmpLPt& rPt = aPosArr[ n ];
             if( n && aPosArr[ n - 1 ].Y() == rPt.Y() )  // same Y level?
             {
-                sal_Bool bEmptyBox = IsEmptyBox( *rPt.pSelBox, aPam );
+                bool bEmptyBox = IsEmptyBox( *rPt.pSelBox, aPam );
                 if( bEmptyBox )
                 {
                     if( nSEndPos == n )     // beginning is empty
@@ -1499,7 +1499,7 @@ static SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish,
     if ( !nWish )
         nWish = 1;
 
-    const sal_Bool bRTL = pCell->IsRightToLeft();
+    const bool bRTL = pCell->IsRightToLeft();
     SwTwips nRet = bRTL ?
         nAct - pCell->Frm().Width() :
         0;
@@ -1602,7 +1602,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
 
     SWRECTFN( pTab )
 
-    sal_Bool bRTL = pTab->IsRightToLeft();
+    bool bRTL = pTab->IsRightToLeft();
     const long nTmpWish = pOrg->GetFmt()->GetFrmSize().GetWidth();
     const long nWish = ( nTmpWish > 0 ) ? nTmpWish : 1;
 
@@ -1936,7 +1936,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
     }
 }
 
-sal_Bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
+bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
                         const SwTblSearchType eSearchType )
 {
     if( !rShell.IsTableMode() )
@@ -1945,11 +1945,11 @@ sal_Bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
     return CheckSplitCells( *rShell.getShellCrsr(false), nDiv, eSearchType );
 }
 
-sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
+bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
                         const SwTblSearchType eSearchType )
 {
     if( 1 >= nDiv )
-        return sal_False;
+        return false;
 
     sal_uInt16 nMinValue = nDiv * MINLAY;
 
@@ -1999,7 +1999,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
                     if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
                     {
                         if( (pCell->Frm().*fnRect->fnGetWidth)() < nMinValue )
-                            return sal_False;
+                            return false;
                     }
 
                     if ( pCell->GetNext() )
@@ -2015,7 +2015,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
             pRow = (const SwLayoutFrm*)pRow->GetNext();
         }
     }
-    return sal_True;
+    return true;
 }
 
 // These Classes copy the current table selections (rBoxes),
@@ -2149,7 +2149,7 @@ inline void UnsetFollow( SwFlowFrm *pTab )
 
 //When bAccTableDispose is FALSE,the acc table should not be disposed.
 //void _FndBox::DelFrms( SwTable &rTable )
-void _FndBox::DelFrms( SwTable &rTable,sal_Bool bAccTableDispose )
+void _FndBox::DelFrms( SwTable &rTable, bool bAccTableDispose )
 {
     // All lines between pLineBefore and pLineBehind should be cut
     // from the layout and erased.
@@ -2225,7 +2225,7 @@ void _FndBox::DelFrms( SwTable &rTable,sal_Bool bAccTableDispose )
                             // flag from pUp to pPrev. pUp may still have the
                             // flag set although there is not more follow flow
                             // line associated with pUp.
-                            pPrev->SetFollowFlowLine( sal_False );
+                            pPrev->SetFollowFlowLine( false );
                         }
                         else if ( pFollow )
                             ::UnsetFollow( pFollow );
@@ -2263,7 +2263,7 @@ void _FndBox::DelFrms( SwTable &rTable,sal_Bool bAccTableDispose )
                             // We do not delete the follow flow line,
                             // this will be done automatically in the
                             // next turn.
-                            ((SwTabFrm*)pTabFrm)->SetFollowFlowLine( sal_False );
+                            ((SwTabFrm*)pTabFrm)->SetFollowFlowLine( false );
                         }
                         //Set acc table dispose state
                         pFrm->SetAccTableDispose( bAccTableDispose );
@@ -2390,7 +2390,7 @@ void _FndBox::MakeFrms( SwTable &rTable )
 }
 
 void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
-                                            const sal_Bool bBehind )
+                                            const bool bBehind )
 {
     // Create Frms for newly inserted lines
     // bBehind == sal_True:  before  pLineBehind
@@ -2529,12 +2529,12 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
     }
 }
 
-sal_Bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const
+bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const
 {
     // Should we call MakeFrms here?
 
     if ( !pLineBefore && !pLineBehind && rTable.GetTabLines().size() )
-        return sal_True;
+        return true;
 
     sal_uInt16 nBfPos;
     if(pLineBefore)
@@ -2557,7 +2557,7 @@ sal_Bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const
     if ( nBfPos == nBhPos ) // Should never occur.
     {
         OSL_FAIL( "Table, erase but not on any area !?!" );
-        return sal_False;
+        return false;
     }
 
     if ( rTable.GetRowsToRepeat() > 0 )
@@ -2576,19 +2576,19 @@ sal_Bool _FndBox::AreLinesToRestore( const SwTable &rTable ) const
 
     // Some adjacent lines at the beginning of the table have been deleted:
     if ( nBfPos == USHRT_MAX && nBhPos == 0 )
-        return sal_False;
+        return false;
 
     // Some adjacent lines at the end of the table have been deleted:
     if ( nBhPos == USHRT_MAX && nBfPos == (rTable.GetTabLines().size() - 1) )
-        return sal_False;
+        return false;
 
     // Some adjacent lines in the middle of the table have been deleted:
     if ( nBfPos != USHRT_MAX && nBhPos != USHRT_MAX && (nBfPos + 1) == nBhPos )
-        return sal_False;
+        return false;
 
     // The structure of the deleted lines is more complex due to split lines.
     // A call of MakeFrms() is necessary.
-    return sal_True;
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index be84f4083d88..310aea72e5b0 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -61,16 +61,16 @@ bool SwMirrorGrf::operator==( const SfxPoolItem& rItem) const
             ((SwMirrorGrf&)rItem).IsGrfToggle() == IsGrfToggle();
 }
 
-static sal_Bool lcl_IsHoriOnEvenPages(int nEnum, sal_Bool bToggle)
+static bool lcl_IsHoriOnEvenPages(int nEnum, bool bToggle)
 {
-    sal_Bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
+    bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
                    nEnum == RES_MIRROR_GRAPH_BOTH;
             return bEnum != bToggle;
 }
 
-static sal_Bool lcl_IsHoriOnOddPages(int nEnum)
+static bool lcl_IsHoriOnOddPages(int nEnum)
 {
-    sal_Bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
+    bool bEnum = nEnum == RES_MIRROR_GRAPH_VERT ||
                    nEnum == RES_MIRROR_GRAPH_BOTH;
             return bEnum;
 }
@@ -104,7 +104,7 @@ bool SwMirrorGrf::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     bool bRet = true;
-    sal_Bool bVal = *(sal_Bool*)rVal.getValue();
+    bool bVal = *(sal_Bool*)rVal.getValue();
     // vertical and horizontal were swapped at some point
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -112,16 +112,16 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         case MID_MIRROR_HORZ_EVEN_PAGES:
         case MID_MIRROR_HORZ_ODD_PAGES:
         {
-            sal_Bool bIsVert = GetValue() == RES_MIRROR_GRAPH_HOR ||
+            bool bIsVert = GetValue() == RES_MIRROR_GRAPH_HOR ||
                                 GetValue() == RES_MIRROR_GRAPH_BOTH;
-            sal_Bool bOnOddPages = nMemberId == MID_MIRROR_HORZ_EVEN_PAGES ?
+            bool bOnOddPages = nMemberId == MID_MIRROR_HORZ_EVEN_PAGES ?
                                     lcl_IsHoriOnOddPages(GetValue()) : bVal;
-            sal_Bool bOnEvenPages = nMemberId == MID_MIRROR_HORZ_ODD_PAGES ?
+            bool bOnEvenPages = nMemberId == MID_MIRROR_HORZ_ODD_PAGES ?
                                        lcl_IsHoriOnEvenPages(GetValue(), IsGrfToggle()) : bVal;
             MirrorGraph nEnum = bOnOddPages ?
                     bIsVert ? RES_MIRROR_GRAPH_BOTH : RES_MIRROR_GRAPH_VERT :
                         bIsVert ? RES_MIRROR_GRAPH_HOR : RES_MIRROR_GRAPH_DONT;
-            sal_Bool bToggle = bOnOddPages != bOnEvenPages;
+            bool bToggle = bOnOddPages != bOnEvenPages;
             SetValue(static_cast<sal_uInt16>(nEnum));
             SetGrfToggle( bToggle );
         }
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index a2e56de9bb2e..c868c56a1fb5 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -429,7 +429,7 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
                                 const Graphic* pGraphic,
                                 SwGrfFmtColl* pGrfColl,
                                 SwAttrSet* pAutoAttr,
-                                sal_Bool bDelayed )
+                                bool bDelayed )
 {
     OSL_ENSURE( pGrfColl, "MakeGrfNode: Formatpointer ist 0." );
     SwGrfNode *pNode;
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 9fd7003ac468..81289cd3690a 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -38,7 +38,7 @@ protected:
     mutable OUString sNewName;
     SfxItemSet * pNewSet;
     sal_uInt16 nId;     // FmtId related
-    sal_Bool bAuto;
+    bool bAuto;
 
 public:
     SwUndoFmtCreate(SwUndoId nUndoId, SwFmt * pNew, SwFmt * pDerivedFrom,
@@ -63,7 +63,7 @@ protected:
     OUString sOldName;
     SfxItemSet aOldSet;
     sal_uInt16 nId;     // FmtId related
-    sal_Bool bAuto;
+    bool bAuto;
 
 public:
     SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc);
@@ -163,7 +163,7 @@ public:
 
 class SwUndoFrmFmtCreate : public SwUndoFmtCreate
 {
-    sal_Bool bAuto;
+    bool bAuto;
 
 public:
     SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom,
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 726db195a613..ac166fd3d459 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -63,11 +63,11 @@ protected:
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
 
 public:
-    sal_Bool bTextOnly;
+    bool bTextOnly;
     OUString &m_rText;
     SwXMLTextBlockImport(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
-        SwXMLTextBlocks &rBlocks, OUString &rNewText, sal_Bool bNewTextOnly );
+        SwXMLTextBlocks &rBlocks, OUString &rNewText, bool bNewTextOnly );
 
     SwXMLTextBlocks& getBlockList ( void )
     {
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index df3c20ffa9fa..6aa2c270e11a 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -35,8 +35,8 @@ class SwImpBlocks;
 class SwXMLTextBlocks : public SwImpBlocks
 {
 protected:
-    sal_Bool         bAutocorrBlock;
-    sal_Bool         bBlock;
+    bool         bAutocorrBlock;
+    bool         bBlock;
     SfxObjectShellRef xDocShellRef;
     sal_uInt16       nFlags;
     OUString aPackageName;
@@ -53,11 +53,10 @@ public:
     short               nCurBlk;
     SwXMLTextBlocks( const OUString& rFile );
     SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile );
-    void   AddName( const OUString&, const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False );
-    virtual void   AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False ) SAL_OVERRIDE;
+    void   AddName( const OUString&, const OUString&, const OUString&, bool bOnlyTxt = false );
+    virtual void   AddName( const OUString&, const OUString&, bool bOnlyTxt = false ) SAL_OVERRIDE;
     OUString GeneratePackageName ( const OUString& rShort );
     virtual ~SwXMLTextBlocks();
-    //virtual sal_Bool   IsOld() const;
     virtual sal_uLong Delete( sal_uInt16 ) SAL_OVERRIDE;
     virtual sal_uLong Rename( sal_uInt16, const OUString&, const OUString& ) SAL_OVERRIDE;
     virtual sal_uLong CopyBlock( SwImpBlocks& rImp, OUString& rShort, const OUString& rLong) SAL_OVERRIDE;
@@ -70,25 +69,25 @@ public:
     virtual sal_uLong MakeBlockList() SAL_OVERRIDE;
 
     virtual short GetFileType ( void ) const SAL_OVERRIDE;
-    virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ) SAL_OVERRIDE;
+    virtual sal_uLong OpenFile( bool bReadOnly = true ) SAL_OVERRIDE;
     virtual void  CloseFile() SAL_OVERRIDE;
 
-    static sal_Bool IsFileUCBStorage( const OUString & rFileName);
+    static bool IsFileUCBStorage( const OUString & rFileName);
 
     // Methods for the new Autocorrecter
     sal_uLong GetText( const OUString& rShort, OUString& );
 
-    virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE;
-    virtual sal_Bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
-    virtual void SetIsTextOnly( const OUString& rShort, sal_Bool bNewValue );
-    virtual void SetIsTextOnly( sal_uInt16 nIdx, sal_Bool bNewValue );
+    virtual bool IsOnlyTextBlock( const OUString& rShort ) const SAL_OVERRIDE;
+    virtual bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
+    virtual void SetIsTextOnly( const OUString& rShort, bool bNewValue );
+    virtual void SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue );
 
     virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTbl,
-                                 sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE;
+                                 bool bFileAlreadyOpen = false ) SAL_OVERRIDE;
     virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
                                  const SvxMacroTableDtor& rMacroTable,
-                                 sal_Bool bFileAlreadyOpen = sal_False ) SAL_OVERRIDE;
-    virtual sal_Bool PutMuchEntries( sal_Bool bOn ) SAL_OVERRIDE;
+                                 bool bFileAlreadyOpen = false ) SAL_OVERRIDE;
+    virtual bool PutMuchEntries( bool bOn ) SAL_OVERRIDE;
 
 public:
     SwDoc* GetDoc() const { return pDoc; }
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index bff367397ae2..619cc17c4186 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -56,7 +56,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void SaveRedlineData( const SwPaM& rPam, sal_Bool bInsCntnt );
+    void SaveRedlineData( const SwPaM& rPam, bool bInsCntnt );
 
     SwHistory& GetHistory() { return *m_pHistory; }
 };
@@ -192,7 +192,7 @@ class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
     const bool m_bModulus;
 
 public:
-    SwUndoMoveLeftMargin( const SwPaM&, sal_Bool bRight, bool bModulus );
+    SwUndoMoveLeftMargin( const SwPaM&, bool bRight, bool bModulus );
 
     virtual ~SwUndoMoveLeftMargin();
 
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 719bd53f0cb2..4cec6dc69057 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -51,23 +51,23 @@ class SwUndoDelete
     sal_uLong nReplaceDummy;     // diff. to a temporary dummy object
     sal_uInt16 nSetPos;
 
-    sal_Bool bGroup : 1;         // TRUE: is already Grouped; see CanGrouping()
-    sal_Bool bBackSp : 1;        // TRUE: if Grouped and preceding content deleted
-    sal_Bool bJoinNext: 1;       // TRUE: if range is selected forwards
-    sal_Bool bTblDelLastNd : 1;  // TRUE: TextNode following Table inserted/deleted
-    sal_Bool bDelFullPara : 1;   // TRUE: entire Nodes were deleted
-    sal_Bool bResetPgDesc : 1;   // TRUE: reset PgDsc on following node
-    sal_Bool bResetPgBrk : 1;    // TRUE: reset PgBreak on following node
-    sal_Bool bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
-
-    sal_Bool SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
+    bool bGroup : 1;         // TRUE: is already Grouped; see CanGrouping()
+    bool bBackSp : 1;        // TRUE: if Grouped and preceding content deleted
+    bool bJoinNext: 1;       // TRUE: if range is selected forwards
+    bool bTblDelLastNd : 1;  // TRUE: TextNode following Table inserted/deleted
+    bool bDelFullPara : 1;   // TRUE: entire Nodes were deleted
+    bool bResetPgDesc : 1;   // TRUE: reset PgDsc on following node
+    bool bResetPgBrk : 1;    // TRUE: reset PgBreak on following node
+    bool bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
+
+    bool SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
                     SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd );
 
 public:
     SwUndoDelete(
         SwPaM&,
-        sal_Bool bFullPara = sal_False,
-        sal_Bool bCalledByTblCpy = sal_False );
+        bool bFullPara = false,
+        bool bCalledByTblCpy = false );
     virtual ~SwUndoDelete();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -86,18 +86,18 @@ public:
     */
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 
-    sal_Bool CanGrouping( SwDoc*, const SwPaM& );
+    bool CanGrouping( SwDoc*, const SwPaM& );
 
-    void SetTblDelLastNd()      { bTblDelLastNd = sal_True; }
+    void SetTblDelLastNd()      { bTblDelLastNd = true; }
 
     // for PageDesc/PageBreak Attributes of a table
-    void SetPgBrkFlags( sal_Bool bPageBreak, sal_Bool bPageDesc )
+    void SetPgBrkFlags( bool bPageBreak, bool bPageDesc )
         { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
 
     void SetTableName(const OUString & rName);
 
     // SwUndoTblCpyTbl needs this information:
-    sal_Bool IsDelFullPara() const { return bDelFullPara; }
+    bool IsDelFullPara() const { return bDelFullPara; }
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
 };
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 632fd5ec682b..39082b1db822 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -52,7 +52,7 @@ class SwUndoDrawGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
     sal_uInt16 nSize;
-    sal_Bool bDelFmt;
+    bool bDelFmt;
 
 public:
     SwUndoDrawGroup( sal_uInt16 nCnt );
@@ -81,7 +81,7 @@ class SwUndoDrawUnGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
     sal_uInt16 nSize;
-    sal_Bool bDelFmt;
+    bool bDelFmt;
 
 public:
     SwUndoDrawUnGroup( SdrObjGroup* );
@@ -116,7 +116,7 @@ class SwUndoDrawDelete : public SwUndo
     SwUndoGroupObjImpl* pObjArr;
     SdrMarkList* pMarkLst;  // MarkList for all selected SdrObjects
     sal_uInt16 nSize;
-    sal_Bool bDelFmt;
+    bool bDelFmt;
 
 public:
     SwUndoDrawDelete( sal_uInt16 nCnt );
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 2c4c797bfc35..60ef7a986162 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -40,14 +40,14 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
     sal_uLong nNode;
     sal_Int32 nCntnt, nLen;
     bool bIsWordDelim : 1;
-    sal_Bool bIsAppend : 1;
-    sal_Bool m_bWithRsid : 1;
+    bool bIsAppend : 1;
+    bool m_bWithRsid : 1;
 
     const IDocumentContentOperations::InsertFlags m_nInsertFlags;
 
     friend class SwDoc;     // actually only SwDoc::Insert( String )
-    sal_Bool CanGrouping( sal_Unicode cIns );
-    sal_Bool CanGrouping( const SwPosition& rPos );
+    bool CanGrouping( sal_Unicode cIns );
+    bool CanGrouping( const SwPosition& rPos );
 
     SwDoc * pDoc;
 
@@ -57,7 +57,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
 public:
     SwUndoInsert( const SwNodeIndex& rNode, sal_Int32 nCntnt, sal_Int32 nLen,
                   const IDocumentContentOperations::InsertFlags nInsertFlags,
-                  sal_Bool bWDelim = sal_True );
+                  bool bWDelim = true );
     SwUndoInsert( const SwNodeIndex& rNode );
     virtual ~SwUndoInsert();
 
@@ -171,18 +171,18 @@ class SwUndoInsertLabel : public SwUndo
     sal_uInt16 nFldId;
     SwLabelType eType;
     sal_uInt8 nLayerId;              // for character objects
-    sal_Bool bBefore        :1;
-    sal_Bool bUndoKeep      :1;
-    sal_Bool bCpyBrd        :1;
+    bool bBefore        :1;
+    bool bUndoKeep      :1;
+    bool bCpyBrd        :1;
 
 public:
     SwUndoInsertLabel( const SwLabelType eTyp, const OUString &rText,
     // #i39983# the separator is drawn with a character style
                         const OUString& rSeparator,
                         const OUString& rNumberSeparator, //#i61007# order of captions
-                        const sal_Bool bBefore, const sal_uInt16 nId,
+                        const bool bBefore, const sal_uInt16 nId,
                         const OUString& rCharacterStyle,
-                        const sal_Bool bCpyBrd );
+                        const bool bCpyBrd );
     virtual ~SwUndoInsertLabel();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -206,7 +206,7 @@ public:
     void SetNodePos( sal_uLong nNd )
         { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; }
 
-    void SetUndoKeep()  { bUndoKeep = sal_True; }
+    void SetUndoKeep()  { bUndoKeep = true; }
     void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly );
     void SetDrawObj( sal_uInt8 nLayerId );
 };
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index f8647d9fc194..ee711373eaf2 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -78,7 +78,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void AddNode( const SwTxtNode& rNd, sal_Bool bResetLRSpace );
+    void AddNode( const SwTxtNode& rNd, bool bResetLRSpace );
     SwHistory* GetHistory() { return pHistory; }
 };
 
@@ -112,11 +112,11 @@ public:
 class SwUndoNumOrNoNum : public SwUndo
 {
     sal_uLong nIdx;
-    sal_Bool mbNewNum, mbOldNum;
+    bool mbNewNum, mbOldNum;
 
 public:
-    SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool mbOldNum,
-                      sal_Bool mbNewNum );
+    SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool mbOldNum,
+                      bool mbNewNum );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -127,11 +127,11 @@ class SwUndoNumRuleStart : public SwUndo
 {
     sal_uLong nIdx;
     sal_uInt16 nOldStt, nNewStt;
-    sal_Bool bSetSttValue : 1;
-    sal_Bool bFlag : 1;
+    bool bSetSttValue : 1;
+    bool bFlag : 1;
 
 public:
-    SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bDelete );
+    SwUndoNumRuleStart( const SwPosition& rPos, bool bDelete );
     SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 639ee22d72f6..473224d4ca57 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -37,8 +37,8 @@ class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
     SwRedlineSaveDatas* pRedlSaveData;
     sal_uLong nSttNode;
     sal_Int32 nSttCntnt;
-    sal_Bool bInsChar : 1;  // no Overwrite, but Insert
-    sal_Bool bGroup : 1;    // TRUE: is already grouped; evaluated in CanGrouping()
+    bool bInsChar : 1;  // no Overwrite, but Insert
+    bool bGroup : 1;    // TRUE: is already grouped; evaluated in CanGrouping()
 
 public:
     SwUndoOverwrite( SwDoc*, SwPosition&, sal_Unicode cIns );
@@ -62,7 +62,7 @@ public:
      */
     virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
 
-    sal_Bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
+    bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
 };
 
 struct _UndoTransliterate_Data;
@@ -85,7 +85,7 @@ public:
 
     void AddChanges( SwTxtNode& rTNd, sal_Int32 nStart, sal_Int32 nLen,
                      ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets );
-    sal_Bool HasData() const { return aChanges.size() > 0; }
+    bool HasData() const { return aChanges.size() > 0; }
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index 1b5ed47b923e..b67e066065d3 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -33,7 +33,7 @@ protected:
     SwRedlineData* mpRedlData;
     SwRedlineSaveDatas* mpRedlSaveData;
     SwUndoId mnUserId;
-    sal_Bool mbHiddenRedlines;
+    bool mbHiddenRedlines;
 
     virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
     virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
@@ -52,9 +52,9 @@ public:
 
 class SwUndoRedlineDelete : public SwUndoRedline
 {
-    sal_Bool bCanGroup : 1;
-    sal_Bool bIsDelim : 1;
-    sal_Bool bIsBackspace : 1;
+    bool bCanGroup : 1;
+    bool bIsDelim : 1;
+    bool bIsBackspace : 1;
 
     virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
     virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SAL_OVERRIDE;
@@ -62,7 +62,7 @@ class SwUndoRedlineDelete : public SwUndoRedline
 public:
     SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY );
 
-    sal_Bool CanGrouping( const SwUndoRedlineDelete& rPrev );
+    bool CanGrouping( const SwUndoRedlineDelete& rPrev );
 
     // SwUndoTblCpyTbl needs this information:
     long NodeDiff() const { return nSttNode - nEndNode; }
@@ -116,10 +116,10 @@ class SwUndoCompDoc : public SwUndo, public SwUndRng
     SwRedlineData* pRedlData;
     SwUndoDelete* pUnDel, *pUnDel2;
     SwRedlineSaveDatas* pRedlSaveData;
-    sal_Bool bInsert;
+    bool bInsert;
 
 public:
-    SwUndoCompDoc( const SwPaM& rRg, sal_Bool bIns );
+    SwUndoCompDoc( const SwPaM& rRg, bool bIns );
     SwUndoCompDoc( const SwRangeRedline& rRedl );
 
     virtual ~SwUndoCompDoc();
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index 918ab0c293d2..9030f70838b5 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -28,12 +28,12 @@ class SwUndoSplitNode: public SwUndo
     SwRedlineData* pRedlData;
     sal_uLong nNode;
     sal_Int32 nCntnt;
-    sal_Bool bTblFlag : 1;
-    sal_Bool bChkTblStt : 1;
+    bool bTblFlag : 1;
+    bool bChkTblStt : 1;
     sal_uInt32 nParRsid;
 
 public:
-    SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, sal_Bool bChkTbl );
+    SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, bool bChkTbl );
 
     virtual ~SwUndoSplitNode();
 
@@ -41,7 +41,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
     virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
 
-    void SetTblFlag()       { bTblFlag = sal_True; }
+    void SetTblFlag()       { bTblFlag = true; }
 };
 
 class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
@@ -54,7 +54,7 @@ class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
 
     sal_uInt16 nFtnStt; // StartPos of Footnotes in History
 
-    sal_Bool bJoinNext : 1,
+    bool bJoinNext : 1,
          bJoinPrev : 1,
          bMoveRange : 1;
 
@@ -70,11 +70,11 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
 
     /// set the destination range after the move
-    void SetDestRange( const SwPaM&, const SwPosition&, sal_Bool, sal_Bool );
+    void SetDestRange( const SwPaM&, const SwPosition&, bool, bool );
     void SetDestRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd,
                         const SwNodeIndex& rInsPos );
 
-    sal_Bool IsMoveRange() const        { return bMoveRange; }
+    bool IsMoveRange() const        { return bMoveRange; }
     sal_uLong GetEndNode() const        { return nEndNode; }
     sal_uLong GetDestSttNode() const    { return nDestSttNode; }
     sal_Int32 GetDestSttCntnt() const  { return nDestSttCntnt; }
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index c7eb9517a322..256ed9ee9908 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -81,7 +81,7 @@ class SwUndoTxtToTbl : public SwUndo, public SwUndRng
     SwHistory* pHistory;
     sal_Unicode cTrenner;
     sal_uInt16 nAdjust;
-    sal_Bool bSplitEnd : 1;
+    bool bSplitEnd : 1;
 
 public:
     SwUndoTxtToTbl( const SwPaM&, const SwInsertTableOptions&, sal_Unicode,
@@ -109,7 +109,7 @@ class SwUndoTblToTxt : public SwUndo
     sal_uInt16 nAdjust;
     sal_Unicode cTrenner;
     sal_uInt16 nHdlnRpt;
-    sal_Bool bCheckNumFmt : 1;
+    bool bCheckNumFmt : 1;
 
 public:
     SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh );
@@ -129,10 +129,10 @@ class SwUndoAttrTbl : public SwUndo
 {
     sal_uLong nSttNode;
     _SaveTable* pSaveTbl;
-    sal_Bool bClearTabCol : 1;
+    bool bClearTabCol : 1;
 
 public:
-    SwUndoAttrTbl( const SwTableNode& rTblNd, sal_Bool bClearTabCols = sal_False );
+    SwUndoAttrTbl( const SwTableNode& rTblNd, bool bClearTabCols = false );
 
     virtual ~SwUndoAttrTbl();
 
@@ -147,7 +147,7 @@ class SwUndoTblAutoFmt : public SwUndo
     sal_uLong nSttNode;
     _SaveTable* pSaveTbl;
     ::std::vector< ::boost::shared_ptr<SwUndoTblNumFmt> > m_Undos;
-    sal_Bool bSaveCntntAttr;
+    bool bSaveCntntAttr;
     sal_uInt16 m_nRepeatHeading;
 
     void UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext);
@@ -179,15 +179,15 @@ class SwUndoTblNdsChg : public SwUndo, private boost::noncopyable
     long nMin, nMax;        // for redo of delete column
     sal_uLong nSttNode, nCurrBox;
     sal_uInt16 nCount, nRelDiff, nAbsDiff, nSetColType;
-    sal_Bool bFlag;
-    sal_Bool bSameHeight;                   // only used for SplitRow
+    bool bFlag;
+    bool bSameHeight;                   // only used for SplitRow
 
 public:
     SwUndoTblNdsChg( SwUndoId UndoId,
                     const SwSelBoxes& rBoxes,
                     const SwTableNode& rTblNd,
                     long nMn, long nMx,
-                    sal_uInt16 nCnt, sal_Bool bFlg, sal_Bool bSameHeight );
+                    sal_uInt16 nCnt, bool bFlg, bool bSameHeight );
 
     // for SetColWidth
     SwUndoTblNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes,
@@ -253,9 +253,9 @@ class SwUndoTblNumFmt : public SwUndo
     sal_uLong nNode;
     sal_uLong nNdPos;
 
-    sal_Bool bNewFmt : 1;
-    sal_Bool bNewFml : 1;
-    sal_Bool bNewValue : 1;
+    bool bNewFmt : 1;
+    bool bNewFml : 1;
+    bool bNewValue : 1;
 
 public:
     SwUndoTblNumFmt( const SwTableBox& rBox, const SfxItemSet* pNewSet = 0 );
@@ -294,7 +294,7 @@ public:
     void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx,
                 bool bDelCntnt );
 
-    sal_Bool IsEmpty() const;
+    bool IsEmpty() const;
     bool InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, sal_uInt16 nCnt );
 };
 
@@ -321,11 +321,11 @@ class SwUndoSplitTbl : public SwUndo
     _SaveTable* pSavTbl;
     SwHistory* pHistory;
     sal_uInt16 nMode, nFmlEnd;
-    sal_Bool bCalcNewSize;
+    bool bCalcNewSize;
 
 public:
     SwUndoSplitTbl( const SwTableNode& rTblNd, SwSaveRowSpan* pRowSp,
-            sal_uInt16 nMode, sal_Bool bCalcNewSize );
+            sal_uInt16 nMode, bool bCalcNewSize );
 
     virtual ~SwUndoSplitTbl();
 
@@ -345,11 +345,11 @@ class SwUndoMergeTbl : public SwUndo
     _SaveTable* pSavTbl, *pSavHdl;
     SwHistory* pHistory;
     sal_uInt16 nMode;
-    sal_Bool bWithPrev;
+    bool bWithPrev;
 
 public:
     SwUndoMergeTbl( const SwTableNode& rTblNd, const SwTableNode& rDelTblNd,
-                    sal_Bool bWithPrev, sal_uInt16 nMode );
+                    bool bWithPrev, sal_uInt16 nMode );
 
     virtual ~SwUndoMergeTbl();
 
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 16f8b7168f69..9f9c63477150 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -94,19 +94,19 @@ class SwAutoCorrExceptWord
     sal_Int32 nCntnt;
     sal_Unicode cChar;
     LanguageType eLanguage;
-    sal_Bool bDeleted;
+    bool bDeleted;
 
 public:
     SwAutoCorrExceptWord( sal_uLong nAFlags, sal_uLong nNd, sal_Int32 nContent,
                                         const OUString& rWord, sal_Unicode cChr,
                                         LanguageType eLang )
         : sWord(rWord), nFlags(nAFlags), nNode(nNd), nCntnt(nContent),
-        cChar(cChr), eLanguage(eLang), bDeleted(sal_False)
+        cChar(cChr), eLanguage(eLang), bDeleted(false)
     {}
 
-    sal_Bool IsDeleted() const                          { return bDeleted; }
+    bool IsDeleted() const                          { return bDeleted; }
     void CheckChar( const SwPosition& rPos, sal_Unicode cChar );
-    sal_Bool CheckDelChar( const SwPosition& rPos );
+    bool CheckDelChar( const SwPosition& rPos );
 };
 
 #endif
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index e36c89196c19..579b8fe63cf5 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -32,7 +32,7 @@ class SwAttrSetChg;
 class SwTxtFrm;
 
 // implemented in cntfrm.cxx, used in cntfrm.cxx and crsrsh.cxx
-extern sal_Bool GetFrmInPage( const SwCntntFrm*, SwWhichPage, SwPosPage, SwPaM* );
+extern bool GetFrmInPage( const SwCntntFrm*, SwWhichPage, SwPosPage, SwPaM* );
 
 class SwCntntFrm: public SwFrm, public SwFlowFrm
 {
@@ -40,9 +40,9 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
 
     // parameter <bObjsInNewUpper>  indicates that objects exist in remaining
     // area of new upper
-    sal_Bool _WouldFit( SwTwips nSpace,
+    bool _WouldFit( SwTwips nSpace,
                     SwLayoutFrm *pNewUpper,
-                    sal_Bool bTstMove,
+                    bool bTstMove,
                     const bool bObjsInNewUpper );
 
     virtual void MakeAll() SAL_OVERRIDE;
@@ -55,11 +55,11 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
     const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const;
 
 protected:
-    sal_Bool MakePrtArea( const SwBorderAttrs & );
+    bool MakePrtArea( const SwBorderAttrs & );
 
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 
     SwCntntFrm( SwCntntNode * const, SwFrm* );
 
@@ -87,19 +87,19 @@ public:
                          bool bSetInReadOnly = false ) const;
     virtual bool UnitDown( SwPaM *, const SwTwips nOffset = 0,
                            bool bSetInReadOnly = false ) const;
-    inline  sal_Bool StartNextPage( SwPaM * ) const;
-    inline  sal_Bool StartPrevPage( SwPaM * ) const;
-    inline  sal_Bool StartCurrPage( SwPaM * ) const;
-    inline  sal_Bool EndCurrPage( SwPaM * ) const;
-    inline  sal_Bool EndNextPage( SwPaM * ) const;
-    inline  sal_Bool EndPrevPage( SwPaM * ) const;
+    inline  bool StartNextPage( SwPaM * ) const;
+    inline  bool StartPrevPage( SwPaM * ) const;
+    inline  bool StartCurrPage( SwPaM * ) const;
+    inline  bool EndCurrPage( SwPaM * ) const;
+    inline  bool EndNextPage( SwPaM * ) const;
+    inline  bool EndPrevPage( SwPaM * ) const;
 
     // nMaxHeight is the required height
     // bSplit indicates that the paragraph has to be split
     // bTst indicates that we are currently doing a test formatting
     virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst );
 
-    sal_Bool MoveFtnCntFwd( sal_Bool, SwFtnBossFrm* ); // called by MoveFwd if content
+    bool MoveFtnCntFwd( bool, SwFtnBossFrm* ); // called by MoveFwd if content
 
     inline  SwCntntFrm* GetNextCntntFrm() const;
     inline  SwCntntFrm* GetPrevCntntFrm() const;
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index c9b5254dc299..d6863c574b01 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -65,12 +65,12 @@ class SwProtocol
 {
     static sal_uLong nRecord;
     static SwImplProtocol* pImpl;
-    static sal_Bool Start() { return 0 != ( PROT_INIT & nRecord ); }
+    static bool Start() { return 0 != ( PROT_INIT & nRecord ); }
 
 public:
     static sal_uLong Record() { return nRecord; }
     static void SetRecord( sal_uLong nNew ) { nRecord = nNew; }
-    static sal_Bool Record( sal_uLong nFunc ) { return 0 != (( nFunc | PROT_INIT ) & nRecord); }
+    static bool Record( sal_uLong nFunc ) { return 0 != (( nFunc | PROT_INIT ) & nRecord); }
     static void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAction, void* pParam );
     static void Init();
     static void Stop();
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 7859097d9238..f95fc87df621 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -64,19 +64,19 @@ class SwDrawTextInfo
     long nKern;
     sal_Int32 nNumberOfBlanks;
     sal_uInt8 nCursorBidiLevel;
-    sal_Bool bBullet : 1;
-    sal_Bool bUpper : 1;        // for small caps: upper case flag
-    sal_Bool bDrawSpace : 1;    // for small caps: underline/ line through
-    sal_Bool bGreyWave  : 1;    // grey wave line for extended text input
+    bool bBullet : 1;
+    bool bUpper : 1;        // for small caps: upper case flag
+    bool bDrawSpace : 1;    // for small caps: underline/ line through
+    bool bGreyWave  : 1;    // grey wave line for extended text input
     // For underlining we need to know, if a section is right in front of a
     // whole block or a fix margin section.
-    sal_Bool bSpaceStop : 1;
-    sal_Bool bSnapToGrid : 1;   // Does paragraph snap to grid?
+    bool bSpaceStop : 1;
+    bool bSnapToGrid : 1;   // Does paragraph snap to grid?
     // Paint text as if text has LTR direction, used for line numbering
-    sal_Bool bIgnoreFrmRTL : 1;
+    bool bIgnoreFrmRTL : 1;
     // GetCrsrOfst should not return the next position if screen position is
     // inside second half of bound rect, used for Accessibility
-    sal_Bool bPosMatchesBounds :1;
+    bool bPosMatchesBounds :1;
 
     SwDrawTextInfo();          // prohibited
 public:
@@ -104,7 +104,7 @@ public:
 
     SwDrawTextInfo( SwViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI,
                     const OUString &rSt, sal_Int32 nI, sal_Int32 nL,
-                    sal_uInt16 nW = 0, sal_Bool bB = sal_False )
+                    sal_uInt16 nW = 0, bool bB = false )
     {
         pFrm = NULL;
         pSh = pS;
@@ -120,11 +120,11 @@ public:
         nCursorBidiLevel = 0;
         bBullet = bB;
         pUnderFnt = 0;
-        bGreyWave = sal_False;
-        bSpaceStop = sal_False;
-        bSnapToGrid = sal_False;
-        bIgnoreFrmRTL = sal_False;
-        bPosMatchesBounds = sal_False;
+        bGreyWave = false;
+        bSpaceStop = false;
+        bSnapToGrid = false;
+        bIgnoreFrmRTL = false;
+        bPosMatchesBounds = false;
 
         // These values are initialized but have to be set explicitly via their
         // Set-function before they may be accessed by their Get-function:
@@ -140,8 +140,8 @@ public:
         nAscent = 0;
         nSperren = 0;
         nSpace = 0;
-        bUpper = sal_False;
-        bDrawSpace = sal_False;
+        bUpper = false;
+        bDrawSpace = false;
 
 #ifdef DBG_UTIL
         // these flags control whether the matching member variables have been
@@ -346,12 +346,12 @@ public:
         return nCursorBidiLevel;
     }
 
-    sal_Bool GetBullet() const
+    bool GetBullet() const
     {
         return bBullet;
     }
 
-    sal_Bool GetUpper() const
+    bool GetUpper() const
     {
 #ifdef DBG_UTIL
         OSL_ENSURE( m_bUppr, "DrawTextInfo: Undefined Upperflag" );
@@ -359,7 +359,7 @@ public:
         return bUpper;
     }
 
-    sal_Bool GetDrawSpace() const
+    bool GetDrawSpace() const
     {
 #ifdef DBG_UTIL
         OSL_ENSURE( m_bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" );
@@ -367,27 +367,27 @@ public:
         return bDrawSpace;
     }
 
-    sal_Bool GetGreyWave() const
+    bool GetGreyWave() const
     {
         return bGreyWave;
     }
 
-    sal_Bool IsSpaceStop() const
+    bool IsSpaceStop() const
     {
         return bSpaceStop;
     }
 
-    sal_Bool SnapToGrid() const
+    bool SnapToGrid() const
     {
         return bSnapToGrid;
     }
 
-    sal_Bool IsIgnoreFrmRTL() const
+    bool IsIgnoreFrmRTL() const
     {
         return bIgnoreFrmRTL;
     }
 
-    sal_Bool IsPosMatchesBounds() const
+    bool IsPosMatchesBounds() const
     {
         return bPosMatchesBounds;
     }
@@ -551,7 +551,7 @@ public:
         nCompress = nNew;
     }
 
-    void SetBullet( sal_Bool bNew )
+    void SetBullet( bool bNew )
     {
         bBullet = bNew;
     }
@@ -561,7 +561,7 @@ public:
         pUnderFnt = pULFnt;
     }
 
-    void SetUpper( sal_Bool bNew )
+    void SetUpper( bool bNew )
     {
         bUpper = bNew;
 #ifdef DBG_UTIL
@@ -569,7 +569,7 @@ public:
 #endif
     }
 
-    void SetDrawSpace( sal_Bool bNew )
+    void SetDrawSpace( bool bNew )
     {
         bDrawSpace = bNew;
 #ifdef DBG_UTIL
@@ -577,27 +577,27 @@ public:
 #endif
     }
 
-    void SetGreyWave( sal_Bool bNew )
+    void SetGreyWave( bool bNew )
     {
         bGreyWave = bNew;
     }
 
-    void SetSpaceStop( sal_Bool bNew )
+    void SetSpaceStop( bool bNew )
     {
         bSpaceStop = bNew;
     }
 
-    void SetSnapToGrid( sal_Bool bNew )
+    void SetSnapToGrid( bool bNew )
     {
         bSnapToGrid = bNew;
     }
 
-    void SetIgnoreFrmRTL( sal_Bool bNew )
+    void SetIgnoreFrmRTL( bool bNew )
     {
         bIgnoreFrmRTL = bNew;
     }
 
-    void SetPosMatchesBounds( sal_Bool bNew )
+    void SetPosMatchesBounds( bool bNew )
     {
         bPosMatchesBounds = bNew;
     }
@@ -607,7 +607,7 @@ public:
     // sets a new color at the output device if necessary if a font is passed
     // as argument, the change if made to the font otherwise the font at the
     // output device is changed returns if the font has been changed
-    sal_Bool ApplyAutoColor( Font* pFnt = 0 );
+    bool ApplyAutoColor( Font* pFnt = 0 );
 };
 
 #endif
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index a0f31ba1b9fe..5f785fd931fd 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -107,7 +107,7 @@ public:
     inline void ValidateMarkList() { FlushComeBackTimer(); }
 
     // #i99665#
-    sal_Bool IsAntiAliasing() const;
+    bool IsAntiAliasing() const;
 
     // method to replace marked/selected <SwDrawVirtObj>
     // by its reference object for delete of selection and group selection
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 09a6afbd0172..13b1db252057 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -74,7 +74,7 @@ class SwFlowFrm
 
     // helper methods for MoveSubTree()
     static SwLayoutFrm *CutTree( SwFrm* );
-    static sal_Bool   PasteTree( SwFrm *, SwLayoutFrm *, SwFrm *, SwFrm* );
+    static bool         PasteTree( SwFrm *, SwLayoutFrm *, SwFrm *, SwFrm* );
 
     /** indicates that a backward move was done over multiple pages
 
@@ -82,7 +82,7 @@ class SwFlowFrm
         pages can be skipped at the same time. In addition, it is evaluated by
         the MoveBwd() method in TabFrm.
     */
-    static sal_Bool m_bMoveBwdJump;
+    static bool m_bMoveBwdJump;
 
     /** helper method to determine previous frame for calculation of the
         upper space
@@ -114,15 +114,15 @@ protected:
     SwFlowFrm *m_pFollow;
     SwFlowFrm *m_pPrecede;
 
-    sal_Bool m_bLockJoin  :1; // if sal_True than joins (and thus deletes) are prohibited!
-    sal_Bool m_bUndersized:1; // I am smaller than needed
-    sal_Bool m_bFlyLock   :1; // stop positioning of at-character flyframes
+    bool m_bLockJoin  :1; // if sal_True than joins (and thus deletes) are prohibited!
+    bool m_bUndersized:1; // I am smaller than needed
+    bool m_bFlyLock   :1; // stop positioning of at-character flyframes
 
     // checks if forward flow makes sense to prevent infinite moves
-    inline sal_Bool IsFwdMoveAllowed();
+    inline bool IsFwdMoveAllowed();
     // #i44049# - method <CalcCntnt(..)> has to check this property.
     friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
-    sal_Bool IsKeepFwdMoveAllowed();    // like above, forward flow for Keep.
+    bool IsKeepFwdMoveAllowed();    // like above, forward flow for Keep.
 
     /** method to determine overlapping of an object that requests floating
 
@@ -133,11 +133,11 @@ protected:
     */
     sal_uInt8 BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect );
 
-    void LockJoin()   { m_bLockJoin = sal_True;  }
-    void UnlockJoin() { m_bLockJoin = sal_False; }
+    void LockJoin()   { m_bLockJoin = true;  }
+    void UnlockJoin() { m_bLockJoin = false; }
 
-    sal_Bool CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool bMovedBwd );
-    sal_Bool MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways = sal_False );
+    bool CheckMoveFwd( bool& rbMakePage, bool bKeep, bool bMovedBwd );
+    bool MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways = false );
     bool MoveBwd( bool &rbReformat );
     virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat )=0;
 
@@ -148,20 +148,20 @@ public:
     const SwFrm *GetFrm() const { return &m_rThis; }
           SwFrm *GetFrm()       { return &m_rThis; }
 
-    static sal_Bool IsMoveBwdJump() { return m_bMoveBwdJump; }
-    static void SetMoveBwdJump( sal_Bool bNew ){ m_bMoveBwdJump = bNew; }
+    static bool IsMoveBwdJump() { return m_bMoveBwdJump; }
+    static void SetMoveBwdJump( bool bNew ){ m_bMoveBwdJump = bNew; }
 
-    inline void SetUndersized( const sal_Bool bNew ) { m_bUndersized = bNew; }
-    inline sal_Bool IsUndersized()  const { return m_bUndersized; }
+    inline void SetUndersized( const bool bNew ) { m_bUndersized = bNew; }
+    inline bool IsUndersized()  const { return m_bUndersized; }
 
-    sal_Bool IsPrevObjMove() const;
+    bool IsPrevObjMove() const;
 
     /** hook tree onto new parent with minimal operations and notifications */
     void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 );
 
-    sal_Bool HasFollow() const { return m_pFollow ? sal_True : sal_False; }
-    sal_Bool IsFollow() const { return 0 != m_pPrecede; }
-    sal_Bool IsAnFollow( const SwFlowFrm *pFlow ) const;
+    bool HasFollow() const { return m_pFollow ? sal_True : sal_False; }
+    bool IsFollow() const { return 0 != m_pPrecede; }
+    bool IsAnFollow( const SwFlowFrm *pFlow ) const;
     const SwFlowFrm *GetFollow() const { return m_pFollow; }
           SwFlowFrm *GetFollow()       { return m_pFollow; }
     void SetFollow(SwFlowFrm *const pFollow);
@@ -169,18 +169,18 @@ public:
     const SwFlowFrm *GetPrecede() const { return m_pPrecede; }
           SwFlowFrm *GetPrecede()       { return m_pPrecede; }
 
-    sal_Bool IsJoinLocked() const { return m_bLockJoin; }
-    sal_Bool IsAnyJoinLocked() const { return m_bLockJoin || HasLockedFollow(); }
+    bool IsJoinLocked() const { return m_bLockJoin; }
+    bool IsAnyJoinLocked() const { return m_bLockJoin || HasLockedFollow(); }
 
-    sal_Bool IsPageBreak( sal_Bool bAct ) const;
-    sal_Bool IsColBreak( sal_Bool bAct ) const;
+    bool IsPageBreak( bool bAct ) const;
+    bool IsColBreak( bool bAct ) const;
 
     /** method to determine if a Keep needs to be considered (Breaks!) */
-    sal_Bool IsKeep( const SwAttrSet& rAttrs, bool bBreakCheck = false ) const;
+    bool IsKeep( const SwAttrSet& rAttrs, bool bBreakCheck = false ) const;
 
-    sal_Bool HasLockedFollow() const;
+    bool HasLockedFollow() const;
 
-    sal_Bool HasParaSpaceAtPages( sal_Bool bSct ) const;
+    bool HasParaSpaceAtPages( bool bSct ) const;
 
     /** method to determine the upper space hold by the frame
 
@@ -221,8 +221,8 @@ public:
 
     void CheckKeep();
 
-    void SetFlyLock( sal_Bool bNew ){ m_bFlyLock = bNew; }
-    sal_Bool IsFlyLock() const {    return m_bFlyLock; }
+    void SetFlyLock( bool bNew ){ m_bFlyLock = bNew; }
+    bool IsFlyLock() const {    return m_bFlyLock; }
 
     // Casting of a Frm into a FlowFrm (if it is one, otherwise 0)
     // These methods need to be customized in subclasses!
@@ -230,7 +230,7 @@ public:
     static const SwFlowFrm *CastFlowFrm( const SwFrm *pFrm );
 };
 
-inline sal_Bool SwFlowFrm::IsFwdMoveAllowed()
+inline bool SwFlowFrm::IsFwdMoveAllowed()
 {
     return m_rThis.GetIndPrev() != 0;
 }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 74dc31913c93..9430d976693c 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -45,10 +45,10 @@ class SwFmt;
     implemented in layout/flycnt.cxx
  */
 const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
-                              const sal_Bool bBody = sal_False );
+                              const bool bBody = false );
 
 /** calculate rectangle in that the object can be moved or rather be resized */
-sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove = sal_True );
+bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove = true );
 
 /** general base class for all free-flowing frames
 
@@ -61,7 +61,7 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
     friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld,
                         const SwRect* pOldPrt );
 
-    void InitDrawObj( sal_Bool bNotify ); // these to methods are called in the
+    void InitDrawObj( bool bNotify ); // these to methods are called in the
     void FinitDrawObj();                  // constructors
 
     void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
@@ -83,38 +83,38 @@ private:
     // the constructor call of the root object since otherwise the anchor will
     // be formatted before the root is anchored correctly to a shell and
     // because too much would be formatted as a result.
-    sal_Bool bLocked :1;
+    bool bLocked :1;
     // sal_True if the background of NotifyDTor needs to be notified at the end
     // of a MakeAll() call.
-    sal_Bool bNotifyBack :1;
+    bool bNotifyBack :1;
 
 protected:
     // Pos, PrtArea or SSize have been invalidated - they will be evaluated
     // again immediately because they have to be valid _at all time_.
     // The invalidation is tracked here so that LayAction knows about it and
     // can handle it properly. Exceptions prove the rule.
-    sal_Bool bInvalid :1;
+    bool bInvalid :1;
 
     // sal_True if the proposed height of an attribute is a minimal height
     // (this means that the frame can grow higher if needed)
-    sal_Bool bMinHeight :1;
+    bool bMinHeight :1;
     // sal_True if the fly frame could not format position/size based on its
     // attributes, e.g. because there was not enough space.
-    sal_Bool bHeightClipped :1;
-    sal_Bool bWidthClipped :1;
+    bool bHeightClipped :1;
+    bool bWidthClipped :1;
     // If sal_True call only the format after adjusting the width (CheckClip);
     // but the width will not be re-evaluated based on the attributes.
-    sal_Bool bFormatHeightOnly :1;
+    bool bFormatHeightOnly :1;
 
-    sal_Bool bInCnt :1;        ///< FLY_AS_CHAR, anchored as character
-    sal_Bool bAtCnt :1;        ///< FLY_AT_PARA, anchored at paragraph
-    sal_Bool bLayout :1;       ///< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame
-    sal_Bool bAutoPosition :1; ///< FLY_AT_CHAR, anchored at character
+    bool bInCnt :1;        ///< FLY_AS_CHAR, anchored as character
+    bool bAtCnt :1;        ///< FLY_AT_PARA, anchored at paragraph
+    bool bLayout :1;       ///< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame
+    bool bAutoPosition :1; ///< FLY_AT_CHAR, anchored at character
 
-    sal_Bool bNoShrink :1;     ///< temporary forbid shrinking to avoid loops
+    bool bNoShrink :1;     ///< temporary forbid shrinking to avoid loops
     // If sal_True, the content of the fly frame will not be deleted when it
     // is moved to an invisible layer.
-    sal_Bool bLockDeleteContent :1;
+    bool bLockDeleteContent :1;
 
     friend class SwNoTxtFrm; // is allowed to call NotifyBackground
 
@@ -125,11 +125,11 @@ protected:
     void MakePrtArea( const SwBorderAttrs &rAttrs );
     void MakeContentPos( const SwBorderAttrs &rAttrs );
 
-    void Lock()         { bLocked = sal_True; }
-    void Unlock()       { bLocked = sal_False; }
+    void Lock()         { bLocked = true; }
+    void Unlock()       { bLocked = false; }
 
-    void SetMinHeight()  { bMinHeight = sal_True; }
-    void ResetMinHeight(){ bMinHeight = sal_False; }
+    void SetMinHeight()  { bMinHeight = true; }
+    void ResetMinHeight(){ bMinHeight = false; }
 
     Size CalcRel( const SwFmtFrmSize &rSz ) const;
     SwTwips CalcAutoWidth() const;
@@ -172,11 +172,11 @@ public:
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
 #endif
 
-    SwTwips _Shrink( SwTwips, sal_Bool bTst );
-    SwTwips _Grow  ( SwTwips, sal_Bool bTst );
+    SwTwips _Shrink( SwTwips, bool bTst );
+    SwTwips _Grow  ( SwTwips, bool bTst );
     void    _Invalidate( SwPageFrm *pPage = 0 );
 
-    sal_Bool FrmSizeChg( const SwFmtFrmSize & );
+    bool FrmSizeChg( const SwFmtFrmSize & );
 
     SwFlyFrm *GetPrevLink() const { return pPrevLink; }
     SwFlyFrm *GetNextLink() const { return pNextLink; }
@@ -192,32 +192,32 @@ public:
     void NotifyDrawObj();
 
     void ChgRelPos( const Point &rAbsPos );
-    sal_Bool IsInvalid() const { return bInvalid; }
-    void Invalidate() const { ((SwFlyFrm*)this)->bInvalid = sal_True; }
-    void Validate() const { ((SwFlyFrm*)this)->bInvalid = sal_False; }
-
-    sal_Bool IsMinHeight()  const { return bMinHeight; }
-    sal_Bool IsLocked()     const { return bLocked; }
-    sal_Bool IsAutoPos()    const { return bAutoPosition; }
-    sal_Bool IsFlyInCntFrm() const { return bInCnt; }
-    sal_Bool IsFlyFreeFrm() const { return bAtCnt || bLayout; }
-    sal_Bool IsFlyLayFrm() const { return bLayout; }
-    sal_Bool IsFlyAtCntFrm() const { return bAtCnt; }
-
-    sal_Bool IsNotifyBack() const { return bNotifyBack; }
-    void SetNotifyBack()      { bNotifyBack = sal_True; }
-    void ResetNotifyBack()    { bNotifyBack = sal_False; }
-    sal_Bool IsNoShrink()   const { return bNoShrink; }
-    void SetNoShrink( sal_Bool bNew ) { bNoShrink = bNew; }
-    sal_Bool IsLockDeleteContent()  const { return bLockDeleteContent; }
-    void SetLockDeleteContent( sal_Bool bNew ) { bLockDeleteContent = bNew; }
-
-    sal_Bool IsClipped()        const   { return bHeightClipped || bWidthClipped; }
-    sal_Bool IsHeightClipped()  const   { return bHeightClipped; }
-    sal_Bool IsWidthClipped()   const   { return bWidthClipped;  }
-
-    sal_Bool IsLowerOf( const SwLayoutFrm* pUpper ) const;
-    inline sal_Bool IsUpperOf( const SwFlyFrm& _rLower ) const
+    bool IsInvalid() const { return bInvalid; }
+    void Invalidate() const { ((SwFlyFrm*)this)->bInvalid = true; }
+    void Validate() const { ((SwFlyFrm*)this)->bInvalid = false; }
+
+    bool IsMinHeight()  const { return bMinHeight; }
+    bool IsLocked()     const { return bLocked; }
+    bool IsAutoPos()    const { return bAutoPosition; }
+    bool IsFlyInCntFrm() const { return bInCnt; }
+    bool IsFlyFreeFrm() const { return bAtCnt || bLayout; }
+    bool IsFlyLayFrm() const { return bLayout; }
+    bool IsFlyAtCntFrm() const { return bAtCnt; }
+
+    bool IsNotifyBack() const { return bNotifyBack; }
+    void SetNotifyBack()      { bNotifyBack = true; }
+    void ResetNotifyBack()    { bNotifyBack = false; }
+    bool IsNoShrink()   const { return bNoShrink; }
+    void SetNoShrink( bool bNew ) { bNoShrink = bNew; }
+    bool IsLockDeleteContent()  const { return bLockDeleteContent; }
+    void SetLockDeleteContent( bool bNew ) { bLockDeleteContent = bNew; }
+
+    bool IsClipped()        const   { return bHeightClipped || bWidthClipped; }
+    bool IsHeightClipped()  const   { return bHeightClipped; }
+    bool IsWidthClipped()   const   { return bWidthClipped;  }
+
+    bool IsLowerOf( const SwLayoutFrm* pUpper ) const;
+    inline bool IsUpperOf( const SwFlyFrm& _rLower ) const
     {
         return _rLower.IsLowerOf( this );
     }
@@ -226,11 +226,11 @@ public:
 
     // #i13147# - add parameter <_bForPaint> to avoid load of
     // the graphic during paint. Default value: sal_False
-    sal_Bool GetContour( PolyPolygon&   rContour,
-                     const sal_Bool _bForPaint = sal_False ) const;
+    bool GetContour( PolyPolygon&   rContour,
+                     const bool _bForPaint = false ) const;
 
     // Paint on this shell (consider Preview, print flag, etc. recursively)?
-    static sal_Bool IsPaint( SdrObject *pObj, const SwViewShell *pSh );
+    static bool IsPaint( SdrObject *pObj, const SwViewShell *pSh );
 
     /** SwFlyFrm::IsBackgroundTransparent
 
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index b2388f3dcbd7..49dfe5b3c2b0 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -174,8 +174,8 @@ class SwFlyInCntFrm : public SwFlyFrm
 {
     Point aRef;  // relative to this point AbsPos is being calculated
 
-    sal_Bool bInvalidLayout :1;
-    sal_Bool bInvalidCntnt  :1;
+    bool bInvalidLayout :1;
+    bool bInvalidCntnt  :1;
 
 protected:
     virtual void NotifyBackground( SwPageFrm *pPage,
@@ -201,9 +201,9 @@ public:
     inline void InvalidateCntnt() const;
     inline void ValidateLayout() const;
     inline void ValidateCntnt() const;
-    sal_Bool IsInvalid() const { return (bInvalidLayout || bInvalidCntnt); }
-    sal_Bool IsInvalidLayout() const { return bInvalidLayout; }
-    sal_Bool IsInvalidCntnt() const { return bInvalidCntnt; }
+    bool IsInvalid() const { return (bInvalidLayout || bInvalidCntnt); }
+    bool IsInvalidLayout() const { return bInvalidLayout; }
+    bool IsInvalidCntnt() const { return bInvalidCntnt; }
 
     // (26.11.93, see tabfrm.hxx, but might also be valid for others)
     // For creation of a Fly after a FlyCnt was created _and_ inserted.
@@ -225,20 +225,20 @@ public:
 
 inline void SwFlyInCntFrm::InvalidateLayout() const
 {
-    ((SwFlyInCntFrm*)this)->bInvalidLayout = sal_True;
+    ((SwFlyInCntFrm*)this)->bInvalidLayout = true;
 }
 inline void SwFlyInCntFrm::InvalidateCntnt() const
 {
-    ((SwFlyInCntFrm*)this)->bInvalidCntnt = sal_True;
+    ((SwFlyInCntFrm*)this)->bInvalidCntnt = true;
 }
 
 inline void SwFlyInCntFrm::ValidateLayout() const
 {
-    ((SwFlyInCntFrm*)this)->bInvalidLayout = sal_False;
+    ((SwFlyInCntFrm*)this)->bInvalidLayout = false;
 }
 inline void SwFlyInCntFrm::ValidateCntnt() const
 {
-    ((SwFlyInCntFrm*)this)->bInvalidCntnt = sal_False;
+    ((SwFlyInCntFrm*)this)->bInvalidCntnt = false;
 }
 
 #endif
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 42cbf2600b44..b3adc89ef259 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -73,16 +73,16 @@ class SwFntObj : public SwCacheObj
     sal_uInt16 nPrtHeight;
     sal_uInt16 nPropWidth;
     sal_uInt16 nZoom;
-    sal_Bool bSymbol : 1;
-    sal_Bool bPaintBlank : 1;
+    bool bSymbol : 1;
+    bool bPaintBlank : 1;
 
     static long nPixWidth;
     static MapMode *pPixMap;
     static OutputDevice *pPixOut;
 
     void calcLinePos(SwDrawTextInfo& rInf, Point& aStart, Point& aEnd, sal_Int32 nStart,
-       sal_Int32 nWrLen, sal_Int32 nCnt, const sal_Bool bSwitchH2V, const sal_Bool bSwitchL2R,
-       long nHalfSpace, long* pKernArray, const sal_Bool bBidiPor);
+       sal_Int32 nWrLen, sal_Int32 nCnt, const bool bSwitchH2V, const bool bSwitchL2R,
+       long nHalfSpace, long* pKernArray, const bool bBidiPor);
 
 public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwFntObj)
@@ -109,7 +109,7 @@ public:
     inline OutputDevice* GetPrt() const { return pPrinter; }
     inline sal_uInt16   GetZoom() const { return nZoom; }
     inline sal_uInt16   GetPropWidth() const { return nPropWidth; }
-    inline sal_Bool     IsSymbol() const { return bSymbol; }
+    inline bool     IsSymbol() const { return bSymbol; }
 
     void   DrawText( SwDrawTextInfo &rInf );
     /// determine the TextSize (of the printer)
@@ -129,7 +129,7 @@ protected:
 public:
     SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner,
                  SwViewShell *pShell,
-                 sal_Bool bCheck = sal_False  );
+                 bool bCheck = false  );
     inline SwFntObj* Get() { return (SwFntObj*) SwCacheAccess::Get(); };
 };
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 18b23b971f5d..300e8d766b7e 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -119,8 +119,8 @@ class FillAttributes;
 
 class SwFrm;
 typedef long (SwFrm:: *SwFrmGet)() const;
-typedef sal_Bool (SwFrm:: *SwFrmMax)( long );
-typedef void (SwFrm:: *SwFrmMakePos)( const SwFrm*, const SwFrm*, sal_Bool );
+typedef bool (SwFrm:: *SwFrmMax)( long );
+typedef void (SwFrm:: *SwFrmMakePos)( const SwFrm*, const SwFrm*, bool );
 typedef long (*SwOperator)( long, long );
 typedef void (SwFrm:: *SwFrmSet)( long, long );
 
@@ -331,7 +331,7 @@ class SwFrm: public SwClient, public SfxBroadcaster
 
     void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & );
     SwFrm* _GetIndNext();
-    void SetDirFlags( sal_Bool bVert );
+    void SetDirFlags( bool bVert );
 
     const SwLayoutFrm* ImplGetNextLayoutLeaf( bool bFwd ) const;
 
@@ -341,48 +341,48 @@ protected:
     SwRect  maFrm;   // absolute position in document and size of the Frm
     SwRect  maPrt;   // position relatively to Frm and size of PrtArea
 
-    sal_uInt16 mbReverse     : 1; // Next line above/at the right side instead
+    bool mbReverse     : 1; // Next line above/at the right side instead
                                  // under/at the left side of the previous line
-    sal_uInt16 mbInvalidR2L  : 1;
-    sal_uInt16 mbDerivedR2L  : 1;
-    sal_uInt16 mbRightToLeft : 1;
-    sal_uInt16 mbInvalidVert : 1;
-    sal_uInt16 mbDerivedVert : 1;
-    sal_uInt16 mbVertical    : 1;
-
-    sal_uInt16 mbVertLR      : 1;
-    sal_uInt16 mnType        : 4;  //Who am I?
-
-    sal_Bool mbValidPos      : 1;
-    sal_Bool mbValidPrtArea  : 1;
-    sal_Bool mbValidSize     : 1;
-    sal_Bool mbValidLineNum  : 1;
-    sal_Bool mbFixSize       : 1;
+    bool mbInvalidR2L  : 1;
+    bool mbDerivedR2L  : 1;
+    bool mbRightToLeft : 1;
+    bool mbInvalidVert : 1;
+    bool mbDerivedVert : 1;
+    bool mbVertical    : 1;
+
+    bool mbVertLR      : 1;
+    sal_uInt16 mnType    : 4;  //Who am I?
+
+    bool mbValidPos      : 1;
+    bool mbValidPrtArea  : 1;
+    bool mbValidSize     : 1;
+    bool mbValidLineNum  : 1;
+    bool mbFixSize       : 1;
     // if sal_True, frame will be painted completely even content was changed
     // only partially. For CntntFrms a border (from Action) will exclusively
     // painted if <mbCompletePaint> is sal_True.
-    sal_Bool mbCompletePaint : 1;
-    sal_Bool mbRetouche      : 1; // frame is responsible for retouching
+    bool mbCompletePaint : 1;
+    bool mbRetouche      : 1; // frame is responsible for retouching
 
 protected:
-    sal_Bool mbInfInvalid    : 1;  // InfoFlags are invalid
-    sal_Bool mbInfBody       : 1;  // Frm is in document body
-    sal_Bool mbInfTab        : 1;  // Frm is in a table
-    sal_Bool mbInfFly        : 1;  // Frm is in a Fly
-    sal_Bool mbInfFtn        : 1;  // Frm is in a footnote
-    sal_Bool mbInfSct        : 1;  // Frm is in a section
-    sal_Bool mbColLocked     : 1;  // lock Grow/Shrink for column-wise section
+    bool mbInfInvalid    : 1;  // InfoFlags are invalid
+    bool mbInfBody       : 1;  // Frm is in document body
+    bool mbInfTab        : 1;  // Frm is in a table
+    bool mbInfFly        : 1;  // Frm is in a Fly
+    bool mbInfFtn        : 1;  // Frm is in a footnote
+    bool mbInfSct        : 1;  // Frm is in a section
+    bool mbColLocked     : 1;  // lock Grow/Shrink for column-wise section
                                   // or fly frames, will be set in Format
 
-    void ColLock()      { mbColLocked = sal_True; }
-    void ColUnlock()    { mbColLocked = sal_False; }
+    void ColLock()      { mbColLocked = true; }
+    void ColUnlock()    { mbColLocked = false; }
 
     void Destroy(); // for ~SwRootFrm
 
     // Only used by SwRootFrm Ctor to get 'this' into mpRoot...
     void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; }
 
-    SwPageFrm *InsertPage( SwPageFrm *pSibling, sal_Bool bFtn );
+    SwPageFrm *InsertPage( SwPageFrm *pSibling, bool bFtn );
     void PrepareMake();
     void OptPrepareMake();
     void MakePos();
@@ -393,18 +393,18 @@ protected:
 
     virtual void MakeAll() = 0;
     // adjust frames of a page
-    SwTwips AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst = sal_False );
+    SwTwips AdjustNeighbourhood( SwTwips nDiff, bool bTst = false );
 
     // change only frame size not the size of PrtArea
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) = 0;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) = 0;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) = 0;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) = 0;
 
     SwModify        *GetDep()       { return GetRegisteredInNonConst(); }
     const SwModify  *GetDep() const { return GetRegisteredIn(); }
 
     SwFrm( SwModify*, SwFrm* );
 
-    void CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_Bool bBrowse );
+    void CheckDir( sal_uInt16 nDir, bool bVert, bool bOnlyBiDi, bool bBrowse );
 
     /** enumeration for the different invalidations
         #i28701#
@@ -448,8 +448,8 @@ public:
     static void     SetCache( SwCache *pNew ) { mpCache = pNew;  }
 
     // change PrtArea size and FrmSize
-    SwTwips Shrink( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
-    SwTwips Grow  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False );
+    SwTwips Shrink( SwTwips, bool bTst = false, bool bInfo = false );
+    SwTwips Grow  ( SwTwips, bool bTst = false, bool bInfo = false );
 
     // different methods for inserting in layout tree (for performance reasons)
 
@@ -465,7 +465,7 @@ public:
     // For internal use only - who ignores this will be put in a sack and has
     // to stay there for two days
     // Does special treatment for _Get[Next|Prev]Leaf() (for tables).
-    SwLayoutFrm *GetLeaf( MakePageType eMakePage, sal_Bool bFwd );
+    SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd );
     SwLayoutFrm *GetNextLeaf   ( MakePageType eMakePage );
     SwLayoutFrm *GetNextFtnLeaf( MakePageType eMakePage );
     SwLayoutFrm *GetNextSctLeaf( MakePageType eMakePage );
@@ -474,10 +474,10 @@ public:
     SwLayoutFrm *GetPrevFtnLeaf( MakePageType eMakeFtn = MAKEPAGE_FTN );
     SwLayoutFrm *GetPrevSctLeaf( MakePageType eMakeFtn = MAKEPAGE_FTN );
     SwLayoutFrm *GetPrevCellLeaf( MakePageType eMakeFtn = MAKEPAGE_FTN );
-    const SwLayoutFrm *GetLeaf ( MakePageType eMakePage, sal_Bool bFwd,
+    const SwLayoutFrm *GetLeaf ( MakePageType eMakePage, bool bFwd,
                                  const SwFrm *pAnch ) const;
 
-    sal_Bool WrongPageDesc( SwPageFrm* pNew );
+    bool WrongPageDesc( SwPageFrm* pNew );
 
     //#i28701# - new methods to append/remove drawing objects
     void AppendDrawObj( SwAnchoredObject& _rNewObj );
@@ -495,11 +495,11 @@ public:
     virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage,
                               const SwBorderAttrs & ) const;
     void PaintBaBo( const SwRect&, const SwPageFrm *pPage = 0,
-                    const sal_Bool bLowerBorder = sal_False, const bool bOnlyTxtBackground = false ) const;
+                    const bool bLowerBorder = false, const bool bOnlyTxtBackground = false ) const;
     void PaintBackground( const SwRect&, const SwPageFrm *pPage,
                           const SwBorderAttrs &,
-                          const sal_Bool bLowerMode = sal_False,
-                          const sal_Bool bLowerBorder = sal_False,
+                          const bool bLowerMode = false,
+                          const bool bLowerBorder = false,
                           const bool bOnlyTxtBackground = false ) const;
     void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
                           const Color *pColor, const editeng::SvxBorderStyle =
@@ -512,28 +512,28 @@ public:
     // retouch, not in the area of the given Rect!
     void Retouche( const SwPageFrm *pPage, const SwRect &rRect ) const;
 
-    sal_Bool GetBackgroundBrush(
+    bool GetBackgroundBrush(
         boost::shared_ptr< FillAttributes >& rFillAttributes,
         const SvxBrushItem*& rpBrush,
         const Color*& rpColor,
         SwRect &rOrigRect,
-        sal_Bool bLowerMode ) const;
+        bool bLowerMode ) const;
 
     inline void SetCompletePaint() const;
     inline void ResetCompletePaint() const;
-    inline sal_Bool IsCompletePaint() const { return mbCompletePaint; }
+    inline bool IsCompletePaint() const { return mbCompletePaint; }
 
     inline void SetRetouche() const;
     inline void ResetRetouche() const;
-    inline sal_Bool IsRetouche() const { return mbRetouche; }
+    inline bool IsRetouche() const { return mbRetouche; }
 
     void SetInfFlags();
-    inline void InvalidateInfFlags() { mbInfInvalid = sal_True; }
+    inline void InvalidateInfFlags() { mbInfInvalid = true; }
     inline bool IsInDocBody() const;    // use InfoFlags, determine flags
-    inline sal_Bool IsInFtn() const;        // if necessary
-    inline sal_Bool IsInTab() const;
-    inline sal_Bool IsInFly() const;
-    inline sal_Bool IsInSct() const;
+    inline bool IsInFtn() const;        // if necessary
+    inline bool IsInTab() const;
+    inline bool IsInFly() const;
+    inline bool IsInSct() const;
 
     // If frame is inside a split table row, this function returns
     // the corresponding row frame in the follow table.
@@ -546,30 +546,30 @@ public:
     bool IsInBalancedSection() const;
 
     inline bool IsReverse() const { return mbReverse; }
-    inline void SetReverse( sal_Bool bNew ){ mbReverse = bNew ? 1 : 0; }
+    inline void SetReverse( bool bNew ){ mbReverse = bNew ? 1 : 0; }
     inline bool IsVertical() const;
 
-    inline sal_Bool IsVertLR() const;
-    inline sal_Bool GetVerticalFlag() const;
-    inline void SetVertical( sal_Bool bNew ){ mbVertical = bNew ? 1 : 0; }
+    inline bool IsVertLR() const;
+    inline bool GetVerticalFlag() const;
+    inline void SetVertical( bool bNew ){ mbVertical = bNew ? 1 : 0; }
 
-    inline void SetbVertLR( sal_Bool bNew ) { mbVertLR = bNew ? 1 : 0; }
-    inline void SetDerivedVert( sal_Bool bNew ){ mbDerivedVert = bNew ? 1 : 0; }
-    inline void SetInvalidVert( sal_Bool bNew) { mbInvalidVert = bNew ? 1 : 0; }
+    inline void SetbVertLR( bool bNew ) { mbVertLR = bNew ? 1 : 0; }
+    inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew ? 1 : 0; }
+    inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew ? 1 : 0; }
     inline bool IsRightToLeft() const;
-    inline sal_Bool GetRightToLeftFlag() const;
-    inline void SetRightToLeft( sal_Bool bNew ){ mbRightToLeft = bNew ? 1 : 0; }
-    inline void SetDerivedR2L( sal_Bool bNew ) { mbDerivedR2L  = bNew ? 1 : 0; }
-    inline void SetInvalidR2L( sal_Bool bNew ) { mbInvalidR2L  = bNew ? 1 : 0; }
+    inline bool GetRightToLeftFlag() const;
+    inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew ? 1 : 0; }
+    inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L  = bNew ? 1 : 0; }
+    inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L  = bNew ? 1 : 0; }
 
     void CheckDirChange();
     // returns upper left frame position for LTR and
     // upper right frame position for Asian / RTL frames
-    Point   GetFrmAnchorPos( sal_Bool bIgnoreFlysAnchoredAtThisFrame ) const;
+    Point   GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const;
 
     /** determine, if frame is moveable in given environment
 
-        method replaced 'old' method <sal_Bool IsMoveable() const>.
+        method replaced 'old' method <bool IsMoveable() const>.
         Determines, if frame is moveable in given environment. if no environment
         is given (parameter _pLayoutFrm == 0L), the movability in the actual
         environment (<this->GetUpper()) is checked.
@@ -584,7 +584,7 @@ public:
 
     // Is it permitted for the (Txt)Frm to add a footnote in the current
     // environment (not e.g. for repeating table headlines)
-    sal_Bool IsFtnAllowed() const;
+    bool IsFtnAllowed() const;
 
     virtual void  Format( const SwBorderAttrs *pAttrs = 0 );
 
@@ -594,11 +594,11 @@ public:
 
     const SwAttrSet *GetAttrSet() const;
 
-    inline sal_Bool HasFixSize() const { return mbFixSize; }
-    inline void SetFixSize( sal_Bool bNew ) { mbFixSize = bNew; }
+    inline bool HasFixSize() const { return mbFixSize; }
+    inline void SetFixSize( bool bNew ) { mbFixSize = bNew; }
 
     // check all pages (starting from the given) and correct them if needed
-    static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = sal_True, SwPageFrm** ppPrev = 0);
+    static void CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields = true, SwPageFrm** ppPrev = 0);
 
     // might return 0, with and without const
     SwFrm               *GetNext()  { return mpNext; }
@@ -608,7 +608,7 @@ public:
     SwPageFrm           *FindPageFrm();
     SwFrm               *FindColFrm();
     SwRowFrm            *FindRowFrm();
-    SwFtnBossFrm        *FindFtnBossFrm( sal_Bool bFootnotes = sal_False );
+    SwFtnBossFrm        *FindFtnBossFrm( bool bFootnotes = false );
     SwTabFrm            *ImplFindTabFrm();
     SwFtnFrm            *ImplFindFtnFrm();
     SwFlyFrm            *ImplFindFlyFrm();
@@ -628,7 +628,7 @@ public:
     inline SwCntntFrm* FindNextCnt( const bool _bInSameFtn = false );
     inline SwFrm        *FindPrev();
     inline const SwPageFrm *FindPageFrm() const;
-    inline const SwFtnBossFrm *FindFtnBossFrm( sal_Bool bFtn = sal_False ) const;
+    inline const SwFtnBossFrm *FindFtnBossFrm( bool bFtn = false ) const;
     inline const SwFrm     *FindColFrm() const;
     inline const SwFrm     *FindFooterOrHeader() const;
     inline const SwTabFrm  *FindTabFrm() const;
@@ -674,8 +674,8 @@ public:
 
     sal_uInt16 GetPhyPageNum() const;   // page number without offset
     sal_uInt16 GetVirtPageNum() const;  // page number with offset
-    sal_Bool OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
-    sal_Bool WannaRightPage() const;
+    bool OnRightPage() const { return 0 != GetPhyPageNum() % 2; };
+    bool WannaRightPage() const;
     bool OnFirstPage() const;
 
     inline const  SwLayoutFrm *GetPrevLayoutLeaf() const;
@@ -696,7 +696,7 @@ public:
     const SwRect PaintArea() const;
     // UnionFrm is the union of Frm- and PrtArea, normally identical
     // to the FrmArea except in case of negative Prt margins.
-    const SwRect UnionFrm( sal_Bool bBorder = sal_False ) const;
+    const SwRect UnionFrm( bool bBorder = false ) const;
 
     // HACK: Here we exceptionally allow direct access to members.
     // This should not delude into changing those value randomly; it is the
@@ -712,13 +712,13 @@ public:
     void SetAccTableDispose(bool bDispose) { mbIfAccTableShouldDisposing = bDispose;}
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) = 0;
 
-    void ValidateLineNum() { mbValidLineNum = sal_True; }
+    void ValidateLineNum() { mbValidLineNum = true; }
 
-    sal_Bool GetValidPosFlag()    const { return mbValidPos; }
-    sal_Bool GetValidPrtAreaFlag()const { return mbValidPrtArea; }
-    sal_Bool GetValidSizeFlag()   const { return mbValidSize; }
-    sal_Bool GetValidLineNumFlag()const { return mbValidLineNum; }
-    sal_Bool IsValid() const { return mbValidPos && mbValidSize && mbValidPrtArea; }
+    bool GetValidPosFlag()    const { return mbValidPos; }
+    bool GetValidPrtAreaFlag()const { return mbValidPrtArea; }
+    bool GetValidSizeFlag()   const { return mbValidSize; }
+    bool GetValidLineNumFlag()const { return mbValidLineNum; }
+    bool IsValid() const { return mbValidPos && mbValidSize && mbValidPrtArea; }
 
     // Only invalidate Frm
     // #i28701# - add call to method <_ActionOnInvalidation(..)>
@@ -731,7 +731,7 @@ public:
     {
         if ( mbValidSize && _InvalidationAllowed( INVALID_SIZE ) )
         {
-            mbValidSize = sal_False;
+            mbValidSize = false;
             _ActionOnInvalidation( INVALID_SIZE );
         }
     }
@@ -739,7 +739,7 @@ public:
     {
         if ( mbValidPrtArea && _InvalidationAllowed( INVALID_PRTAREA ) )
         {
-            mbValidPrtArea = sal_False;
+            mbValidPrtArea = false;
             _ActionOnInvalidation( INVALID_PRTAREA );
         }
     }
@@ -747,7 +747,7 @@ public:
     {
         if ( mbValidPos && _InvalidationAllowed( INVALID_POS ) )
         {
-            mbValidPos = sal_False;
+            mbValidPos = false;
             _ActionOnInvalidation( INVALID_POS );
         }
     }
@@ -755,7 +755,7 @@ public:
     {
         if ( mbValidLineNum && _InvalidationAllowed( INVALID_LINENUM ) )
         {
-            mbValidLineNum = sal_False;
+            mbValidLineNum = false;
             _ActionOnInvalidation( INVALID_LINENUM );
         }
     }
@@ -764,7 +764,7 @@ public:
         if ( ( mbValidSize || mbValidPrtArea || mbValidPos ) &&
              _InvalidationAllowed( INVALID_ALL ) )
         {
-            mbValidSize = mbValidPrtArea = mbValidPos = sal_False;
+            mbValidSize = mbValidPrtArea = mbValidPos = false;
             _ActionOnInvalidation( INVALID_ALL );
         }
     }
@@ -779,8 +779,8 @@ public:
     void ImplInvalidatePos();
     void ImplInvalidateLineNum();
 
-    inline void InvalidateNextPos( sal_Bool bNoFtn = sal_False );
-    void ImplInvalidateNextPos( sal_Bool bNoFtn = sal_False );
+    inline void InvalidateNextPos( bool bNoFtn = false );
+    void ImplInvalidateNextPos( bool bNoFtn = false );
 
     /** method to invalidate printing area of next frame
         #i11859#
@@ -837,9 +837,9 @@ public:
 
     // Is the Frm (or the section containing it) protected? Same for Fly in
     // Fly in ... and footnotes
-    sal_Bool IsProtected() const;
+    bool IsProtected() const;
 
-    sal_Bool IsColLocked()  const { return mbColLocked; }
+    bool IsColLocked()  const { return mbColLocked; }
 
     virtual ~SwFrm();
 
@@ -860,14 +860,14 @@ public:
     long GetPrtBottom() const;
     long GetPrtRight() const;
     long GetPrtTop() const;
-    sal_Bool SetMinLeft( long );
-    sal_Bool SetMaxBottom( long );
-    sal_Bool SetMaxRight( long );
-    sal_Bool SetMinTop( long );
-    void MakeBelowPos( const SwFrm*, const SwFrm*, sal_Bool );
-    void MakeUpperPos( const SwFrm*, const SwFrm*, sal_Bool );
-    void MakeLeftPos( const SwFrm*, const SwFrm*, sal_Bool );
-    void MakeRightPos( const SwFrm*, const SwFrm*, sal_Bool );
+    bool SetMinLeft( long );
+    bool SetMaxBottom( long );
+    bool SetMaxRight( long );
+    bool SetMinTop( long );
+    void MakeBelowPos( const SwFrm*, const SwFrm*, bool );
+    void MakeUpperPos( const SwFrm*, const SwFrm*, bool );
+    void MakeLeftPos( const SwFrm*, const SwFrm*, bool );
+    void MakeRightPos( const SwFrm*, const SwFrm*, bool );
     inline bool IsNeighbourFrm() const
         { return (GetType() & FRM_NEIGHBOUR) != 0; }
 
@@ -902,25 +902,25 @@ inline bool SwFrm::IsInDocBody() const
         ((SwFrm*)this)->SetInfFlags();
     return mbInfBody;
 }
-inline sal_Bool SwFrm::IsInFtn() const
+inline bool SwFrm::IsInFtn() const
 {
     if ( mbInfInvalid )
         ((SwFrm*)this)->SetInfFlags();
     return mbInfFtn;
 }
-inline sal_Bool SwFrm::IsInTab() const
+inline bool SwFrm::IsInTab() const
 {
     if ( mbInfInvalid )
         ((SwFrm*)this)->SetInfFlags();
     return mbInfTab;
 }
-inline sal_Bool SwFrm::IsInFly() const
+inline bool SwFrm::IsInFly() const
 {
     if ( mbInfInvalid )
         ((SwFrm*)this)->SetInfFlags();
     return mbInfFly;
 }
-inline sal_Bool SwFrm::IsInSct() const
+inline bool SwFrm::IsInSct() const
 {
     if ( mbInfInvalid )
         ((SwFrm*)this)->SetInfFlags();
@@ -929,44 +929,44 @@ inline sal_Bool SwFrm::IsInSct() const
 bool SwFrm::IsVertical() const
 {
     if( mbInvalidVert )
-        ((SwFrm*)this)->SetDirFlags( sal_True );
-    return mbVertical != 0;
+        ((SwFrm*)this)->SetDirFlags( true );
+    return mbVertical;
 }
-inline sal_Bool SwFrm::IsVertLR() const
+inline bool SwFrm::IsVertLR() const
 {
-    return mbVertLR != 0;
+    return mbVertLR;
 }
-sal_Bool SwFrm::GetVerticalFlag() const
+bool SwFrm::GetVerticalFlag() const
 {
-    return mbVertical != 0;
+    return mbVertical;
 }
 inline bool SwFrm::IsRightToLeft() const
 {
     if( mbInvalidR2L )
-        ((SwFrm*)this)->SetDirFlags( sal_False );
-    return mbRightToLeft != 0;
+        ((SwFrm*)this)->SetDirFlags( false );
+    return mbRightToLeft;
 }
-sal_Bool SwFrm::GetRightToLeftFlag() const
+bool SwFrm::GetRightToLeftFlag() const
 {
-    return mbRightToLeft != 0;
+    return mbRightToLeft;
 }
 
 inline void SwFrm::SetCompletePaint() const
 {
-    ((SwFrm*)this)->mbCompletePaint = sal_True;
+    ((SwFrm*)this)->mbCompletePaint = true;
 }
 inline void SwFrm::ResetCompletePaint() const
 {
-    ((SwFrm*)this)->mbCompletePaint = sal_False;
+    ((SwFrm*)this)->mbCompletePaint = false;
 }
 
 inline void SwFrm::SetRetouche() const
 {
-    ((SwFrm*)this)->mbRetouche = sal_True;
+    ((SwFrm*)this)->mbRetouche = true;
 }
 inline void SwFrm::ResetRetouche() const
 {
-    ((SwFrm*)this)->mbRetouche = sal_False;
+    ((SwFrm*)this)->mbRetouche = false;
 }
 
 inline SwLayoutFrm *SwFrm::GetNextLayoutLeaf()
@@ -1012,13 +1012,13 @@ inline void SwFrm::InvalidateAll()
     {
         if ( mbValidPrtArea && mbValidSize && mbValidPos  )
             ImplInvalidatePos();
-        mbValidPrtArea = mbValidSize = mbValidPos = sal_False;
+        mbValidPrtArea = mbValidSize = mbValidPos = false;
 
         // #i28701#
         _ActionOnInvalidation( INVALID_ALL );
     }
 }
-inline void SwFrm::InvalidateNextPos( sal_Bool bNoFtn )
+inline void SwFrm::InvalidateNextPos( bool bNoFtn )
 {
     if ( mpNext && !mpNext->IsSctFrm() )
         mpNext->InvalidatePos();
@@ -1062,7 +1062,7 @@ inline SwTabFrm *SwFrm::FindTabFrm()
 {
     return IsInTab() ? ImplFindTabFrm() : 0;
 }
-inline const SwFtnBossFrm *SwFrm::FindFtnBossFrm( sal_Bool bFtn ) const
+inline const SwFtnBossFrm *SwFrm::FindFtnBossFrm( bool bFtn ) const
 {
     return ((SwFrm*)this)->FindFtnBossFrm( bFtn );
 }
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index e8a3c2bd4d8f..c7e32b9dab1e 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -59,7 +59,7 @@ void DrawGraphic(
     const SwRect &rOrg,
     const SwRect &rOut,
     const sal_uInt8 nGrfNum = GRFNUM_NO,
-    const sal_Bool bConsiderBackgroundTransparency = sal_False );
+    const bool bConsiderBackgroundTransparency = false );
 bool DrawFillAttributes(
     const boost::shared_ptr< FillAttributes >& rFillAttributes,
     const SwRect& rOriginalLayoutRect,
@@ -101,7 +101,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
 
 // Get CntntNodes, create CntntFrms, and add them to LayFrm.
 void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, sal_uLong nIndex,
-                 sal_Bool bPages = sal_False, sal_uLong nEndIndex = 0,
+                 bool bPages = false, sal_uLong nEndIndex = 0,
                  SwFrm *pPrv = 0 );
 
 // Creation of frames for a specific section (uses _InsertCnt)
@@ -119,7 +119,7 @@ long CalcRowRstHeight( SwLayoutFrm *pRow );
 long CalcHeightWidthFlys( const SwFrm *pFrm );
 
 SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
-                          bool bOdd, bool bFirst, bool bInsertEmpty, sal_Bool bFtn,
+                          bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn,
                           SwFrm *pSibling );
 
 // connect Flys with page
@@ -133,7 +133,7 @@ void Notify_Background( const SdrObject* pObj,
                         SwPageFrm* pPage,
                         const SwRect& rRect,
                         const PrepareHint eHint,
-                        const sal_Bool bInva );
+                        const bool bInva );
 
 const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos );
 
@@ -152,7 +152,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout,
                        sal_uInt16 const nFrmType,
                        const Point* = 0,
                        const SwPosition *pPos = 0,
-                       const sal_Bool bCalcFrm = sal_False );
+                       const bool bCalcFrm = false );
 
 // Should extra data (reline stroke, line numbers) be painted?
 bool IsExtraData( const SwDoc *pDoc );
@@ -172,9 +172,9 @@ protected:
     const SwRect aPrt;
     SwTwips mnFlyAnchorOfst;
     SwTwips mnFlyAnchorOfstNoWrap;
-    sal_Bool     bHadFollow;
-    sal_Bool     bInvaKeep;
-    sal_Bool     bValidSize;
+    bool     bHadFollow;
+    bool     bInvaKeep;
+    bool     bValidSize;
     // #i49383#
     bool mbFrmDeleted;
 
@@ -184,7 +184,7 @@ public:
 
     const SwRect &Frm() const { return aFrm; }
     const SwRect &Prt() const { return aPrt; }
-    void SetInvaKeep() { bInvaKeep = sal_True; }
+    void SetInvaKeep() { bInvaKeep = true; }
     // #i49383#
     void FrmDeleted()
     {
@@ -194,7 +194,7 @@ public:
 
 class SwLayNotify : public SwFrmNotify
 {
-    sal_Bool bLowersComplete;
+    bool bLowersComplete;
 
     SwLayoutFrm *GetLay() { return (SwLayoutFrm*)pFrm; }
 
@@ -202,8 +202,8 @@ public:
     SwLayNotify( SwLayoutFrm *pLayFrm );
     ~SwLayNotify();
 
-    void SetLowersComplete( sal_Bool b ) { bLowersComplete = b; }
-    sal_Bool IsLowersComplete()          { return bLowersComplete; }
+    void SetLowersComplete( bool b ) { bLowersComplete = b; }
+    bool IsLowersComplete()          { return bLowersComplete; }
 };
 
 class SwFlyNotify : public SwLayNotify
@@ -264,31 +264,31 @@ class SwBorderAttrs : public SwCacheObj
     const Size            aFrmSize;
 
     // Is it a frame that can have a margin without a border?
-    sal_Bool bBorderDist  : 1;
+    bool bBorderDist  : 1;
 
     // the following bool values set the cached values to INVALID - until they
     // are calculated for the first time
-    sal_Bool bTopLine     : 1;
-    sal_Bool bBottomLine  : 1;
-    sal_Bool bLeftLine    : 1;
-    sal_Bool bRightLine   : 1;
-    sal_Bool bTop         : 1;
-    sal_Bool bBottom      : 1;
-    sal_Bool bLine        : 1;
-
-    sal_Bool bIsLine      : 1; // border on at least one side?
-
-    sal_Bool bCacheGetLine        : 1; // cache GetTopLine(), GetBottomLine()?
-    sal_Bool bCachedGetTopLine    : 1; // is GetTopLine() cached?
-    sal_Bool bCachedGetBottomLine : 1; // is GetBottomLine() cached?
+    bool bTopLine     : 1;
+    bool bBottomLine  : 1;
+    bool bLeftLine    : 1;
+    bool bRightLine   : 1;
+    bool bTop         : 1;
+    bool bBottom      : 1;
+    bool bLine        : 1;
+
+    bool bIsLine      : 1; // border on at least one side?
+
+    bool bCacheGetLine        : 1; // cache GetTopLine(), GetBottomLine()?
+    bool bCachedGetTopLine    : 1; // is GetTopLine() cached?
+    bool bCachedGetBottomLine : 1; // is GetBottomLine() cached?
     // Booleans indicate that <bJoinedWithPrev> and <bJoinedWithNext> are
     // cached and valid.
     // Caching depends on value of <bCacheGetLine>.
-    mutable sal_Bool bCachedJoinedWithPrev : 1;
-    mutable sal_Bool bCachedJoinedWithNext : 1;
+    mutable bool bCachedJoinedWithPrev : 1;
+    mutable bool bCachedJoinedWithNext : 1;
     // Booleans indicate that borders are joined with previous/next frame.
-    sal_Bool bJoinedWithPrev :1;
-    sal_Bool bJoinedWithNext :1;
+    bool bJoinedWithPrev :1;
+    bool bJoinedWithNext :1;
 
     // The cached values (un-defined until calculated for the first time)
     sal_uInt16 nTopLine,
@@ -326,11 +326,11 @@ class SwBorderAttrs : public SwCacheObj
     void _CalcJoinedWithNext( const SwFrm& _rFrm );
 
     // internal helper method for _CalcJoinedWithPrev and _CalcJoinedWithNext
-    sal_Bool _JoinWithCmp( const SwFrm& _rCallerFrm,
+    bool _JoinWithCmp( const SwFrm& _rCallerFrm,
                        const SwFrm& _rCmpFrm ) const;
 
     // Are the left and right line and the LRSpace equal?
-    sal_Bool CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
+    bool CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
                        const SwFrm *pCaller,
                        const SwFrm *pCmp ) const;
 
@@ -355,11 +355,11 @@ public:
            long CalcLeft( const SwFrm *pCaller ) const;
            long CalcRight( const SwFrm *pCaller ) const;
 
-    inline sal_Bool IsLine() const;
+    inline bool IsLine() const;
 
     inline const Size &GetSize()     const { return aFrmSize; }
 
-    inline sal_Bool IsBorderDist() const { return bBorderDist; }
+    inline bool IsBorderDist() const { return bBorderDist; }
 
     // Should upper (or lower) border be evaluated for this frame?
     // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
@@ -367,14 +367,14 @@ public:
     inline sal_uInt16 GetTopLine   ( const SwFrm& _rFrm,
                                  const SwFrm* _pPrevFrm = 0L ) const;
     inline sal_uInt16 GetBottomLine( const SwFrm& _rFrm ) const;
-    inline void   SetGetCacheLine( sal_Bool bNew ) const;
+    inline void   SetGetCacheLine( bool bNew ) const;
 
     // Accessors for cached values <bJoinedWithPrev> and <bJoinedWithPrev>
     // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if
     // borders/shadow have to be joined with previous frame.
-    sal_Bool JoinedWithPrev( const SwFrm& _rFrm,
+    bool JoinedWithPrev( const SwFrm& _rFrm,
                          const SwFrm* _pPrevFrm = 0L ) const;
-    sal_Bool JoinedWithNext( const SwFrm& _rFrm ) const;
+    bool JoinedWithNext( const SwFrm& _rFrm ) const;
 };
 
 class SwBorderAttrAccess : public SwCacheAccess
@@ -397,10 +397,10 @@ class SwOrderIter
 {
     const SwPageFrm *pPage;
     const SdrObject *pCurrent;
-    const sal_Bool bFlysOnly;
+    const bool bFlysOnly;
 
 public:
-    SwOrderIter( const SwPageFrm *pPage, sal_Bool bFlysOnly = sal_True );
+    SwOrderIter( const SwPageFrm *pPage, bool bFlysOnly = true );
 
     void             Current( const SdrObject *pNew ) { pCurrent = pNew; }
     const SdrObject *Current()    const { return pCurrent; }
@@ -414,21 +414,21 @@ public:
 class StackHack
 {
     static sal_uInt8 nCnt;
-    static sal_Bool bLocked;
+    static bool bLocked;
 
 public:
     StackHack()
     {
         if ( ++StackHack::nCnt > 50 )
-            StackHack::bLocked = sal_True;
+            StackHack::bLocked = true;
     }
     ~StackHack()
     {
         if ( --StackHack::nCnt < 5 )
-            StackHack::bLocked = sal_False;
+            StackHack::bLocked = false;
     }
 
-    static sal_Bool IsLocked()  { return StackHack::bLocked; }
+    static bool IsLocked()  { return StackHack::bLocked; }
     static sal_uInt8 Count()        { return StackHack::nCnt; }
 };
 
@@ -450,14 +450,14 @@ inline sal_uInt16 SwBorderAttrs::GetBottomLine( const SwFrm& _rFrm ) const
         const_cast<SwBorderAttrs*>(this)->_GetBottomLine( _rFrm );
     return nGetBottomLine;
 }
-inline void SwBorderAttrs::SetGetCacheLine( sal_Bool bNew ) const
+inline void SwBorderAttrs::SetGetCacheLine( bool bNew ) const
 {
     ((SwBorderAttrs*)this)->bCacheGetLine = bNew;
     ((SwBorderAttrs*)this)->bCachedGetBottomLine =
-    ((SwBorderAttrs*)this)->bCachedGetTopLine = sal_False;
+    ((SwBorderAttrs*)this)->bCachedGetTopLine = false;
     // invalidate cache for values <bJoinedWithPrev> and <bJoinedWithNext>
-    bCachedJoinedWithPrev = sal_False;
-    bCachedJoinedWithNext = sal_False;
+    bCachedJoinedWithPrev = false;
+    bCachedJoinedWithNext = false;
 }
 
 inline sal_uInt16 SwBorderAttrs::CalcTopLine() const
@@ -496,7 +496,7 @@ inline sal_uInt16 SwBorderAttrs::CalcBottom() const
         ((SwBorderAttrs*)this)->_CalcBottom();
     return nBottom;
 }
-inline sal_Bool SwBorderAttrs::IsLine() const
+inline bool SwBorderAttrs::IsLine() const
 {
     if ( bLine )
         ((SwBorderAttrs*)this)->_IsLine();
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 0df137ddbade..e51e12468a54 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -76,16 +76,16 @@ public:
 
     // footnote interface
     void AppendFtn( SwCntntFrm *, SwTxtFtn * );
-    void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, sal_Bool bPrep = sal_True );
+    void RemoveFtn( const SwCntntFrm *, const SwTxtFtn *, bool bPrep = true );
     static       SwFtnFrm     *FindFtn( const SwCntntFrm *, const SwTxtFtn * );
                  SwFtnContFrm *FindFtnCont();
     inline const SwFtnContFrm *FindFtnCont() const;
            const SwFtnFrm     *FindFirstFtn( SwCntntFrm* ) const;
-                 SwFtnContFrm *FindNearestFtnCont( sal_Bool bDontLeave = sal_False );
+                 SwFtnContFrm *FindNearestFtnCont( bool bDontLeave = false );
 
     void ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *,
                        SwCntntFrm *pNew );
-    void RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock = sal_False,
+    void RearrangeFtns( const SwTwips nDeadLine, const bool bLock = false,
                         const SwTxtFtn *pAttr = 0 );
 
     // Set DeadLine (in document coordinates) so that the text formatter can
@@ -105,7 +105,7 @@ public:
     static void _CollectFtns( const SwCntntFrm*   _pRef,
                               SwFtnFrm*           _pFtn,
                               SwFtnFrms&          _rFtnArr,
-                              const sal_Bool      _bCollectOnlyPreviousFtns = sal_False,
+                              const bool      _bCollectOnlyPreviousFtns = false,
                               const SwFtnBossFrm* _pRefFtnBossFrm = NULL);
     // The parameter <_bCollectOnlyPreviousFtns> controls if only footnotes
     // that are positioned before the footnote boss-frame <this> have to be
@@ -113,8 +113,8 @@ public:
     void    CollectFtns( const SwCntntFrm* _pRef,
                          SwFtnBossFrm*     _pOld,
                          SwFtnFrms&        _rFtnArr,
-                         const sal_Bool    _bCollectOnlyPreviousFtns = sal_False );
-    void    _MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc = sal_False );
+                         const bool    _bCollectOnlyPreviousFtns = false );
+    void    _MoveFtns( SwFtnFrms &rFtnArr, bool bCalc = false );
     void    MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
                       SwTxtFtn *pAttr );
 
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 59fdb07eac22..3f6ef0bdd719 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -38,8 +38,8 @@ public:
 
     const SwFtnFrm* FindFootNote() const;
 
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual void    Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
     virtual void    PaintBorder( const SwRect &, const SwPageFrm *pPage,
                                  const SwBorderAttrs & ) const SAL_OVERRIDE;
@@ -59,13 +59,13 @@ class SwFtnFrm: public SwLayoutFrm
     SwTxtFtn     *pAttr;        // footnote attribute (for recognition)
 
     // if true paragraphs in this footnote are NOT permitted to flow backwards
-    sal_Bool bBackMoveLocked : 1;
+    bool bBackMoveLocked : 1;
     // #i49383# - control unlock of position of lower anchored objects.
     bool mbUnlockPosOfLowerObjs : 1;
 #ifdef DBG_UTIL
 protected:
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 #endif
 
 public:
@@ -76,7 +76,7 @@ public:
 
     virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
 
-    sal_Bool operator<( const SwTxtFtn* pTxtFtn ) const;
+    bool operator<( const SwTxtFtn* pTxtFtn ) const;
 
 #ifdef DBG_UTIL
     const SwCntntFrm *GetRef() const;
@@ -103,13 +103,13 @@ public:
 
     void InvalidateNxtFtnCnts( SwPageFrm* pPage );
 
-    void LockBackMove()     { bBackMoveLocked = sal_True; }
-    void UnlockBackMove()   { bBackMoveLocked = sal_False;}
-    sal_Bool IsBackMoveLocked() { return bBackMoveLocked; }
+    void LockBackMove()     { bBackMoveLocked = true; }
+    void UnlockBackMove()   { bBackMoveLocked = false;}
+    bool IsBackMoveLocked() { return bBackMoveLocked; }
 
     // prevents that the last content deletes the SwFtnFrm as well (Cut())
-    inline void ColLock()       { mbColLocked = sal_True; }
-    inline void ColUnlock()     { mbColLocked = sal_False; }
+    inline void ColLock()       { mbColLocked = true; }
+    inline void ColUnlock()     { mbColLocked = false; }
 
     // #i49383#
     inline void UnlockPosOfLowerObjs()
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 776c772998b5..650113cae0d1 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -28,15 +28,15 @@ class SwHeadFootFrm : public SwLayoutFrm
 protected:
     void FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs);
     void FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs);
-    inline sal_Bool GetEatSpacing() const; // in hffrm.cxx
+    inline bool GetEatSpacing() const; // in hffrm.cxx
 
 public:
     SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType);
     virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
     virtual SwTwips GrowFrm( SwTwips,
-                             sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+                             bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual SwTwips ShrinkFrm( SwTwips,
-                               sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+                               bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
 };
 
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 6cdd2924ae5c..ac87a66bd084 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -69,52 +69,52 @@ class SwLayAction
     sal_uInt16 nCheckPageNum; //CheckPageDesc() was delayed if != USHRT_MAX
                           // check from this page on
 
-    sal_Bool bPaint;        // painting or only formatting?
-    sal_Bool bComplete;     //Alles bis zum sichtbaren Bereich Formatieren oder
+    bool bPaint;        // painting or only formatting?
+    bool bComplete;     //Alles bis zum sichtbaren Bereich Formatieren oder
                         // or only the visible area?
-    sal_Bool bCalcLayout;   //Vollstaendige Reformatierung?
-    sal_Bool bAgain;        //Zur automatisch wiederholten Action wenn Seiten
+    bool bCalcLayout;   //Vollstaendige Reformatierung?
+    bool bAgain;        //Zur automatisch wiederholten Action wenn Seiten
                         //geloscht werden.
-    sal_Bool bNextCycle;    //Wiederaufsetzen bei der ersten Ungueltigen Seite.
-    sal_Bool bInput;        //Zum Abbrechen der Verarbeitung wenn ein Input anliegt.
-    sal_Bool bIdle;         //True wenn die Layaction vom Idler ausgeloest wurde.
-    sal_Bool bReschedule;   //Soll das Reschedule - abhaengig vom Progress -
+    bool bNextCycle;    //Wiederaufsetzen bei der ersten Ungueltigen Seite.
+    bool bInput;        //Zum Abbrechen der Verarbeitung wenn ein Input anliegt.
+    bool bIdle;         //True wenn die Layaction vom Idler ausgeloest wurde.
+    bool bReschedule;   //Soll das Reschedule - abhaengig vom Progress -
                         //gerufen werden?
-    sal_Bool bCheckPages;   //CheckPageDescs() ausfuehren oder verzoegern.
-    sal_Bool bUpdateExpFlds;//Wird gesetzt wenn nach dem Formatierien noch eine
+    bool bCheckPages;   //CheckPageDescs() ausfuehren oder verzoegern.
+    bool bUpdateExpFlds;//Wird gesetzt wenn nach dem Formatierien noch eine
                         //Runde fuer den ExpFld laufen muss.
-    sal_Bool bBrowseActionStop; //Action fruehzeitig beenden (per bInput) und den
+    bool bBrowseActionStop; //Action fruehzeitig beenden (per bInput) und den
                             //Rest dem Idler ueberlassen.
-    sal_Bool bWaitAllowed;      //Wartecursor erlaubt?
+    bool bWaitAllowed;      //Wartecursor erlaubt?
     bool bPaintExtraData;   //Anzeige von Zeilennumerierung o. ae. eingeschaltet?
-    sal_Bool bActionInProgress; // wird in Action() anfangs gesetzt und zum Schluss geloescht
+    bool bActionInProgress; // wird in Action() anfangs gesetzt und zum Schluss geloescht
 
     // OD 14.04.2003 #106346# - new flag for content formatting on interrupt.
-    sal_Bool    mbFormatCntntOnInterrupt;
+    bool    mbFormatCntntOnInterrupt;
 
 #ifdef _LAYACT_CXX
 
     void PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
                      const SwRect &rOldRect, long nOldBottom );
-    sal_Bool PaintWithoutFlys( const SwRect &, const SwCntntFrm *,
+    bool PaintWithoutFlys( const SwRect &, const SwCntntFrm *,
                            const SwPageFrm * );
-    inline sal_Bool _PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
+    inline bool _PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
                              const SwRect & );
 
-    sal_Bool FormatLayout( SwLayoutFrm *, sal_Bool bAddRect = sal_True );
-    sal_Bool FormatLayoutTab( SwTabFrm *, sal_Bool bAddRect = sal_True );
-    sal_Bool FormatCntnt( const SwPageFrm* pPage );
+    bool FormatLayout( SwLayoutFrm *, bool bAddRect = true );
+    bool FormatLayoutTab( SwTabFrm *, bool bAddRect = true );
+    bool FormatCntnt( const SwPageFrm* pPage );
     void _FormatCntnt( const SwCntntFrm* pCntnt,
                        const SwPageFrm* pPage );
-    sal_Bool IsShortCut( SwPageFrm *& );
+    bool IsShortCut( SwPageFrm *& );
 
-    sal_Bool TurboAction();
-    sal_Bool _TurboAction( const SwCntntFrm * );
+    bool TurboAction();
+    bool _TurboAction( const SwCntntFrm * );
     void InternalAction();
 
     SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage );
 
-    sal_Bool RemoveEmptyBrowserPages();
+    bool RemoveEmptyBrowserPages();
 
     inline void CheckIdleEnd();
     inline sal_uLong GetStartTicks() { return nStartTicks; }
@@ -126,35 +126,35 @@ public:
     ~SwLayAction();
 
 #ifdef _LAYACT_CXX
-    void SetIdle            ( sal_Bool bNew )   { bIdle = bNew; }
-    void SetCheckPages      ( sal_Bool bNew )   { bCheckPages = bNew; }
-    void SetBrowseActionStop(sal_Bool bNew  )   { bBrowseActionStop = bNew; }
-    void SetNextCycle       ( sal_Bool bNew )   { bNextCycle = bNew; }
-
-    sal_Bool IsWaitAllowed()        const       { return bWaitAllowed; }
-    sal_Bool IsNextCycle()          const       { return bNextCycle; }
-    sal_Bool IsInput()              const       { return bInput; }
-    sal_Bool IsWait()               const       { return 0 != pWait;  }
-    sal_Bool IsPaint()              const       { return bPaint; }
-    sal_Bool IsIdle()               const       { return bIdle;  }
-    sal_Bool IsReschedule()         const       { return bReschedule;  }
+    void SetIdle            ( bool bNew )   { bIdle = bNew; }
+    void SetCheckPages      ( bool bNew )   { bCheckPages = bNew; }
+    void SetBrowseActionStop( bool bNew )   { bBrowseActionStop = bNew; }
+    void SetNextCycle       ( bool bNew )   { bNextCycle = bNew; }
+
+    bool IsWaitAllowed()        const       { return bWaitAllowed; }
+    bool IsNextCycle()          const       { return bNextCycle; }
+    bool IsInput()              const       { return bInput; }
+    bool IsWait()               const       { return 0 != pWait;  }
+    bool IsPaint()              const       { return bPaint; }
+    bool IsIdle()               const       { return bIdle;  }
+    bool IsReschedule()         const       { return bReschedule;  }
     bool IsPaintExtraData()     const       { return bPaintExtraData;}
-    sal_Bool IsInterrupt()        const { return IsInput(); }
+    bool IsInterrupt()          const       { return IsInput(); }
 
     sal_uInt16 GetInputType()    const { return nInputType; }
 #endif
 
     // adjusting Action to the wanted behaviour
-    void SetPaint       ( sal_Bool bNew )   { bPaint = bNew; }
-    void SetComplete    ( sal_Bool bNew )   { bComplete = bNew; }
-    void SetStatBar     ( sal_Bool bNew );
+    void SetPaint       ( bool bNew )   { bPaint = bNew; }
+    void SetComplete    ( bool bNew )   { bComplete = bNew; }
+    void SetStatBar     ( bool bNew );
     void SetInputType   ( sal_uInt16 nNew ) { nInputType = nNew; }
-    void SetCalcLayout  ( sal_Bool bNew )   { bCalcLayout = bNew; }
-    void SetReschedule  ( sal_Bool bNew )   { bReschedule = bNew; }
-    void SetWaitAllowed ( sal_Bool bNew )   { bWaitAllowed = bNew; }
+    void SetCalcLayout  ( bool bNew )   { bCalcLayout = bNew; }
+    void SetReschedule  ( bool bNew )   { bReschedule = bNew; }
+    void SetWaitAllowed ( bool bNew )   { bWaitAllowed = bNew; }
 
-    void SetAgain()         { bAgain = sal_True; }
-    void SetUpdateExpFlds() {bUpdateExpFlds = sal_True; }
+    void SetAgain()         { bAgain = true; }
+    void SetUpdateExpFlds() {bUpdateExpFlds = true; }
 
     inline void SetCheckPageNum( sal_uInt16 nNew );
     inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { nCheckPageNum = nNew; }
@@ -162,13 +162,13 @@ public:
     void Action();  // here it begins
     void Reset();   // back to CTor-defaults
 
-    sal_Bool IsAgain()      const { return bAgain; }
-    sal_Bool IsComplete()   const { return bComplete; }
-    sal_Bool IsExpFlds()    const { return bUpdateExpFlds; }
-    sal_Bool IsCalcLayout() const { return bCalcLayout;  }
-    sal_Bool IsCheckPages() const { return bCheckPages;  }
-    sal_Bool IsBrowseActionStop() const { return bBrowseActionStop; }
-    sal_Bool IsActionInProgress() const { return bActionInProgress; }
+    bool IsAgain()      const { return bAgain; }
+    bool IsComplete()   const { return bComplete; }
+    bool IsExpFlds()    const { return bUpdateExpFlds; }
+    bool IsCalcLayout() const { return bCalcLayout;  }
+    bool IsCheckPages() const { return bCheckPages;  }
+    bool IsBrowseActionStop() const { return bBrowseActionStop; }
+    bool IsActionInProgress() const { return bActionInProgress; }
 
     sal_uInt16 GetCheckPageNum() const { return nCheckPageNum; }
 
@@ -177,9 +177,9 @@ public:
 
     // #i28701# - method is now public;
     // delete 2nd parameter, because its not used;
-    sal_Bool FormatLayoutFly( SwFlyFrm * );
+    bool FormatLayoutFly( SwFlyFrm * );
     // #i28701# - method is now public
-    sal_Bool _FormatFlyCntnt( const SwFlyFrm * );
+    bool _FormatFlyCntnt( const SwFlyFrm * );
 
 };
 
@@ -190,8 +190,8 @@ class SwLayIdle
     SwViewImp  *pImp;           // Hier Meldet sich der Idler an und ab.
     SwCntntNode *pCntntNode;    // Hier wird die aktuelle Cursorposition
     sal_Int32  nTxtPos;        // zwischengespeichert.
-    sal_Bool        bPageValid;     // Konnte die Seite alles validiert werden?
-    sal_Bool        bAllValid;      // Konnte alles validiert werden?
+    bool        bPageValid;     // Konnte die Seite alles validiert werden?
+    bool        bAllValid;      // Konnte alles validiert werden?
 
 #ifdef DBG_UTIL
     bool m_bIndicator;
@@ -204,8 +204,8 @@ class SwLayIdle
 #endif
 
     enum IdleJobType{ ONLINE_SPELLING, AUTOCOMPLETE_WORDS, WORD_COUNT, SMART_TAGS };
-    sal_Bool _DoIdleJob( const SwCntntFrm*, IdleJobType );
-    sal_Bool DoIdleJob( IdleJobType, sal_Bool bVisAreaOnly );
+    bool _DoIdleJob( const SwCntntFrm*, IdleJobType );
+    bool DoIdleJob( IdleJobType, bool bVisAreaOnly );
 
 #endif
 
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index 2ea98d4709d2..3cd5be70271c 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -50,7 +50,7 @@ public:
     void Write( SvStream &rStream, const SwDoc& rDoc );
 
     void ClearImpl();
-    sal_Bool IsLocked() const { return nLockCount > 0; }
+    bool IsLocked() const { return nLockCount > 0; }
     sal_uInt16& GetLockCount() { return nLockCount; }
     SwLayCacheImpl *LockImpl()
         { if( nLockCount & 0x8000 ) return NULL;
@@ -60,7 +60,7 @@ public:
     void UnlockImpl() { --nLockCount; }
 
 #ifdef DBG_UTIL
-    sal_Bool CompareLayout( const SwDoc& rDoc ) const;
+    bool CompareLayout( const SwDoc& rDoc ) const;
 #endif
 };
 #endif
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index a5f1e5147253..28e2bd28b649 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -56,10 +56,10 @@ protected:
     SwFrm           *pLower;
     std::vector<SwAnchoredObject*> aVertPosOrientFrmsFor;
 
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 
-    long CalcRel( const SwFmtFrmSize &rSz, sal_Bool bWidth ) const;
+    long CalcRel( const SwFmtFrmSize &rSz, bool bWidth ) const;
 
 public:
     // --> #i28701#
@@ -72,10 +72,10 @@ public:
         //Proportionale Groessenanpassung der untergeordneten.
     void ChgLowersProp( const Size& rOldSize );
 
-    void AdjustColumns( const SwFmtCol *pCol, sal_Bool bAdjustAttributes );
+    void AdjustColumns( const SwFmtCol *pCol, bool bAdjustAttributes );
 
     void ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
-        const sal_Bool bChgFtn = sal_False );
+        const bool bChgFtn = false );
 
         //Painted die Column-Trennlinien fuer die innenliegenden Columns.
     void PaintColLines( const SwRect &, const SwFmtCol &,
@@ -91,11 +91,11 @@ public:
 
         //sucht den dichtesten Cntnt zum SPoint, wird bei Seiten, Flys und Cells
         //benutzt wenn GetCrsrOfst versagt hat.
-    const SwCntntFrm* GetCntntPos( Point &rPoint, const sal_Bool bDontLeave,
-                                   const sal_Bool bBodyOnly = sal_False,
-                                   const sal_Bool bCalc = sal_False,
+    const SwCntntFrm* GetCntntPos( Point &rPoint, const bool bDontLeave,
+                                   const bool bBodyOnly = false,
+                                   const bool bCalc = false,
                                    const SwCrsrMoveState *pCMS = 0,
-                                   const sal_Bool bDefaultExpand = sal_True ) const;
+                                   const bool bDefaultExpand = true ) const;
 
     SwLayoutFrm( SwFrmFmt*, SwFrm* );
     virtual ~SwLayoutFrm();
@@ -115,7 +115,7 @@ public:
     // investigated for sections.
     const SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false ) const;
     inline SwFrm *ContainsAny( const bool _bInvestigateFtnForSections = false );
-    sal_Bool IsAnLower( const SwFrm * ) const;
+    bool IsAnLower( const SwFrm * ) const;
 
     virtual const SwFrmFmt *GetFmt() const;
     virtual       SwFrmFmt *GetFmt();
@@ -124,8 +124,8 @@ public:
     //Verschieben der Ftns aller Lower - ab dem StartCntnt.
     //sal_True wenn mindestens eine Ftn verschoben wurde.
     //Ruft das Update der Seitennummer wenn bFtnNums gesetzt ist.
-    sal_Bool MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
-                        SwFtnBossFrm *pNewBoss, const sal_Bool bFtnNums );
+    bool MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
+                        SwFtnBossFrm *pNewBoss, const bool bFtnNums );
 
     // --> #i28701# - change purpose of method and its name
     // --> #i44016# - add parameter <_bUnlockPosOfObjs> to
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index ac55613aaaff..c961bd8a72fa 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -44,7 +44,7 @@ class SwLayouter
     SwEndnoter* pEndnoter;
     SwLooping* pLooping;
     void _CollectEndnotes( SwSectionFrm* pSect );
-    sal_Bool StartLooping( SwPageFrm* pPage );
+    bool StartLooping( SwPageFrm* pPage );
 
     // --> #i28701#
     SwMovedFwdFrmsByObjPos* mpMovedFwdFrms;
@@ -104,8 +104,8 @@ public:
     void LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm );
 
     static void CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect );
-    static sal_Bool Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn );
-    static sal_Bool StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage );
+    static bool Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn );
+    static bool StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage );
 
     // --> #i28701#
     static void ClearMovedFwdFrms( const SwDoc& _rDoc );
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 1c84b86987b7..da4922741519 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -107,7 +107,7 @@ void _RestFlyInRange( _SaveFlyArr& rArr, const SwNodeIndex& rSttIdx,
                       const SwNodeIndex* pInsPos );
 void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr );
 void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
-                       _SaveFlyArr& rArr, sal_Bool bMoveAllFlys );
+                       _SaveFlyArr& rArr, bool bMoveAllFlys );
 
 void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
                     const SwNodeIndex& rPtNdIdx );
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 89de8533e131..b794164da41b 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -67,7 +67,7 @@ public:
 
     SwFrm *GetFrm( const Point* pDocPos = 0,
                     const SwPosition *pPos = 0,
-                    const sal_Bool bCalcFrm = sal_True ) const;
+                    const bool bCalcFrm = true ) const;
 };
 
 #endif
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index 2a2f7671578f..08516da98326 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -38,7 +38,7 @@ public:
     const OUString& GetURL()      const { return aURL; }
     const OUString& GetTarget()   const { return aTarget; }
     const SwRect& GetRect()     const { return aRect; }
-    sal_Bool operator==( const SwURLNote& rSwURLNote ) const
+    bool operator==( const SwURLNote& rSwURLNote ) const
     { return aRect == rSwURLNote.aRect; }
 };
 
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index b0ede4481686..8eb6dbeae76b 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -56,10 +56,10 @@ public:
     const Size &GetGrfSize() const  { return GetSize(); }
     void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const;
 
-    sal_Bool IsTransparent() const;
+    bool IsTransparent() const;
 
     void StopAnimation( OutputDevice* = 0 ) const;
-    sal_Bool HasAnimation()  const;
+    bool HasAnimation()  const;
 
     // Routine for the graphics cache
     sal_uInt16 GetWeight() { return nWeight; }
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 78be9917370f..c80601f85caf 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -54,19 +54,19 @@ class SwPageFrm: public SwFtnBossFrm
 
     sal_uInt16  nPhyPageNum;        //Physikalische Seitennummer.
 
-    sal_Bool bInvalidCntnt      :1;
-    sal_Bool bInvalidLayout     :1;
-    sal_Bool bInvalidFlyCntnt   :1;
-    sal_Bool bInvalidFlyLayout  :1;
-    sal_Bool bInvalidFlyInCnt   :1;
-    sal_Bool bFtnPage           :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
-    sal_Bool bEmptyPage         :1; //Dies ist eine explizite Leerseite
-    sal_Bool bEndNotePage       :1; //'Fussnotenseite' fuer Endnoten
-    sal_Bool bInvalidSpelling   :1; //Das Online-Spelling ist gefordert
-    sal_Bool bInvalidSmartTags :1;  //checking for smarttags is needed
-    sal_Bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren
-    sal_Bool bInvalidWordCount  :1;
-    sal_Bool bHasGrid           :1; // Grid for Asian layout
+    bool bInvalidCntnt      :1;
+    bool bInvalidLayout     :1;
+    bool bInvalidFlyCntnt   :1;
+    bool bInvalidFlyLayout  :1;
+    bool bInvalidFlyInCnt   :1;
+    bool bFtnPage           :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
+    bool bEmptyPage         :1; //Dies ist eine explizite Leerseite
+    bool bEndNotePage       :1; //'Fussnotenseite' fuer Endnoten
+    bool bInvalidSpelling   :1; //Das Online-Spelling ist gefordert
+    bool bInvalidSmartTags :1;  //checking for smarttags is needed
+    bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren
+    bool bInvalidWordCount  :1;
+    bool bHasGrid           :1; // Grid for Asian layout
 
     static const sal_Int8 mnShadowPxWidth;
 
@@ -141,13 +141,13 @@ public:
     //Spezialisiertes GetCntntPos() fuer Felder in Rahmen.
     void GetCntntPosition( const Point &rPt, SwPosition &rPos ) const;
 
-    sal_Bool IsEmptyPage() const { return bEmptyPage; } //explizite Leerseite.
+    bool IsEmptyPage() const { return bEmptyPage; } //explizite Leerseite.
 
     void    UpdateFtnNum();
 
     //Immer nach dem Paste rufen. Erzeugt die Seitengeb. Rahmen und Formatiert
     //generischen Inhalt.
-    void PreparePage( sal_Bool bFtn );
+    void PreparePage( bool bFtn );
 
     //Schickt an alle ContentFrames ein Prepare wg. geaenderter Registervorlage
     void PrepareRegisterChg();
@@ -168,9 +168,9 @@ public:
     virtual void Cut() SAL_OVERRIDE;
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
     virtual void CheckDirection( bool bVert ) SAL_OVERRIDE;
-    void CheckGrid( sal_Bool bInvalidate );
+    void CheckGrid( bool bInvalidate );
     void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const;
-    sal_Bool HasGrid() const { return bHasGrid; }
+    bool HasGrid() const { return bHasGrid; }
 
     void PaintDecorators( ) const;
     virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
@@ -183,10 +183,10 @@ public:
     void RefreshSubsidiary( const SwRect& ) const;
 
     //Fussnotenschnittstelle
-    sal_Bool IsFtnPage() const                                  { return bFtnPage; }
-    sal_Bool IsEndNotePage() const                              { return bEndNotePage; }
-    void SetFtnPage( sal_Bool b )                               { bFtnPage = b; }
-    void SetEndNotePage( sal_Bool b )                           { bEndNotePage = b; }
+    bool IsFtnPage() const                                  { return bFtnPage; }
+    bool IsEndNotePage() const                              { return bEndNotePage; }
+    void SetFtnPage( bool b )                               { bFtnPage = b; }
+    void SetEndNotePage( bool b )                           { bEndNotePage = b; }
 
     inline  sal_uInt16 GetPhyPageNum() const        { return nPhyPageNum;}
     inline  void SetPhyPageNum( sal_uInt16 nNum )   { nPhyPageNum = nNum;}
@@ -213,19 +213,19 @@ public:
     inline void ValidateSmartTags() const;
     inline void ValidateAutoCompleteWords() const;
     inline void ValidateWordCount() const;
-    inline sal_Bool IsInvalid() const;
-    inline sal_Bool IsInvalidFly() const;
-    sal_Bool IsRightShadowNeeded() const;
-    sal_Bool IsLeftShadowNeeded() const;
-    sal_Bool IsInvalidFlyLayout() const { return bInvalidFlyLayout; }
-    sal_Bool IsInvalidFlyCntnt() const { return bInvalidFlyCntnt; }
-    sal_Bool IsInvalidFlyInCnt() const { return bInvalidFlyInCnt; }
-    sal_Bool IsInvalidLayout() const { return bInvalidLayout; }
-    sal_Bool IsInvalidCntnt() const { return (bInvalidCntnt || bInvalidFlyInCnt); }
-    sal_Bool IsInvalidSpelling() const { return bInvalidSpelling; }
-    sal_Bool IsInvalidSmartTags() const { return bInvalidSmartTags; }
-    sal_Bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; }
-    sal_Bool IsInvalidWordCount() const { return bInvalidWordCount; }
+    inline bool IsInvalid() const;
+    inline bool IsInvalidFly() const;
+    bool IsRightShadowNeeded() const;
+    bool IsLeftShadowNeeded() const;
+    bool IsInvalidFlyLayout() const { return bInvalidFlyLayout; }
+    bool IsInvalidFlyCntnt() const { return bInvalidFlyCntnt; }
+    bool IsInvalidFlyInCnt() const { return bInvalidFlyInCnt; }
+    bool IsInvalidLayout() const { return bInvalidLayout; }
+    bool IsInvalidCntnt() const { return (bInvalidCntnt || bInvalidFlyInCnt); }
+    bool IsInvalidSpelling() const { return bInvalidSpelling; }
+    bool IsInvalidSmartTags() const { return bInvalidSmartTags; }
+    bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; }
+    bool IsInvalidWordCount() const { return bInvalidWordCount; }
 
     /** SwPageFrm::GetDrawBackgrdColor
 
@@ -348,84 +348,84 @@ inline const SwCntntFrm *SwPageFrm::FindLastBodyCntnt() const
 }
 inline void SwPageFrm::InvalidateFlyLayout() const
 {
-    ((SwPageFrm*)this)->bInvalidFlyLayout = sal_True;
+    ((SwPageFrm*)this)->bInvalidFlyLayout = true;
 }
 inline void SwPageFrm::InvalidateFlyCntnt() const
 {
-    ((SwPageFrm*)this)->bInvalidFlyCntnt = sal_True;
+    ((SwPageFrm*)this)->bInvalidFlyCntnt = true;
 }
 inline void SwPageFrm::InvalidateFlyInCnt() const
 {
-    ((SwPageFrm*)this)->bInvalidFlyInCnt = sal_True;
+    ((SwPageFrm*)this)->bInvalidFlyInCnt = true;
 }
 inline void SwPageFrm::InvalidateLayout() const
 {
-    ((SwPageFrm*)this)->bInvalidLayout = sal_True;
+    ((SwPageFrm*)this)->bInvalidLayout = true;
 }
 inline void SwPageFrm::InvalidateCntnt() const
 {
-    ((SwPageFrm*)this)->bInvalidCntnt = sal_True;
+    ((SwPageFrm*)this)->bInvalidCntnt = true;
 }
 inline void SwPageFrm::InvalidateSpelling() const
 {
-    ((SwPageFrm*)this)->bInvalidSpelling = sal_True;
+    ((SwPageFrm*)this)->bInvalidSpelling = true;
 }
 
 inline void SwPageFrm::InvalidateSmartTags() const
 {
-   ((SwPageFrm*)this)->bInvalidSmartTags = sal_True;
+   ((SwPageFrm*)this)->bInvalidSmartTags = true;
 }
 inline void SwPageFrm::InvalidateAutoCompleteWords() const
 {
-    ((SwPageFrm*)this)->bInvalidAutoCmplWrds = sal_True;
+    ((SwPageFrm*)this)->bInvalidAutoCmplWrds = true;
 }
 inline void SwPageFrm::InvalidateWordCount() const
 {
-    ((SwPageFrm*)this)->bInvalidWordCount = sal_True;
+    ((SwPageFrm*)this)->bInvalidWordCount = true;
 }
 inline void SwPageFrm::ValidateFlyLayout() const
 {
-    ((SwPageFrm*)this)->bInvalidFlyLayout = sal_False;
+    ((SwPageFrm*)this)->bInvalidFlyLayout = false;
 }
 inline void SwPageFrm::ValidateFlyCntnt() const
 {
-    ((SwPageFrm*)this)->bInvalidFlyCntnt = sal_False;
+    ((SwPageFrm*)this)->bInvalidFlyCntnt = false;
 }
 inline void SwPageFrm::ValidateFlyInCnt() const
 {
-    ((SwPageFrm*)this)->bInvalidFlyInCnt = sal_False;
+    ((SwPageFrm*)this)->bInvalidFlyInCnt = false;
 }
 inline void SwPageFrm::ValidateLayout() const
 {
-    ((SwPageFrm*)this)->bInvalidLayout = sal_False;
+    ((SwPageFrm*)this)->bInvalidLayout = false;
 }
 inline void SwPageFrm::ValidateCntnt() const
 {
-    ((SwPageFrm*)this)->bInvalidCntnt = sal_False;
+    ((SwPageFrm*)this)->bInvalidCntnt = false;
 }
 inline void SwPageFrm::ValidateSpelling() const
 {
-    ((SwPageFrm*)this)->bInvalidSpelling = sal_False;
+    ((SwPageFrm*)this)->bInvalidSpelling = false;
 }
 
 inline void SwPageFrm::ValidateSmartTags() const
 {
-   ((SwPageFrm*)this)->bInvalidSmartTags = sal_False;
+   ((SwPageFrm*)this)->bInvalidSmartTags = false;
 }
 inline void SwPageFrm::ValidateAutoCompleteWords() const
 {
-    ((SwPageFrm*)this)->bInvalidAutoCmplWrds = sal_False;
+    ((SwPageFrm*)this)->bInvalidAutoCmplWrds = false;
 }
 inline void SwPageFrm::ValidateWordCount() const
 {
-    ((SwPageFrm*)this)->bInvalidWordCount = sal_False;
+    ((SwPageFrm*)this)->bInvalidWordCount = false;
 }
 
-inline sal_Bool SwPageFrm::IsInvalid() const
+inline bool SwPageFrm::IsInvalid() const
 {
     return (bInvalidCntnt || bInvalidLayout || bInvalidFlyInCnt);
 }
-inline sal_Bool SwPageFrm::IsInvalidFly() const
+inline bool SwPageFrm::IsInvalidFly() const
 {
     return bInvalidFlyLayout || bInvalidFlyCntnt;
 }
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index adb659025c26..59ee1716a270 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -44,24 +44,24 @@ bool GoInCntntCellsSkipHidden( SwPaM&, SwMoveFn);
 const SwTxtAttr* GetFrwrdTxtHint( const SwpHints&, sal_uInt16&, sal_Int32 );
 const SwTxtAttr* GetBkwrdTxtHint( const SwpHints&, sal_uInt16&, sal_Int32 );
 
-sal_Bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
-sal_Bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
-SW_DLLPUBLIC SwCntntNode* GoNextNds( SwNodeIndex * pIdx, sal_Bool );
-SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, sal_Bool );
+bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
+bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
+SW_DLLPUBLIC SwCntntNode* GoNextNds( SwNodeIndex * pIdx, bool );
+SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
 
 // --------- Funktionsdefinitionen fuer die SwCrsrShell --------------
 
-sal_Bool GoPrevPara( SwPaM&, SwPosPara);
-sal_Bool GoCurrPara( SwPaM&, SwPosPara);
-sal_Bool GoNextPara( SwPaM&, SwPosPara);
-sal_Bool GoPrevSection( SwPaM&, SwPosSection);
-sal_Bool GoCurrSection( SwPaM&, SwPosSection);
-sal_Bool GoNextSection( SwPaM&, SwPosSection);
+bool GoPrevPara( SwPaM&, SwPosPara);
+bool GoCurrPara( SwPaM&, SwPosPara);
+bool GoNextPara( SwPaM&, SwPosPara);
+bool GoPrevSection( SwPaM&, SwPosSection);
+bool GoCurrSection( SwPaM&, SwPosSection);
+bool GoNextSection( SwPaM&, SwPosSection);
 
 // ------------ Typedefiniton fuer Funktionen ----------------------
 
-typedef sal_Bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
-typedef SwCntntNode* (*GoNds)( SwNodeIndex*, sal_Bool );
+typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
+typedef SwCntntNode* (*GoNds)( SwNodeIndex*, bool );
 typedef void (*GoDoc)( SwPosition* );
 typedef void (*GoSection)( SwPosition* );
 typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
@@ -83,7 +83,7 @@ struct SwMoveFnCollection
 };
 
 // --------- Funktionsdefinitionen fuers Suchen --------------
-SwCntntNode* GetNode( SwPaM&, sal_Bool&, SwMoveFn, sal_Bool bInReadOnly = sal_False );
+SwCntntNode* GetNode( SwPaM&, bool&, SwMoveFn, bool bInReadOnly = false );
 
 #endif
 
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index a70d40e63a19..c89686fe08fb 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -51,16 +51,16 @@ class SwRetrievedInputStreamDataManager
         {
             boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
             com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
-            sal_Bool mbIsStreamReadOnly;
+            bool mbIsStreamReadOnly;
 
             tData()
                 : mpThreadConsumer(),
-                  mbIsStreamReadOnly( sal_False )
+                  mbIsStreamReadOnly( false )
             {};
 
             tData( boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
                 : mpThreadConsumer( pThreadConsumer ),
-                  mbIsStreamReadOnly( sal_False )
+                  mbIsStreamReadOnly( false )
             {};
         };
 
@@ -70,7 +70,7 @@ class SwRetrievedInputStreamDataManager
 
         void PushData( const tDataKey nDataKey,
                        com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
-                       const sal_Bool bIsStreamReadOnly );
+                       const bool bIsStreamReadOnly );
 
         bool PopData( const tDataKey nDataKey,
                       tData& rData );
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index fa955a0a62ae..f1c6ea2a730e 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -75,16 +75,16 @@ class SwRootFrm: public SwLayoutFrm
 
     static SwLayVout     *pVout;
     static bool           bInPaint;     //Schutz gegen doppelte Paints.
-    static sal_Bool           bNoVirDev;    //Bei SystemPaints kein virt. Device
-
-    sal_Bool    bCheckSuperfluous   :1; //Leere Seiten suchen?
-    sal_Bool    bIdleFormat         :1; //Idle-Formatierer anwerfen?
-    sal_Bool    bBrowseWidthValid   :1; //Ist nBrowseWidth gueltig?
-    sal_Bool    bTurboAllowed       :1;
-    sal_Bool    bAssertFlyPages     :1; //Ggf. weitere Seiten fuer Flys einfuegen?
-    sal_Bool    bIsVirtPageNum      :1; //gibt es eine virtuelle Seitennummer ?
-    sal_Bool    bIsNewLayout        :1; //Layout geladen oder neu erzeugt.
-    sal_Bool    bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht
+    static bool           bNoVirDev;    //Bei SystemPaints kein virt. Device
+
+    bool    bCheckSuperfluous   :1; //Leere Seiten suchen?
+    bool    bIdleFormat         :1; //Idle-Formatierer anwerfen?
+    bool    bBrowseWidthValid   :1; //Ist nBrowseWidth gueltig?
+    bool    bTurboAllowed       :1;
+    bool    bAssertFlyPages     :1; //Ggf. weitere Seiten fuer Flys einfuegen?
+    bool    bIsVirtPageNum      :1; //gibt es eine virtuelle Seitennummer ?
+    bool    bIsNewLayout        :1; //Layout geladen oder neu erzeugt.
+    bool    bCallbackActionEnabled:1; //Keine Action in Benachrichtung erwuenscht
                                     //siehe dcontact.cxx, ::Changed()
     bool        bLayoutFreezed;
 
@@ -156,9 +156,9 @@ public:
     void AllRemoveFtns() ;
     void AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const;
     //Virtuelles Device ausgeben (z.B. wenn Animationen ins Spiel kommen)
-    static sal_Bool FlushVout();
+    static bool FlushVout();
     //Clipping sparen, wenn im Vout eh genau das Cliprechteck ausgegeben wird
-    static sal_Bool HasSameRect( const SwRect& rRect );
+    static bool HasSameRect( const SwRect& rRect );
 
     SwRootFrm( SwFrmFmt*, SwViewShell* );
     virtual ~SwRootFrm();
@@ -173,7 +173,7 @@ public:
     //Der ChangeLinkd der CrsrShell (UI-Benachrichtigung) wird im EndAllAction
     //automatisch gecallt.
     void StartAllAction();
-    void EndAllAction( sal_Bool bVirDev = sal_False );
+    void EndAllAction( bool bVirDev = false );
 
     // fuer bestimmte UNO-Aktionen (Tabellencursor) ist es notwendig, dass alle Actions
     // kurzfristig zurueckgesetzt werden. Dazu muss sich jede SwViewShell ihren alten Action-zaehler
@@ -190,8 +190,8 @@ public:
 
     virtual void Paint( SwRect const&,
                         SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 #ifdef DBG_UTIL
     virtual void Cut() SAL_OVERRIDE;
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) SAL_OVERRIDE;
@@ -199,13 +199,13 @@ public:
 
     virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE;
 
-    Point  GetNextPrevCntntPos( const Point &rPoint, sal_Bool bNext ) const;
+    Point  GetNextPrevCntntPos( const Point &rPoint, bool bNext ) const;
 
     virtual Size ChgSize( const Size& aNewSize ) SAL_OVERRIDE;
 
     void SetIdleFlags()
     {
-        bIdleFormat = sal_True;
+        bIdleFormat = true;
 
         SwViewShell* lcl_pCurrShell = GetCurrShell();
         // May be NULL if called from SfxBaseModel::dispose
@@ -213,8 +213,8 @@ public:
         if (lcl_pCurrShell != NULL)
             lcl_pCurrShell->GetDoc()->StartBackgroundJobs();
     }
-    sal_Bool IsIdleFormat()  const { return bIdleFormat; }
-    void ResetIdleFormat()     { bIdleFormat = sal_False; }
+    bool IsIdleFormat()  const { return bIdleFormat; }
+    void ResetIdleFormat()     { bIdleFormat = false; }
 
     bool IsNeedGrammarCheck() const         { return mbNeedGrammarCheck; }
     void SetNeedGrammarCheck( bool bVal )
@@ -232,9 +232,9 @@ public:
     }
 
     //Sorgt dafuer, dass alle gewuenschten Seitengebunden Flys eine Seite finden
-    void SetAssertFlyPages() { bAssertFlyPages = sal_True; }
+    void SetAssertFlyPages() { bAssertFlyPages = true; }
     void AssertFlyPages();
-    sal_Bool IsAssertFlyPages()  { return bAssertFlyPages; }
+    bool IsAssertFlyPages()  { return bAssertFlyPages; }
 
     //Stellt sicher, dass ab der uebergebenen Seite auf allen Seiten die
     //Seitengebundenen Rahmen auf der richtigen Seite (Seitennummer) stehen.
@@ -252,8 +252,8 @@ public:
     void InvalidateAllObjPos();
 
     //Ueberfluessige Seiten entfernen.
-    void SetSuperfluous()      { bCheckSuperfluous = sal_True; }
-    sal_Bool IsSuperfluous() const { return bCheckSuperfluous; }
+    void SetSuperfluous()      { bCheckSuperfluous = true; }
+    bool IsSuperfluous() const { return bCheckSuperfluous; }
     void RemoveSuperfluous();
 
     //abfragen/setzen der aktuellen Seite und der Gesamtzahl der Seiten.
@@ -264,9 +264,9 @@ public:
     sal_uInt16  GetPageNum() const      { return nPhyPageNums; }
     void    DecrPhyPageNums()       { --nPhyPageNums; }
     void    IncrPhyPageNums()       { ++nPhyPageNums; }
-    sal_Bool    IsVirtPageNum() const   { return bIsVirtPageNum; }
-    inline  void SetVirtPageNum( const sal_Bool bOf ) const;
-    sal_Bool    IsDummyPage( sal_uInt16 nPageNum ) const;
+    bool    IsVirtPageNum() const   { return bIsVirtPageNum; }
+    inline  void SetVirtPageNum( const bool bOf ) const;
+    bool    IsDummyPage( sal_uInt16 nPageNum ) const;
 
     // Point rPt: The point that should be used to find the page
     // Size pSize: If given, we return the (first) page that overlaps with the
@@ -277,16 +277,16 @@ public:
 
     void CalcFrmRects(
         SwShellCrsr&,
-        const sal_Bool bIsTblSel );
+        const bool bIsTblSel );
 
     // Calculates the cells included from the current selection
     // false: There was no result because of an invalid layout
     // true: Everything worked fine.
     bool MakeTblCrsrs( SwTableCursor& );
 
-    void DisallowTurbo()  const { ((SwRootFrm*)this)->bTurboAllowed = sal_False; }
-    void ResetTurboFlag() const { ((SwRootFrm*)this)->bTurboAllowed = sal_True; }
-    sal_Bool IsTurboAllowed() const { return bTurboAllowed; }
+    void DisallowTurbo()  const { ((SwRootFrm*)this)->bTurboAllowed = false; }
+    void ResetTurboFlag() const { ((SwRootFrm*)this)->bTurboAllowed = true; }
+    bool IsTurboAllowed() const { return bTurboAllowed; }
     void SetTurbo( const SwCntntFrm *pCntnt ) { pTurbo = pCntnt; }
     void ResetTurbo() { pTurbo = 0; }
     const SwCntntFrm *GetTurbo() { return pTurbo; }
@@ -295,23 +295,23 @@ public:
     void UpdateFtnNums();           //nur bei Seitenweiser Nummerierung!
 
     //Alle Fussnoten (nicht etwa die Referenzen) entfernen.
-    void RemoveFtns( SwPageFrm *pPage = 0, sal_Bool bPageOnly = sal_False,
-                     sal_Bool bEndNotes = sal_False );
-    void CheckFtnPageDescs( sal_Bool bEndNote );
+    void RemoveFtns( SwPageFrm *pPage = 0, bool bPageOnly = false,
+                     bool bEndNotes = false );
+    void CheckFtnPageDescs( bool bEndNote );
 
     const SwPageFrm *GetLastPage() const { return pLastPage; }
           SwPageFrm *GetLastPage()       { return pLastPage; }
 
     static bool IsInPaint() { return bInPaint; }
 
-    static void SetNoVirDev( const sal_Bool bNew ) { bNoVirDev = bNew; }
+    static void SetNoVirDev( const bool bNew ) { bNoVirDev = bNew; }
 
     inline long GetBrowseWidth() const;
-    void SetBrowseWidth( long n ) { bBrowseWidthValid = sal_True; nBrowseWidth = n;}
+    void SetBrowseWidth( long n ) { bBrowseWidthValid = true; nBrowseWidth = n;}
     inline void InvalidateBrowseWidth();
 
-    sal_Bool IsNewLayout() const { return bIsNewLayout; }
-    void ResetNewLayout()    { bIsNewLayout = sal_False;}
+    bool IsNewLayout() const { return bIsNewLayout; }
+    void ResetNewLayout()    { bIsNewLayout = false;}
 
     // Hier werden leere SwSectionFrms zur Zerstoerung angemeldet
     // und spaeter zerstoert oder wieder abgemeldet
@@ -322,10 +322,10 @@ public:
     bool IsInDelList( SwSectionFrm* pSct ) const;
 #endif
 
-    void SetCallbackActionEnabled( sal_Bool b ) { bCallbackActionEnabled = b; }
-    sal_Bool IsCallbackActionEnabled() const    { return bCallbackActionEnabled; }
+    void SetCallbackActionEnabled( bool b ) { bCallbackActionEnabled = b; }
+    bool IsCallbackActionEnabled() const    { return bCallbackActionEnabled; }
 
-    sal_Bool IsAnyShellAccessible() const { return nAccessibleShells > 0; }
+    bool IsAnyShellAccessible() const { return nAccessibleShells > 0; }
     void AddAccessibleShell() { ++nAccessibleShells; }
     void RemoveAccessibleShell() { --nAccessibleShells; }
 
@@ -367,7 +367,7 @@ inline void SwRootFrm::InvalidateBrowseWidth()
         ImplInvalidateBrowseWidth();
 }
 
-inline  void SwRootFrm::SetVirtPageNum( const sal_Bool bOf) const
+inline  void SwRootFrm::SetVirtPageNum( const bool bOf) const
 {
     ((SwRootFrm*)this)->bIsVirtPageNum = bOf;
 }
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index bb03e0165f35..f4943a45147e 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -31,8 +31,8 @@ class SwRowFrm: public SwLayoutFrm
 {
     virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
         //Aendern nur die Framesize, nicht die PrtArea-SSize
-    virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 
     const SwTableLine *pTabLine;
     SwRowFrm* pFollowRow;
@@ -65,7 +65,7 @@ public:
 
     //Passt die Zellen auf die aktuelle Hoehe an, invalidiert die Zellen
     //wenn die Direction nicht der Hoehe entspricht.
-    void AdjustCells( const SwTwips nHeight, const sal_Bool bHeight );
+    void AdjustCells( const SwTwips nHeight, const bool bHeight );
 
     SwRowFrm* GetFollowRow() const { return pFollowRow; }
     void SetFollowRow( SwRowFrm* pNew ) { pFollowRow = pNew; }
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 26e04ee1151e..aa6f22452654 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -45,10 +45,10 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
 
     void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
                       SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
-    void _Cut( sal_Bool bRemove );
+    void _Cut( bool bRemove );
     // Is there a FtnContainer?
     // An empty sectionfrm without FtnCont is superfluous
-    sal_Bool IsSuperfluous() const { return !ContainsAny() && !ContainsFtnCont(); }
+    bool IsSuperfluous() const { return !ContainsAny() && !ContainsFtnCont(); }
     void CalcFtnAtEndFlag();
     void CalcEndAtEndFlag();
     const SwSectionFmt* _GetEndSectFmt() const;
@@ -62,7 +62,7 @@ protected:
 
 public:
     SwSectionFrm( SwSection &, SwFrm* );                 //Inhalt wird nicht erzeugt!
-    SwSectionFrm( SwSectionFrm &, sal_Bool bMaster );//_Nur_ zum Erzeugen von Master/Follows
+    SwSectionFrm( SwSectionFrm &, bool bMaster );//_Nur_ zum Erzeugen von Master/Follows
     virtual ~SwSectionFrm();
 
     void Init();
@@ -81,49 +81,49 @@ public:
     inline const SwCntntFrm *FindLastCntnt( sal_uInt8 nMode = 0 ) const;
     inline SwSection* GetSection() { return pSection; }
     inline const SwSection* GetSection() const { return pSection; }
-    inline void ColLock()       { mbColLocked = sal_True; }
-    inline void ColUnlock()     { mbColLocked = sal_False; }
+    inline void ColLock()       { mbColLocked = true; }
+    inline void ColUnlock()     { mbColLocked = false; }
 
     void CalcFtnCntnt();
     void SimpleFormat();
-    sal_Bool IsDescendantFrom( const SwSectionFmt* pSect ) const;
-    sal_Bool HasToBreak( const SwFrm* pFrm ) const;
+    bool IsDescendantFrom( const SwSectionFmt* pSect ) const;
+    bool HasToBreak( const SwFrm* pFrm ) const;
     void MergeNext( SwSectionFrm* pNxt );
     //Zerlegt den pFrm umgebenden SectionFrm in zwei Teile,
     //pFrm an den Anfang des 2. Teils
-    sal_Bool SplitSect( SwFrm* pFrm, sal_Bool bApres );
-    void DelEmpty( sal_Bool bRemove );  // wie Cut(), Follow-Verkettung wird aber mitgepflegt
-    sal_Bool IsToIgnore() const         // Keine Groesse, kein Inhalt, muss ignoriert werden
+    bool SplitSect( SwFrm* pFrm, bool bApres );
+    void DelEmpty( bool bRemove );  // wie Cut(), Follow-Verkettung wird aber mitgepflegt
+    bool IsToIgnore() const         // Keine Groesse, kein Inhalt, muss ignoriert werden
     { return !Frm().Height() && !ContainsCntnt(); }
     SwFtnContFrm* ContainsFtnCont( const SwFtnContFrm* pCont = NULL ) const;
-    sal_Bool Growable() const;
-    SwTwips _Shrink( SwTwips, sal_Bool bTst );
-    SwTwips _Grow  ( SwTwips, sal_Bool bTst );
+    bool Growable() const;
+    SwTwips _Shrink( SwTwips, bool bTst );
+    SwTwips _Grow  ( SwTwips, bool bTst );
 
     // A sectionfrm has to maximize, if he has a follow or a ftncontainer at
     // the end of the page. A superfluous follow will be ignored,
     // if bCheckFollow is set.
-    sal_Bool ToMaximize( sal_Bool bCheckFollow ) const;
-    inline sal_Bool _ToMaximize() const
-        { if( !pSection ) return sal_False; return ToMaximize( sal_False ); }
-    sal_Bool MoveAllowed( const SwFrm* ) const;
-    sal_Bool CalcMinDiff( SwTwips& rMinDiff ) const;
+    bool ToMaximize( bool bCheckFollow ) const;
+    inline bool _ToMaximize() const
+        { if( !pSection ) return false; return ToMaximize( false ); }
+    bool MoveAllowed( const SwFrm* ) const;
+    bool CalcMinDiff( SwTwips& rMinDiff ) const;
     // Uebergibt man kein bOverSize bzw. sal_False, so ist der Returnwert
     // >0 fuer Undersized-Frames, ==0 sonst.
     // Uebergibt man sal_True, so kann es auch einen negativen Returnwert geben,
     // wenn der SectionFrm nicht vollstaendig ausgefuellt ist, was z.B. bei
     // SectionFrm mit Follow meist vorkommt. Benoetigt wird dies im
     // FormatWidthCols, um "Luft" aus den Spalten zu lassen.
-    long Undersize( sal_Bool bOverSize = sal_False );
+    long Undersize( bool bOverSize = false );
     // Groesse an die Umgebung anpassen
-    void _CheckClipping( sal_Bool bGrow, sal_Bool bMaximize );
+    void _CheckClipping( bool bGrow, bool bMaximize );
 
     void InvalidateFtnPos();
     void CollectEndnotes( SwLayouter* pLayouter );
     const SwSectionFmt* GetEndSectFmt() const
         { if( IsEndnAtEnd() ) return _GetEndSectFmt(); return NULL; }
 
-    static void MoveCntntAndDelete( SwSectionFrm* pDel, sal_Bool bSave );
+    static void MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave );
 
     bool IsBalancedSection() const;
 
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index b07ca6796756..263493d129cb 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -36,9 +36,9 @@ public:
     OUString aShort;                    // Short name
     OUString aLong;                     // Long name
     OUString aPackageName;         // Package name
-    sal_Bool bIsOnlyTxtFlagInit : 1;        // ist das Flag gueltig?
-    sal_Bool bIsOnlyTxt : 1;                // unformatted text
-    sal_Bool bInPutMuchBlocks : 1;          // put serveral block entries
+    bool bIsOnlyTxtFlagInit : 1;        // ist das Flag gueltig?
+    bool bIsOnlyTxt : 1;                // unformatted text
+    bool bInPutMuchBlocks : 1;          // put serveral block entries
 
     SwBlockName( const OUString& rShort, const OUString& rLong );
     SwBlockName( const OUString& rShort, const OUString& rLong, const OUString& rPackageName );
@@ -64,11 +64,11 @@ protected:
     Time aTimeModified;
     SwDoc* pDoc;                        // Austauschdokument
     sal_uInt16 nCur;                        // aktueller Index
-    sal_Bool bReadOnly : 1;
-    sal_Bool bInPutMuchBlocks : 1;          // put serveral block entries
-    sal_Bool bInfoChanged : 1;              // any Info of TextBlock is changed
+    bool bReadOnly : 1;
+    bool bInPutMuchBlocks : 1;          // put serveral block entries
+    bool bInfoChanged : 1;              // any Info of TextBlock is changed
 
-    SwImpBlocks( const OUString&, sal_Bool = sal_False );
+    SwImpBlocks( const OUString&, bool = false );
     virtual ~SwImpBlocks();
 
     static short GetFileType( const OUString& );
@@ -81,8 +81,8 @@ protected:
 
     virtual void   ClearDoc();                  // Doc-Inhalt loeschen
     SwPaM* MakePaM();                   // PaM ueber Doc aufspannen
-    virtual void   AddName( const OUString&, const OUString&, sal_Bool bOnlyTxt = sal_False );
-    sal_Bool   IsFileChanged() const;
+    virtual void   AddName( const OUString&, const OUString&, bool bOnlyTxt = false );
+    bool   IsFileChanged() const;
     void   Touch();
 
 public:
@@ -96,7 +96,7 @@ public:
 
     OUString GetFileName() const {return aFile;}   // phys. Dateinamen liefern
     void SetName( const OUString& rName )          // logic name
-        { aName = rName; bInfoChanged = sal_True; }
+        { aName = rName; bInfoChanged = true; }
     OUString GetName( void )
         { return aName; }
 
@@ -113,17 +113,17 @@ public:
     virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) = 0;
     virtual sal_uLong MakeBlockList() = 0;
 
-    virtual sal_uLong OpenFile( sal_Bool bReadOnly = sal_True ) = 0;
+    virtual sal_uLong OpenFile( bool bReadOnly = true ) = 0;
     virtual void  CloseFile() = 0;
 
-    virtual sal_Bool IsOnlyTextBlock( const OUString& rShort ) const;
+    virtual bool IsOnlyTextBlock( const OUString& rShort ) const;
 
     virtual sal_uLong GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl,
-                                 sal_Bool bFileAlreadyOpen = sal_False );
+                                 bool bFileAlreadyOpen = false );
     virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
                                  const SvxMacroTableDtor& rMacroTbl,
-                                 sal_Bool bFileAlreadyOpen = sal_False );
-    virtual sal_Bool PutMuchEntries( sal_Bool bOn );
+                                 bool bFileAlreadyOpen = false );
+    virtual bool PutMuchEntries( bool bOn );
 };
 
 #endif
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 7b2ea25953b7..c4eee1d91a29 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -103,12 +103,12 @@ public:
     void Flush( const sal_uInt8 nPercent = 100 );
 
     //bToTop == sal_False -> Keine LRU-Umsortierung!
-    SwCacheObj *Get( const void *pOwner, const sal_Bool bToTop = sal_True );
+    SwCacheObj *Get( const void *pOwner, const bool bToTop = true );
     SwCacheObj *Get( const void *pOwner, const sal_uInt16 nIndex,
-                     const sal_Bool bToTop = sal_True );
+                     const bool bToTop = true );
     void ToTop( SwCacheObj *pObj );
 
-    sal_Bool Insert( SwCacheObj *pNew );
+    bool Insert( SwCacheObj *pNew );
     void Delete( const void *pOwner );
 //  void Delete( const void *pOwner, const sal_uInt16 nIndex );
 
@@ -168,12 +168,12 @@ public:
     virtual ~SwCacheObj();
 
     inline const void *GetOwner() const { return pOwner; }
-    inline sal_Bool IsOwner( const void *pNew ) const;
+    inline bool IsOwner( const void *pNew ) const;
 
     inline sal_uInt16 GetCachePos() const { return nCachePos; }
     inline void Invalidate()          { pOwner = 0; }
 
-    inline sal_Bool IsLocked() const { return 0 != nLock; }
+    inline bool IsLocked() const { return 0 != nLock; }
 
 #ifdef DBG_UTIL
     void Lock();
@@ -211,7 +211,7 @@ protected:
 
     inline SwCacheObj *Get();
 
-    inline SwCacheAccess( SwCache &rCache, const void *pOwner, sal_Bool bSeek = sal_True );
+    inline SwCacheAccess( SwCache &rCache, const void *pOwner, bool bSeek = true );
     inline SwCacheAccess( SwCache &rCache, const void *pOwner, const sal_uInt16 nIndex );
 
 public:
@@ -240,7 +240,7 @@ inline void SwCache::DecreaseMax( const sal_uInt16 nSub )
 #endif
 }
 
-inline sal_Bool SwCacheObj::IsOwner( const void *pNew ) const
+inline bool SwCacheObj::IsOwner( const void *pNew ) const
 {
     return pOwner && pOwner == pNew;
 }
@@ -253,7 +253,7 @@ inline SwCacheObj *SwCache::Next( SwCacheObj *pCacheObj)
         return NULL;
 }
 
-inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, sal_Bool bSeek ) :
+inline SwCacheAccess::SwCacheAccess( SwCache &rC, const void *pOwn, bool bSeek ) :
     rCache( rC ),
     pObj( 0 ),
     pOwner( pOwn )
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 1c77cf92a8ba..bee664a32ad5 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -68,13 +68,13 @@ class SwSubFont : public SvxFont
 
     short _CheckKerning( );
 
-    sal_Bool ChgFnt( SwViewShell *pSh, OutputDevice& rOut );
-    sal_Bool IsSymbol( SwViewShell *pSh );
+    bool ChgFnt( SwViewShell *pSh, OutputDevice& rOut );
+    bool IsSymbol( SwViewShell *pSh );
     sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut );
     sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut );
     Size _GetTxtSize( SwDrawTextInfo& rInf );
     Size GetCapitalSize( SwDrawTextInfo& rInf );
-    void _DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey );
+    void _DrawText( SwDrawTextInfo &rInf, const bool bGrey );
     void DrawCapital( SwDrawTextInfo &rInf );
     void DrawStretchCapital( SwDrawTextInfo &rInf );
     void DoOnCapitals( SwDoCapitals &rDo );
@@ -91,11 +91,11 @@ class SwSubFont : public SvxFont
     inline void SetOverline( const FontUnderline eOverline );
     inline void SetStrikeout( const FontStrikeout eStrikeout );
     inline void SetItalic( const FontItalic eItalic );
-    inline void SetOutline( const sal_Bool bOutline );
-    inline void SetVertical( const sal_uInt16 nDir, const sal_Bool bVertFormat );
-    inline void SetShadow( const sal_Bool bShadow );
+    inline void SetOutline( const bool bOutline );
+    inline void SetVertical( const sal_uInt16 nDir, const bool bVertFormat );
+    inline void SetShadow( const bool bShadow );
     inline void SetAutoKern( const sal_uInt8 nAutoKern );
-    inline void SetWordLineMode( const sal_Bool bWordLineMode );
+    inline void SetWordLineMode( const bool bWordLineMode );
     inline void SetEmphasisMark( const FontEmphasisMark eValue );
     inline void SetRelief( const FontRelief eNew );
 
@@ -157,15 +157,15 @@ class SwFont
     sal_uInt8   nActual;        // actual font (Latin, CJK or CTL)
 
     // switch for the font-extensions
-    sal_Bool bNoHyph        :1;  // SwTxtNoHyphenHere: no separator
-    sal_Bool bBlink         :1;  // blinking font
-    sal_Bool bPaintBlank    :1;  // blanks not with DrawRect
-    sal_Bool bFntChg        :1;
-    sal_Bool bOrgChg        :1;  // nOrgHeight/Ascent are invalid
-    sal_Bool bURL           :1;
-    sal_Bool bPaintWrong    :1;  // flag for spelling mistakes
-    sal_Bool bGreyWave      :1;  // for the extended TextInput: gray waveline
-    sal_Bool bNoColReplace  :1;  // Replacement without colormanipulation
+    bool bNoHyph        :1;  // SwTxtNoHyphenHere: no separator
+    bool bBlink         :1;  // blinking font
+    bool bPaintBlank    :1;  // blanks not with DrawRect
+    bool bFntChg        :1;
+    bool bOrgChg        :1;  // nOrgHeight/Ascent are invalid
+    bool bURL           :1;
+    bool bPaintWrong    :1;  // flag for spelling mistakes
+    bool bGreyWave      :1;  // for the extended TextInput: gray waveline
+    bool bNoColReplace  :1;  // Replacement without colormanipulation
 
 public:
     SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess );
@@ -199,14 +199,14 @@ public:
         { rMagic = aSub[nWhich].pMagic; rIdx = aSub[nWhich].nFntIndex; }
     inline void SetMagic( const void* pNew, const sal_uInt16 nIdx, sal_uInt8 nWhich )
         { aSub[nWhich].pMagic = pNew; aSub[nWhich].nFntIndex = nIdx; }
-    inline sal_Bool DifferentMagic( const SwFont* pFnt, sal_uInt8 nWhich )
+    inline bool DifferentMagic( const SwFont* pFnt, sal_uInt8 nWhich )
         { return aSub[nWhich].pMagic != pFnt->aSub[nWhich].pMagic ||
           !aSub[nWhich].pMagic || !pFnt->aSub[nWhich].pMagic; }
 
     inline const Size &GetSize( sal_uInt8 nWhich ) const
         { return aSub[nWhich].aSize; }
-    inline sal_Bool IsFntChg() const { return bFntChg; }
-    inline void SetFntChg( const sal_Bool bNew ) { bFntChg = bNew; }
+    inline bool IsFntChg() const { return bFntChg; }
+    inline void SetFntChg( const bool bNew ) { bFntChg = bNew; }
 
     // the encapsulated SV-Font-methods (set bFntChg to sal_True)
     inline void SetColor( const Color& rColor );
@@ -217,12 +217,12 @@ public:
     inline void SetOverline( const FontUnderline eOverline );
     inline void SetOverColor( const Color &rColor ) { aOverColor = rColor; }
     inline void SetStrikeout( const FontStrikeout eStrikeout );
-    inline void SetOutline( const sal_Bool bOutline );
-           void SetVertical( sal_uInt16 nDir, const sal_Bool nVertLayout = sal_False );
-    inline void SetShadow( const sal_Bool bShadow );
+    inline void SetOutline( const bool bOutline );
+           void SetVertical( sal_uInt16 nDir, const bool nVertLayout = false );
+    inline void SetShadow( const bool bShadow );
     inline void SetAutoKern( sal_uInt8 nAutoKern );
-    inline void SetTransparent( const sal_Bool bTrans );
-    inline void SetWordLineMode( const sal_Bool bWordLineMode );
+    inline void SetTransparent( const bool bTrans );
+    inline void SetWordLineMode( const bool bWordLineMode );
     inline void SetFixKerning( const short nNewKern );
     inline void SetCaseMap( const SvxCaseMap eNew );
     inline void SetEmphasisMark( const FontEmphasisMark eValue );
@@ -245,33 +245,33 @@ public:
     inline void SetRelief( const FontRelief eNew );
 
     // Get/Set-methods for the current setting
-    inline void SetNoHyph( const sal_Bool bNew );
-    inline sal_Bool IsNoHyph() const { return bNoHyph; }
-    inline void SetBlink( const sal_Bool bBlink );
-    inline sal_Bool IsBlink() const { return bBlink; }
+    inline void SetNoHyph( const bool bNew );
+    inline bool IsNoHyph() const { return bNoHyph; }
+    inline void SetBlink( const bool bBlink );
+    inline bool IsBlink() const { return bBlink; }
     inline sal_uInt8 &GetTox() { return nToxCnt; }
     inline sal_uInt8 GetTox() const { return nToxCnt; }
-    inline sal_Bool IsTox() const { return ( 0 != nToxCnt ); }
+    inline bool IsTox() const { return ( 0 != nToxCnt ); }
     inline sal_uInt8 &GetRef() { return nRefCnt; }
     inline sal_uInt8 GetRef() const { return nRefCnt; }
-    inline sal_Bool IsRef() const { return ( 0 != nRefCnt ); }
+    inline bool IsRef() const { return ( 0 != nRefCnt ); }
     inline sal_uInt8 &GetMeta() { return m_nMetaCount; }
     inline sal_uInt8 GetMeta() const { return m_nMetaCount; }
     inline bool IsMeta() const { return (0 != m_nMetaCount); }
     inline sal_uInt8 &GetInputField() { return m_nInputFieldCount; }
     inline sal_uInt8 GetInputField() const { return m_nInputFieldCount; }
     inline bool IsInputField() const { return (0 != m_nInputFieldCount); }
-    inline void SetURL( const sal_Bool bURL );
-    inline sal_Bool IsURL() const { return bURL; }
-    inline void SetGreyWave( const sal_Bool bNew );
-    inline sal_Bool IsGreyWave() const { return bGreyWave; }
-    inline void SetNoCol( const sal_Bool bNew );
-    inline sal_Bool IsNoCol() const { return bNoColReplace; }
-
-    inline void SetPaintBlank( const sal_Bool bNew );
-    inline sal_Bool IsPaintBlank() const { return bPaintBlank; }
-    inline void SetPaintWrong( const sal_Bool bNew );
-    inline sal_Bool IsPaintWrong() const { return bPaintWrong; }
+    inline void SetURL( const bool bURL );
+    inline bool IsURL() const { return bURL; }
+    inline void SetGreyWave( const bool bNew );
+    inline bool IsGreyWave() const { return bGreyWave; }
+    inline void SetNoCol( const bool bNew );
+    inline bool IsNoCol() const { return bNoColReplace; }
+
+    inline void SetPaintBlank( const bool bNew );
+    inline bool IsPaintBlank() const { return bPaintBlank; }
+    inline void SetPaintWrong( const bool bNew );
+    inline bool IsPaintWrong() const { return bPaintWrong; }
 
     // setting of the base class font for SwTxtCharFmt
     void SetDiffFnt( const SfxItemSet* pSet,
@@ -280,7 +280,7 @@ public:
     inline const SvxFont &GetFnt( const sal_uInt8 nWhich ) const
         { return aSub[nWhich]; };
 
-    sal_Bool IsSymbol( SwViewShell *pSh )
+    bool IsSymbol( SwViewShell *pSh )
         { return aSub[nActual].IsSymbol( pSh ); }
     FontUnderline GetUnderline() const { return aSub[nActual].GetUnderline(); }
     const Color& GetUnderColor() const { return aUnderColor; }
@@ -289,10 +289,10 @@ public:
     short GetFixKerning() const { return aSub[nActual].GetFixKerning(); }
     FontStrikeout GetStrikeout() const { return aSub[nActual].GetStrikeout(); }
     const Color& GetColor() const { return aSub[nActual].GetColor(); }
-    sal_Bool IsShadow() const { return aSub[nActual].IsShadow(); }
-    sal_Bool IsWordLineMode() const { return aSub[nActual].IsWordLineMode(); }
-    sal_Bool IsOutline() const { return aSub[nActual].IsOutline(); }
-    sal_Bool IsKerning() const { return aSub[nActual].IsKerning(); }
+    bool IsShadow() const { return aSub[nActual].IsShadow(); }
+    bool IsWordLineMode() const { return aSub[nActual].IsWordLineMode(); }
+    bool IsOutline() const { return aSub[nActual].IsOutline(); }
+    bool IsKerning() const { return aSub[nActual].IsKerning(); }
     short GetEscapement() const { return aSub[nActual].GetEscapement(); }
     SvxCaseMap GetCaseMap() const { return aSub[nActual].GetCaseMap(); }
     sal_uInt8 GetPropr() const { return aSub[nActual].GetPropr(); }
@@ -309,7 +309,7 @@ public:
     FontEmphasisMark GetEmphasisMark() const
         { return aSub[nActual].GetEmphasisMark(); }
     sal_uInt16 GetPropWidth() const { return aSub[nActual].GetPropWidth(); }
-    sal_uInt16 GetOrientation( const sal_Bool nVertLayout = sal_False ) const;
+    sal_uInt16 GetOrientation( const bool nVertLayout = false ) const;
 
     inline const OUString& GetName( const sal_uInt8 nWhich ) const
         { return aSub[nWhich].GetName(); }
@@ -378,7 +378,7 @@ public:
         { return aSub[nActual].GetHeight( pSh, rOut ); }
 
     inline void Invalidate()
-        { bFntChg = bOrgChg = sal_True; }
+        { bFntChg = bOrgChg = true; }
 
     void SetTopBorder( const editeng::SvxBorderLine* pTopBorder );
     void SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder );
@@ -451,7 +451,7 @@ public:
 
 inline void SwFont::SetColor( const Color& rColor )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetColor( rColor );
     aSub[1].SetColor( rColor );
     aSub[2].SetColor( rColor );
@@ -473,7 +473,7 @@ inline void SwSubFont::SetFillColor( const Color& rColor )
 
 inline void SwFont::SetFillColor( const Color& rColor )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetFillColor( rColor );
     aSub[1].SetFillColor( rColor );
     aSub[2].SetFillColor( rColor );
@@ -488,7 +488,7 @@ inline void SwSubFont::SetFamily( const FontFamily eFamily )
 
 inline void SwFont::SetFamily( const FontFamily eFamily, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetFamily( eFamily );
 }
 
@@ -501,7 +501,7 @@ inline void SwSubFont::SetName( const OUString& rName )
 
 inline void SwFont::SetName( const OUString& rName, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetName( rName );
 }
 
@@ -514,7 +514,7 @@ inline void SwSubFont::SetStyleName( const OUString& rStyleName )
 
 inline void SwFont::SetStyleName( const OUString& rStyle, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetStyleName( rStyle );
 }
 
@@ -527,7 +527,7 @@ inline void SwSubFont::SetCharSet( const rtl_TextEncoding eCharSet )
 
 inline void SwFont::SetCharSet( const rtl_TextEncoding eCharSet, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetCharSet( eCharSet );
 }
 
@@ -541,7 +541,7 @@ inline void SwSubFont::SetPitch( const FontPitch ePitch )
 // encapsulated SV-Font-method
 inline void SwFont::SetPitch( const FontPitch ePitch, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetPitch( ePitch );
 }
 
@@ -554,7 +554,7 @@ inline void SwSubFont::SetAlign( const FontAlign eAlign )
 
 inline void SwFont::SetAlign( const FontAlign eAlign )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetAlign( eAlign );
     aSub[1].SetAlign( eAlign );
     aSub[2].SetAlign( eAlign );
@@ -569,7 +569,7 @@ inline void SwSubFont::SetWeight( const FontWeight eWeight )
 
 inline void SwFont::SetWeight( const FontWeight eWeight, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetWeight( eWeight );
 }
 
@@ -582,7 +582,7 @@ inline void SwSubFont::SetUnderline( const FontUnderline eUnderline )
 
 inline void SwFont::SetUnderline( const FontUnderline eUnderline )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetUnderline( eUnderline );
     aSub[1].SetUnderline( eUnderline );
     aSub[2].SetUnderline( eUnderline );
@@ -597,7 +597,7 @@ inline void SwSubFont::SetOverline( const FontUnderline eOverline )
 
 inline void SwFont::SetOverline( const FontUnderline eOverline )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetOverline( eOverline );
     aSub[1].SetOverline( eOverline );
     aSub[2].SetOverline( eOverline );
@@ -612,7 +612,7 @@ inline void SwSubFont::SetStrikeout( const FontStrikeout eStrikeout )
 
 inline void SwFont::SetStrikeout( const FontStrikeout eStrikeout )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetStrikeout( eStrikeout );
     aSub[1].SetStrikeout( eStrikeout );
     aSub[2].SetStrikeout( eStrikeout );
@@ -627,35 +627,35 @@ inline void SwSubFont::SetItalic( const FontItalic eItalic )
 
 inline void SwFont::SetItalic( const FontItalic eItalic, const sal_uInt8 nWhich )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[nWhich].SetItalic( eItalic );
 }
 
 // encapsulated SV-Font-method
-inline void SwSubFont::SetOutline( const sal_Bool bOutline )
+inline void SwSubFont::SetOutline( const bool bOutline )
 {
     pMagic = 0;
     Font::SetOutline( bOutline );
 }
 
-inline void SwFont::SetOutline( const sal_Bool bOutline )
+inline void SwFont::SetOutline( const bool bOutline )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetOutline( bOutline );
     aSub[1].SetOutline( bOutline );
     aSub[2].SetOutline( bOutline );
 }
 
 // encapsulated SV-Font-method
-inline void SwSubFont::SetShadow( const sal_Bool bShadow )
+inline void SwSubFont::SetShadow( const bool bShadow )
 {
     pMagic = 0;
     Font::SetShadow( bShadow );
 }
 
-inline void SwFont::SetShadow( const sal_Bool bShadow )
+inline void SwFont::SetShadow( const bool bShadow )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetShadow( bShadow );
     aSub[1].SetShadow( bShadow );
     aSub[2].SetShadow( bShadow );
@@ -670,7 +670,7 @@ inline void SwSubFont::SetAutoKern( const sal_uInt8 nAutoKern )
 
 inline void SwFont::SetAutoKern( sal_uInt8 nAutoKern )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[1].SetAutoKern( nAutoKern );
     if( nAutoKern )
         nAutoKern = KERNING_FONTSPECIFIC;
@@ -678,7 +678,7 @@ inline void SwFont::SetAutoKern( sal_uInt8 nAutoKern )
     aSub[2].SetAutoKern( nAutoKern );
 }
 
-inline void SwFont::SetTransparent( const sal_Bool bTrans )
+inline void SwFont::SetTransparent( const bool bTrans )
 {
     aSub[0].SetTransparent( bTrans );
     aSub[1].SetTransparent( bTrans );
@@ -700,15 +700,15 @@ inline void SwFont::SetCaseMap( const SvxCaseMap eNew )
 }
 
 // encapsulated SV-Font-method
-inline void SwSubFont::SetWordLineMode( const sal_Bool bWordLineMode )
+inline void SwSubFont::SetWordLineMode( const bool bWordLineMode )
 {
     pMagic = 0;
     Font::SetWordLineMode( bWordLineMode );
 }
 
-inline void SwFont::SetWordLineMode( const sal_Bool bWordLineMode )
+inline void SwFont::SetWordLineMode( const bool bWordLineMode )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetWordLineMode( bWordLineMode );
     aSub[1].SetWordLineMode( bWordLineMode );
     aSub[2].SetWordLineMode( bWordLineMode );
@@ -722,7 +722,7 @@ inline void SwSubFont::SetEmphasisMark( const FontEmphasisMark eValue )
 
 inline void SwFont::SetEmphasisMark( const FontEmphasisMark eValue )
 {
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[0].SetEmphasisMark( eValue );
     aSub[1].SetEmphasisMark( eValue );
     aSub[2].SetEmphasisMark( eValue );
@@ -732,7 +732,7 @@ inline void SwFont::SetPropWidth( const sal_uInt16 nNew )
 {
     if( nNew != aSub[0].GetPropWidth() )
     {
-        bFntChg = sal_True;
+        bFntChg = true;
         aSub[0].SetPropWidth( nNew );
         aSub[1].SetPropWidth( nNew );
         aSub[2].SetPropWidth( nNew );
@@ -750,7 +750,7 @@ inline void SwFont::SetRelief( const FontRelief eNew )
 {
     if( eNew != aSub[0].GetRelief() )
     {
-        bFntChg = sal_True;
+        bFntChg = true;
         aSub[0].SetRelief( eNew );
         aSub[1].SetRelief( eNew );
         aSub[2].SetRelief( eNew );
@@ -777,8 +777,8 @@ inline void SwFont::SetSize( const Size& rSize, const sal_uInt8 nWhich )
     if( aSub[nWhich].aSize != rSize )
     {
         aSub[nWhich].SetSize( rSize );
-        bFntChg = sal_True;
-        bOrgChg = sal_True;
+        bFntChg = true;
+        bOrgChg = true;
     }
 }
 
@@ -786,8 +786,8 @@ inline void SwFont::SetActual( sal_uInt8 nNew )
 {
      if ( nActual != nNew )
      {
-        bFntChg = sal_True;
-        bOrgChg = sal_True;
+        bFntChg = true;
+        bOrgChg = true;
         nActual = nNew;
      }
 }
@@ -804,8 +804,8 @@ inline void SwFont::SetProportion( const sal_uInt8 nNewPropr )
 {
     if( nNewPropr != aSub[0].GetPropr() )
     {
-        bFntChg = sal_True;
-        bOrgChg = sal_True;
+        bFntChg = true;
+        bOrgChg = true;
 
         aSub[0].SetProportion( nNewPropr );
         aSub[1].SetProportion( nNewPropr );
@@ -825,8 +825,8 @@ inline void SwFont::SetEscapement( const short nNewEsc )
     {
         // these have to be set, otherwise nOrgHeight and nOrgAscent will not
         // be calculated
-        bFntChg = sal_True;
-        bOrgChg = sal_True;
+        bFntChg = true;
+        bOrgChg = true;
 
         aSub[0].SetEscapement( nNewEsc );
         aSub[1].SetEscapement( nNewEsc );
@@ -853,42 +853,42 @@ inline void SwFont::SetLanguage( const LanguageType eNewLang, const sal_uInt8 nW
     }
 }
 
-inline void SwFont::SetPaintBlank( const sal_Bool bNew )
+inline void SwFont::SetPaintBlank( const bool bNew )
 {
     bPaintBlank = bNew;
 }
 
-inline void SwFont::SetPaintWrong( const sal_Bool bNew )
+inline void SwFont::SetPaintWrong( const bool bNew )
 {
     bPaintWrong = bNew;
 }
 
-inline void SwFont::SetNoHyph( const sal_Bool bNew )
+inline void SwFont::SetNoHyph( const bool bNew )
 {
     bNoHyph = bNew;
 }
 
-inline void SwFont::SetBlink( const sal_Bool bNew )
+inline void SwFont::SetBlink( const bool bNew )
 {
     bBlink = bNew;
 }
 
-inline void SwFont::SetURL( const sal_Bool bNew )
+inline void SwFont::SetURL( const bool bNew )
 {
     bURL = bNew;
 }
 
-inline void SwFont::SetGreyWave( const sal_Bool bNew )
+inline void SwFont::SetGreyWave( const bool bNew )
 {
     bGreyWave = bNew;
 }
 
-inline void SwFont::SetNoCol( const sal_Bool bNew )
+inline void SwFont::SetNoCol( const bool bNew )
 {
     bNoColReplace = bNew;
 }
 
-inline void SwSubFont::SetVertical( const sal_uInt16 nDir, const sal_Bool bVertFormat )
+inline void SwSubFont::SetVertical( const sal_uInt16 nDir, const bool bVertFormat )
 {
     pMagic = 0;
     Font::SetVertical( bVertFormat );
@@ -898,28 +898,28 @@ inline void SwSubFont::SetVertical( const sal_uInt16 nDir, const sal_Bool bVertF
 inline void SwFont::SetTopBorderDist( const sal_uInt16 nTopDist )
 {
     m_nTopBorderDist = nTopDist;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 inline void SwFont::SetBottomBorderDist( const sal_uInt16 nBottomDist )
 {
     m_nBottomBorderDist = nBottomDist;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 inline void SwFont::SetRightBorderDist( const sal_uInt16 nRightDist )
 {
     m_nRightBorderDist = nRightDist;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 inline void SwFont::SetLeftBorderDist( const sal_uInt16 nLeftDist )
 {
     m_nLeftBorderDist = nLeftDist;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -991,28 +991,28 @@ inline bool SwFont::HasBorder() const
 inline void SwFont::SetShadowColor( const Color& rColor )
 {
     m_aShadowColor = rColor;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 inline void SwFont::SetShadowWidth( const sal_uInt16 nWidth )
 {
     m_nShadowWidth = nWidth;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 inline void SwFont::SetShadowLocation( const SvxShadowLocation aLocation )
 {
     m_aShadowLocation = aLocation;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 inline void SwFont::SetHighlightColor( const Color& aNewColor )
 {
     m_aHighlightColor = aNewColor;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -1059,7 +1059,7 @@ public:
     inline SvStatistics() { Reset(); }
 
     inline void PrintOn( SvStream &rOS ) const; //$ ostream
-    inline sal_Bool IsEmpty() const
+    inline bool IsEmpty() const
     {
         return !( nGetTextSize || nDrawText ||
                   nDrawStretchText || nChangeFont || nGetFontMetric );
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 7b974fa04ef9..b983d10b27f6 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -34,45 +34,45 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
 
     // does the special treatment for _Get[Next|Prev]Leaf()
     using SwFrm::GetLeaf;
-    SwLayoutFrm *GetLeaf( MakePageType eMakePage, sal_Bool bFwd );
+    SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd );
 
     SwTable* pTable;
 
-    sal_Bool bComplete          :1; //Eintrage als Repaint ohne das CompletePaint
+    bool bComplete          :1; //Eintrage als Repaint ohne das CompletePaint
                                     //der Basisklasse gesetzt werden muss. Damit
                                     //sollen unertraegliche Tabellen-Repaints
                                     //vermieden werden.
-    sal_Bool bCalcLowers        :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
+    bool bCalcLowers        :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
     //des Inhaltes sorgen.
-    sal_Bool bLowersFormatted   :1;//Kommunikation zwischen MakeAll und Layact
-    sal_Bool bLockBackMove      :1; //BackMove-Test hat der Master erledigt.
-    sal_Bool bResizeHTMLTable   :1; //Resize des HTMLTableLayout rufen im MakeAll
+    bool bLowersFormatted   :1;//Kommunikation zwischen MakeAll und Layact
+    bool bLockBackMove      :1; //BackMove-Test hat der Master erledigt.
+    bool bResizeHTMLTable   :1; //Resize des HTMLTableLayout rufen im MakeAll
     //Zur Optimierung, damit dies nicht im
     //CntntFrm::Grow gerufen werden muss, denn dann
     //wird es ggf. fuer jede Zelle gerufen #47483#
-    sal_Bool bONECalcLowers     :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
+    bool bONECalcLowers     :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
     //die Cntnts auf jedenfall per Calc() formatiert.
     //es finden keine zusaetzlichen Invalidierungen
     //statt und dieser Weg kann auch kaum garantien
     //geben.
 
-    sal_Bool bHasFollowFlowLine :1; // Means that the first line in the follow
+    bool bHasFollowFlowLine :1; // Means that the first line in the follow
                                 // is indented to contain content from a broken
                                 // cell
-    sal_Bool bIsRebuildLastLine :1; // Means that currently the last line of the
+    bool bIsRebuildLastLine :1; // Means that currently the last line of the
                                 // TabFrame is rebuilded. In this case we
                                 // do not want any notification to the master
                                 // table
-    sal_Bool bRestrictTableGrowth :1;       // Usually, the table may grow infinite,
+    bool bRestrictTableGrowth :1;       // Usually, the table may grow infinite,
                                         // because the table can be split in
                                         // SwTabFrm::MakeAll. In MakeAll, this
                                         // flag is set to indicate that the table
                                         // may only grow inside its upper. This
                                         // is necessary, in order to let the text
                                         // flow into the FollowFlowLine
-    sal_Bool bRemoveFollowFlowLinePending :1;
+    bool bRemoveFollowFlowLinePending :1;
     // #i26945#
-    sal_Bool bConsiderObjsForMinCellHeight :1; // Usually, the floating screen objects
+    bool bConsiderObjsForMinCellHeight :1; // Usually, the floating screen objects
                                            // are considered on the calculation
                                            // for the minimal cell height.
                                            // For splitting table rows algorithm
@@ -81,7 +81,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
                                            // of the re-calculation of the
                                            // last table row.
     // #i26945#
-    sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean
+    bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean
                           // indicates, if the floating screen objects fits
 
     bool mbInRecalcLowerRow : 1;
@@ -105,7 +105,7 @@ protected:
     virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
     virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
         // only changes the Framesize, not the PrtArea size
-    virtual SwTwips GrowFrm  ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ) SAL_OVERRIDE;
+    virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
 
 public:
     SwTabFrm( SwTable &, SwFrm* );  // calling Regist Flys always after creation _and_pasting!
@@ -138,32 +138,32 @@ public:
     const SwTable *GetTable() const { return pTable; }
           SwTable *GetTable()       { return pTable; }
 
-    sal_Bool IsComplete()  { return bComplete; }
-    void SetComplete() { bComplete = sal_True; }
-    void ResetComplete() { bComplete = sal_False; }
+    bool IsComplete()  { return bComplete; }
+    void SetComplete() { bComplete = true; }
+    void ResetComplete() { bComplete = false; }
 
-    sal_Bool IsLowersFormatted() const      { return bLowersFormatted; }
-    void SetLowersFormatted( sal_Bool b )   { bLowersFormatted = b;    }
+    bool IsLowersFormatted() const      { return bLowersFormatted; }
+    void SetLowersFormatted( bool b )   { bLowersFormatted = b;    }
 
-    void SetCalcLowers()        { bCalcLowers = sal_True;      } // use rarely
-    void SetResizeHTMLTable()   { bResizeHTMLTable = sal_True; } // same
-    void SetONECalcLowers()     { bONECalcLowers = sal_True;   }
+    void SetCalcLowers()        { bCalcLowers = true;      } // use rarely
+    void SetResizeHTMLTable()   { bResizeHTMLTable = true; } // same
+    void SetONECalcLowers()     { bONECalcLowers = true;   }
 
     // Start: New stuff for breaking table rows
 
-    sal_Bool HasFollowFlowLine() const { return bHasFollowFlowLine; }
-    void SetFollowFlowLine( sal_Bool bNew ) { bHasFollowFlowLine = bNew; }
+    bool HasFollowFlowLine() const { return bHasFollowFlowLine; }
+    void SetFollowFlowLine( bool bNew ) { bHasFollowFlowLine = bNew; }
     //return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for
     SwTabFrm* GetFollowFlowLineFor();
 
-    sal_Bool IsRebuildLastLine() const { return bIsRebuildLastLine; }
-    void SetRebuildLastLine( sal_Bool bNew ) { bIsRebuildLastLine = bNew; }
+    bool IsRebuildLastLine() const { return bIsRebuildLastLine; }
+    void SetRebuildLastLine( bool bNew ) { bIsRebuildLastLine = bNew; }
 
-    sal_Bool IsRestrictTableGrowth() const { return bRestrictTableGrowth; }
-    void SetRestrictTableGrowth( sal_Bool bNew ) { bRestrictTableGrowth = bNew; }
+    bool IsRestrictTableGrowth() const { return bRestrictTableGrowth; }
+    void SetRestrictTableGrowth( bool bNew ) { bRestrictTableGrowth = bNew; }
 
-    sal_Bool IsRemoveFollowFlowLinePending() const { return bRemoveFollowFlowLinePending; }
-    void SetRemoveFollowFlowLinePending( sal_Bool bNew ) { bRemoveFollowFlowLinePending = bNew; }
+    bool IsRemoveFollowFlowLinePending() const { return bRemoveFollowFlowLinePending; }
+    void SetRemoveFollowFlowLinePending( bool bNew ) { bRemoveFollowFlowLinePending = bNew; }
 
     bool IsInRecalcLowerRow() const
     {
@@ -175,21 +175,21 @@ public:
     }
 
     // #i26945#
-    sal_Bool IsConsiderObjsForMinCellHeight() const
+    bool IsConsiderObjsForMinCellHeight() const
     {
         return bConsiderObjsForMinCellHeight;
     }
-    void SetConsiderObjsForMinCellHeight( sal_Bool _bNewConsiderObjsForMinCellHeight )
+    void SetConsiderObjsForMinCellHeight( bool _bNewConsiderObjsForMinCellHeight )
     {
         bConsiderObjsForMinCellHeight = _bNewConsiderObjsForMinCellHeight;
     }
 
     // #i26945#
-    sal_Bool DoesObjsFit() const
+    bool DoesObjsFit() const
     {
         return bObjsDoesFit;
     }
-    void SetDoesObjsFit( sal_Bool _bNewObjsDoesFit )
+    void SetDoesObjsFit( bool _bNewObjsDoesFit )
     {
         bObjsDoesFit = _bNewObjsDoesFit;
     }
@@ -198,7 +198,7 @@ public:
 
     // End: New stuff for breaking table rows
 
-    sal_Bool CalcFlyOffsets(
+    bool CalcFlyOffsets(
         SwTwips& rUpper,
         long& rLeftOffset,
         long& rRightOffset ) const;
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index e029d49ab18b..441145ce57d4 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -68,7 +68,7 @@ public:
         CreateXFieldMaster(SwDoc & rDoc, SwFieldType & rType);
 
     static OUString GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc);
-    static OUString LocalizeFormula(const SwSetExpField& rFld, const OUString& rFormula, sal_Bool bQuery);
+    static OUString LocalizeFormula(const SwSetExpField& rFld, const OUString& rFormula, bool bQuery);
 
     SwFieldType* GetFldType(bool bDontCreate = false) const;
 
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index d776ed2154e8..f750029106cb 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -148,7 +148,7 @@ class SwXFlatParagraphIterator:
     public SwClient     // to get notified when doc is closed...
 {
 public:
-    SwXFlatParagraphIterator( SwDoc& rDoc, sal_Int32 nType, sal_Bool bAutomatic );
+    SwXFlatParagraphIterator( SwDoc& rDoc, sal_Int32 nType, bool bAutomatic );
     virtual ~SwXFlatParagraphIterator();
 
     // text::XFlatParagraphIterator:
@@ -171,12 +171,12 @@ private:
 
     SwDoc* mpDoc;
     const sal_Int32 mnType;
-    const sal_Bool mbAutomatic;
+    const bool mbAutomatic;
 
     sal_uLong mnCurrentNode;    // used for non-automatic mode
     sal_uLong mnStartNode;      // used for non-automatic mode
     sal_uLong mnEndNode;        // used for non-automatic mode
-    sal_Bool mbWrapped;     // used for non-automatic mode
+    bool mbWrapped;     // used for non-automatic mode
 };
 
 #endif
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 6011d0912f07..f0316fc23a5b 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -147,7 +147,7 @@ protected:
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
         const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames,
-        sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
+        bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
 
     virtual ~SwXTextPortion();
 
@@ -163,7 +163,7 @@ public:
         SwTxtRuby const& rAttr,
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
             const& xParent,
-        sal_Bool bIsEnd );
+        bool bIsEnd );
 
     //XTextRange
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@@ -330,7 +330,7 @@ public:
             OUString const& PropertyName, SwRangeRedline const& rRedline) throw();
     static ::com::sun::star::uno::Sequence<
         ::com::sun::star::beans::PropertyValue > CreateRedlineProperties(
-                SwRangeRedline const& rRedline, sal_Bool const bIsStart) throw();
+                SwRangeRedline const& rRedline, bool const bIsStart) throw();
 
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
         getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 80678e8acb3a..a6fab3f90aa2 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -818,7 +818,7 @@ void SwAnchoredDrawObject::NotifyBackground( SwPageFrm* _pPageFrm,
                                              const SwRect& _rRect,
                                              PrepareHint _eHint )
 {
-    ::Notify_Background( GetDrawObj(), _pPageFrm, _rRect, _eHint, sal_True );
+    ::Notify_Background( GetDrawObj(), _pPageFrm, _rRect, _eHint, true );
 }
 
 /** method to assure that anchored object is registered at the correct
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index da13f6183025..428a90683a32 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -240,13 +240,13 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
         {
-            sal_Bool bTmp = 0xFF == GetHeightPercent();
+            bool bTmp = 0xFF == GetHeightPercent();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
         break;
         case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT:
         {
-            sal_Bool bTmp = 0xFF == GetWidthPercent();
+            bool bTmp = 0xFF == GetWidthPercent();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
         break;
@@ -265,7 +265,7 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_FRMSIZE_IS_AUTO_HEIGHT:
         {
-            sal_Bool bTmp = ATT_FIX_SIZE != GetHeightSizeType();
+            bool bTmp = ATT_FIX_SIZE != GetHeightSizeType();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
         break;
@@ -339,7 +339,7 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         break;
         case MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH:
         {
-            sal_Bool bSet = *(sal_Bool*)rVal.getValue();
+            bool bSet = *(sal_Bool*)rVal.getValue();
             if(bSet)
                 SetHeightPercent(0xff);
             else if( 0xff == GetHeightPercent() )
@@ -348,7 +348,7 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         break;
         case MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT:
         {
-            sal_Bool bSet = *(sal_Bool*)rVal.getValue();
+            bool bSet = *(sal_Bool*)rVal.getValue();
             if(bSet)
                 SetWidthPercent(0xff);
             else if( 0xff == GetWidthPercent() )
@@ -398,7 +398,7 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         break;
         case MID_FRMSIZE_IS_AUTO_HEIGHT:
         {
-            sal_Bool bSet = *(sal_Bool*)rVal.getValue();
+            bool bSet = *(sal_Bool*)rVal.getValue();
             SetHeightSizeType(bSet ? ATT_VAR_SIZE : ATT_FIX_SIZE);
         }
         break;
@@ -453,7 +453,7 @@ SwFmtHeader::SwFmtHeader( const SwFmtHeader &rCpy )
 {
 }
 
-SwFmtHeader::SwFmtHeader( sal_Bool bOn )
+SwFmtHeader::SwFmtHeader( bool bOn )
     : SfxPoolItem( RES_HEADER ),
     SwClient( 0 ),
     bActive( bOn )
@@ -500,7 +500,7 @@ SwFmtFooter::SwFmtFooter( const SwFmtFooter &rCpy )
 {
 }
 
-SwFmtFooter::SwFmtFooter( sal_Bool bOn )
+SwFmtFooter::SwFmtFooter( bool bOn )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( 0 ),
     bActive( bOn )
@@ -773,7 +773,7 @@ SwColumn::SwColumn() :
 {
 }
 
-sal_Bool SwColumn::operator==( const SwColumn &rCmp ) const
+bool SwColumn::operator==( const SwColumn &rCmp ) const
 {
     return (nWish    == rCmp.GetWishWidth() &&
             GetLeft()  == rCmp.GetLeft() &&
@@ -833,7 +833,7 @@ SwFmtCol::SwFmtCol()
     eAdj( COLADJ_NONE ),
     nWidth( USHRT_MAX ),
     aWidthAdjustValue( 0 ),
-    bOrtho( sal_True )
+    bOrtho( true )
 {
 }
 
@@ -865,7 +865,7 @@ SfxPoolItem*  SwFmtCol::Clone( SfxItemPool* ) const
     return new SwFmtCol( *this );
 }
 
-sal_uInt16 SwFmtCol::GetGutterWidth( sal_Bool bMin ) const
+sal_uInt16 SwFmtCol::GetGutterWidth( bool bMin ) const
 {
     sal_uInt16 nRet = 0;
     if ( aColumns.size() == 2 )
@@ -924,13 +924,13 @@ void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nA
     {   SwColumn *pCol = new SwColumn;
         aColumns.push_back( pCol );
     }
-    bOrtho = sal_True;
+    bOrtho = true;
     nWidth = USHRT_MAX;
     if( nNumCols )
         Calc( nGutterWidth, nAct );
 }
 
-void SwFmtCol::SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
+void SwFmtCol::SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
 {
     bOrtho = bNew;
     if ( bNew && !aColumns.empty() )
@@ -1066,7 +1066,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 }
             bRet = true;
             nWidth = nWidthSum;
-            bOrtho = sal_False;
+            bOrtho = false;
 
             uno::Reference<lang::XUnoTunnel> xNumTunnel(xCols, uno::UNO_QUERY);
             SwXTextColumns* pSwColums = 0;
@@ -1111,7 +1111,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 SwFmtSurround::SwFmtSurround( SwSurround eFly ) :
     SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) )
 {
-    bAnchorOnly = bContour = bOutside = sal_False;
+    bAnchorOnly = bContour = bOutside = false;
 }
 
 SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) :
@@ -1153,19 +1153,19 @@ bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_SURROUND_ANCHORONLY:
         {
-            sal_Bool bTmp = IsAnchorOnly();
+            bool bTmp = IsAnchorOnly();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
                 break;
         case MID_SURROUND_CONTOUR:
         {
-            sal_Bool bTmp = IsContour();
+            bool bTmp = IsContour();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
                 break;
         case MID_SURROUND_CONTOUROUTSIDE:
         {
-            sal_Bool bTmp = IsOutside();
+            bool bTmp = IsOutside();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
                 break;
@@ -1329,7 +1329,7 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 //  Partially implemented inline in hxx
 
 SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
-                              sal_Int16 eRel, sal_Bool bPos )
+                              sal_Int16 eRel, bool bPos )
     : SfxPoolItem( RES_HORI_ORIENT ),
     nXPos( nX ),
     eOrient( eHori ),
@@ -1371,7 +1371,7 @@ bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
                 break;
         case MID_HORIORIENT_PAGETOGGLE:
         {
-            sal_Bool bTmp = IsPosToggle();
+            bool bTmp = IsPosToggle();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
                 break;
@@ -1724,7 +1724,7 @@ bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
         break;
         case MID_URL_SERVERMAP:
         {
-            sal_Bool bTmp = IsServerMap();
+            bool bTmp = IsServerMap();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
             break;
@@ -1851,20 +1851,20 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons
     {
         case MID_COLLECT     :
         {
-            sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND;
+            bool bVal = GetValue() >= FTNEND_ATTXTEND;
             rVal.setValue(&bVal, ::getBooleanCppuType());
         }
         break;
         case MID_RESTART_NUM :
         {
-            sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ;
+            bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ;
             rVal.setValue(&bVal, ::getBooleanCppuType());
         }
         break;
         case MID_NUM_START_AT: rVal <<= (sal_Int16) nOffset; break;
         case MID_OWN_NUM     :
         {
-            sal_Bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
+            bool bVal = GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
             rVal.setValue(&bVal, ::getBooleanCppuType());
         }
         break;
@@ -1884,7 +1884,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     {
         case MID_COLLECT     :
         {
-            sal_Bool bVal = *(sal_Bool*)rVal.getValue();
+            bool bVal = *(sal_Bool*)rVal.getValue();
             if(!bVal && GetValue() >= FTNEND_ATTXTEND)
                 SetValue(FTNEND_ATPGORDOCEND);
             else if(bVal && GetValue() < FTNEND_ATTXTEND)
@@ -1893,7 +1893,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         break;
         case MID_RESTART_NUM :
         {
-            sal_Bool bVal = *(sal_Bool*)rVal.getValue();
+            bool bVal = *(sal_Bool*)rVal.getValue();
             if(!bVal && GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ)
                 SetValue(FTNEND_ATTXTEND);
             else if(bVal && GetValue() < FTNEND_ATTXTEND_OWNNUMSEQ)
@@ -1912,7 +1912,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         break;
         case MID_OWN_NUM     :
         {
-            sal_Bool bVal = *(sal_Bool*)rVal.getValue();
+            bool bVal = *(sal_Bool*)rVal.getValue();
             if(!bVal && GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT)
                 SetValue(FTNEND_ATTXTEND_OWNNUMSEQ);
             else if(bVal && GetValue() < FTNEND_ATTXTEND_OWNNUMANDFMT)
@@ -2038,7 +2038,7 @@ SwFmtLineNumber::SwFmtLineNumber() :
     SfxPoolItem( RES_LINENUMBER )
 {
     nStartValue = 0;
-    bCountLines = sal_True;
+    bCountLines = true;
 }
 
 SwFmtLineNumber::~SwFmtLineNumber()
@@ -2067,7 +2067,7 @@ bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     {
         case MID_LINENUMBER_COUNT:
         {
-            sal_Bool bTmp = IsCount();
+            bool bTmp = IsCount();
             rVal.setValue(&bTmp, ::getBooleanCppuType());
         }
         break;
@@ -2112,8 +2112,8 @@ bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 SwTextGridItem::SwTextGridItem()
     : SfxPoolItem( RES_TEXTGRID ), m_aColor( COL_LIGHTGRAY ), m_nLines( 20 )
     , m_nBaseHeight( 400 ), m_nRubyHeight( 200 ), m_eGridType( GRID_NONE )
-    , m_bRubyTextBelow( 0 ), m_bPrintGrid( 1 ), m_bDisplayGrid( 1 )
-    , m_nBaseWidth(400), m_bSnapToChars( 1 ), m_bSquaredMode(1)
+    , m_bRubyTextBelow( false ), m_bPrintGrid( true ), m_bDisplayGrid( true )
+    , m_nBaseWidth(400), m_bSnapToChars( true ), m_bSquaredMode(true)
 {
 }
 
@@ -2219,7 +2219,7 @@ bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
             break;
         case MID_GRID_STANDARD_MODE:
             {
-                sal_Bool bStandardMode = !m_bSquaredMode;
+                bool bStandardMode = !m_bSquaredMode;
                 rVal.setValue( &bStandardMode, ::getBooleanCppuType() );
             }
             break;
@@ -2325,7 +2325,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             break;
         case MID_GRID_STANDARD_MODE:
         {
-            sal_Bool bStandard = *(sal_Bool*)rVal.getValue();
+            bool bStandard = *(sal_Bool*)rVal.getValue();
                SetSquaredMode( !bStandard );
             break;
         }
@@ -2337,7 +2337,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-void SwTextGridItem::SwitchPaperMode(sal_Bool bNew)
+void SwTextGridItem::SwitchPaperMode(bool bNew)
 {
     if (bNew == m_bSquaredMode)
     {
@@ -2378,10 +2378,10 @@ void SwTextGridItem::Init()
         m_nBaseHeight = 400;
         m_nRubyHeight = 200;
         m_eGridType = GRID_NONE;
-        m_bRubyTextBelow = 0;
-        m_bPrintGrid = 1;
-        m_bDisplayGrid = 1;
-        m_bSnapToChars = 1;
+        m_bRubyTextBelow = false;
+        m_bPrintGrid = true;
+        m_bDisplayGrid = true;
+        m_bSnapToChars = true;
         m_nBaseWidth = 400;
     }
     else
@@ -2390,11 +2390,11 @@ void SwTextGridItem::Init()
         m_nBaseHeight = 312;
         m_nRubyHeight = 0;
         m_eGridType = GRID_NONE;
-        m_bRubyTextBelow = 0;
-        m_bPrintGrid = 1;
-        m_bDisplayGrid = 1;
+        m_bRubyTextBelow = false;
+        m_bPrintGrid = true;
+        m_bDisplayGrid = true;
         m_nBaseWidth = 210;
-        m_bSnapToChars = 1;
+        m_bSnapToChars = true;
     }
 }
 
@@ -2549,8 +2549,8 @@ void SwFrmFmt::MakeFrms()
     OSL_ENSURE( !this, "Sorry not implemented." );
 }
 
-SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
-                                 const sal_Bool bCalcFrm ) const
+SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
+                                 const bool bCalcFrm ) const
 {
     SwRect aRet;
     SwFrm *pFrm = 0;
@@ -2617,13 +2617,13 @@ SdrObject* SwFrmFmt::FindRealSdrObject()
     {
         Point aNullPt;
         SwFlyFrm* pFly = (SwFlyFrm*)::GetFrmOfModify( 0, *this, FRM_FLY,
-                                                    &aNullPt, 0, sal_False );
+                                                    &aNullPt, 0, false );
         return pFly ? pFly->GetVirtDrawObj() : 0;
     }
     return FindSdrObject();
 }
 
-sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
+bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
 {
     //Also linking from inside to outside or from outside to inside is not
     //allowed.
@@ -2653,13 +2653,13 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
                 if( pIdx && pFlyNd == &pIdx->GetNode() )
                 {
                     if( pFmt == this )
-                        return sal_True;
+                        return true;
 
                     pAnchor = &pFmt->GetAnchor();
                     if ((FLY_AT_PAGE == pAnchor->GetAnchorId()) ||
                         !pAnchor->GetCntntAnchor() )
                     {
-                        return sal_False;
+                        return false;
                     }
 
                     pFlyNd = pAnchor->GetCntntAnchor()->nNode.GetNode().
@@ -2670,11 +2670,11 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
             if( n >= rFmts.size() )
             {
                 OSL_ENSURE( !this, "Fly section but no format found" );
-                return sal_False;
+                return false;
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 // #i31698#
@@ -2899,13 +2899,13 @@ void SwFlyFrmFmt::MakeFrms()
     }
 }
 
-SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const sal_Bool bCalcFrm ) const
+SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const bool bCalcFrm ) const
 {
     return (SwFlyFrm*)::GetFrmOfModify( 0, *(SwModify*)this, FRM_FLY,
                                             pPoint, 0, bCalcFrm );
 }
 
-SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const sal_Bool bCalcFrm ) const
+SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const bool bCalcFrm ) const
 {
     SwFlyFrm* pFlyFrm( GetFrm( pPoint, bCalcFrm ) );
     if ( pFlyFrm )
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 218b70e44cfb..5bb985f84c3b 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -152,7 +152,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
                    ( pNewUpper->IsColBodyFrm() &&
                      !pNewUpper->GetUpper()->GetPrev() &&
                      !pNewUpper->GetUpper()->GetNext() ) ) ) )
-                nSpace += pNewUpper->Grow( LONG_MAX, sal_True );
+                nSpace += pNewUpper->Grow( LONG_MAX, true );
 
             if ( nMoveAnyway < 3 )
             {
@@ -248,8 +248,8 @@ void SwFrm::PrepareMake()
 
         const bool bCnt = IsCntntFrm();
         const bool bTab = IsTabFrm();
-        sal_Bool bNoSect = IsInSct();
-        sal_Bool bOldTabLock = sal_False, bFoll = sal_False;
+        bool bNoSect = IsInSct();
+        bool bOldTabLock = false, bFoll = false;
         SwFlowFrm* pThis = bCnt ? (SwCntntFrm*)this : NULL;
 
         if ( bTab )
@@ -263,10 +263,9 @@ void SwFrm::PrepareMake()
         {
             pThis = (SwSectionFrm*)this;
             bFoll = pThis->IsFollow();
-            bNoSect = sal_False;
+            bNoSect = false;
         }
-        else if ( bCnt && sal_True == (bFoll = pThis->IsFollow()) &&
-             GetPrev() )
+        else if ( bCnt && (bFoll = pThis->IsFollow()) && GetPrev() )
         {
             //Do not follow the chain when we need only one instance
             const SwTxtFrm* pMaster = ((SwCntntFrm*)this)->FindMaster();
@@ -372,9 +371,9 @@ void SwFrm::PrepareCrsr()
 
         const bool bCnt = IsCntntFrm();
         const bool bTab = IsTabFrm();
-        sal_Bool bNoSect = IsInSct();
+        bool bNoSect = IsInSct();
 
-        sal_Bool bOldTabLock = sal_False, bFoll;
+        bool bOldTabLock = false, bFoll;
         SwFlowFrm* pThis = bCnt ? (SwCntntFrm*)this : NULL;
 
         if ( bTab )
@@ -386,7 +385,7 @@ void SwFrm::PrepareCrsr()
         else if( IsSctFrm() )
         {
             pThis = (SwSectionFrm*)this;
-            bNoSect = sal_False;
+            bNoSect = false;
         }
         bFoll = pThis && pThis->IsFollow();
 
@@ -462,7 +461,7 @@ void SwFrm::MakePos()
 {
     if ( !mbValidPos )
     {
-        mbValidPos = sal_True;
+        mbValidPos = true;
         bool bUseUpper = false;
         SwFrm* pPrv = lcl_Prev( this );
         if ( pPrv &&
@@ -492,7 +491,7 @@ void SwFrm::MakePos()
             maFrm.Pos( pPrv->Frm().Pos() );
             if( FRM_NEIGHBOUR & nMyType )
             {
-                sal_Bool bR2L = IsRightToLeft();
+                bool bR2L = IsRightToLeft();
                 if( bR2L )
                     (maFrm.*fnRect->fnSetPosX)( (maFrm.*fnRect->fnGetLeft)() -
                                                (maFrm.*fnRect->fnGetWidth)() );
@@ -546,7 +545,7 @@ void SwFrm::MakePos()
                 maFrm.Pos( pPrv->Frm().Pos() );
                 if( FRM_NEIGHBOUR & nMyType )
                 {
-                    sal_Bool bR2L = IsRightToLeft();
+                    bool bR2L = IsRightToLeft();
                     if( bR2L )
                         (maFrm.*fnRect->fnSetPosX)( (maFrm.*fnRect->fnGetLeft)() -
                                                  (maFrm.*fnRect->fnGetWidth)() );
@@ -597,7 +596,7 @@ void SwFrm::MakePos()
 
         if( IsBodyFrm() && bVert && !bVertL2R && !mbReverse && GetUpper() )
             maFrm.Pos().setX(maFrm.Pos().getX() + GetUpper()->Prt().Width() - maFrm.Width());
-        mbValidPos = sal_True;
+        mbValidPos = true;
     }
 }
 
@@ -645,7 +644,7 @@ void SwPageFrm::MakeAll()
     {
         if ( !mbValidPos )
         {
-            mbValidPos = sal_True; // positioning of the pages is taken care of by the root frame
+            mbValidPos = true; // positioning of the pages is taken care of by the root frame
         }
 
         if ( !mbValidSize || !mbValidPrtArea )
@@ -655,7 +654,7 @@ void SwPageFrm::MakeAll()
                 Frm().Width( 0 );  Prt().Width( 0 );
                 Frm().Height( 0 ); Prt().Height( 0 );
                 Prt().Left( 0 );   Prt().Top( 0 );
-                mbValidSize = mbValidPrtArea = sal_True;
+                mbValidSize = mbValidPrtArea = true;
             }
             else
             {
@@ -755,7 +754,7 @@ void SwPageFrm::MakeAll()
                     Prt().Width( Frm().Width() - ( Prt().Left()
                         + pAttrs->CalcRightLine() + aBorder.Width() ) );
                     Prt().Height( Frm().Height() - (nTop + nBottom) );
-                    mbValidSize = mbValidPrtArea = sal_True;
+                    mbValidSize = mbValidPrtArea = true;
                 }
                 else
                 {   // Set FixSize. For pages, this is not done from Upper, but from
@@ -799,14 +798,14 @@ void SwLayoutFrm::MakeAll()
             if ( IsLeaveUpperAllowed() )
             {
                 if ( !mbValidSize )
-                    mbValidPrtArea = sal_False;
+                    mbValidPrtArea = false;
             }
             else
             {
                 if ( !mbValidSize )
                 {
                     // Set FixSize; VarSize is set by Format() after calculating the PrtArea
-                    mbValidPrtArea = sal_False;
+                    mbValidPrtArea = false;
 
                     SwTwips nPrtWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)();
                     if( bVert && ( IsBodyFrm() || IsFtnContFrm() ) )
@@ -835,7 +834,7 @@ void SwLayoutFrm::MakeAll()
                     // Don't leave your upper
                     const SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)();
                     if( (Frm().*fnRect->fnOverStep)( nDeadLine ) )
-                        mbValidSize = sal_False;
+                        mbValidSize = false;
                 }
             }
         }
@@ -883,13 +882,13 @@ bool SwFrm::IsCollapse() const
     return pTxtNode && pTxtNode->IsCollapse();
 }
 
-sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
+bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
 {
-    sal_Bool bSizeChgd = sal_False;
+    bool bSizeChgd = false;
 
     if ( !mbValidPrtArea )
     {
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
 
         SWRECTFN( this )
         const bool bTxtFrm = IsTxtFrm();
@@ -934,7 +933,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
                     // <SwSortedObjs> entries
                     SwAnchoredObject* pObj = (*GetDrawObjs())[i];
                     const SwFrmFmt& rFmt = pObj->GetFrmFmt();
-                    const sal_Bool bFly = pObj->ISA(SwFlyFrm);
+                    const bool bFly = pObj->ISA(SwFlyFrm);
                     if ((bFly && (FAR_AWAY == pObj->GetObjRect().Width()))
                         || rFmt.GetFrmSize().GetWidthPercent())
                     {
@@ -1003,7 +1002,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
                 GrowFrm( nUpper );
             else
                 ShrinkFrm( -nUpper );
-            bSizeChgd = sal_True;
+            bSizeChgd = true;
         }
     }
     return bSizeChgd;
@@ -1017,8 +1016,8 @@ inline void ValidateSz( SwFrm *pFrm )
 {
     if ( pFrm )
     {
-        pFrm->mbValidSize = sal_True;
-        pFrm->mbValidPrtArea = sal_True;
+        pFrm->mbValidSize = true;
+        pFrm->mbValidPrtArea = true;
     }
 }
 
@@ -1086,10 +1085,10 @@ void SwCntntFrm::MakeAll()
                                             // didn't keep it's promise, we can act in a
                                             // controlled fashion.
     bool bMoveable;
-    const sal_Bool bFly = IsInFly();
-    const sal_Bool bTab = IsInTab();
-    const sal_Bool bFtn = IsInFtn();
-    const sal_Bool bSct = IsInSct();
+    const bool bFly = IsInFly();
+    const bool bTab = IsInTab();
+    const bool bFtn = IsInFtn();
+    const bool bSct = IsInSct();
     Point aOldFrmPos;               // This is so we can compare with the last pos
     Point aOldPrtPos;               // and determine whether it makes sense to Prepare
 
@@ -1102,7 +1101,7 @@ void SwCntntFrm::MakeAll()
         pNotify->SetBordersJoinedWithPrev();
     }
 
-    const sal_Bool bKeep = IsKeep( rAttrs.GetAttrSet() );
+    const bool bKeep = IsKeep( rAttrs.GetAttrSet() );
 
     SwSaveFtnHeight *pSaveFtn = 0;
     if ( bFtn )
@@ -1146,7 +1145,7 @@ void SwCntntFrm::MakeAll()
              IsMoveable() )
         {
             bMovedFwd = true;
-            MoveFwd( bMakePage, sal_False );
+            MoveFwd( bMakePage, false );
         }
     }
 
@@ -1162,7 +1161,7 @@ void SwCntntFrm::MakeAll()
         {
             lcl_Prev( this )->InvalidatePrt();
         }
-        MoveFwd( bMakePage, sal_False );
+        MoveFwd( bMakePage, false );
     }
 
     // OD 08.11.2002 #104840# - check footnote content for forward move.
@@ -1182,7 +1181,7 @@ void SwCntntFrm::MakeAll()
                  pFtnBossOfFtn->IsBefore( pFtnBossOfRef ) )
             {
                 bMovedFwd = true;
-                MoveFwd( bMakePage, sal_False );
+                MoveFwd( bMakePage, false );
             }
         }
     }
@@ -1242,7 +1241,7 @@ void SwCntntFrm::MakeAll()
                  (Frm().*fnRect->fnGetWidth)() == 0 &&
                  (Prt().*fnRect->fnGetWidth)() == 0 )
             {
-                mbValidPrtArea = sal_False;
+                mbValidPrtArea = false;
             }
 
             (Frm().*fnRect->fnSetWidth)( nNewFrmWidth );
@@ -1284,7 +1283,7 @@ void SwCntntFrm::MakeAll()
                 if ( !bNoPrepAdjustFrm )
                 {
                     Prepare( PREP_ADJUST_FRM );
-                    mbValidSize = sal_False;
+                    mbValidSize = false;
                 }
             }
         }
@@ -1295,13 +1294,13 @@ void SwCntntFrm::MakeAll()
         // - It needs to overlap with the lower edge of the PrtArea of the Upper
         if ( !bMustFit )
         {
-            sal_Bool bWidow = sal_True;
+            bool bWidow = true;
             const SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)();
             if ( bMoveable && !bFormatted && ( GetFollow() ||
                  ( (Frm().*fnRect->fnOverStep)( nDeadLine ) ) ) )
             {
                 Prepare( PREP_WIDOWS_ORPHANS, 0, false );
-                mbValidSize = bWidow = sal_False;
+                mbValidSize = bWidow = false;
             }
             if( (Frm().*fnRect->fnGetPos)() != aOldFrmPos ||
                 (Prt().*fnRect->fnGetPos)() != aOldPrtPos )
@@ -1312,7 +1311,7 @@ void SwCntntFrm::MakeAll()
                 if ( bWidow && GetFollow() )
                 {
                     Prepare( PREP_WIDOWS_ORPHANS, 0, false );
-                    mbValidSize = sal_False;
+                    mbValidSize = false;
                 }
             }
         }
@@ -1321,7 +1320,7 @@ void SwCntntFrm::MakeAll()
             mbValidSize = bFormatted = sal_True;
             ++nFormatCount;
             if( nFormatCount > STOP_FLY_FORMAT )
-                SetFlyLock( sal_True );
+                SetFlyLock( true );
             // - loop prevention
             // No format any longer, if <cnStopFormat> consequetive formats
             // without change occur.
@@ -1353,7 +1352,7 @@ void SwCntntFrm::MakeAll()
             bFormatted = sal_False;
             if ( bKeep && bMoveable )
             {
-                if( CheckMoveFwd( bMakePage, sal_False, bMovedBwd ) )
+                if( CheckMoveFwd( bMakePage, false, bMovedBwd ) )
                 {
                     bMovedFwd = true;
                     bMoveable = IsMoveable();
@@ -1405,10 +1404,10 @@ void SwCntntFrm::MakeAll()
                         {
                             SwSectionFrm* pNxtSct = pNxt->FindSctFrm();
                             if( pNxtSct && pSct->IsAnFollow( pNxtSct ) )
-                                mbValidPos = sal_False;
+                                mbValidPos = false;
                         }
                         else
-                            mbValidPos = sal_False;
+                            mbValidPos = false;
                     }
                 }
             }
@@ -1429,7 +1428,7 @@ void SwCntntFrm::MakeAll()
                  nFormatCount <= STOP_FLY_FORMAT &&
                  !GetDrawObjs() )
             {
-                mbValidPos = sal_False;
+                mbValidPos = false;
                 MakePos();
                 aOldFrmPos = (Frm().*fnRect->fnGetPos)();
                 aOldPrtPos = (Prt().*fnRect->fnGetPos)();
@@ -1559,7 +1558,7 @@ void SwCntntFrm::MakeAll()
                 if ( nTmp > 0 && WouldFit( nTmp, bSplit, false ) )
                 {
                     Prepare( PREP_WIDOWS_ORPHANS, 0, false );
-                    mbValidSize = sal_False;
+                    mbValidSize = false;
                     bFitPromise = true;
                     continue;
                 }
@@ -1603,10 +1602,10 @@ void SwCntntFrm::MakeAll()
             bMovedFwd = false;
         }
 
-        const sal_Bool bCheckForGrownBody = pOldUp->IsBodyFrm();
+        const bool bCheckForGrownBody = pOldUp->IsBodyFrm();
         const long nOldBodyHeight = (pOldUp->Frm().*fnRect->fnGetHeight)();
 
-        if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) )
+        if ( !bMovedFwd && !MoveFwd( bMakePage, false ) )
             bMakePage = false;
         SWREFRESHFN( this )
 
@@ -1633,7 +1632,7 @@ void SwCntntFrm::MakeAll()
             if ( nConsequetiveFormatsWithoutChange <= cnStopFormat )
             {
                 Prepare( PREP_MUST_FIT, 0, false );
-                mbValidSize = sal_False;
+                mbValidSize = false;
                 bMustFit = true;
                 continue;
             }
@@ -1678,7 +1677,7 @@ void SwCntntFrm::MakeAll()
         pNotify->SetInvalidatePrevPrtArea();
     }
     delete pNotify;
-    SetFlyLock( sal_False );
+    SetFlyLock( false );
 }
 
 void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
@@ -1686,10 +1685,10 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
     // fix(25455): Validate, otherwise this leads to a recursion.
     // The first try, cancelling with pFrm = 0 if !Valid, leads to a problem, as
     // the Keep may not be considered properly anymore (27417).
-    const sal_Bool bOldPos = pFrm->GetValidPosFlag();
-    const sal_Bool bOldSz  = pFrm->GetValidSizeFlag();
-    const sal_Bool bOldPrt = pFrm->GetValidPrtAreaFlag();
-    pFrm->mbValidPos = pFrm->mbValidPrtArea = pFrm->mbValidSize = sal_True;
+    const bool bOldPos = pFrm->GetValidPosFlag();
+    const bool bOldSz  = pFrm->GetValidSizeFlag();
+    const bool bOldPrt = pFrm->GetValidPrtAreaFlag();
+    pFrm->mbValidPos = pFrm->mbValidPrtArea = pFrm->mbValidSize = true;
 
     // fix(29272): Don't call MakeAll - there, pFrm might be invalidated again, and
     // we recursively end up in here again.
@@ -1745,9 +1744,9 @@ static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
     return pFrm && pNxt && pFrm->GetNext() == pNxt;
 }
 
-sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
+bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                             SwLayoutFrm *pNewUpper,
-                            sal_Bool bTstMove,
+                            bool bTstMove,
                             const bool bObjsInNewUpper )
 {
     // To have the footnote select it's place carefully, it needs
@@ -1757,11 +1756,11 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
     if ( IsInFtn() )
     {
         if( !lcl_IsNextFtnBoss( pNewUpper, this ) )
-            return sal_True;
+            return true;
         pFtnFrm = FindFtnFrm();
     }
 
-    sal_Bool bRet;
+    bool bRet;
     bool bSplit = !pNewUpper->Lower();
     SwCntntFrm *pFrm = this;
     const SwFrm *pTmpPrev = pNewUpper->Lower();
@@ -1805,7 +1804,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                  )
                )
             {
-                bTstMove = sal_True;
+                bTstMove = true;
                 bRet = ((SwTxtFrm*)pFrm)->TestFormat( pTmpPrev, nSpace, bSplit );
             }
             else
@@ -1835,7 +1834,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
 
                 // in balanced columned section frames we do not want the
                 // common border
-                sal_Bool bCommonBorder = sal_True;
+                bool bCommonBorder = true;
                 if ( pFrm->IsInSct() && pFrm->GetUpper()->IsColBodyFrm() )
                 {
                     const SwSectionFrm* pSct = pFrm->FindSctFrm();
@@ -1871,7 +1870,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
 
             if ( nSpace < 0 )
             {
-                bRet = sal_False;
+                bRet = false;
 
                 // #i46181#
                 if ( nSecondCheck > 0 )
@@ -1888,7 +1887,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                     const bool bSecondRet = nOldSpace >= 0 && pFrm->WouldFit( nOldSpace, bOldSplit, false );
                     if ( bSecondRet && bOldSplit && nOldSpace >= 0 )
                     {
-                        bRet = sal_True;
+                        bRet = true;
                         bSplit = true;
                     }
                 }
@@ -1902,7 +1901,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
             nSpace -= rAttrs.GetULSpace().GetLower();
             if ( nSpace < 0 )
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
 
@@ -1920,7 +1919,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                 if ( IsAnFollow( pFrm ) && !pFrm->IsValid() )
                 {
                     OSL_FAIL( "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
-                    return sal_True;
+                    return true;
                 }
             }
             SwFrm *pNxt;
@@ -1935,7 +1934,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                 if ( bTstMove &&
                      ( pNxt->GetDrawObjs() || bObjsInNewUpper ) )
                 {
-                    return sal_True;
+                    return true;
                 }
 
                 if ( !pNxt->IsValid() )
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 89d7232e3398..c5c9ebe4654d 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -30,7 +30,7 @@
 #include "switerator.hxx"
 
 // ftnfrm.cxx:
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes );
+void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
 
 SwColumnFrm::SwColumnFrm( SwFrmFmt *pFmt, SwFrm* pSib ):
     SwFtnBossFrm( pFmt, pSib )
@@ -60,7 +60,7 @@ static void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt )
             "no columns to remove." );
 
     SwColumnFrm *pColumn = (SwColumnFrm*)pCont->Lower();
-    sw_RemoveFtns( pColumn, sal_True, sal_True );
+    sw_RemoveFtns( pColumn, true, true );
     while ( pColumn->GetNext() )
     {
         OSL_ENSURE( pColumn->GetNext()->IsColumnFrm(),
@@ -93,10 +93,10 @@ static SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount )
     return 0;
 }
 
-static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
+static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
 {
     SwDoc *pDoc = pCont->GetFmt()->GetDoc();
-    const sal_Bool bMod = pDoc->IsModified();
+    const bool bMod = pDoc->IsModified();
 
     //Formats should be shared whenever possible. If a neighbour already has
     //the same column settings we can add them to the same format.
@@ -123,12 +123,12 @@ static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
         pNeighbour = aIter.Next();
     }
 
-    sal_Bool bRet;
+    bool bRet;
     SwTwips nMax = pCont->IsPageBodyFrm() ?
                    pCont->FindPageFrm()->GetMaxFtnHeight() : LONG_MAX;
     if ( pNeighbourCol )
     {
-        bRet = sal_False;
+        bRet = false;
         SwFrm *pTmp = pCont->Lower();
         while ( pTmp )
         {
@@ -145,7 +145,7 @@ static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
     }
     else
     {
-        bRet = sal_True;
+        bRet = true;
         for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             SwFrmFmt *pFmt = pDoc->MakeFrmFmt( aEmptyOUStr, pDoc->GetDfltFrmFmt());
@@ -171,7 +171,7 @@ static sal_Bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount )
  * @param bChgFtn if true, the columnframe will be inserted or removed, if necessary.
  */
 void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
-    const sal_Bool bChgFtn )
+    const bool bChgFtn )
 {
     if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFtn )
         return;
@@ -193,14 +193,14 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
     nNewNum = rNew.GetNumCols();
     if( !nNewNum )
         ++nNewNum;
-    sal_Bool bAtEnd;
+    bool bAtEnd;
     if( IsSctFrm() )
         bAtEnd = ((SwSectionFrm*)this)->IsAnyNoteAtEnd();
     else
-        bAtEnd = sal_False;
+        bAtEnd = false;
 
     //Setting the column width is only needed for new formats.
-    sal_Bool bAdjustAttributes = nOldNum != rOld.GetNumCols();
+    bool bAdjustAttributes = nOldNum != rOld.GetNumCols();
 
     //The content is saved and restored if the column count is different.
     SwFrm *pSave = 0;
@@ -211,7 +211,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
         // SaveCntnt would also suck up the content of the footnote container
         // and store it within the normal text flow.
         if( IsPageBodyFrm() )
-            pDoc->GetCurrentLayout()->RemoveFtns( (SwPageFrm*)GetUpper(), sal_True, sal_False );
+            pDoc->GetCurrentLayout()->RemoveFtns( (SwPageFrm*)GetUpper(), true, false );
         pSave = ::SaveCntnt( this );
 
         //If columns exist, they get deleted if a column count of 0 or 1 is requested.
@@ -238,7 +238,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
         if ( nOldNum > nNewNum )
         {
             ::lcl_RemoveColumns( this, nOldNum - nNewNum );
-            bAdjustAttributes = sal_True;
+            bAdjustAttributes = true;
         }
         else if( nOldNum < nNewNum )
         {
@@ -252,14 +252,14 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
         if ( rOld.GetLineWidth()    != rNew.GetLineWidth() ||
              rOld.GetWishWidth()    != rNew.GetWishWidth() ||
              rOld.IsOrtho()         != rNew.IsOrtho() )
-            bAdjustAttributes = sal_True;
+            bAdjustAttributes = true;
         else
         {
             sal_uInt16 nCount = std::min( rNew.GetColumns().size(), rOld.GetColumns().size() );
             for ( sal_uInt16 i = 0; i < nCount; ++i )
                 if ( !(rOld.GetColumns()[i] == rNew.GetColumns()[i]) )
                 {
-                    bAdjustAttributes = sal_True;
+                    bAdjustAttributes = true;
                     break;
                 }
         }
@@ -280,7 +280,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
     }
 }
 
-void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttributes )
+void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes )
 {
     if( !Lower()->GetNext() )
     {
@@ -288,7 +288,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttribut
         return;
     }
 
-    const sal_Bool bVert = IsVertical();
+    const bool bVert = IsVertical();
 
     SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
 
@@ -312,16 +312,16 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, sal_Bool bAdjustAttribut
     //The columns can now be easily adjusted.
     //The widths get counted so we can give the reminder to the last one.
     SwTwips nAvail = (Prt().*fnRect->fnGetWidth)();
-    const sal_Bool bLine = pAttr->GetLineAdj() != COLADJ_NONE;
+    const bool bLine = pAttr->GetLineAdj() != COLADJ_NONE;
     const sal_uInt16 nMin = bLine ? sal_uInt16( 20 + ( pAttr->GetLineWidth() / 2) ) : 0;
 
-    const sal_Bool bR2L = IsRightToLeft();
+    const bool bR2L = IsRightToLeft();
     SwFrm *pCol = bR2L ? GetLastLower() : Lower();
 
     // #i27399#
     // bOrtho means we have to adjust the column frames manually. Otherwise
     // we may use the values returned by CalcColWidth:
-    const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
+    const bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
     long nGutter = 0;
 
     for ( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; ++i ) //i118878, value returned by GetNumCols() can't be trusted
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 6546a000b2b1..87779c4011bc 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -528,7 +528,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
 
     if( 1 == nTestMode && nFunction != PROT_TESTFORMAT )
         return; // we may only log inside a test formatting
-    sal_Bool bTmp = sal_False;
+    bool bTmp = false;
     OStringBuffer aOut(aLayer);
     aOut.append(static_cast<sal_Int64>(lcl_GetFrameId(pFrm)));
     aOut.append(' ');
@@ -542,9 +542,9 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
                             if( nAct == ACT_START )
                                 lcl_Flags( aOut, pFrm );
                             break;
-        case PROT_MOVE_FWD: bTmp = sal_True; // NoBreak
+        case PROT_MOVE_FWD: bTmp = true; // NoBreak
         case PROT_MOVE_BWD:
-                            if (nFunction == bTmp)
+                            if (nFunction == (bTmp ? 1 : 0))
                                 aOut.append("Fwd");
                             else
                                 aOut.append("Bwd");
@@ -564,7 +564,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
                             aOut.append("TestShrink");
                             break;
         case PROT_ADJUSTN :
-        case PROT_SHRINK:   bTmp = sal_True; // NoBreak
+        case PROT_SHRINK:   bTmp = true; // NoBreak
         case PROT_GROW:
                             if (!bTmp)
                                 aOut.append("Grow");
@@ -605,7 +605,7 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong
                             break;
         case PROT_SECTION:  SectFunc(aOut, pFrm, nAct, pParam);
                             break;
-        case PROT_CUT:      bTmp = sal_True; // NoBreak
+        case PROT_CUT:      bTmp = true; // NoBreak
         case PROT_PASTE:
                             if (bTmp)
                                 aOut.append("Cut from ");
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 83d2f64fdf18..def75771e7c7 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -98,7 +98,7 @@ namespace sw
     sal_Bool LayoutDumpFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
         throw (uno::RuntimeException, std::exception)
     {
-        sal_Bool bRet = sal_False;
+        bool bRet = false;
 
         utl::MediaDescriptor aMediaDesc = aDescriptor;
 
@@ -136,7 +136,7 @@ namespace sw
             xmlTextWriterEndDocument( writer );
             xmlFreeTextWriter( writer );
 
-            bRet = sal_True;
+            bRet = true;
         }
 
         return bRet;
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 21fa7112c165..78c065696e2b 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -166,19 +166,19 @@ SwFrm* SwFrm::GetLower()
     return IsLayoutFrm() ? ((SwLayoutFrm*)this)->Lower() : 0;
 }
 
-sal_Bool SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const
+bool SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const
 {
     const SwFrm *pUp = pAssumed;
     while ( pUp )
     {
         if ( pUp == this )
-            return sal_True;
+            return true;
         if ( pUp->IsFlyFrm() )
             pUp = ((SwFlyFrm*)pUp)->GetAnchorFrm();
         else
             pUp = pUp->GetUpper();
     }
-    return sal_False;
+    return false;
 }
 
 /** method to check relative position of layout frame to
@@ -383,7 +383,7 @@ SwPageFrm* SwFrm::FindPageFrm()
     return (SwPageFrm*)pRet;
 }
 
-SwFtnBossFrm* SwFrm::FindFtnBossFrm( sal_Bool bFootnotes )
+SwFtnBossFrm* SwFrm::FindFtnBossFrm( bool bFootnotes )
 {
     SwFrm *pRet = this;
     // Footnote bosses can't exist inside a table; also sections with columns
@@ -411,7 +411,7 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( sal_Bool bFootnotes )
         SwSectionFrm* pSct = pRet->FindSctFrm();
         OSL_ENSURE( pSct, "FindFtnBossFrm: Single column outside section?" );
         if( !pSct->IsFtnAtEnd() )
-            return pSct->FindFtnBossFrm( sal_True );
+            return pSct->FindFtnBossFrm( true );
     }
     return (SwFtnBossFrm*)pRet;
 }
@@ -648,7 +648,7 @@ SwFrm *SwFrm::_FindNext()
         return NULL;
 
     SwFrm* pRet = NULL;
-    const sal_Bool bFtn  = pThis->IsInFtn();
+    const bool bFtn  = pThis->IsInFtn();
     if ( !bIgnoreTab && pThis->IsInTab() )
     {
         SwLayoutFrm *pUp = pThis->GetUpper();
@@ -769,7 +769,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
     if ( pThis->IsCntntFrm() )
     {
         const bool bBody = pThis->IsInDocBody();
-        const sal_Bool bFtn  = pThis->IsInFtn();
+        const bool bFtn  = pThis->IsInFtn();
         SwCntntFrm *pNxtCnt = ((SwCntntFrm*)pThis)->GetNextCntntFrm();
         if ( pNxtCnt )
         {
@@ -1021,7 +1021,7 @@ SwFrm *SwFrm::_FindPrev()
         {
             SwFrm* pRet;
             const bool bBody = pThis->IsInDocBody();
-            const sal_Bool bFtn  = bBody ? sal_False : pThis->IsInFtn();
+            const bool bFtn  = bBody ? sal_False : pThis->IsInFtn();
             if ( bBody || bFtn )
             {
                 while ( pPrvCnt )
@@ -1063,7 +1063,7 @@ SwFrm *SwFrm::_FindPrev()
     return 0;
 }
 
-void SwFrm::ImplInvalidateNextPos( sal_Bool bNoFtn )
+void SwFrm::ImplInvalidateNextPos( bool bNoFtn )
 {
     SwFrm *pFrm;
     if ( 0 != (pFrm = _FindNext()) )
@@ -1250,27 +1250,27 @@ void SwFrm::SetInfFlags()
     if ( !IsFlyFrm() && !GetUpper() ) //not yet pasted, no information available
         return;
 
-    mbInfInvalid = mbInfBody = mbInfTab = mbInfFly = mbInfFtn = mbInfSct = sal_False;
+    mbInfInvalid = mbInfBody = mbInfTab = mbInfFly = mbInfFtn = mbInfSct = false;
 
     SwFrm *pFrm = this;
     if( IsFtnContFrm() )
-        mbInfFtn = sal_True;
+        mbInfFtn = true;
     do
     {
         // mbInfBody is only set in the page body, but not in the column body
         if ( pFrm->IsBodyFrm() && !mbInfFtn && pFrm->GetUpper()
              && pFrm->GetUpper()->IsPageFrm() )
-            mbInfBody = sal_True;
+            mbInfBody = true;
         else if ( pFrm->IsTabFrm() || pFrm->IsCellFrm() )
         {
-            mbInfTab = sal_True;
+            mbInfTab = true;
         }
         else if ( pFrm->IsFlyFrm() )
-            mbInfFly = sal_True;
+            mbInfFly = true;
         else if ( pFrm->IsSctFrm() )
-            mbInfSct = sal_True;
+            mbInfSct = true;
         else if ( pFrm->IsFtnFrm() )
-            mbInfFtn = sal_True;
+            mbInfFtn = true;
 
         pFrm = pFrm->GetUpper();
 
@@ -1282,7 +1282,7 @@ void SwFrm::SetInfFlags()
  * If the property is derived, it's from the upper or (for fly frames) from
  * the anchor. Otherwise we've to call a virtual method to check the property.
  */
-void SwFrm::SetDirFlags( sal_Bool bVert )
+void SwFrm::SetDirFlags( bool bVert )
 {
     if( bVert )
     {
@@ -1303,7 +1303,7 @@ void SwFrm::SetDirFlags( sal_Bool bVert )
                 mbVertLR  = pAsk->IsVertLR() ? 1 : 0;
 
                 if ( !pAsk->mbInvalidVert )
-                    mbInvalidVert = sal_False;
+                    mbInvalidVert = false;
             }
         }
         else
@@ -1311,7 +1311,7 @@ void SwFrm::SetDirFlags( sal_Bool bVert )
     }
     else
     {
-        sal_Bool bInv = 0;
+        bool bInv = false;
         if( !mbDerivedR2L ) // CheckDirection is able to set bDerivedR2L!
             CheckDirection( bVert );
         if( mbDerivedR2L )
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 05c166afe6e4..b06a2b7f2824 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -50,7 +50,7 @@
 #include <fmtfollowtextflow.hxx>
 #include <switerator.hxx>
 
-sal_Bool SwFlowFrm::m_bMoveBwdJump = sal_False;
+bool SwFlowFrm::m_bMoveBwdJump = false;
 
 SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) :
     m_rThis( rFrm ),
@@ -93,19 +93,19 @@ void SwFlowFrm::SetFollow(SwFlowFrm *const pFollow)
 }
 
 /// @return sal_True if any follow has the JoinLocked flag
-sal_Bool SwFlowFrm::HasLockedFollow() const
+bool SwFlowFrm::HasLockedFollow() const
 {
     const SwFlowFrm* pFrm = GetFollow();
     while( pFrm )
     {
         if( pFrm->IsJoinLocked() )
-            return sal_True;
+            return true;
         pFrm = pFrm->GetFollow();
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
+bool SwFlowFrm::IsKeepFwdMoveAllowed()
 {
     // If all the predecessors up to the first of the chain have
     // the 'keep' attribute set, and the first of the chain's
@@ -116,13 +116,13 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
         {   if ( pFrm->GetAttrSet()->GetKeep().GetValue() )
                 pFrm = pFrm->GetIndPrev();
             else
-                return sal_True;
+                return true;
         } while ( pFrm );
 
                   //See IsFwdMoveAllowed()
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( pFrm && pFrm->GetIndPrev() )
-        bRet = sal_True;
+        bRet = true;
     return bRet;
 }
 
@@ -140,8 +140,8 @@ void SwFlowFrm::CheckKeep()
             return;
     }
     SwFrm* pTmp;
-    sal_Bool bKeep;
-    while ( sal_True == (bKeep = pPre->GetAttrSet()->GetKeep().GetValue()) &&
+    bool bKeep;
+    while ( (bKeep = pPre->GetAttrSet()->GetKeep().GetValue()) &&
             0 != ( pTmp = pPre->GetIndPrev() ) )
     {
         if( pTmp->IsSctFrm() )
@@ -158,7 +158,7 @@ void SwFlowFrm::CheckKeep()
         pPre->InvalidatePos();
 }
 
-sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ) const
+bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep ) const
 {
     // 1. The keep attribute is ignored inside footnotes
     // 2. For compatibility reasons, the keep attribute is
@@ -166,7 +166,7 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
     // 3. If bBreakCheck is set to true, this function only checks
     //    if there are any break after attributes set at rAttrs
     //    or break before attributes set for the next content (or next table)
-    sal_Bool bKeep = bCheckIfLastRowShouldKeep ||
+    bool bKeep = bCheckIfLastRowShouldKeep ||
                  (  !m_rThis.IsInFtn() &&
                     ( !m_rThis.IsInTab() || m_rThis.IsTabFrm() ) &&
                     rAttrs.GetKeep().GetValue() );
@@ -184,7 +184,7 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
             case SVX_BREAK_PAGE_AFTER:
             case SVX_BREAK_PAGE_BOTH:
             {
-                bKeep = sal_False;
+                bKeep = false;
             }
             default: break;
         }
@@ -211,7 +211,7 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
                         pNextSection = pNextSectionFrm->GetSection();
 
                     if ( pThisSection != pNextSection )
-                        bKeep = sal_False;
+                        bKeep = false;
                 }
 
                 if ( bKeep )
@@ -231,14 +231,14 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK
                     OSL_ENSURE( pSet, "No AttrSet to check keep attribute" );
 
                     if ( pSet->GetPageDesc().GetPageDesc() )
-                        bKeep = sal_False;
+                        bKeep = false;
                     else switch ( pSet->GetBreak().GetBreak() )
                     {
                         case SVX_BREAK_COLUMN_BEFORE:
                         case SVX_BREAK_COLUMN_BOTH:
                         case SVX_BREAK_PAGE_BEFORE:
                         case SVX_BREAK_PAGE_BOTH:
-                            bKeep = sal_False;
+                            bKeep = false;
                         default: break;
                     }
                 }
@@ -422,11 +422,11 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
 
 /// A specialized form of Paste(), which relocates a whole chain (this and the following,
 /// in particular). During this process, only the minimum operations and notifications are done.
-sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
+bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
                            SwFrm *pOldParent )
 {
     //returns sal_True if there's a LayoutFrm in the chain.
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // The chain beginning with pStart is inserted before pSibling
     // under the parent. We take care to invalidate as required.
@@ -499,7 +499,7 @@ sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibl
                 ((SwTxtFrm*)pFloat)->Init();    // I'm his friend.
         }
         else
-            bRet = sal_True;
+            bRet = true;
 
         nGrowVal += (pFloat->Frm().*fnRect->fnGetHeight)();
         if ( pFloat->GetNext() )
@@ -569,7 +569,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
     SwPageFrm *pOldPage = m_rThis.FindPageFrm();
 
     SwLayoutFrm *pOldParent = CutTree( &m_rThis );
-    const sal_Bool bInvaLay = PasteTree( &m_rThis, pParent, pSibling, pOldParent );
+    const bool bInvaLay = PasteTree( &m_rThis, pParent, pSibling, pOldParent );
 
     // If, by cutting & pasting, an empty SectionFrm came into existence, it should
     // disappear automatically.
@@ -581,7 +581,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
            !(pSct = pOldParent->FindSctFrm())->ContainsCntnt() &&
            !pSct->ContainsAny( true ) ) )
     {
-            pSct->DelEmpty( sal_False );
+            pSct->DelEmpty( false );
     }
 
     // If we're in a column section, we'd rather not call Calc "from below"
@@ -591,7 +591,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
     else if( m_rThis.GetUpper()->IsSctFrm() )
     {
         SwSectionFrm* pTmpSct = (SwSectionFrm*)m_rThis.GetUpper();
-        sal_Bool bOld = pTmpSct->IsCntntLocked();
+        bool bOld = pTmpSct->IsCntntLocked();
         pTmpSct->SetCntntLock( true );
         pTmpSct->Calc();
         if( !bOld )
@@ -618,15 +618,15 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
         m_rThis.GetUpper()->InvalidatePage( pPage );
 }
 
-sal_Bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
+bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
 {
     const SwFlowFrm *pFoll = this;
     do
     {   if ( pAssumed == pFoll )
-            return sal_True;
+            return true;
         pFoll = pFoll->GetFollow();
     } while ( pFoll );
-    return sal_False;
+    return false;
 }
 
 SwTxtFrm* SwCntntFrm::FindMaster() const
@@ -704,7 +704,7 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
  * Returns the next/previous Layout leaf that's NOT below this (or even is this itself).
  * Also, that leaf must be in the same text flow as the pAnch origin frame (Body, Ftn)
  */
-const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd,
+const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd,
                                    const SwFrm *pAnch ) const
 {
     // No flow, no joy...
@@ -731,7 +731,7 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd,
     return (const SwLayoutFrm*)pLeaf;
 }
 
-SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd )
+SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd )
 {
     if ( IsInFtn() )
         return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage );
@@ -772,7 +772,7 @@ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, sal_Bool bFwd )
     return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf( eMakePage );
 }
 
-sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
+bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
 {
     // Now it's getting a bit complicated:
 
@@ -818,7 +818,7 @@ sal_Bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
     // Does the Cntnt bring a Pagedesc or do we need the
     // virtual page number of the new layout leaf?
     // PageDesc isn't allowed with Follows
-    const sal_Bool bOdd = nTmp ? ( (nTmp % 2) ? sal_True : sal_False )
+    const bool bOdd = nTmp ? ( (nTmp % 2) ? sal_True : sal_False )
                            : pNew->OnRightPage();
     if ( !pDesc )
         pDesc = pNew->FindPageDesc();
@@ -941,7 +941,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
                         if ( !pPg || pPg == pNew )
                             pPg = FindPageFrm();
 
-                        InsertPage( pPg, sal_False );
+                        InsertPage( pPg, false );
                         pLayLeaf = GetNextLayoutLeaf();
                         pOldLayLeaf = 0;
                         continue;
@@ -960,7 +960,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
             {
                 InsertPage(
                     pOldLayLeaf ? pOldLayLeaf->FindPageFrm() : FindPageFrm(),
-                    sal_False );
+                    false );
 
                 // And again from the start.
                 pLayLeaf = pOldLayLeaf ? pOldLayLeaf : GetNextLayoutLeaf();
@@ -979,7 +979,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
 
     const bool bBody = IsInDocBody();  // If I'm coming from the DocBody,
                                            // I want to end up in the body.
-    const sal_Bool bFly  = IsInFly();
+    const bool bFly  = IsInFly();
 
     SwLayoutFrm *pLayLeaf = GetPrevLayoutLeaf();
     SwLayoutFrm *pPrevLeaf = 0;
@@ -996,7 +996,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
             pPrevLeaf = pLayLeaf;
             pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
             if ( pLayLeaf )
-                SwFlowFrm::SetMoveBwdJump( sal_True );
+                SwFlowFrm::SetMoveBwdJump( true );
         }
         else if ( bFly )
             break;  //Cntnts in Flys should accept any layout leaf.
@@ -1006,7 +1006,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
     return pLayLeaf ? pLayLeaf : pPrevLeaf;
 }
 
-sal_Bool SwFlowFrm::IsPrevObjMove() const
+bool SwFlowFrm::IsPrevObjMove() const
 {
     //sal_True The FlowFrm must respect the a border of the predecessor, also needs
     //         to insert a break if required.
@@ -1014,7 +1014,7 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const
     //!!!!!!!!!!!Hack!!!!!!!!!!!
     const SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-        return sal_False;
+        return false;
 
     SwFrm *pPre = m_rThis.FindPrev();
 
@@ -1022,7 +1022,7 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const
     {
         OSL_ENSURE( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" );
         if( SwFlowFrm::CastFlowFrm( pPre )->IsAnFollow( this ) )
-            return sal_False;
+            return false;
         SwLayoutFrm* pPreUp = pPre->GetUpper();
         // If the upper is a SectionFrm, or a column of a SectionFrm, we're
         // allowed to protrude out of it.  However, we need to respect the
@@ -1055,12 +1055,12 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const
                      pPreUp != pVertPosOrientFrm &&
                      !pPreUp->IsAnLower( pVertPosOrientFrm ) )
                 {
-                    return sal_True;
+                    return true;
                 }
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 /**
@@ -1078,14 +1078,14 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const
 |*      The implementation works only on CntntFrms! - the definition
 |*      of the predecessor is not clear for LayoutFrms.
 |*/
-sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
+bool SwFlowFrm::IsPageBreak( bool bAct ) const
 {
     if ( !IsFollow() && m_rThis.IsInDocBody() &&
          ( !m_rThis.IsInTab() || ( m_rThis.IsTabFrm() && !m_rThis.GetUpper()->IsInTab() ) ) ) // i66968
     {
         const SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
         if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-            return sal_False;
+            return false;
         const SwAttrSet *pSet = m_rThis.GetAttrSet();
 
         // Determine predecessor
@@ -1099,27 +1099,27 @@ sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
             OSL_ENSURE( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" );
             if ( bAct )
             {   if ( m_rThis.FindPageFrm() == pPrev->FindPageFrm() )
-                    return sal_False;
+                    return false;
             }
             else
             {   if ( m_rThis.FindPageFrm() != pPrev->FindPageFrm() )
-                    return sal_False;
+                    return false;
             }
 
             const SvxBreak eBreak = pSet->GetBreak().GetBreak();
             if ( eBreak == SVX_BREAK_PAGE_BEFORE || eBreak == SVX_BREAK_PAGE_BOTH )
-                return sal_True;
+                return true;
             else
             {
                 const SvxBreak &ePrB = pPrev->GetAttrSet()->GetBreak().GetBreak();
                 if ( ePrB == SVX_BREAK_PAGE_AFTER ||
                      ePrB == SVX_BREAK_PAGE_BOTH  ||
                      pSet->GetPageDesc().GetPageDesc() )
-                    return sal_True;
+                    return true;
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
 /**
@@ -1135,7 +1135,7 @@ sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const
 |*      The implementation works only on CntntFrms! - the definition
 |*      of the predecessor is not clear for LayoutFrms.
 |*/
-sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const
+bool SwFlowFrm::IsColBreak( bool bAct ) const
 {
     if ( !IsFollow() && (m_rThis.IsMoveable() || bAct) )
     {
@@ -1152,31 +1152,31 @@ sal_Bool SwFlowFrm::IsColBreak( sal_Bool bAct ) const
             {
                 if ( bAct )
                 {   if ( pCol == pPrev->FindColFrm() )
-                        return sal_False;
+                        return false;
                 }
                 else
                 {   if ( pCol != pPrev->FindColFrm() )
-                        return sal_False;
+                        return false;
                 }
 
                 const SvxBreak eBreak = m_rThis.GetAttrSet()->GetBreak().GetBreak();
                 if ( eBreak == SVX_BREAK_COLUMN_BEFORE ||
                      eBreak == SVX_BREAK_COLUMN_BOTH )
-                    return sal_True;
+                    return true;
                 else
                 {
                     const SvxBreak &ePrB = pPrev->GetAttrSet()->GetBreak().GetBreak();
                     if ( ePrB == SVX_BREAK_COLUMN_AFTER ||
                          ePrB == SVX_BREAK_COLUMN_BOTH )
-                        return sal_True;
+                        return true;
                 }
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwFlowFrm::HasParaSpaceAtPages( sal_Bool bSct ) const
+bool SwFlowFrm::HasParaSpaceAtPages( bool bSct ) const
 {
     if( m_rThis.IsInSct() )
     {
@@ -1186,26 +1186,26 @@ sal_Bool SwFlowFrm::HasParaSpaceAtPages( sal_Bool bSct ) const
             if( pTmp->IsCellFrm() || pTmp->IsFlyFrm() ||
                 pTmp->IsFooterFrm() || pTmp->IsHeaderFrm() ||
                 ( pTmp->IsFtnFrm() && !((SwFtnFrm*)pTmp)->GetMaster() ) )
-                return sal_True;
+                return true;
             if( pTmp->IsPageFrm() )
-                return ( pTmp->GetPrev() && !IsPageBreak(sal_True) ) ? sal_False : sal_True;
+                return ( pTmp->GetPrev() && !IsPageBreak(true) ) ? sal_False : sal_True;
             if( pTmp->IsColumnFrm() && pTmp->GetPrev() )
-                return IsColBreak( sal_True );
+                return IsColBreak( true );
             if( pTmp->IsSctFrm() && ( !bSct || pTmp->GetPrev() ) )
-                return sal_False;
+                return false;
             pTmp = pTmp->GetUpper();
         }
         OSL_FAIL( "HasParaSpaceAtPages: Where's my page?" );
-        return sal_False;
+        return false;
     }
     if( !m_rThis.IsInDocBody() || ( m_rThis.IsInTab() && !m_rThis.IsTabFrm()) ||
-        IsPageBreak( sal_True ) || ( m_rThis.FindColFrm() && IsColBreak( sal_True ) ) )
-        return sal_True;
+        IsPageBreak( true ) || ( m_rThis.FindColFrm() && IsColBreak( true ) ) )
+        return true;
     const SwFrm* pTmp = m_rThis.FindColFrm();
     if( pTmp )
     {
         if( pTmp->GetPrev() )
-            return sal_False;
+            return false;
     }
     else
         pTmp = &m_rThis;
@@ -1619,7 +1619,7 @@ SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const
         _pAttrs = pAttrAccess->Get();
     }
 
-    sal_Bool bCommonBorder = sal_True;
+    bool bCommonBorder = true;
     if ( m_rThis.IsInSct() && m_rThis.GetUpper()->IsColBodyFrm() )
     {
         const SwSectionFrm* pSectFrm = m_rThis.FindSctFrm();
@@ -1689,7 +1689,7 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
 }
 
 /// Moves the Frm forward if it seems necessary regarding the current conditions and attributes.
-sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
+bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool )
 {
     const SwFrm* pNxt = m_rThis.GetIndNext();
 
@@ -1725,46 +1725,46 @@ sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
             if( bMove )
             {
                 //Keep together with the following frame
-                MoveFwd( rbMakePage, sal_False );
-                return sal_True;
+                MoveFwd( rbMakePage, false );
+                return true;
             }
         }
     }
 
-    sal_Bool bMovedFwd = sal_False;
+    bool bMovedFwd = false;
 
     if ( m_rThis.GetIndPrev() )
     {
         if ( IsPrevObjMove() ) // Should we care about objects of the Prev?
         {
-            bMovedFwd = sal_True;
-            if ( !MoveFwd( rbMakePage, sal_False ) )
+            bMovedFwd = true;
+            if ( !MoveFwd( rbMakePage, false ) )
                 rbMakePage = false;
         }
         else
         {
-            if ( IsPageBreak( sal_False ) )
+            if ( IsPageBreak( false ) )
             {
-                while ( MoveFwd( rbMakePage, sal_True ) )
+                while ( MoveFwd( rbMakePage, true ) )
                         /* do nothing */;
                 rbMakePage = false;
-                bMovedFwd = sal_True;
+                bMovedFwd = true;
             }
-            else if ( IsColBreak ( sal_False ) )
+            else if ( IsColBreak ( false ) )
             {
                 const SwPageFrm *pPage = m_rThis.FindPageFrm();
                 SwFrm *pCol = m_rThis.FindColFrm();
                 do
-                {   MoveFwd( rbMakePage, sal_False );
+                {   MoveFwd( rbMakePage, false );
                     SwFrm *pTmp = m_rThis.FindColFrm();
                     if( pTmp != pCol )
                     {
-                        bMovedFwd = sal_True;
+                        bMovedFwd = true;
                         pCol = pTmp;
                     }
                     else
                         break;
-                } while ( IsColBreak( sal_False ) );
+                } while ( IsColBreak( false ) );
                 if ( pPage != m_rThis.FindPageFrm() )
                     rbMakePage = false;
             }
@@ -1774,7 +1774,7 @@ sal_Bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool )
 }
 
 /// Return value tells us whether the Frm has changed the page.
-sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways )
+bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
 {
 //!!!!MoveFtnCntFwd might need to be updated as well.
     SwFtnBossFrm *pOldBoss = m_rThis.FindFtnBossFrm();
@@ -1806,17 +1806,17 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
             // It's allowed to move PageBreaks if the Frm isn't the first
             // one on the page.
             if ( !bPageBreak )
-                return sal_False;
+                return false;
 
             const SwFrm *pCol = m_rThis.FindColFrm();
             if ( !pCol || !pCol->GetPrev() )
-                return sal_False;
+                return false;
         }
     }
 
-    sal_Bool bSamePage = sal_True;
+    bool bSamePage = true;
     SwLayoutFrm *pNewUpper =
-            m_rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, sal_True );
+            m_rThis.GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, true );
 
     if ( pNewUpper )
     {
@@ -1848,12 +1848,12 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
 
         SwFtnBossFrm *pNewBoss = pNewUpper->FindFtnBossFrm();
         bool bBossChg = pNewBoss != pOldBoss;
-        pNewBoss = pNewBoss->FindFtnBossFrm( sal_True );
-        pOldBoss = pOldBoss->FindFtnBossFrm( sal_True );
+        pNewBoss = pNewBoss->FindFtnBossFrm( true );
+        pOldBoss = pOldBoss->FindFtnBossFrm( true );
         SwPageFrm* pNewPage = pOldPage;
 
         // First, we move the footnotes.
-        sal_Bool bFtnMoved = sal_False;
+        bool bFtnMoved = false;
 
         // #i26831#
         // If pSect has just been created, the printing area of pSect has
@@ -1882,7 +1882,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
                 (SwLayoutFrm*)((SwTxtFrm*)pStart)->FindBodyFrm() : 0 ) : 0;
             if( pBody )
                 bFtnMoved = pBody->MoveLowerFtns( pStart, pOldBoss, pNewBoss,
-                                                  sal_False);
+                                                  false);
         }
         // It's possible when dealing with SectionFrms that we have been moved
         // by pNewUpper->Calc(), for instance into the pNewUpper.
@@ -1953,7 +1953,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
                  ( m_rThis.GetAttrSet()->GetPageDesc().GetPageDesc() ||
                    pOldPage->GetPageDesc()->GetFollow() != pNewPage->GetPageDesc() ) )
             {
-                SwFrm::CheckPageDescs( pNewPage, sal_False );
+                SwFrm::CheckPageDescs( pNewPage, false );
             }
         }
     }
@@ -1967,7 +1967,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
  */
 bool SwFlowFrm::MoveBwd( bool &rbReformat )
 {
-    SwFlowFrm::SetMoveBwdJump( sal_False );
+    SwFlowFrm::SetMoveBwdJump( false );
 
     SwFtnFrm* pFtn = m_rThis.FindFtnFrm();
     if ( pFtn && pFtn->IsBackMoveLocked() )
@@ -2019,16 +2019,16 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
         OSL_ENSURE( pRef, "MoveBwd: Endnote for an empty section?" );
 
         if( !bEndnote )
-            pOldBoss = pOldBoss->FindFtnBossFrm( sal_True );
+            pOldBoss = pOldBoss->FindFtnBossFrm( true );
         SwFtnBossFrm *pRefBoss = pRef->FindFtnBossFrm( !bEndnote );
         if ( pOldBoss != pRefBoss &&
              // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)>
              ( !bEndnote ||
                pRefBoss->IsBefore( pOldBoss ) )
            )
-            pNewUpper = m_rThis.GetLeaf( MAKEPAGE_FTN, sal_False );
+            pNewUpper = m_rThis.GetLeaf( MAKEPAGE_FTN, false );
     }
-    else if ( IsPageBreak( sal_True ) ) // Do we have to respect a PageBreak?
+    else if ( IsPageBreak( true ) ) // Do we have to respect a PageBreak?
     {
         // If the previous page doesn't have an Frm in the body,
         // flowing back makes sense despite the PageBreak (otherwise,
@@ -2050,7 +2050,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                     nDiff -= 1;
                 if ( nDiff > 1 )
                 {
-                    pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+                    pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, false );
                     // #i53139#
                     // Now <pNewUpper> is a previous layout frame, which contains
                     // content. But the new upper layout frame has to be the next one.
@@ -2075,7 +2075,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                     // returns new upper on page 2.
                     if ( pNewUpper->Lower() )
                     {
-                        SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True );
+                        SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, true );
                         if ( pNewNextUpper &&
                              pNewNextUpper != m_rThis.GetUpper() &&
                              pNewNextUpper->GetType() == pNewUpper->GetType() &&
@@ -2095,14 +2095,14 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
             }
         }
     }
-    else if ( IsColBreak( sal_True ) )
+    else if ( IsColBreak( true ) )
     {
         // If the previous column doesn't contain a CntntFrm, flowing back
         // makes sense despite the ColumnBreak, as otherwise we'd get
         // an empty column.
         if( m_rThis.IsInSct() )
         {
-            pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+            pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, false );
             if( pNewUpper && !SwFlowFrm::IsMoveBwdJump() &&
                 ( pNewUpper->ContainsCntnt() ||
                   ( ( !pNewUpper->IsColBodyFrm() ||
@@ -2126,7 +2126,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 // #136538# - another correction of fix for i53139
                 // Beside type check, check also, if proposed new next upper
                 // frame is inside the same frame types.
-                SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NOSECTION, sal_True );
+                SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NOSECTION, true );
                 if ( pNewNextUpper &&
                      pNewNextUpper->GetType() == pNewUpper->GetType() &&
                      pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() &&
@@ -2151,7 +2151,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 else
                 {
                     bGoOn = false;
-                    pCol = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+                    pCol = m_rThis.GetLeaf( MAKEPAGE_NONE, false );
                 }
                 if ( pCol )
                 {
@@ -2180,7 +2180,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                             // #i71065#
                             // Check that the proposed new next upper layout
                             // frame isn't the current one.
-                            SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, sal_True );
+                            SwLayoutFrm* pNewNextUpper = pNewUpper->GetLeaf( MAKEPAGE_NONE, true );
                             if ( pNewNextUpper &&
                                  pNewNextUpper != m_rThis.GetUpper() &&
                                  pNewNextUpper->GetType() == pNewUpper->GetType() &&
@@ -2204,11 +2204,11 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 }
             } while( bGoOn );
             if( bJump )
-                SwFlowFrm::SetMoveBwdJump( sal_True );
+                SwFlowFrm::SetMoveBwdJump( true );
         }
     }
     else // No breaks - we can flow back.
-        pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, sal_False );
+        pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, false );
 
     // #i27801# - no move backward of 'master' text frame,
     // if - due to its object positioning - it isn't allowed to be on the new page frame
@@ -2283,7 +2283,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 SwFrm *pFrm = pNewUpper->Lower();
                 while ( pFrm->GetNext() )
                     pFrm = pFrm->GetNext();
-                pNewUpper = pFrm->GetLeaf( MAKEPAGE_INSERT, sal_True );
+                pNewUpper = pFrm->GetLeaf( MAKEPAGE_INSERT, true );
                 if( pNewUpper == m_rThis.GetUpper() ) // Did we end up in the same place?
                     pNewUpper = NULL;               // If so, moving is not needed.
             }
@@ -2308,9 +2308,9 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                 if ( pSectFrm && !pSectFrm->IsColLocked() &&
                      !pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) )
                 {
-                    pSectFrm->DelEmpty( sal_True );
+                    pSectFrm->DelEmpty( true );
                     delete pSectFrm;
-                    m_rThis.mbValidPos = sal_True;
+                    m_rThis.mbValidPos = true;
                 }
             }
         }
@@ -2364,7 +2364,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                                     ( !m_rThis.IsSctFrm() && m_rThis.IsInSct() )
                                     ? MAKEPAGE_NOSECTION
                                     : MAKEPAGE_NONE,
-                                    sal_True );
+                                    true );
         // #i73194# - make code robust
         OSL_ENSURE( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" );
         if ( pNextNewUpper &&
@@ -2417,7 +2417,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                     pNewUpper = (SwSectionFrm*)pTmp;
                 else
                 {
-                    pSct = new SwSectionFrm( *pSct, sal_True );
+                    pSct = new SwSectionFrm( *pSct, true );
                     pSct->Paste( pNewUpper );
                     pSct->Init();
                     pNewUpper = pSct;
@@ -2426,7 +2426,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
             }
         }
         bool bUnlock = false;
-        sal_Bool bFollow = sal_False;
+        bool bFollow = false;
         // Lock section. Otherwise, it could get destroyed if the only Cntnt
         // moves e.g. from the second into the first column.
         SwSectionFrm* pSect = pNewUpper->FindSctFrm();
@@ -2480,13 +2480,13 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat )
                     SwPageFrm* pStartPage = bCheckPageDescOfNextPage ?
                                             pNewPage :
                                             (SwPageFrm*)pNewPage->GetNext();
-                    SwFrm::CheckPageDescs( pStartPage, sal_False);
+                    SwFrm::CheckPageDescs( pStartPage, false);
                 }
                 else if ( m_rThis.GetAttrSet()->GetPageDesc().GetPageDesc() )
                 {
                     // First page could get empty for example by disabling
                     // a section
-                    SwFrm::CheckPageDescs( (SwPageFrm*)pNewPage, sal_False);
+                    SwFrm::CheckPageDescs( (SwPageFrm*)pNewPage, false);
                 }
             }
         }
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 99baaf855afe..6c541c747f7c 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -67,19 +67,19 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     SwAnchoredObject(), // #i26791#
     pPrevLink( 0 ),
     pNextLink( 0 ),
-    bInCnt( sal_False ),
-    bAtCnt( sal_False ),
-    bLayout( sal_False ),
-    bAutoPosition( sal_False ),
-    bNoShrink( sal_False ),
-    bLockDeleteContent( sal_False ),
+    bInCnt( false ),
+    bAtCnt( false ),
+    bLayout( false ),
+    bAutoPosition( false ),
+    bNoShrink( false ),
+    bLockDeleteContent( false ),
     m_bValidContentPos( false )
 {
     mnType = FRMC_FLY;
 
-    bInvalid = bNotifyBack = sal_True;
+    bInvalid = bNotifyBack = true;
     bLocked  = bMinHeight =
-    bHeightClipped = bWidthClipped = bFormatHeightOnly = sal_False;
+    bHeightClipped = bWidthClipped = bFormatHeightOnly = false;
 
     // Size setting: Fixed size is always the width
     const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize();
@@ -87,43 +87,43 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
         ((SvxFrameDirectionItem&)pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue();
     if( FRMDIR_ENVIRONMENT == nDir )
     {
-        mbDerivedVert = 1;
-        mbDerivedR2L = 1;
+        mbDerivedVert = true;
+        mbDerivedR2L = true;
     }
     else
     {
-        mbInvalidVert = 0;
-        mbDerivedVert = 0;
-        mbDerivedR2L = 0;
+        mbInvalidVert = false;
+        mbDerivedVert = false;
+        mbDerivedR2L = false;
         if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir )
         {
-            mbVertLR = 0;
-            mbVertical = 0;
+            mbVertLR = false;
+            mbVertical = false;
         }
         else
         {
             const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
             if( pSh && pSh->GetViewOptions()->getBrowseMode() )
             {
-                mbVertLR = 0;
-                mbVertical = 0;
+                mbVertLR = false;
+                mbVertical = false;
             }
             else
             {
-                mbVertical = 1;
+                mbVertical = true;
 
                 if ( FRMDIR_VERT_TOP_LEFT == nDir )
-                    mbVertLR = 1;
+                    mbVertLR = true;
                 else
-                    mbVertLR = 0;
+                    mbVertLR = false;
             }
         }
 
-        mbInvalidR2L = 0;
+        mbInvalidR2L = false;
         if( FRMDIR_HORI_RIGHT_TOP == nDir )
-            mbRightToLeft = 1;
+            mbRightToLeft = true;
         else
-            mbRightToLeft = 0;
+            mbRightToLeft = false;
     }
 
     Frm().Width( rFrmSize.GetWidth() );
@@ -131,9 +131,9 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
 
     // Fixed or variable Height?
     if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE )
-        bMinHeight = sal_True;
+        bMinHeight = true;
     else if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE )
-        mbFixSize = sal_True;
+        mbFixSize = true;
 
     // insert columns, if necessary
     InsertColumns();
@@ -141,7 +141,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     // First the Init, then the Content:
     // This is due to the fact that the Content may have Objects/Frames,
     // which are then registered
-    InitDrawObj( sal_False );
+    InitDrawObj( false );
 
     Chain( pAnch );
 
@@ -197,8 +197,8 @@ void SwFlyFrm::InsertCnt()
         // NoTxt always have a fixed height.
         if ( Lower() && Lower()->IsNoTxtFrm() )
         {
-            mbFixSize = sal_True;
-            bMinHeight = sal_False;
+            mbFixSize = true;
+            bMinHeight = false;
         }
     }
 }
@@ -384,7 +384,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact )
     return pDrawObj;
 }
 
-void SwFlyFrm::InitDrawObj( sal_Bool bNotify )
+void SwFlyFrm::InitDrawObj( bool bNotify )
 {
     // Find ContactObject from the Format. If there's already one, we just
     // need to create a new Ref, else we create the Contact now.
@@ -622,23 +622,23 @@ SwFrm *SwFlyFrm::FindLastLower()
     return pRet;
 }
 
-sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
+bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTwips nDiffHeight = Frm().Height();
     if ( rFrmSize.GetHeightSizeType() == ATT_VAR_SIZE )
-        mbFixSize = bMinHeight = sal_False;
+        mbFixSize = bMinHeight = false;
     else
     {
         if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE )
         {
-            mbFixSize = sal_True;
-            bMinHeight = sal_False;
+            mbFixSize = true;
+            bMinHeight = false;
         }
         else if ( rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE )
         {
-            mbFixSize = sal_False;
-            bMinHeight = sal_True;
+            mbFixSize = false;
+            bMinHeight = true;
         }
         nDiffHeight -= rFrmSize.GetHeight();
     }
@@ -659,13 +659,13 @@ sal_Bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize )
             maPrt.Width ( maPrt.Width()  - nDiffWidth  );
             ChgLowersProp( aOldSz );
             ::Notify( this, FindPageFrm(), aOld );
-            mbValidPos = sal_False;
-            bRet = sal_True;
+            mbValidPos = false;
+            bRet = true;
         }
         else if ( Lower()->IsNoTxtFrm() )
         {
-            mbFixSize = sal_True;
-            bMinHeight = sal_False;
+            mbFixSize = true;
+            bMinHeight = false;
         }
     }
     return bRet;
@@ -944,8 +944,8 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             break;
 
         case RES_FRAMEDIR :
-            SetDerivedVert( sal_False );
-            SetDerivedR2L( sal_False );
+            SetDerivedVert( false );
+            SetDerivedR2L( false );
             CheckDirChange();
             break;
 
@@ -1064,7 +1064,7 @@ bool SwFlyFrm::GetInfo( SfxPoolItem & rInfo ) const
 void SwFlyFrm::_Invalidate( SwPageFrm *pPage )
 {
     InvalidatePage( pPage );
-    bNotifyBack = bInvalid = sal_True;
+    bNotifyBack = bInvalid = true;
 
     SwFlyFrm *pFrm;
     if ( GetAnchorFrm() && 0 != (pFrm = AnchorFrm()->FindFlyFrm()) )
@@ -1169,13 +1169,13 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
             {
                 aHori.SetHoriOrient( text::HoriOrientation::NONE );
                 aHori.SetRelationOrient( text::RelOrientation::PAGE_FRAME );
-                aHori.SetPosToggle( sal_False );
+                aHori.SetPosToggle( false );
             }
             else if ( eAnchorType == FLY_AT_FLY )
             {
                 aHori.SetHoriOrient( text::HoriOrientation::NONE );
                 aHori.SetRelationOrient( text::RelOrientation::FRAME );
-                aHori.SetPosToggle( sal_False );
+                aHori.SetPosToggle( false );
             }
             else if ( IsFlyAtCntFrm() || text::HoriOrientation::NONE != aHori.GetHoriOrient() )
             {
@@ -1199,7 +1199,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
                 }
                 else
                     aHori.SetRelationOrient( text::RelOrientation::FRAME );
-                aHori.SetPosToggle( sal_False );
+                aHori.SetPosToggle( false );
             }
             aHori.SetPos( nTmpX );
             aSet.Put( aHori );
@@ -1232,9 +1232,9 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 
         // Check column width and set it if needed
         if ( Lower() && Lower()->IsColumnFrm() )
-            AdjustColumns( 0, sal_False );
+            AdjustColumns( 0, false );
 
-        mbValidSize = sal_True;
+        mbValidSize = true;
 
         const SwTwips nUL = pAttrs->CalcTopLine()  + pAttrs->CalcBottomLine();
         const SwTwips nLR = pAttrs->CalcLeftLine() + pAttrs->CalcRightLine();
@@ -1272,11 +1272,11 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
             {
                 InvalidateObjRectWithSpaces();
             }
-            mbValidSize = sal_True;
+            mbValidSize = true;
         }
         else
         {
-            mbValidSize = sal_True;  // Fixed Frms do not Format itself
+            mbValidSize = true;  // Fixed Frms do not Format itself
             // Flys set their size using the attr
             SwTwips nNewSize = bVert ? aRelSize.Width() : aRelSize.Height();
             nNewSize -= nUL;
@@ -1369,7 +1369,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
                     if( bCollect )
                         pLay->GetFmt()->GetDoc()->GetLayouter()->
                             InsertEndnotes( pSect );
-                    sal_Bool bLock = pSect->IsFtnLock();
+                    bool bLock = pSect->IsFtnLock();
                     pSect->SetFtnLock( true );
                     pSect->CalcFtnCntnt();
                     pSect->CalcFtnCntnt();
@@ -1409,14 +1409,14 @@ void CalcCntnt( SwLayoutFrm *pLay,
 
             if ( pFrm->IsTabFrm() )
             {
-                ((SwTabFrm*)pFrm)->bCalcLowers = sal_True;
+                ((SwTabFrm*)pFrm)->bCalcLowers = true;
                 // OD 26.08.2003 #i18103# - lock move backward of follow table,
                 // if no section content is formatted or follow table belongs
                 // to the section, which content is formatted.
                 if ( ((SwTabFrm*)pFrm)->IsFollow() &&
                      ( !pSect || pSect == pFrm->FindSctFrm() ) )
                 {
-                    ((SwTabFrm*)pFrm)->bLockBackMove = sal_True;
+                    ((SwTabFrm*)pFrm)->bLockBackMove = true;
                 }
             }
 
@@ -1584,7 +1584,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
             if ( pFrm->IsTabFrm() )
             {
                 if ( ((SwTabFrm*)pFrm)->IsFollow() )
-                    ((SwTabFrm*)pFrm)->bLockBackMove = sal_False;
+                    ((SwTabFrm*)pFrm)->bLockBackMove = false;
             }
 
             pFrm = bPrevInvalid ? pTmpPrev : pFrm->FindNext();
@@ -1651,7 +1651,7 @@ void SwFlyFrm::MakeObjPos()
 {
     if ( !mbValidPos )
     {
-        mbValidPos = sal_True;
+        mbValidPos = true;
 
         // OD 29.10.2003 #113049# - use new class to position object
         GetAnchorFrm()->Calc();
@@ -1675,7 +1675,7 @@ void SwFlyFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
 {
     if ( !mbValidPrtArea )
     {
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
 
         // OD 31.07.2003 #110978# - consider vertical layout
         SWRECTFN( this )
@@ -1745,7 +1745,7 @@ void SwFlyFrm::InvalidateContentPos()
     _Invalidate();
 }
 
-SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst )
+SwTwips SwFlyFrm::_Grow( SwTwips nDist, bool bTst )
 {
     SWRECTFN( this )
     if ( Lower() && !IsColLocked() && !HasFixSize() )
@@ -1774,7 +1774,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst )
         {
             const SwRect aOld( GetObjRectWithSpaces() );
             _InvalidateSize();
-            const sal_Bool bOldLock = bLocked;
+            const bool bOldLock = bLocked;
             Unlock();
             if ( IsFlyFreeFrm() )
             {
@@ -1784,16 +1784,16 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst )
                 // Writer fly frames - inner Writer fly frames format its
                 // anchor, which grows/shrinks the outer Writer fly frame.
                 // Note: position will be invalidated below.
-                mbValidPos = sal_True;
+                mbValidPos = true;
                 // #i55416#
                 // Suppress format of width for autowidth frame, because the
                 // format of the width would call <SwTxtFrm::CalcFitToContent()>
                 // for the lower frame, which initiated this grow.
-                const sal_Bool bOldFormatHeightOnly = bFormatHeightOnly;
+                const bool bOldFormatHeightOnly = bFormatHeightOnly;
                 const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize();
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
-                    bFormatHeightOnly = sal_True;
+                    bFormatHeightOnly = true;
                 }
                 static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true );
                 ((SwFlyFreeFrm*)this)->SwFlyFreeFrm::MakeAll();
@@ -1820,7 +1820,7 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, sal_Bool bTst )
     return 0L;
 }
 
-SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst )
+SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst )
 {
     if( Lower() && !IsColLocked() && !HasFixSize() && !IsNoShrink() )
     {
@@ -1869,7 +1869,7 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst )
         {
             const SwRect aOld( GetObjRectWithSpaces() );
             _InvalidateSize();
-            const sal_Bool bOldLocked = bLocked;
+            const bool bOldLocked = bLocked;
             Unlock();
             if ( IsFlyFreeFrm() )
             {
@@ -1879,16 +1879,16 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, sal_Bool bTst )
                 // Writer fly frames - inner Writer fly frames format its
                 // anchor, which grows/shrinks the outer Writer fly frame.
                 // Note: position will be invalidated below.
-                mbValidPos = sal_True;
+                mbValidPos = true;
                 // #i55416#
                 // Suppress format of width for autowidth frame, because the
                 // format of the width would call <SwTxtFrm::CalcFitToContent()>
                 // for the lower frame, which initiated this shrink.
-                const sal_Bool bOldFormatHeightOnly = bFormatHeightOnly;
+                const bool bOldFormatHeightOnly = bFormatHeightOnly;
                 const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize();
                 if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
                 {
-                    bFormatHeightOnly = sal_True;
+                    bFormatHeightOnly = true;
                 }
                 static_cast<SwFlyFreeFrm*>(this)->SetNoMoveOnCheckClip( true );
                 ((SwFlyFreeFrm*)this)->SwFlyFreeFrm::MakeAll();
@@ -1933,7 +1933,7 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
              static_cast<SwNoTxtFrm*>(Lower())->GetNode()->GetOLENode() )
         {
             SwRect aClipRect;
-            ::CalcClipRect( GetVirtDrawObj(), aClipRect, sal_False );
+            ::CalcClipRect( GetVirtDrawObj(), aClipRect, false );
             if ( aAdjustedNewSize.Width() > aClipRect.Width() )
             {
                 aAdjustedNewSize.setWidth( aClipRect.Width() );
@@ -1958,19 +1958,19 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
         return Frm().SSize();
 }
 
-sal_Bool SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const
+bool SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const
 {
     OSL_ENSURE( GetAnchorFrm(), "8-( Fly is lost in Space." );
     const SwFrm* pFrm = GetAnchorFrm();
     do
     {
         if ( pFrm == pUpperFrm )
-            return sal_True;
+            return true;
         pFrm = pFrm->IsFlyFrm()
                ? ((const SwFlyFrm*)pFrm)->GetAnchorFrm()
                : pFrm->GetUpper();
     } while ( pFrm );
-    return sal_False;
+    return false;
 }
 
 void SwFlyFrm::Cut()
@@ -2429,10 +2429,10 @@ SwTwips SwFlyFrm::CalcAutoWidth() const
 
 /// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains
 /// a graphic, load of intrinsic graphic has to be avoided.
-sal_Bool SwFlyFrm::GetContour( PolyPolygon&   rContour,
-                           const sal_Bool _bForPaint ) const
+bool SwFlyFrm::GetContour( PolyPolygon&   rContour,
+                           const bool _bForPaint ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( GetFmt()->GetSurround().IsContour() && Lower() &&
         Lower()->IsNoTxtFrm() )
     {
@@ -2523,7 +2523,7 @@ sal_Bool SwFlyFrm::GetContour( PolyPolygon&   rContour,
                 aClip.Height( 1 );
             rContour.Clip( aClip.SVRect() );
             rContour.Optimize(POLY_OPTIMIZE_CLOSE);
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 6beb63344516..fd1519eea399 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star;
 SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     SwFlyFreeFrm( pFmt, pSib, pAnch )
 {
-    bAtCnt = sal_True;
+    bAtCnt = true;
     bAutoPosition = (FLY_AT_CHAR == pFmt->GetAnchor().GetAnchorId());
 }
 
@@ -596,7 +596,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
         {
             // <rPt> point is left of environment of given content frame
             // seems not to be correct for vertical layout!?
-            const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, sal_False, pCnt );
+            const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, false, pCnt );
             if( !pLay ||
                 (bVert && (pLay->Frm().Top() + pLay->Prt().Bottom()) <rPt.Y())||
                 (!bVert && (pLay->Frm().Left() + pLay->Prt().Right())<rPt.X()) )
@@ -626,7 +626,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
                 : ( (pUp->Frm().Top() + pUp->Prt().Bottom()) - nTopForObjPos );
 
             const SwFrm *pPre = pCnt;
-            const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, sal_True, pCnt );
+            const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, true, pCnt );
             SwTwips nFrmTop = 0;
             SwTwips nPrtHeight = 0;
             bool bSct = false;
@@ -731,7 +731,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
                     else
                         rRet.nMain += nPrtHeight;
                     pPre = pLay;
-                    pLay = pLay->GetLeaf( MAKEPAGE_NONE, sal_True, pCnt );
+                    pLay = pLay->GetLeaf( MAKEPAGE_NONE, true, pCnt );
                     if( pSect && !pSect->IsAnLower( pLay ) )
                     {   // If we're leaving a SwSectionFrm, the next Leaf-Frm
                         // is the part of the upper below the SectionFrm.
@@ -842,7 +842,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet,
 
 static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
                           const SwCntntFrm *& rpCnt,
-                          const bool bBody, const sal_Bool bFtn )
+                          const bool bBody, const bool bFtn )
 {
     // Searches below pLay the nearest Cnt to the point. The reference point of
     //the Cntnts is always the left upper corner.
@@ -905,7 +905,7 @@ static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay,
 }
 
 static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt,
-                                  const bool bBody, const sal_Bool bFtn )
+                                  const bool bBody, const bool bFtn )
 {
     //Starting from pCnt searches the CntntFrm whose left upper corner is the
     //nearest to the point.
@@ -1008,7 +1008,7 @@ static void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm )
  *  when dragging paragraph bound objects.
  */
 const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
-                              const sal_Bool bBodyOnly )
+                              const bool bBodyOnly )
 {
     //Search the nearest Cnt around the given document position in the text
     //flow. The given anchor is the starting Frm.
@@ -1026,13 +1026,13 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
             SwRect aTmpRect( aTmp, Size(0,0) );
             pTmpLay = (SwLayoutFrm*)::FindPage( aTmpRect, pTmpLay->Lower() );
         }
-        pCnt = pTmpLay->GetCntntPos( aTmp, sal_False, bBodyOnly );
+        pCnt = pTmpLay->GetCntntPos( aTmp, false, bBodyOnly );
     }
 
     //Take care to use meaningful ranges during search. This means to not enter
     //or leave header/footer in this case.
     const bool bBody = pCnt->IsInDocBody() || bBodyOnly;
-    const sal_Bool bFtn  = !bBodyOnly && pCnt->IsInFtn();
+    const bool bFtn  = !bBodyOnly && pCnt->IsInFtn();
 
     Point aNew( rNew );
     if ( bBody )
@@ -1053,7 +1053,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew,
         // With this we won't run into problems with the columns.
         Point aTmp( aNew );
         const SwCntntFrm *pTmp = pCnt->FindPageFrm()->
-                                        GetCntntPos( aTmp, sal_False, sal_True, sal_False );
+                                        GetCntntPos( aTmp, false, true, false );
         if ( pTmp && pTmp->Frm().IsInside( aNew ) )
             return pTmp;
     }
@@ -1174,7 +1174,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
     const bool bVert = pCnt->IsVertical();
 
     const bool bVertL2R = pCnt->IsVertLR();
-    const sal_Bool bRTL = pCnt->IsRightToLeft();
+    const bool bRTL = pCnt->IsRightToLeft();
 
     if( ( !bVert != !GetAnchorFrm()->IsVertical() ) ||
         ( !bRTL !=  !GetAnchorFrm()->IsRightToLeft() ) )
@@ -1298,7 +1298,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
 
     SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
     const SwFmtSurround& rSurround = pFmt->GetSurround();
-    const sal_Bool bWrapThrough =
+    const bool bWrapThrough =
         rSurround.GetSurround() == SURROUND_THROUGHT;
     SwTwips nBaseOfstForFly = 0;
     const SwFrm* pTmpFrm = pFrm ? pFrm : pCnt;
@@ -1393,7 +1393,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
     GetFmt()->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
 
     if ( pOldPage != FindPageFrm() )
-        ::Notify_Background( GetVirtDrawObj(), pOldPage, aOld, PREP_FLY_LEAVE, sal_False );
+        ::Notify_Background( GetVirtDrawObj(), pOldPage, aOld, PREP_FLY_LEAVE, false );
 }
 
 /** method to assure that anchored object is registered at the correct
@@ -1428,7 +1428,7 @@ void SwFlyAtCntFrm::MakeObjPos()
     }
 
     // #i26791# - validate position flag here.
-    mbValidPos = sal_True;
+    mbValidPos = true;
 
     // #i35911# - no calculation of new position, if
     // anchored object is marked that it clears its environment and its
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 57406cc137ac..0929a8fd4a76 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -28,7 +28,7 @@
 SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     SwFlyFrm( pFmt, pSib, pAnch )
 {
-    bInCnt = bInvalidLayout = bInvalidCntnt = sal_True;
+    bInCnt = bInvalidLayout = bInvalidCntnt = true;
     SwTwips nRel = pFmt->GetVertOrient().GetPos();
     // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject>
     Point aRelPos;
@@ -71,8 +71,8 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
     if( pNotify )
     {
         InvalidatePage();
-        mbValidPos = sal_False;
-        bInvalid  = sal_True;
+        mbValidPos = false;
+        bInvalid  = true;
         Calc();
         delete pNotify;
     }
@@ -143,7 +143,7 @@ void SwFlyInCntFrm::MakeObjPos()
 {
     if ( !mbValidPos )
     {
-        mbValidPos = sal_True;
+        mbValidPos = true;
         SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
         const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
         //Update the current values in the format if needed, during this we of
@@ -214,14 +214,14 @@ void SwFlyInCntFrm::MakeAll()
     const SwBorderAttrs &rAttrs = *aAccess.Get();
 
     if ( IsClipped() )
-        mbValidSize = bHeightClipped = bWidthClipped = sal_False;
+        mbValidSize = bHeightClipped = bWidthClipped = false;
 
     while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || !m_bValidContentPos )
     {
         //Only stop, if the flag is set!!
         if ( !mbValidSize )
         {
-            mbValidPrtArea = sal_False;
+            mbValidPrtArea = false;
         }
 
         if ( !mbValidPrtArea )
@@ -251,8 +251,8 @@ void SwFlyInCntFrm::MakeAll()
                  Frm().Width() > pFrm->Prt().Width() )
             {
                 Frm().Width( pFrm->Prt().Width() );
-                mbValidPrtArea = sal_False;
-                bWidthClipped = sal_True;
+                mbValidPrtArea = false;
+                bWidthClipped = true;
             }
         }
     }
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index a878b623d65b..3d0f269e4fdf 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -89,7 +89,7 @@ TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
 void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm,
                                      const SwRect& rRect, PrepareHint eHint )
 {
-    ::Notify_Background( GetVirtDrawObj(), pPageFrm, rRect, eHint, sal_True );
+    ::Notify_Background( GetVirtDrawObj(), pPageFrm, rRect, eHint, true );
 }
 
 void SwFlyFreeFrm::MakeAll()
@@ -119,7 +119,7 @@ void SwFlyFreeFrm::MakeAll()
 
     if ( IsClipped() )
     {
-        mbValidSize = bHeightClipped = bWidthClipped = sal_False;
+        mbValidSize = bHeightClipped = bWidthClipped = false;
         // no invalidation of position,
         // if anchored object is anchored inside a Writer fly frame,
         // its position is already locked, and it follows the text flow.
@@ -130,7 +130,7 @@ void SwFlyFreeFrm::MakeAll()
                 GetAnchorFrm()->IsInFly() &&
                 GetFrmFmt().GetFollowTextFlow().GetValue() ) )
         {
-            mbValidPos = sal_False;
+            mbValidPos = false;
         }
     }
 
@@ -151,7 +151,7 @@ void SwFlyFreeFrm::MakeAll()
             // Only set when the flag is set!
             if ( !mbValidSize )
             {
-                mbValidPrtArea = sal_False;
+                mbValidPrtArea = false;
             }
 
             if ( !mbValidPrtArea )
@@ -162,9 +162,9 @@ void SwFlyFreeFrm::MakeAll()
 
             if ( !mbValidSize || bFormatHeightOnly )
             {
-                mbValidSize = sal_False;
+                mbValidSize = false;
                 Format( &rAttrs );
-                bFormatHeightOnly = sal_False;
+                bFormatHeightOnly = false;
             }
 
             if ( !mbValidPos )
@@ -173,7 +173,7 @@ void SwFlyFreeFrm::MakeAll()
                 // #i26791# - use new method <MakeObjPos()>
                 // #i34753# - no positioning, if requested.
                 if ( IsNoMakePos() )
-                    mbValidPos = sal_True;
+                    mbValidPos = true;
                 else
                     // #i26791# - use new method <MakeObjPos()>
                     MakeObjPos();
@@ -181,10 +181,10 @@ void SwFlyFreeFrm::MakeAll()
                 {
                     if( !mbValidPos && GetAnchorFrm()->IsInSct() &&
                         !GetAnchorFrm()->FindSctFrm()->IsValid() )
-                        mbValidPos = sal_True;
+                        mbValidPos = true;
                 }
                 else
-                    mbValidSize = sal_False;
+                    mbValidSize = false;
             }
 
             if ( !m_bValidContentPos )
@@ -261,8 +261,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
 
     const SwVirtFlyDrawObj *pObj = GetVirtDrawObj();
     SwRect aClip, aTmpStretch;
-    ::CalcClipRect( pObj, aClip, sal_True );
-    ::CalcClipRect( pObj, aTmpStretch, sal_False );
+    ::CalcClipRect( pObj, aClip, true );
+    ::CalcClipRect( pObj, aTmpStretch, false );
     aClip._Intersection( aTmpStretch );
 
     const long nBot = Frm().Top() + Frm().Height();
@@ -290,7 +290,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 Frm().Pos().Y() = std::max( aClip.Top(), nClipBot - Frm().Height() );
                 if ( Frm().Top() != nOld )
                     bAgain = true;
-                bHeightClipped = sal_True;
+                bHeightClipped = true;
             }
         }
         if ( bRig )
@@ -307,10 +307,10 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 else
                     bAgain = true;
             }
-            bWidthClipped = sal_True;
+            bWidthClipped = true;
         }
         if ( bAgain )
-            mbValidSize = sal_False;
+            mbValidSize = false;
         else
         {
             // If we reach this branch, the Frm protrudes into forbidden
@@ -330,7 +330,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 nDiff -= aFrmRect.Top(); // nDiff represents the available distance
                 nDiff = aFrmRect.Height() - nDiff;
                 aFrmRect.Height( aFrmRect.Height() - nDiff );
-                bHeightClipped = sal_True;
+                bHeightClipped = true;
             }
             if ( bRig )
             {
@@ -338,7 +338,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 nDiff -= aFrmRect.Left();// nDiff represents the available distance
                 nDiff = aFrmRect.Width() - nDiff;
                 aFrmRect.Width( aFrmRect.Width() - nDiff );
-                bWidthClipped = sal_True;
+                bWidthClipped = true;
             }
 
             // #i17297# - no proportional
@@ -372,14 +372,14 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 {
                     aFrmRect.Height( aFrmRect.Width() * aOldSize.Height() /
                                      aOldSize.Width() );
-                    bHeightClipped = sal_True;
+                    bHeightClipped = true;
                 }
                 // Adjusted the height? change width proportionally
                 else if( aFrmRect.Height() != aOldSize.Height() )
                 {
                     aFrmRect.Width( aFrmRect.Height() * aOldSize.Width() /
                                     aOldSize.Height() );
-                    bWidthClipped = sal_True;
+                    bWidthClipped = true;
                 }
 
                 // #i17297# - reactivate change
@@ -429,7 +429,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
                 ::CalcCntnt( this );
                 ColUnlock();
                 if ( !mbValidSize && !bWidthClipped )
-                    bFormatHeightOnly = mbValidSize = sal_True;
+                    bFormatHeightOnly = mbValidSize = true;
             }
             else
             {
@@ -457,7 +457,7 @@ bool SwFlyFreeFrm::IsFormatPossible() const
 SwFlyLayFrm::SwFlyLayFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
     SwFlyFreeFrm( pFmt, pSib, pAnch )
 {
-    bLayout = sal_True;
+    bLayout = true;
 }
 
 // #i28701#
@@ -892,9 +892,9 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
 // #i28701# - if document compatibility option 'Consider wrapping style influence
 // on object positioning' is ON, the clip area corresponds to the one as the
 // object doesn't follow the text flow.
-sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove )
+bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if ( pSdrObj->ISA(SwVirtFlyDrawObj) )
     {
         const SwFlyFrm* pFly = ((const SwVirtFlyDrawObj*)pSdrObj)->GetFlyFrm();
@@ -1217,7 +1217,7 @@ sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove )
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
     }
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 3b49a6e1c437..3418f3d9dad6 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -62,7 +62,7 @@
 #include <switerator.hxx>
 
 // ftnfrm.cxx:
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes );
+void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes );
 
 using namespace ::com::sun::star;
 
@@ -71,13 +71,13 @@ bool bDontCreateObjects = false;
 bool bSetCompletePaintOnInvalidate = false;
 
 sal_uInt8 StackHack::nCnt = 0;
-sal_Bool StackHack::bLocked = sal_False;
+bool StackHack::bLocked = false;
 
 SwFrmNotify::SwFrmNotify( SwFrm *pF ) :
     pFrm( pF ),
     aFrm( pF->Frm() ),
     aPrt( pF->Prt() ),
-    bInvaKeep( sal_False ),
+    bInvaKeep( false ),
     bValidSize( pF->GetValidSizeFlag() ),
     mbFrmDeleted( false )     // #i49383#
 {
@@ -396,7 +396,7 @@ SwFrmNotify::~SwFrmNotify()
 
 SwLayNotify::SwLayNotify( SwLayoutFrm *pLayFrm ) :
     SwFrmNotify( pLayFrm ),
-    bLowersComplete( sal_False )
+    bLowersComplete( false )
 {
 }
 
@@ -451,10 +451,10 @@ SwLayNotify::~SwLayNotify()
                 bInvaPercent = true;
                 long nNew = (pLay->Prt().*fnRect->fnGetHeight)();
                 if( nNew != (aPrt.*fnRect->fnGetHeight)() )
-                     ((SwRowFrm*)pLay)->AdjustCells( nNew, sal_True);
+                     ((SwRowFrm*)pLay)->AdjustCells( nNew, true);
                 if( (pLay->Prt().*fnRect->fnGetWidth)()
                     != (aPrt.*fnRect->fnGetWidth)() )
-                     ((SwRowFrm*)pLay)->AdjustCells( 0, sal_False );
+                     ((SwRowFrm*)pLay)->AdjustCells( 0, false );
             }
             else
             {
@@ -865,7 +865,7 @@ SwCntntNotify::~SwCntntNotify()
 
                 if ( pFESh && pNd->IsOLESizeInvalid() )
                 {
-                    pNd->SetOLESizeInvalid( sal_False );
+                    pNd->SetOLESizeInvalid( false );
                     pFESh->CalcAndSetScale( xObj ); // create client
                 }
             }
@@ -1110,15 +1110,15 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
         {
             SwFrmFmt *pFmt = (SwFrmFmt*)aCpy[ sal_uInt16(i) ];
             const SwFmtAnchor &rAnch = pFmt->GetAnchor();
-            sal_Bool bRemove = sal_False;
+            bool bRemove = false;
             if ((rAnch.GetAnchorId() == FLY_AT_PAGE) ||
                 (rAnch.GetAnchorId() == FLY_AS_CHAR))
             {
                 //Page bounded are already anchored, character bounded
                 //I don't want here.
-                bRemove = sal_True;
+                bRemove = true;
             }
-            else if ( sal_False == (bRemove = ::lcl_ObjConnected( pFmt, pSib )) ||
+            else if ( false == (bRemove = ::lcl_ObjConnected( pFmt, pSib )) ||
                       ::lcl_InHeaderOrFooter( *pFmt ) )
             {
             // OD 23.06.2003 #108784# - correction: for objects in header
@@ -1158,14 +1158,14 @@ static void lcl_SetPos( SwFrm&             _rNewFrm,
 }
 
 void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
-                             sal_uLong nIndex, sal_Bool bPages, sal_uLong nEndIndex,
+                             sal_uLong nIndex, bool bPages, sal_uLong nEndIndex,
                              SwFrm *pPrv )
 {
     pDoc->BlockIdling();
     SwRootFrm* pLayout = pLay->getRootFrm();
-    const sal_Bool bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False;
+    const bool bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False;
     if( bOldCallbackActionEnabled )
-        pLayout->SetCallbackActionEnabled( sal_False );
+        pLayout->SetCallbackActionEnabled( false );
 
     //In the generation of the Layout will be bPage with sal_True handed over.
     //Then will be new pages generated all x paragraphs already times in advance.
@@ -1186,7 +1186,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
     SwPageFrm *pPage = pLay->FindPageFrm();
     const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
     SwFrm       *pFrm = 0;
-    sal_Bool   bBreakAfter   = sal_False;
+    bool   bBreakAfter   = false;
 
     SwActualSection *pActualSection = 0;
     SwLayHelper *pPageMaker;
@@ -1475,7 +1475,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                 if( ! pOuterSectionFrm->IsColLocked() &&
                     ! pOuterSectionFrm->ContainsCntnt() )
                 {
-                    pOuterSectionFrm->DelEmpty( sal_True );
+                    pOuterSectionFrm->DelEmpty( true );
                     delete pOuterSectionFrm;
                 }
                 pActualSection->SetSectionFrm( (SwSectionFrm*)pFrm );
@@ -1562,21 +1562,21 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                                             pDoc->GetNodes()[ nEndIdx-1 ]);
     if ( pNd )
     {
-        sal_Bool bApres = aTmp < rSttIdx;
+        bool bApres = aTmp < rSttIdx;
         SwNode2Layout aNode2Layout( *pNd, rSttIdx.GetIndex() );
         SwFrm* pFrm;
         while( 0 != (pFrm = aNode2Layout.NextFrm()) )
         {
             SwLayoutFrm *pUpper = pFrm->GetUpper();
             SwFtnFrm* pFtnFrm = pUpper->FindFtnFrm();
-            sal_Bool bOldLock, bOldFtn;
+            bool bOldLock, bOldFtn;
             if( pFtnFrm )
             {
                 bOldFtn = pFtnFrm->IsColLocked();
                 pFtnFrm->ColLock();
             }
             else
-                bOldFtn = sal_True;
+                bOldFtn = true;
             SwSectionFrm* pSct = pUpper->FindSctFrm();
             // Inside of footnotes only those areas are interesting that are inside of them. But
             // not the ones (e.g. column areas) in which are the footnote containers positioned.
@@ -1589,7 +1589,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                 pSct->ColLock();
             }
             else
-                bOldLock = sal_True;
+                bOldLock = true;
 
             // If pFrm cannot be moved, it is not possible to move it to the next page. This applies
             // also for frames (in the first column of a frame pFrm is moveable) and column
@@ -1680,9 +1680,9 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                     SwFrm* pOldUp = pTmp->GetFrm()->GetUpper();
                     // MoveFwd==sal_True means that we are still on the same page.
                     // But since we want to move if possible!
-                    sal_Bool bTmpOldLock = pTmp->IsJoinLocked();
+                    bool bTmpOldLock = pTmp->IsJoinLocked();
                     pTmp->LockJoin();
-                    while( pTmp->MoveFwd( sal_True, sal_False, sal_True ) )
+                    while( pTmp->MoveFwd( true, false, true ) )
                     {
                         if( pOldUp == pTmp->GetFrm()->GetUpper() )
                             break;
@@ -1696,7 +1696,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
             }
             else
             {
-                sal_Bool bSplit;
+                bool bSplit;
                 SwFrm* pPrv = bApres ? pFrm : pFrm->GetPrev();
                 // If the section frame is inserted into another one, it must be split.
                 if( pSct && rSttIdx.GetNode().IsSectionNode() )
@@ -1709,9 +1709,9 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                     }
                 }
                 else
-                    bSplit = sal_False;
+                    bSplit = false;
 
-                ::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), sal_False,
+                ::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), false,
                               nEndIdx, pPrv );
                 // OD 23.06.2003 #108784# - correction: append objects doesn't
                 // depend on value of <bAllowMove>
@@ -1733,7 +1733,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
             }
 
             SwPageFrm *pPage = pUpper->FindPageFrm();
-            SwFrm::CheckPageDescs( pPage, sal_False );
+            SwFrm::CheckPageDescs( pPage, false );
             if( !bOldFtn )
                 pFtnFrm->ColUnlock();
             if( !bOldLock )
@@ -1743,7 +1743,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                 // sections) and can be destroyed in such cases.
                 if( !pSct->ContainsCntnt() )
                 {
-                    pSct->DelEmpty( sal_True );
+                    pSct->DelEmpty( true );
                     pUpper->getRootFrm()->RemoveFromList( pSct );
                     delete pSct;
                 }
@@ -1782,20 +1782,20 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor )
 
     // everything needs to be calculated at least once:
     bTopLine = bBottomLine = bLeftLine = bRightLine =
-    bTop     = bBottom     = bLine   = sal_True;
+    bTop     = bBottom     = bLine   = true;
 
-    bCacheGetLine = bCachedGetTopLine = bCachedGetBottomLine = sal_False;
+    bCacheGetLine = bCachedGetTopLine = bCachedGetBottomLine = false;
     // OD 21.05.2003 #108789# - init cache status for values <bJoinedWithPrev>
     // and <bJoinedWithNext>, which aren't initialized by default.
-    bCachedJoinedWithPrev = sal_False;
-    bCachedJoinedWithNext = sal_False;
+    bCachedJoinedWithPrev = false;
+    bCachedJoinedWithNext = false;
 
     bBorderDist = 0 != (pConstructor->GetType() & (FRM_CELL));
 }
 
 SwBorderAttrs::~SwBorderAttrs()
 {
-    ((SwModify*)pOwner)->SetInCache( sal_False );
+    ((SwModify*)pOwner)->SetInCache( false );
 }
 
 /* All calc methods calculate a safety distance in addition to the values given by the attributes.
@@ -1806,13 +1806,13 @@ SwBorderAttrs::~SwBorderAttrs()
 void SwBorderAttrs::_CalcTop()
 {
     nTop = CalcTopLine() + rUL.GetUpper();
-    bTop = sal_False;
+    bTop = false;
 }
 
 void SwBorderAttrs::_CalcBottom()
 {
     nBottom = CalcBottomLine() + rUL.GetLower();
-    bBottom = sal_False;
+    bBottom = false;
 }
 
 long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
@@ -1919,7 +1919,7 @@ void SwBorderAttrs::_CalcTopLine()
                             ? rBox.GetDistance  (BOX_LINE_TOP)
                             : rBox.CalcLineSpace(BOX_LINE_TOP);
     nTopLine = nTopLine + rShadow.CalcShadowSpace(SHADOW_TOP);
-    bTopLine = sal_False;
+    bTopLine = false;
 }
 
 void SwBorderAttrs::_CalcBottomLine()
@@ -1928,7 +1928,7 @@ void SwBorderAttrs::_CalcBottomLine()
                             ? rBox.GetDistance  (BOX_LINE_BOTTOM)
                             : rBox.CalcLineSpace(BOX_LINE_BOTTOM);
     nBottomLine = nBottomLine + rShadow.CalcShadowSpace(SHADOW_BOTTOM);
-    bBottomLine = sal_False;
+    bBottomLine = false;
 }
 
 void SwBorderAttrs::_CalcLeftLine()
@@ -1937,7 +1937,7 @@ void SwBorderAttrs::_CalcLeftLine()
                             ? rBox.GetDistance  (BOX_LINE_LEFT)
                             : rBox.CalcLineSpace(BOX_LINE_LEFT);
     nLeftLine = nLeftLine + rShadow.CalcShadowSpace(SHADOW_LEFT);
-    bLeftLine = sal_False;
+    bLeftLine = false;
 }
 
 void SwBorderAttrs::_CalcRightLine()
@@ -1946,14 +1946,14 @@ void SwBorderAttrs::_CalcRightLine()
                             ? rBox.GetDistance  (BOX_LINE_RIGHT)
                             : rBox.CalcLineSpace(BOX_LINE_RIGHT);
     nRightLine = nRightLine + rShadow.CalcShadowSpace(SHADOW_RIGHT);
-    bRightLine = sal_False;
+    bRightLine = false;
 }
 
 void SwBorderAttrs::_IsLine()
 {
     bIsLine = rBox.GetTop() || rBox.GetBottom() ||
               rBox.GetLeft()|| rBox.GetRight();
-    bLine = sal_False;
+    bLine = false;
 }
 
 /* The borders of neighboring paragraphs are condensed by following algorithm:
@@ -1975,7 +1975,7 @@ inline bool CmpLines( const editeng::SvxBorderLine *pL1, const editeng::SvxBorde
 // OD 21.05.2003 #108789# - compare <CalcRight()> and <rCmpAttrs.CalcRight()>
 //          instead of only the right LR-spacing, because R2L-layout has to be
 //          considered.
-sal_Bool SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
+bool SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
                                   const SwFrm *pCaller,
                                   const SwFrm *pCmp ) const
 {
@@ -1986,10 +1986,10 @@ sal_Bool SwBorderAttrs::CmpLeftRight( const SwBorderAttrs &rCmpAttrs,
              CalcRight( pCaller ) == rCmpAttrs.CalcRight( pCmp ) );
 }
 
-sal_Bool SwBorderAttrs::_JoinWithCmp( const SwFrm& _rCallerFrm,
+bool SwBorderAttrs::_JoinWithCmp( const SwFrm& _rCallerFrm,
                                   const SwFrm& _rCmpFrm ) const
 {
-    sal_Bool bReturnVal = sal_False;
+    bool bReturnVal = false;
 
     SwBorderAttrAccess aCmpAccess( SwFrm::GetCache(), &_rCmpFrm );
     const SwBorderAttrs &rCmpAttrs = *aCmpAccess.Get();
@@ -1999,7 +1999,7 @@ sal_Bool SwBorderAttrs::_JoinWithCmp( const SwFrm& _rCallerFrm,
          CmpLeftRight( rCmpAttrs, &_rCallerFrm, &_rCmpFrm )
        )
     {
-        bReturnVal = sal_True;
+        bReturnVal = true;
     }
 
     return bReturnVal;
@@ -2012,7 +2012,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm,
                                          const SwFrm* _pPrevFrm )
 {
     // set default
-    bJoinedWithPrev = sal_False;
+    bJoinedWithPrev = false;
 
     if ( _rFrm.IsTxtFrm() )
     {
@@ -2046,7 +2046,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm,
 void SwBorderAttrs::_CalcJoinedWithNext( const SwFrm& _rFrm )
 {
     // set default
-    bJoinedWithNext = sal_False;
+    bJoinedWithNext = false;
 
     if ( _rFrm.IsTxtFrm() )
     {
@@ -2074,7 +2074,7 @@ void SwBorderAttrs::_CalcJoinedWithNext( const SwFrm& _rFrm )
 // OD 21.05.2003 #108789# - accessor for cached values <bJoinedWithPrev>
 // OD 2004-02-26 #i25029# - add 2nd parameter <_pPrevFrm>, which is passed to
 // method <_CalcJoindWithPrev(..)>.
-sal_Bool SwBorderAttrs::JoinedWithPrev( const SwFrm& _rFrm,
+bool SwBorderAttrs::JoinedWithPrev( const SwFrm& _rFrm,
                                     const SwFrm* _pPrevFrm ) const
 {
     if ( !bCachedJoinedWithPrev || _pPrevFrm )
@@ -2086,7 +2086,7 @@ sal_Bool SwBorderAttrs::JoinedWithPrev( const SwFrm& _rFrm,
     return bJoinedWithPrev;
 }
 
-sal_Bool SwBorderAttrs::JoinedWithNext( const SwFrm& _rFrm ) const
+bool SwBorderAttrs::JoinedWithNext( const SwFrm& _rFrm ) const
 {
     if ( !bCachedJoinedWithNext )
     {
@@ -2131,19 +2131,20 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm& _rFrm )
 }
 
 SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) :
-    SwCacheAccess( rCach, (pFrm->IsCntntFrm() ?
-                                (void*)((SwCntntFrm*)pFrm)->GetNode() :
-                                (void*)((SwLayoutFrm*)pFrm)->GetFmt()),
-                           (sal_Bool)(pFrm->IsCntntFrm() ?
-                ((SwModify*)((SwCntntFrm*)pFrm)->GetNode())->IsInCache() :
-                ((SwModify*)((SwLayoutFrm*)pFrm)->GetFmt())->IsInCache()) ),
+    SwCacheAccess( rCach,
+                   (pFrm->IsCntntFrm() ?
+                      (void*)((SwCntntFrm*)pFrm)->GetNode() :
+                      (void*)((SwLayoutFrm*)pFrm)->GetFmt()),
+                   (pFrm->IsCntntFrm() ?
+                      ((SwModify*)((SwCntntFrm*)pFrm)->GetNode())->IsInCache() :
+                      ((SwModify*)((SwLayoutFrm*)pFrm)->GetFmt())->IsInCache()) ),
     pConstructor( pFrm )
 {
 }
 
 SwCacheObj *SwBorderAttrAccess::NewObj()
 {
-    ((SwModify*)pOwner)->SetInCache( sal_True );
+    ((SwModify*)pOwner)->SetInCache( true );
     return new SwBorderAttrs( (SwModify*)pOwner, pConstructor );
 }
 
@@ -2152,7 +2153,7 @@ SwBorderAttrs *SwBorderAttrAccess::Get()
     return (SwBorderAttrs*)SwCacheAccess::Get();
 }
 
-SwOrderIter::SwOrderIter( const SwPageFrm *pPg, sal_Bool bFlys ) :
+SwOrderIter::SwOrderIter( const SwPageFrm *pPg, bool bFlys ) :
     pPage( pPg ),
     pCurrent( 0 ),
     bFlysOnly( bFlys )
@@ -2332,7 +2333,7 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm )
 SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
 {
     if( pLay->IsSctFrm() && pLay->Lower() && pLay->Lower()->IsColumnFrm() )
-        sw_RemoveFtns( (SwColumnFrm*)pLay->Lower(), sal_True, sal_True );
+        sw_RemoveFtns( (SwColumnFrm*)pLay->Lower(), true, true );
 
     SwFrm *pSav;
     if ( 0 == (pSav = pLay->ContainsAny()) )
@@ -2583,7 +2584,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
 }
 
 SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
-                          bool bOdd, bool bFirst, bool bInsertEmpty, sal_Bool bFtn,
+                          bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn,
                           SwFrm *pSibling )
 {
     SwPageFrm *pRet;
@@ -2839,7 +2840,7 @@ void Notify_Background( const SdrObject* pObj,
                         SwPageFrm* pPage,
                         const SwRect& rRect,
                         const PrepareHint eHint,
-                        const sal_Bool bInva )
+                        const bool bInva )
 {
     // If the frame was positioned correctly for the first time, do not inform the old area
     if ( eHint == PREP_FLY_LEAVE && rRect.Top() == FAR_AWAY )
@@ -3201,7 +3202,7 @@ void SwFrmHolder::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 }
 
 SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt16 const nFrmType,
-        const Point* pPoint, const SwPosition *pPos, const sal_Bool bCalcFrm )
+        const Point* pPoint, const SwPosition *pPos, const bool bCalcFrm )
 {
     SwFrm *pMinFrm = 0, *pTmpFrm;
     SwFrmHolder aHolder;
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 51dd9012f6c6..2f660a3cbcf2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -55,7 +55,7 @@ static sal_uLong lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr )
     return 0;
 }
 
-sal_Bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const
+bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const
 {
     const SwDoc* pDoc = GetFmt()->GetDoc();
     OSL_ENSURE( pDoc, "SwFtnFrm: Missing doc!" );
@@ -65,22 +65,22 @@ sal_Bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const
 
 /*
 |*
-|*  sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage)
+|*  bool lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage)
 |*  sets pBoss on the next SwFtnBossFrm, which can either be a column
 |*  or a page (without columns). If the page changes meanwhile,
 |*  pPage contains the new page and this function returns sal_True.
 |*
 |*/
 
-static sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
-    sal_Bool bDontLeave )
+static bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
+    bool bDontLeave )
 {
     if( rpBoss->IsColumnFrm() )
     {
         if( rpBoss->GetNext() )
         {
             rpBoss = (SwFtnBossFrm*)rpBoss->GetNext(); //next column
-            return sal_False;
+            return false;
         }
         if( rpBoss->IsInSct() )
         {
@@ -98,7 +98,7 @@ static sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
             {
                 rpPage = NULL;
                 rpBoss = NULL;
-                return sal_False;
+                return false;
             }
         }
     }
@@ -110,7 +110,7 @@ static sal_Bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
         if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() )
             rpBoss = (SwFtnBossFrm*)pBody->Lower(); // first column
     }
-    return sal_True;
+    return true;
 }
 
 /// @returns column number if pBoss is a column, otherwise 0.
@@ -190,12 +190,12 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
     SWRECTFN( this )
     if ( !mbValidPrtArea )
     {
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
         (Prt().*fnRect->fnSetTop)( nBorder );
         (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
         (Prt().*fnRect->fnSetHeight)((Frm().*fnRect->fnGetHeight)() - nBorder );
         if( (Prt().*fnRect->fnGetHeight)() < 0 && !pPage->IsFtnPage() )
-            mbValidSize = sal_False;
+            mbValidSize = false;
     }
 
     if ( !mbValidSize )
@@ -208,7 +208,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
                 bGrow = false;
         }
         if( bGrow )
-                Grow( LONG_MAX, sal_False );
+                Grow( LONG_MAX, false );
         else
         {
             // VarSize is determined based on the content plus the borders
@@ -256,11 +256,11 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
                 }
             }
         }
-        mbValidSize = sal_True;
+        mbValidSize = true;
     }
 }
 
-SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
+SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
 {
     // No check if FixSize since FtnContainer are variable up to their max. height.
     // If the max. height is LONG_MAX, take as much space as needed.
@@ -285,7 +285,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
         // In a section, which has to maximize, a footnotecontainer is allowed
         // to grow, when the section can't grow anymore.
         if( !bTst && !pSect->IsColLocked() &&
-            pSect->ToMaximize( sal_False ) && pSect->Growable() )
+            pSect->ToMaximize( false ) && pSect->Growable() )
         {
             pSect->InvalidateSize();
             return 0;
@@ -392,7 +392,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
     return nReal;
 }
 
-SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo )
 {
     SwPageFrm *pPage = FindPageFrm();
     bool bShrink = false;
@@ -428,7 +428,7 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt
     pMaster( 0 ),
     pRef( pCnt ),
     pAttr( pAt ),
-    bBackMoveLocked( sal_False ),
+    bBackMoveLocked( false ),
     // #i49383#
     mbUnlockPosOfLowerObjs( true )
 {
@@ -460,7 +460,7 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
 }
 
 #ifdef DBG_UTIL
-SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     static sal_uInt16 nNum = USHRT_MAX;
     SwTxtFtn* pTxtFtn = GetAttr();
@@ -473,7 +473,7 @@ SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     return SwLayoutFrm::GrowFrm( nDist, bTst, bInfo );
 }
 
-SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     static sal_uInt16 nNum = USHRT_MAX;
     if( nNum != USHRT_MAX )
@@ -528,7 +528,7 @@ void SwFtnFrm::Cut()
             delete pUp;
             // If the last footnote container was removed from a column
             // section without a Follow, then this section can be shrinked.
-            if( pSect && !pSect->ToMaximize( sal_False ) && !pSect->IsColLocked() )
+            if( pSect && !pSect->ToMaximize( false ) && !pSect->IsColLocked() )
                 pSect->_InvalidateSize();
         }
         else
@@ -714,8 +714,8 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
 
         // Do not leave the corresponding page if the footnote should
         // be shown at the document ending or the footnote is an endnote.
-        const sal_Bool bEndNote = pOldPage->IsEndNotePage();
-        const sal_Bool bFtnEndDoc = pOldPage->IsFtnPage();
+        const bool bEndNote = pOldPage->IsEndNotePage();
+        const bool bFtnEndDoc = pOldPage->IsFtnPage();
         SwFtnBossFrm* pNxtBoss = pOldBoss;
         SwSectionFrm *pSect = pNxtBoss->GetUpper()->IsSctFrm() ?
                               (SwSectionFrm*)pNxtBoss->GetUpper() : 0;
@@ -798,15 +798,15 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
                 bJump = true;
         }
         if( bJump )
-            SwFlowFrm::SetMoveBwdJump( sal_True );
+            SwFlowFrm::SetMoveBwdJump( true );
     }
     return pRet;
 }
 
-sal_Bool SwFrm::IsFtnAllowed() const
+bool SwFrm::IsFtnAllowed() const
 {
     if ( !IsInDocBody() )
-        return sal_False;
+        return false;
 
     if ( IsInTab() )
     {
@@ -815,7 +815,7 @@ sal_Bool SwFrm::IsFtnAllowed() const
         if ( pTab->IsFollow() )
             return !pTab->IsInHeadline( *this );
     }
-    return sal_True;
+    return true;
 }
 
 void SwRootFrm::UpdateFtnNums()
@@ -833,7 +833,7 @@ void SwRootFrm::UpdateFtnNums()
 }
 
 /// remove all footnotes (not the references) and all footnote pages
-void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes )
+void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes )
 {
     do
     {
@@ -887,7 +887,7 @@ void sw_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes
     } while( pBoss );
 }
 
-void SwRootFrm::RemoveFtns( SwPageFrm *pPage, sal_Bool bPageOnly, sal_Bool bEndNotes )
+void SwRootFrm::RemoveFtns( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes )
 {
     if ( !pPage )
         pPage = (SwPageFrm*)Lower();
@@ -921,7 +921,7 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, sal_Bool bPageOnly, sal_Bool bEndN
 }
 
 /// Change the page template of the footnote pages
-void SwRootFrm::CheckFtnPageDescs( sal_Bool bEndNote )
+void SwRootFrm::CheckFtnPageDescs( bool bEndNote )
 {
     SwPageFrm *pPage = (SwPageFrm*)Lower();
     while ( pPage && !pPage->IsFtnPage() )
@@ -930,7 +930,7 @@ void SwRootFrm::CheckFtnPageDescs( sal_Bool bEndNote )
         pPage = (SwPageFrm*)pPage->GetNext();
 
     if ( pPage )
-        SwFrm::CheckPageDescs( pPage, sal_False );
+        SwFrm::CheckPageDescs( pPage, false );
 }
 
 /** Insert a footnote container
@@ -983,7 +983,7 @@ SwFtnContFrm *SwFtnBossFrm::FindFtnCont()
 }
 
 /// Search the next available footnote container.
-SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( sal_Bool bDontLeave )
+SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( bool bDontLeave )
 {
     SwFtnContFrm *pCont = 0;
     if ( !GetFmt()->GetDoc()->GetFtnIdxs().empty() )
@@ -993,10 +993,10 @@ SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( sal_Bool bDontLeave )
         {
             SwPageFrm *pPage = FindPageFrm();
             SwFtnBossFrm* pBoss = this;
-            sal_Bool bEndNote = pPage->IsEndNotePage();
+            bool bEndNote = pPage->IsEndNotePage();
             do
             {
-                sal_Bool bChgPage = lcl_NextFtnBoss( pBoss, pPage, bDontLeave );
+                bool bChgPage = lcl_NextFtnBoss( pBoss, pPage, bDontLeave );
                 // Found another boss? When changing pages, also the endnote flag must match.
                 if( pBoss && ( !bChgPage || pPage->IsEndNotePage() == bEndNote ) )
                     pCont = pBoss->FindFtnCont();
@@ -1055,7 +1055,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
         {
             pBoss = pRet->FindFtnBossFrm();
             pPage = pBoss->FindPageFrm();
-            lcl_NextFtnBoss( pBoss, pPage, sal_False ); // next FtnBoss
+            lcl_NextFtnBoss( pBoss, pPage, false ); // next FtnBoss
             pCont = pBoss ? pBoss->FindNearestFtnCont() : 0;
             if ( pCont )
                 pNxt = (SwFtnFrm*)pCont->Lower();
@@ -1101,7 +1101,7 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const
             else
             {   SwFtnBossFrm *pBoss = (SwFtnBossFrm*)pRet->FindFtnBossFrm();
                 SwPageFrm *pPage = pBoss->FindPageFrm();
-                lcl_NextFtnBoss( pBoss, pPage, sal_False ); // next FtnBoss
+                lcl_NextFtnBoss( pBoss, pPage, false ); // next FtnBoss
                 SwFtnContFrm *pCont = pBoss ? pBoss->FindNearestFtnCont() : 0;
                 pRet = pCont ? (SwFtnFrm*)pCont->Lower() : 0;
             }
@@ -1167,7 +1167,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
 
     ResetFtn( pNew );
     SwFtnFrm *pSibling = FindFirstFtn();
-    sal_Bool bDontLeave = sal_False;
+    bool bDontLeave = false;
 
     // Ok, a sibling has been found, but is the sibling in an acceptable
     // environment?
@@ -1284,8 +1284,8 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 {
                     pNxtB = pSibling->FindFtnBossFrm();
                     SwPageFrm *pSibPage = pNxtB->FindPageFrm();
-                    sal_Bool bEndNote = pSibPage->IsEndNotePage();
-                    sal_Bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave );
+                    bool bEndNote = pSibPage->IsEndNotePage();
+                    bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave );
                     // When changing pages, also the endnote flag must match.
                     SwFtnContFrm *pCont = pNxtB && ( !bChgPage ||
                         pSibPage->IsEndNotePage() == bEndNote )
@@ -1356,8 +1356,8 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             {
                 SwFtnBossFrm* pNxtB = pSibling->FindFtnBossFrm();
                 SwPageFrm *pSibPage = pNxtB->FindPageFrm();
-                sal_Bool bEndNote = pSibPage->IsEndNotePage();
-                sal_Bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave );
+                bool bEndNote = pSibPage->IsEndNotePage();
+                bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave );
                 // When changing pages, also the endnote flag must match.
                 SwFtnContFrm *pCont = pNxtB && ( !bChgPage ||
                     pSibPage->IsEndNotePage() == bEndNote )
@@ -1425,10 +1425,10 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
     SwPageFrm *pPage = FindPageFrm();
     SwPageFrm *pMyPage = pPage;
     bool bChgPage = false;
-    sal_Bool bEnd = sal_False;
+    bool bEnd = false;
     if ( pAttr->GetFtn().IsEndNote() )
     {
-        bEnd = sal_True;
+        bEnd = true;
         if( GetUpper()->IsSctFrm() &&
             ((SwSectionFrm*)GetUpper())->IsEndnAtEnd() )
         {
@@ -1451,8 +1451,8 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
             {
                 SwPageDesc *pDesc = pDoc->GetEndNoteInfo().GetPageDesc( *pDoc );
                 pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(),
-                        !pPage->OnRightPage(), false, false, sal_True, 0 );
-                pPage->SetEndNotePage( sal_True );
+                        !pPage->OnRightPage(), false, false, true, 0 );
+                pPage->SetEndNotePage( true );
                 bChgPage = true;
             }
             else
@@ -1495,7 +1495,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
         {
             SwPageDesc *pDesc = pDoc->GetFtnInfo().GetPageDesc( *pDoc );
             pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(),
-                !pPage->OnRightPage(), false, false, sal_True, pPage->GetNext() );
+                !pPage->OnRightPage(), false, false, true, pPage->GetNext() );
             bChgPage = true;
         }
         else
@@ -1666,7 +1666,7 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr )
 }
 
 void SwFtnBossFrm::RemoveFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr,
-                              sal_Bool bPrep )
+                              bool bPrep )
 {
     SwFtnFrm *pFtn = FindFtn( pRef, pAttr );
     if( pFtn )
@@ -1706,7 +1706,7 @@ void SwFtnBossFrm::ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *pAttr,
 void SwFtnBossFrm::CollectFtns( const SwCntntFrm* _pRef,
                                 SwFtnBossFrm*     _pOld,
                                 SwFtnFrms&        _rFtnArr,
-                                const sal_Bool    _bCollectOnlyPreviousFtns )
+                                const bool    _bCollectOnlyPreviousFtns )
 {
     SwFtnFrm *pFtn = _pOld->FindFirstFtn();
     while( !pFtn )
@@ -1771,7 +1771,7 @@ inline void FtnInArr( SwFtnFrms& rFtnArr, SwFtnFrm* pFtn )
 void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
                                  SwFtnFrm*           _pFtn,
                                  SwFtnFrms&          _rFtnArr,
-                                 sal_Bool            _bCollectOnlyPreviousFtns,
+                                 bool                _bCollectOnlyPreviousFtns,
                                  const SwFtnBossFrm* _pRefFtnBossFrm)
 {
     // OD 03.04.2003 #108446# - assert, that no reference footnote boss frame
@@ -1810,7 +1810,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
             SwPageFrm* pPage = pBoss->FindPageFrm();
             do
             {
-                lcl_NextFtnBoss( pBoss, pPage, sal_False );
+                lcl_NextFtnBoss( pBoss, pPage, false );
                 if( pBoss )
                 {
                     SwLayoutFrm* pCont = pBoss->FindFtnCont();
@@ -1845,7 +1845,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
         {
             if ( _bCollectOnlyPreviousFtns )
             {
-                SwFtnBossFrm* pBossOfFoundFtn = _pFtn->FindFtnBossFrm( sal_True );
+                SwFtnBossFrm* pBossOfFoundFtn = _pFtn->FindFtnBossFrm( true );
                 OSL_ENSURE( pBossOfFoundFtn,
                         "<SwFtnBossFrm::_CollectFtns(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" );
                 if ( !pBossOfFoundFtn ||    // don't crash, if no footnote boss is found.
@@ -1906,7 +1906,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
     while ( _pFtn );
 }
 
-void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
+void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc )
 {
     // All footnotes referenced by pRef need to be moved
     // to a new position (based on the new column/page)
@@ -1921,7 +1921,7 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, sal_Bool bCalc )
     {
         SwFtnFrm *pFtn = rFtnArr[i];
 
-        SwFtnBossFrm* pRefBoss = pFtn->GetRef()->FindFtnBossFrm( sal_True );
+        SwFtnBossFrm* pRefBoss = pFtn->GetRef()->FindFtnBossFrm( true );
         if( pRefBoss != this )
         {
             const sal_uInt16 nRefNum = pRefBoss->FindPageFrm()->GetPhyPageNum();
@@ -2101,14 +2101,14 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
         || pAttr->GetFtn().IsEndNote() )
         return;
 
-    OSL_ENSURE( this == pSrc->FindFtnBossFrm( sal_True ),
+    OSL_ENSURE( this == pSrc->FindFtnBossFrm( true ),
             "SwPageFrm::MoveFtns: source frame isn't on that FtnBoss" );
 
     SwFtnFrm *pFtn = FindFirstFtn();
     if( pFtn )
     {
         ChangeFtnRef( pSrc, pAttr, pDest );
-        SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( sal_True );
+        SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( true );
         OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" );
         if( pDestBoss )     // robust
         {
@@ -2116,7 +2116,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
             pDestBoss->_CollectFtns( pDest, pFtn, aFtnArr );
             if ( !aFtnArr.empty() )
             {
-                pDestBoss->_MoveFtns( aFtnArr, sal_True );
+                pDestBoss->_MoveFtns( aFtnArr, true );
                 SwPageFrm* pSrcPage = FindPageFrm();
                 SwPageFrm* pDestPage = pDestBoss->FindPageFrm();
                 // update FtnNum only at page change
@@ -2131,7 +2131,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
     }
 }
 
-void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const sal_Bool bLock,
+void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock,
                                   const SwTxtFtn *pAttr )
 {
     // Format all footnotes of a column/page so that they might change the column/page.
@@ -2354,7 +2354,7 @@ void SwPageFrm::UpdateFtnNum()
     {
         if( ((SwTxtFrm*)pCntnt)->HasFtn() )
         {
-            SwFtnBossFrm* pBoss = pCntnt->FindFtnBossFrm( sal_True );
+            SwFtnBossFrm* pBoss = pCntnt->FindFtnBossFrm( true );
             if( pBoss->GetUpper()->IsSctFrm() &&
                 ((SwSectionFrm*)pBoss->GetUpper())->IsOwnFtnNum() )
                 pCntnt = ((SwSectionFrm*)pBoss->GetUpper())->FindLastCntnt();
@@ -2375,12 +2375,12 @@ void SwPageFrm::UpdateFtnNum()
                         pFtn = (SwFtnFrm*)pFtn->GetNext();
                     else
                     {
-                        SwFtnBossFrm* pTmpBoss = pFtn->FindFtnBossFrm( sal_True );
+                        SwFtnBossFrm* pTmpBoss = pFtn->FindFtnBossFrm( true );
                         if( pTmpBoss )
                         {
                             SwPageFrm* pPage = pTmpBoss->FindPageFrm();
                             pFtn = NULL;
-                            lcl_NextFtnBoss( pTmpBoss, pPage, sal_False );
+                            lcl_NextFtnBoss( pTmpBoss, pPage, false );
                             SwFtnContFrm *pCont = pTmpBoss ? pTmpBoss->FindNearestFtnCont() : NULL;
                             if ( pCont )
                                 pFtn = (SwFtnFrm*)pCont->Lower();
@@ -2413,9 +2413,9 @@ void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine )
 
     const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-        nMaxFtnHeight += pBody->Grow( LONG_MAX, sal_True );
+        nMaxFtnHeight += pBody->Grow( LONG_MAX, true );
     if ( IsInSct() )
-        nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, sal_True );
+        nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, true );
 
     if ( nMaxFtnHeight < 0 )
         nMaxFtnHeight = 0;
@@ -2547,22 +2547,22 @@ void SwPageFrm::SetColMaxFtnHeight()
     }
 }
 
-sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
-                                 SwFtnBossFrm *pNewBoss, const sal_Bool bFtnNums )
+bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
+                                 SwFtnBossFrm *pNewBoss, const bool bFtnNums )
 {
     SwDoc *pDoc = GetFmt()->GetDoc();
     if ( pDoc->GetFtnIdxs().empty() )
-        return sal_False;
+        return false;
     if( pDoc->GetFtnInfo().ePos == FTNPOS_CHAPTER &&
         ( !IsInSct() || !FindSctFrm()->IsFtnAtEnd() ) )
-        return sal_True;
+        return true;
 
     if ( !pNewBoss )
-        pNewBoss = FindFtnBossFrm( sal_True );
+        pNewBoss = FindFtnBossFrm( true );
     if ( pNewBoss == pOldBoss )
-        return sal_False;
+        return false;
 
-    sal_Bool bMoved = sal_False;
+    bool bMoved = false;
     if( !pStart )
         pStart = ContainsCntnt();
 
@@ -2577,7 +2577,7 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
             // method <SwFtnBossFrm::CollectFtn(..)>) to control, that only
             // footnotes have to be collected, that are positioned before the
             // new dedicated footnote boss frame.
-            pNewBoss->CollectFtns( pStart, pOldBoss, aFtnArr, sal_True );
+            pNewBoss->CollectFtns( pStart, pOldBoss, aFtnArr, true );
         }
         pStart = pStart->GetNextCntntFrm();
     }
@@ -2599,8 +2599,8 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
     if (bFoundCandidate)
     {
         pFtnArr = new SwFtnFrms;
-        pOldChief = pOldBoss->FindFtnBossFrm( sal_True );
-        pNewChief = pNewBoss->FindFtnBossFrm( sal_True );
+        pOldChief = pOldBoss->FindFtnBossFrm( true );
+        pNewChief = pNewBoss->FindFtnBossFrm( true );
         while( pOldChief->IsAnLower( pStart ) )
         {
             if ( ((SwTxtFrm*)pStart)->HasFtn() )
@@ -2620,13 +2620,13 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
     if ( !aFtnArr.empty() || pFtnArr )
     {
         if( !aFtnArr.empty() )
-            pNewBoss->_MoveFtns( aFtnArr, sal_True );
+            pNewBoss->_MoveFtns( aFtnArr, true );
         if( pFtnArr )
         {
-            ((SwFtnBossFrm*)pNewChief)->_MoveFtns( *pFtnArr, sal_True );
+            ((SwFtnBossFrm*)pNewChief)->_MoveFtns( *pFtnArr, true );
             delete pFtnArr;
         }
-        bMoved = sal_True;
+        bMoved = true;
 
         // update FtnNum only at page change
         if ( bFtnNums )
@@ -2643,7 +2643,7 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
     return bMoved;
 }
 
-sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage, SwFtnBossFrm *pOldBoss )
+bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss )
 {
     OSL_ENSURE( IsInFtn(), "no footnote." );
     SwLayoutFrm *pFtn = FindFtnFrm();
@@ -2656,7 +2656,7 @@ sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage, SwFtnBossFrm *pOldBoss )
     {
         SwLayoutFrm* pBody = pOldBoss->FindBodyCont();
         if( !pBody || !pBody->Lower() )
-            return sal_True;
+            return true;
     }
 
     //fix(9538): if the footnote has neighbors behind itself, remove them temporarily
@@ -2672,14 +2672,14 @@ sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage, SwFtnBossFrm *pOldBoss )
         {   pLst = pNxt;
             SwCntntFrm *pCnt = pNxt->ContainsCntnt();
             if( pCnt )
-                pCnt->MoveFtnCntFwd( sal_True, pOldBoss );
+                pCnt->MoveFtnCntFwd( true, pOldBoss );
             pNxt = (SwLayoutFrm*)pFtn->GetNext();
         }
     }
 
-    sal_Bool bSamePage = sal_True;
+    bool bSamePage = true;
     SwLayoutFrm *pNewUpper =
-                GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, sal_True );
+                GetLeaf( bMakePage ? MAKEPAGE_INSERT : MAKEPAGE_NONE, true );
 
     if ( pNewUpper )
     {
@@ -2737,7 +2737,7 @@ sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage, SwFtnBossFrm *pOldBoss )
                     pNewUp = (SwSectionFrm*)pTmpFtn->Lower();
                 else
                 {
-                    pNewUp = new SwSectionFrm( *pSect, sal_False );
+                    pNewUp = new SwSectionFrm( *pSect, false );
                     pNewUp->InsertBefore( pTmpFtn, pTmpFtn->Lower() );
                     static_cast<SwSectionFrm*>(pNewUp)->Init();
                     pNewUp->Frm().Pos() = pTmpFtn->Frm().Pos();
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index b99aca0a367a..312de9264483 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -100,7 +100,7 @@ SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, sal_uInt16 nTypeIn)
     : SwLayoutFrm( pFmt, pSib )
 {
     mnType = nTypeIn;
-    SetDerivedVert( sal_False );
+    SetDerivedVert( false );
 
     const SwFmtCntnt &rCnt = pFmt->GetCntnt();
 
@@ -210,7 +210,7 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs)
 
     }
 
-    mbValidPrtArea = sal_True;
+    mbValidPrtArea = true;
 }
 
 void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
@@ -219,7 +219,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
     {
         if( !IsColLocked() )
         {
-            mbValidSize = mbValidPrtArea = sal_True;
+            mbValidSize = mbValidPrtArea = true;
 
             const SwTwips nBorder = nUL;
             SwTwips nMinHeight = lcl_GetFrmMinHeight(*this);
@@ -372,11 +372,11 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
                         Prt().SSize().Height() = Frm().Height() - nBorder;
                     }
                 }
-                mbValidSize = mbValidPrtArea = sal_True;
+                mbValidSize = mbValidPrtArea = true;
             } while( nRemaining<=nMaxHeight && nOldHeight!=Prt().Height() );
             ColUnlock();
         }
-        mbValidSize = mbValidPrtArea = sal_True;
+        mbValidSize = mbValidPrtArea = true;
     }
     else //if ( GetType() & 0x0018 )
     {
@@ -384,7 +384,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
         {
             if ( Frm().Height() != pAttrs->GetSize().Height() )
                 ChgSize( Size( Frm().Width(), pAttrs->GetSize().Height()));
-            mbValidSize = sal_True;
+            mbValidSize = true;
             MakePos();
         } while ( !mbValidSize );
     }
@@ -415,7 +415,7 @@ void SwHeadFootFrm::Format(const SwBorderAttrs * pAttrs)
     }
 }
 
-SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst,  sal_Bool bInfo )
+SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SwTwips nResult;
 
@@ -470,7 +470,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst,  sal_Bool bInfo )
         // OD 10.04.2003 #108719# - Notify fly frame, if header frame
         // grows. Consider, that 'normal' grow of layout frame already notifys
         // the fly frames.
-        sal_Bool bNotifyFlys = sal_False;
+        bool bNotifyFlys = false;
         if (nEat > 0)
         {
             if ( ! bTst)
@@ -488,7 +488,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst,  sal_Bool bInfo )
             // OD 14.04.2003 #108719# - trigger fly frame notify.
             if ( IsHeaderFrm() )
             {
-                bNotifyFlys = sal_True;
+                bNotifyFlys = true;
             }
         }
 
@@ -500,7 +500,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst,  sal_Bool bInfo )
             nResult += nFrmGrow;
             if ( nFrmGrow > 0 )
             {
-                bNotifyFlys = sal_False;
+                bNotifyFlys = false;
             }
         }
 
@@ -517,7 +517,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst,  sal_Bool bInfo )
     return nResult;
 }
 
-SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SwTwips nResult;
 
@@ -560,7 +560,7 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
         // OD 10.04.2003 #108719# - Notify fly frame, if header/footer frame
         // shrinks. Consider, that 'normal' shrink of layout frame already notifys
         // the fly frames.
-        sal_Bool bNotifyFlys = sal_False;
+        bool bNotifyFlys = false;
         if (nRest > 0)
         {
 
@@ -607,7 +607,7 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
             // OD 14.04.2003 #108719# - trigger fly frame notify.
             if ( IsHeaderFrm() )
             {
-                bNotifyFlys = sal_True;
+                bNotifyFlys = true;
             }
         }
 
@@ -619,7 +619,7 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
             nResult += nShrinkAmount;
             if ( nShrinkAmount > 0 )
             {
-                bNotifyFlys = sal_False;
+                bNotifyFlys = false;
             }
         }
 
@@ -633,15 +633,15 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     return nResult;
 }
 
-sal_Bool SwHeadFootFrm::GetEatSpacing() const
+bool SwHeadFootFrm::GetEatSpacing() const
 {
     const SwFrmFmt * pFmt = GetFmt();
     OSL_ENSURE(pFmt, "SwHeadFootFrm: no format?");
 
     if (pFmt->GetHeaderAndFooterEatSpacing().GetValue())
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
 void DelFlys( SwLayoutFrm *pFrm, SwPageFrm *pPage )
@@ -673,7 +673,7 @@ void SwPageFrm::PrepareHeader()
     const SwFmtHeader &rH = ((SwFrmFmt*)GetRegisteredIn())->GetHeader();
 
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
-    const sal_Bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+    const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
 
     if ( bOn && rH.IsActive() )
     {   //Implant header, but remove first, if already present
@@ -715,7 +715,7 @@ void SwPageFrm::PrepareFooter()
         pLay = (SwLayoutFrm*)pLay->GetNext();
 
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
-    const sal_Bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+    const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
 
     if ( bOn && rF.IsActive() )
     {   //Implant footer, but remove first, if already present
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 6c15b5cdadb0..f32831d28caf 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -120,7 +120,7 @@ inline void SwLayAction::CheckIdleEnd()
         bInput = GetInputType() && Application::AnyInput( GetInputType() );
 }
 
-void SwLayAction::SetStatBar( sal_Bool bNew )
+void SwLayAction::SetStatBar( bool bNew )
 {
     if ( bNew )
     {
@@ -131,7 +131,7 @@ void SwLayAction::SetStatBar( sal_Bool bNew )
         nEndPage = USHRT_MAX;
 }
 
-sal_Bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
+bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt,
                                     const SwPageFrm *pPage )
 {
     SwRegionRects aTmp( rRect );
@@ -174,7 +174,7 @@ sal_Bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *p
             }
             else
             {
-                const sal_Bool bLowerOfSelf = pFly->IsLowerOf( pSelfFly );
+                const bool bLowerOfSelf = pFly->IsLowerOf( pSelfFly );
                 if ( !bLowerOfSelf && !pFly->GetFmt()->GetOpaque().GetValue() )
                     // Things from other layers are only interesting to us if
                     // they're not transparent or lie inwards
@@ -207,13 +207,13 @@ sal_Bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *p
         aTmp -= pFly->Frm();
     }
 
-    sal_Bool bRetPaint = sal_False;
+    bool bRetPaint = false;
     for ( SwRects::const_iterator it = aTmp.begin(); it != aTmp.end(); ++it )
         bRetPaint |= pImp->GetShell()->AddPaintRect( *it );
     return bRetPaint;
 }
 
-inline sal_Bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt,
+inline bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt,
                                       const SwPageFrm *pPage,
                                       const SwRect &rRect )
 {
@@ -224,7 +224,7 @@ inline sal_Bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt,
         else
             return pImp->GetShell()->AddPaintRect( rRect );
     }
-    return sal_False;
+    return false;
 }
 
 /**
@@ -294,11 +294,11 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) :
     nCheckPageNum( USHRT_MAX )
 {
     bPaintExtraData = ::IsExtraData( pImp->GetShell()->GetDoc() );
-    bPaint = bComplete = bWaitAllowed = bCheckPages = sal_True;
+    bPaint = bComplete = bWaitAllowed = bCheckPages = true;
     bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
-    bUpdateExpFlds = bBrowseActionStop = bActionInProgress = sal_False;
+    bUpdateExpFlds = bBrowseActionStop = bActionInProgress = false;
     // OD 14.04.2003 #106346# - init new flag <mbFormatCntntOnInterrupt>.
-    mbFormatCntntOnInterrupt = sal_False;
+    mbFormatCntntOnInterrupt = false;
 
     pImp->pLayAct = this;   // register there
 }
@@ -315,16 +315,16 @@ void SwLayAction::Reset()
     nStartTicks = Ticks();
     nInputType = 0;
     nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX;
-    bPaint = bComplete = bWaitAllowed = bCheckPages = sal_True;
+    bPaint = bComplete = bWaitAllowed = bCheckPages = true;
     bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule =
-    bUpdateExpFlds = bBrowseActionStop = sal_False;
+    bUpdateExpFlds = bBrowseActionStop = false;
 }
 
-sal_Bool SwLayAction::RemoveEmptyBrowserPages()
+bool SwLayAction::RemoveEmptyBrowserPages()
 {
     // switching from the normal to the browser mode, empty pages may be
     // retained for an annoyingly long time, so delete them here
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwViewShell *pSh = pRoot->GetCurrShell();
     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
     {
@@ -336,7 +336,7 @@ sal_Bool SwLayAction::RemoveEmptyBrowserPages()
                 pPage = (SwPageFrm*)pPage->GetNext();
             else
             {
-                bRet = sal_True;
+                bRet = true;
                 SwPageFrm *pDel = pPage;
                 pPage = (SwPageFrm*)pPage->GetNext();
                 pDel->Cut();
@@ -349,14 +349,14 @@ sal_Bool SwLayAction::RemoveEmptyBrowserPages()
 
 void SwLayAction::Action()
 {
-    bActionInProgress = sal_True;
+    bActionInProgress = true;
 
     //TurboMode? Hands-off during idle-format
     if ( IsPaint() && !IsIdle() && TurboAction() )
     {
         delete pWait, pWait = 0;
         pRoot->ResetTurboFlag();
-        bActionInProgress = sal_False;
+        bActionInProgress = false;
         pRoot->DeleteEmptySct();
         return;
     }
@@ -370,13 +370,13 @@ void SwLayAction::Action()
     pRoot->DisallowTurbo();
 
     if ( IsCalcLayout() )
-        SetCheckPages( sal_False );
+        SetCheckPages( false );
 
     InternalAction();
     bAgain |= RemoveEmptyBrowserPages();
     while ( IsAgain() )
     {
-        bAgain = bNextCycle = sal_False;
+        bAgain = bNextCycle = false;
         InternalAction();
         bAgain |= RemoveEmptyBrowserPages();
     }
@@ -388,20 +388,20 @@ void SwLayAction::Action()
     pRoot->ResetTurboFlag();
     pRoot->ResetTurbo();
 
-    SetCheckPages( sal_True );
+    SetCheckPages( true );
 
-    bActionInProgress = sal_False;
+    bActionInProgress = false;
 }
 
 SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage )
 {
     SwCntntFrm *pCnt = pPage->FindFirstBodyCntnt();
     SwCntntFrm *pChk = pCnt;
-    sal_Bool bPageChgd = sal_False;
+    bool bPageChgd = false;
     while ( pCnt && pCnt->IsFollow() )
         pCnt = static_cast<SwCntntFrm*>(pCnt)->FindMaster();
     if ( pCnt && pChk != pCnt )
-    {   bPageChgd = sal_True;
+    {   bPageChgd = true;
         pPage = pCnt->FindPageFrm();
     }
 
@@ -475,7 +475,7 @@ void SwLayAction::InternalAction()
         pPage = (SwPageFrm*)pPage->GetNext();
 
     IDocumentLayoutAccess *pLayoutAccess = pRoot->GetFmt()->getIDocumentLayoutAccess();
-    sal_Bool bNoLoop = pPage ? SwLayouter::StartLoopControl( pRoot->GetFmt()->GetDoc(), pPage ) : sal_False;
+    bool bNoLoop = pPage ? SwLayouter::StartLoopControl( pRoot->GetFmt()->GetDoc(), pPage ) : sal_False;
     sal_uInt16 nPercentPageNum = 0;
     while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX )
     {
@@ -494,9 +494,9 @@ void SwLayAction::InternalAction()
             }
             SwPageFrm *pTmp = pPage->GetPrev() ?
                                         (SwPageFrm*)pPage->GetPrev() : pPage;
-            SetCheckPages( sal_True );
-            SwFrm::CheckPageDescs( pPage, sal_True, &pTmp );
-            SetCheckPages( sal_False );
+            SetCheckPages( true );
+            SwFrm::CheckPageDescs( pPage, true, &pTmp );
+            SetCheckPages( false );
             nCheckPageNum = USHRT_MAX;
             pPage = pTmp;
             continue;
@@ -520,7 +520,7 @@ void SwLayAction::InternalAction()
                     pRoot->AssertFlyPages();
                 if ( pRoot->IsSuperfluous() )
                 {
-                    sal_Bool bOld = IsAgain();
+                    bool bOld = IsAgain();
                     pRoot->RemoveSuperfluous();
                     bAgain = bOld;
                 }
@@ -602,7 +602,7 @@ void SwLayAction::InternalAction()
                             pPage->InvalidateFlyLayout();
                             pPage->InvalidateFlyCntnt();
                             if ( IsBrowseActionStop() )
-                                bInput = sal_True;
+                                bInput = true;
                         }
                     }
                     if( bNoLoop )
@@ -622,7 +622,7 @@ void SwLayAction::InternalAction()
             }
             if ( !IsInterrupt() )
             {
-                SetNextCycle( sal_False );
+                SetNextCycle( false );
 
                 if ( nPreInvaPage != USHRT_MAX )
                 {
@@ -670,7 +670,7 @@ void SwLayAction::InternalAction()
                 pRoot->AssertFlyPages();
             if ( pRoot->IsSuperfluous() )
             {
-                sal_Bool bOld = IsAgain();
+                bool bOld = IsAgain();
                 pRoot->RemoveSuperfluous();
                 bAgain = bOld;
             }
@@ -805,20 +805,20 @@ void SwLayAction::InternalAction()
             pPg = (SwPageFrm*)pPg->GetNext();
         }
         // reset flag for special interrupt content formatting.
-        mbFormatCntntOnInterrupt = sal_False;
+        mbFormatCntntOnInterrupt = false;
     }
     pOptTab = 0;
     if( bNoLoop )
         pLayoutAccess->GetLayouter()->EndLoopControl();
 }
 
-sal_Bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
+bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
 {
 
     const SwPageFrm *pPage = 0;
     if ( !pCnt->IsValid() || pCnt->IsCompletePaint() || pCnt->IsRetouche() )
     {
-        const SwRect aOldRect( pCnt->UnionFrm( sal_True ) );
+        const SwRect aOldRect( pCnt->UnionFrm( true ) );
         const long   nOldBottom = pCnt->Frm().Top() + pCnt->Prt().Bottom();
         pCnt->Calc();
         if ( pCnt->Frm().Bottom() < aOldRect.Bottom() )
@@ -846,11 +846,11 @@ sal_Bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
                 if ( pNxt )
                     pNxt->InvalidatePage();
             }
-            return sal_False;
+            return false;
         }
 
         if ( pPage->IsInvalidLayout() || (IS_FLYS && IS_INVAFLY) )
-            return sal_False;
+            return false;
     }
     if ( !pPage )
         pPage = pCnt->FindPageFrm();
@@ -860,29 +860,29 @@ sal_Bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt )
          !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCnt)),
                                               *pPage, this ) )
     {
-        return sal_False;
+        return false;
     }
 
     if ( pPage->IsInvalidCntnt() )
-        return sal_False;
-    return sal_True;
+        return false;
+    return true;
 }
 
-sal_Bool SwLayAction::TurboAction()
+bool SwLayAction::TurboAction()
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
     if ( pRoot->GetTurbo() )
     {
         if ( !_TurboAction( pRoot->GetTurbo() ) )
         {
             CheckIdleEnd();
-            bRet = sal_False;
+            bRet = false;
         }
         pRoot->ResetTurbo();
     }
     else
-        bRet = sal_False;
+        bRet = false;
     return bRet;
 }
 
@@ -1008,9 +1008,9 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
  * For BrowseMode, you may even activate the ShortCut if the invalid content
  * of the page lies below the visible area.
  */
-sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
+bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwViewShell *pSh = pRoot->GetCurrShell();
     const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
 
@@ -1036,14 +1036,14 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
         else
             FormatLayout( prPage );
         if ( IsAgain() )
-            return sal_False;
+            return false;
     }
 
     const SwRect &rVis = pImp->GetShell()->VisArea();
     if ( (prPage->Frm().Top() >= rVis.Bottom()) ||
          (prPage->Frm().Left()>= rVis.Right()) )
     {
-        bRet = sal_True;
+        bRet = true;
 
         // This is going to be a bit nasty: The first CntntFrm of this
         // page in the Body text needs formatting; if it changes the page during
@@ -1108,7 +1108,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         pSct->Calc();
                         pSct->SetCompletePaint();
                         if ( IsAgain() )
-                            return sal_False;
+                            return false;
                         // #i27756#
                         bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
                                    prPage->GetPrev();
@@ -1120,7 +1120,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                     pCntnt->Calc();
                     pCntnt->SetCompletePaint();
                     if ( IsAgain() )
-                        return sal_False;
+                        return false;
                     // #i27756#
                     bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
                                prPage->GetPrev();
@@ -1134,7 +1134,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         pTab->Calc();
                         pTab->SetCompletePaint();
                         if ( IsAgain() )
-                            return sal_False;
+                            return false;
                         // #i27756#
                         bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
                                    prPage->GetPrev();
@@ -1149,7 +1149,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                         pSct->Calc();
                         pSct->SetCompletePaint();
                         if ( IsAgain() )
-                            return sal_False;
+                            return false;
                         // #i27756#
                         bPageChg = pCntnt->FindPageFrm() != p2ndPage &&
                                    prPage->GetPrev();
@@ -1159,7 +1159,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                 // #i27756#
                 if ( bPageChg )
                 {
-                    bRet = sal_False;
+                    bRet = false;
                     const SwPageFrm* pTmp = pCntnt->FindPageFrm();
                     if ( pTmp->GetPhyPageNum() < prPage->GetPhyPageNum() &&
                          pTmp->IsInvalid() )
@@ -1186,7 +1186,7 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
                             SwAnchoredObject* pObj = (*pObjs)[i];
                             if ( pObj->GetAnchorFrmContainingAnchPos() == pCntnt )
                             {
-                                bRet = sal_False;
+                                bRet = false;
                                 break;
                             }
                         }
@@ -1205,34 +1205,34 @@ sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage )
              0 != (pObj = lcl_FindFirstInvaObj( prPage, nBottom )) &&
              pObj->GetObjRect().Top() <= nBottom )
         {
-            return sal_False;
+            return false;
         }
         const SwFrm* pFrm( 0L );
         if ( prPage->IsInvalidLayout() &&
              0 != (pFrm = lcl_FindFirstInvaLay( prPage, nBottom )) &&
              pFrm->Frm().Top() <= nBottom )
         {
-            return sal_False;
+            return false;
         }
         if ( (prPage->IsInvalidCntnt() || prPage->IsInvalidFlyInCnt()) &&
              0 != (pFrm = lcl_FindFirstInvaCntnt( prPage, nBottom, 0 )) &&
              pFrm->Frm().Top() <= nBottom )
         {
-            return sal_False;
+            return false;
         }
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
 
 // OD 15.11.2002 #105155# - introduce support for vertical layout
-sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
+bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect )
 {
     OSL_ENSURE( !IsAgain(), "Attention to the invalid page." );
     if ( IsAgain() )
-        return sal_False;
+        return false;
 
-    sal_Bool bChanged = sal_False;
+    bool bChanged = false;
     bool bAlreadyPainted = false;
     // OD 11.11.2002 #104414# - remember frame at complete paint
     SwRect aFrmAtCompletePaint;
@@ -1251,7 +1251,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
 
         pLay->Calc();
         if ( aOldFrame != pLay->Frm() )
-            bChanged = sal_True;
+            bChanged = true;
 
         bool bNoPaint = false;
         if ( pLay->IsPageBodyFrm() &&
@@ -1290,7 +1290,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
                 if ( pLay->IsCompletePaint() )
                 {
                     pImp->GetShell()->AddPaintRect( aPaint );
-                    bAddRect = sal_False;
+                    bAddRect = false;
                 }
                 else
                 {
@@ -1386,12 +1386,12 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
     }
 
     if( bAlreadyPainted )
-        bAddRect = sal_False;
+        bAddRect = false;
 
     CheckWaitCrsr();
 
     if ( IsAgain() )
-        return sal_False;
+        return false;
 
     // Now, deal with the lowers that are LayoutFrms
 
@@ -1399,7 +1399,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
         return bChanged;
 
     SwFrm *pLow = pLay->Lower();
-    sal_Bool bTabChanged = sal_False;
+    bool bTabChanged = false;
     while ( pLow && pLow->GetUpper() == pLay )
     {
         if ( pLow->IsLayoutFrm() )
@@ -1416,7 +1416,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
             pLow->OptCalc();
 
         if ( IsAgain() )
-            return sal_False;
+            return false;
         pLow = pLow->GetNext();
     }
     // OD 11.11.2002 #104414# - add complete frame area as paint area, if frame
@@ -1434,14 +1434,14 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
     return bChanged || bTabChanged;
 }
 
-sal_Bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
+bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
 {
     OSL_ENSURE( !IsAgain(), "Attention to the invalid page." );
     if ( IsAgain() )
-        return sal_False;
+        return false;
 
-    sal_Bool bChanged = false;
-    sal_Bool bAddRect = true;
+    bool bChanged = false;
+    bool bAddRect = true;
 
     if ( !pFly->IsValid() || pFly->IsCompletePaint() || pFly->IsInvalid() )
     {
@@ -1464,10 +1464,10 @@ sal_Bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
     }
 
     if ( IsAgain() )
-        return sal_False;
+        return false;
 
     // Now, deal with the lowers that are LayoutFrms
-    sal_Bool bTabChanged = false;
+    bool bTabChanged = false;
     SwFrm *pLow = pFly->Lower();
     while ( pLow )
     {
@@ -1485,22 +1485,22 @@ sal_Bool SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
 
 // OD 31.10.2002 #104100#
 // Implement vertical layout support
-sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
+bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect )
 {
     OSL_ENSURE( !IsAgain(), "8-) Attention to the invalid page." );
     if ( IsAgain() || !pTab->Lower() )
-        return sal_False;
+        return false;
 
     IDocumentTimerAccess *pTimerAccess = pRoot->GetFmt()->getIDocumentTimerAccess();
     pTimerAccess->BlockIdling();
 
-    sal_Bool bChanged = sal_False;
+    bool bChanged = false;
     bool bPainted = false;
 
     const SwPageFrm *pOldPage = pTab->FindPageFrm();
 
     // OD 31.10.2002 #104100# - vertical layout support
-    // use macro to declare and init <sal_Bool bVert>, <sal_Bool bRev> and
+    // use macro to declare and init <bool bVert>, <bool bRev> and
     // <SwRectFn fnRect> for table frame <pTab>.
     SWRECTFN( pTab );
 
@@ -1512,11 +1512,11 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
         }
 
         const SwRect aOldRect( pTab->Frm() );
-        pTab->SetLowersFormatted( sal_False );
+        pTab->SetLowersFormatted( false );
         pTab->Calc();
         if ( aOldRect != pTab->Frm() )
         {
-            bChanged = sal_True;
+            bChanged = true;
         }
         const SwRect aPaintFrm = pTab->PaintArea();
 
@@ -1567,7 +1567,7 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
             else if ( pTab->IsCompletePaint() )
             {
                 pImp->GetShell()->AddPaintRect( aPaintFrm );
-                bAddRect = sal_False;
+                bAddRect = false;
                 bPainted = true;
             }
 
@@ -1581,7 +1581,7 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
             }
         }
         else
-            bAddRect = sal_False;
+            bAddRect = false;
 
         if ( pTab->IsCompletePaint() && !pOptTab )
             pOptTab = pTab;
@@ -1606,16 +1606,16 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
     // Ugly shortcut!
     if ( pTab->IsLowersFormatted() &&
          (bPainted || !pImp->GetShell()->VisArea().IsOver( pTab->Frm())) )
-        return sal_False;
+        return false;
 
     // Now, deal with the lowers
     if ( IsAgain() )
-        return sal_False;
+        return false;
 
     // OD 20.10.2003 #112464# - for savety reasons:
     // check page number before formatting lowers.
     if ( pOldPage->GetPhyPageNum() > (pTab->FindPageFrm()->GetPhyPageNum() + 1) )
-        SetNextCycle( sal_True );
+        SetNextCycle( true );
 
     // OD 20.10.2003 #112464# - format lowers, only if table frame is valid
     if ( pTab->IsValid() )
@@ -1625,7 +1625,7 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
         {
             bChanged |= FormatLayout( (SwLayoutFrm*)pLow, bAddRect );
             if ( IsAgain() )
-                return sal_False;
+                return false;
             pLow = (SwLayoutFrm*)pLow->GetNext();
         }
     }
@@ -1633,7 +1633,7 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect )
     return bChanged;
 }
 
-sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
+bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
 {
     const SwCntntFrm *pCntnt = pPage->ContainsCntnt();
     const SwViewShell *pSh = pRoot->GetCurrShell();
@@ -1654,7 +1654,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
             const SwLayoutFrm*pOldUpper  = pCntnt->GetUpper();
             const SwTabFrm *pTab = pCntnt->FindTabFrm();
             const bool bInValid = !pCntnt->IsValid() || pCntnt->IsCompletePaint();
-            const sal_Bool bOldPaint = IsPaint();
+            const bool bOldPaint = IsPaint();
             bPaint = bOldPaint && !(pTab && pTab == pOptTab);
             _FormatCntnt( pCntnt, pPage );
             // #i26945# - reset <bPaint> before format objects
@@ -1672,7 +1672,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                  !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCntnt)),
                                                       *(pCntnt->FindPageFrm()), this ) )
             {
-                return sal_False;
+                return false;
             }
 
             if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() )
@@ -1685,7 +1685,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
             }
 
             if ( IsAgain() )
-                return sal_False;
+                return false;
 
             // Temporarily interrupt processing if layout or Flys become invalid again.
             // However not for the BrowseView: The layout is getting invalid
@@ -1701,7 +1701,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                      // OD 07.05.2003 #109435# - consider interrupt formatting
                      ( IS_FLYS && IS_INVAFLY && !mbFormatCntntOnInterrupt )
                    )
-                    return sal_False;
+                    return false;
             }
             if ( pOldUpper != pCntnt->GetUpper() )
             {
@@ -1713,11 +1713,11 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                 // start over again from the beginning, so nothing gets left out.
                 if ( !IsCalcLayout() && pPage->GetPhyPageNum() > nCurNum+1 )
                 {
-                    SetNextCycle( sal_True );
+                    SetNextCycle( true );
                     // OD 07.05.2003 #109435# - consider interrupt formatting
                     if ( !mbFormatCntntOnInterrupt )
                     {
-                        return sal_False;
+                        return false;
                     }
                 }
             }
@@ -1751,11 +1751,11 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                               !lcl_FindFirstInvaObj( pPage, nBottom )) &&
                               (!pPage->IsInvalidLayout() ||
                                !lcl_FindFirstInvaLay( pPage, nBottom )))
-                            SetBrowseActionStop( sal_True );
+                            SetBrowseActionStop( true );
                         // OD 14.04.2003 #106346# - consider interrupt formatting.
                         if ( !mbFormatCntntOnInterrupt )
                         {
-                            return sal_False;
+                            return false;
                         }
                     }
                 }
@@ -1784,7 +1784,7 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                 CheckIdleEnd();
                 // OD 14.04.2003 #106346# - consider interrupt formatting.
                 if ( IsInterrupt() && !mbFormatCntntOnInterrupt )
-                    return sal_False;
+                    return false;
             }
             if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() &&
                  pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom())
@@ -1798,11 +1798,11 @@ sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage )
                             !lcl_FindFirstInvaObj( pPage, nBottom )) &&
                             (!pPage->IsInvalidLayout() ||
                             !lcl_FindFirstInvaLay( pPage, nBottom )))
-                        SetBrowseActionStop( sal_True );
+                        SetBrowseActionStop( true );
                     // OD 14.04.2003 #106346# - consider interrupt formatting.
                     if ( !mbFormatCntntOnInterrupt )
                     {
-                        return sal_False;
+                        return false;
                     }
                 }
             }
@@ -1846,7 +1846,7 @@ void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt,
 
 /// Returns sal_True if all Cntnts of the Fly have been processed completely.
 /// Returns sal_False if processing has been interrupted prematurely.
-sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
+bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
 {
     const SwCntntFrm *pCntnt = pFly->ContainsCntnt();
 
@@ -1879,7 +1879,7 @@ sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
         }
 
         if ( IsAgain() )
-            return sal_False;
+            return false;
 
         // If there's input, we interrupt processing.
         if ( !pFly->IsFlyInCntFrm() )
@@ -1887,7 +1887,7 @@ sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
             CheckIdleEnd();
             // OD 14.04.2003 #106346# - consider interrupt formatting.
             if ( IsInterrupt() && !mbFormatCntntOnInterrupt )
-                return sal_False;
+                return false;
         }
         pCntnt = pCntnt->GetNextCntntFrm();
     }
@@ -1896,12 +1896,12 @@ sal_Bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly )
     return !(IsInterrupt() && !mbFormatCntntOnInterrupt);
 }
 
-sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
+bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
 {
     OSL_ENSURE( pCnt->IsTxtFrm(), "NoTxt neighbour of Txt" );
     // robust against misuse by e.g. #i52542#
     if( !pCnt->IsTxtFrm() )
-        return sal_False;
+        return false;
 
     const SwTxtNode* pTxtNode = pCnt->GetNode()->GetTxtNode();
 
@@ -1942,17 +1942,17 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                 SwRect aRepaint( ((SwTxtFrm*)pCnt)->_AutoSpell( pCntntNode,  *pSh->GetViewOptions(), nTxtPos ) );
                 bPageValid = bPageValid && !pTxtNode->IsWrongDirty();
                 if( !bPageValid )
-                    bAllValid = sal_False;
+                    bAllValid = false;
                 if ( aRepaint.HasArea() )
                     pImp->GetShell()->InvalidateWindows( aRepaint );
                 if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) )
-                    return sal_True;
+                    return true;
                 break;
             }
             case AUTOCOMPLETE_WORDS :
                 ((SwTxtFrm*)pCnt)->CollectAutoCmplWrds( pCntntNode, nTxtPos );
                 if ( Application::AnyInput( VCL_INPUT_ANY ) )
-                    return sal_True;
+                    return true;
                 break;
             case WORD_COUNT :
             {
@@ -1960,7 +1960,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                 SwDocStat aStat;
                 pTxtNode->CountWords( aStat, 0, nEnd );
                 if ( Application::AnyInput( VCL_INPUT_ANY ) )
-                    return sal_True;
+                    return true;
                 break;
             }
             case SMART_TAGS :
@@ -1969,7 +1969,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                     const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan( pCntntNode, nTxtPos ) );
                     bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty();
                     if( !bPageValid )
-                        bAllValid = sal_False;
+                        bAllValid = false;
                     if ( aRepaint.HasArea() )
                         pImp->GetShell()->InvalidateWindows( aRepaint );
                 } catch( const ::com::sun::star::uno::RuntimeException& e) {
@@ -1977,7 +1977,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                     SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message);
                 }
                 if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) )
-                    return sal_True;
+                    return true;
                 break;
             }
         }
@@ -2001,7 +2001,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
                         if ( pC->IsTxtFrm() )
                         {
                             if ( _DoIdleJob( pC, eJob ) )
-                                return sal_True;
+                                return true;
                         }
                         pC = pC->GetNextCntntFrm();
                     }
@@ -2009,10 +2009,10 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
             }
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly )
+bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly )
 {
     // Spellcheck all contents of the pages. Either only the
     // visible ones or all of them.
@@ -2024,22 +2024,22 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly )
     {
         case ONLINE_SPELLING :
             if( !pViewOptions->IsOnlineSpell() )
-                return sal_False;
+                return false;
             break;
         case AUTOCOMPLETE_WORDS :
             if( !pViewOptions->IsAutoCompleteWords() ||
                  pDoc->GetAutoCompleteWords().IsLockWordLstLocked())
-                return sal_False;
+                return false;
             break;
         case WORD_COUNT :
             if ( !pViewShell->getIDocumentStatistics()->GetDocStat().bModified )
-                return sal_False;
+                return false;
             break;
         case SMART_TAGS :
             if ( pDoc->GetDocShell()->IsHelpDocument() ||
                  pDoc->isXForms() ||
                 !SwSmartTagMgr::Get().IsSmartTagsEnabled() )
-                return sal_False;
+                return false;
             break;
         default: OSL_FAIL( "Unknown idle job type" );
     }
@@ -2055,12 +2055,12 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly )
 
     while ( pPage )
     {
-        bPageValid = sal_True;
+        bPageValid = true;
         const SwCntntFrm *pCnt = pPage->ContainsCntnt();
         while( pCnt && pPage->IsAnLower( pCnt ) )
         {
             if ( _DoIdleJob( pCnt, eJob ) )
-                return sal_True;
+                return true;
             pCnt = pCnt->GetNextCntntFrm();
         }
         if ( pPage->GetSortedObjs() )
@@ -2078,7 +2078,7 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly )
                         if ( pC->IsTxtFrm() )
                         {
                             if ( _DoIdleJob( pC, eJob ) )
-                                return sal_True;
+                                return true;
                         }
                         pC = pC->GetNextCntntFrm();
                     }
@@ -2102,7 +2102,7 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly )
              !pPage->Frm().IsOver( pImp->GetShell()->VisArea()))
              break;
     }
-    return sal_False;
+    return false;
 }
 
 #if HAVE_FEATURE_DESKTOP && defined DBG_UTIL
@@ -2143,13 +2143,13 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
 
     SHOW_IDLE( COL_LIGHTRED );
 
-    pImp->GetShell()->EnableSmooth( sal_False );
+    pImp->GetShell()->EnableSmooth( false );
 
     // First, spellcheck the visible area. Only if there's nothing
     // to do there, we trigger the IdleFormat.
-    if ( !DoIdleJob( SMART_TAGS, sal_True ) &&
-         !DoIdleJob( ONLINE_SPELLING, sal_True ) &&
-         !DoIdleJob( AUTOCOMPLETE_WORDS, sal_True ) )
+    if ( !DoIdleJob( SMART_TAGS, true ) &&
+         !DoIdleJob( ONLINE_SPELLING, true ) &&
+         !DoIdleJob( AUTOCOMPLETE_WORDS, true ) )
     {
         // Format, then register repaint rectangles with the SwViewShell if necessary.
         // This requires running artificial actions, so we don't get undesired
@@ -2160,7 +2160,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
         SwViewShell *pSh = pImp->GetShell();
         do
         {   ++pSh->mnStartAction;
-            sal_Bool bVis = sal_False;
+            bool bVis = false;
             if ( pSh->ISA(SwCrsrShell) )
             {
                 bVis = ((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea());
@@ -2171,8 +2171,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
 
         SwLayAction aAction( pRoot, pImp );
         aAction.SetInputType( VCL_INPUT_ANY );
-        aAction.SetIdle( sal_True );
-        aAction.SetWaitAllowed( sal_False );
+        aAction.SetIdle( true );
+        aAction.SetWaitAllowed( false );
         aAction.Action();
 
         // Further start/end actions only happen if there were paints started
@@ -2200,8 +2200,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
                 bActions |= aTmp != pSh->VisArea();
                 if ( aTmp == pSh->VisArea() && pSh->ISA(SwCrsrShell) )
                 {
-                    bActions |= ((sal_Bool) aBools[nBoolIdx]) !=
-                                static_cast<SwCrsrShell*>(pSh)->GetCharRect().IsOver( pSh->VisArea() );
+                    bActions |= (aBools[nBoolIdx]) !=
+                                 static_cast<SwCrsrShell*>(pSh)->GetCharRect().IsOver( pSh->VisArea() );
                 }
             }
 
@@ -2216,7 +2216,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
             nBoolIdx = 0;
             do
             {
-                sal_Bool bCrsrShell = pSh->IsA( TYPE(SwCrsrShell) );
+                bool bCrsrShell = pSh->IsA( TYPE(SwCrsrShell) );
 
                 if ( bCrsrShell )
                     ((SwCrsrShell*)pSh)->SttCrsrMove();
@@ -2250,11 +2250,11 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
                         // paint the selection! -> Set the focus flag at
                         // CrsrShell and it dont paint the selection.
                         ((SwCrsrShell*)pSh)->ShLooseFcs();
-                        pSh->UnlockPaint( sal_True );
-                        ((SwCrsrShell*)pSh)->ShGetFcs( sal_False );
+                        pSh->UnlockPaint( true );
+                        ((SwCrsrShell*)pSh)->ShGetFcs( false );
                     }
                     else
-                        pSh->UnlockPaint( sal_True );
+                        pSh->UnlockPaint( true );
                 }
 
                 pSh = (SwViewShell*)pSh->GetNext();
@@ -2265,19 +2265,19 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
 
         if ( !aAction.IsInterrupt() )
         {
-            if ( !DoIdleJob( WORD_COUNT, sal_False ) )
-                if ( !DoIdleJob( SMART_TAGS, sal_False ) )
-                    if ( !DoIdleJob( ONLINE_SPELLING, sal_False ) )
-                        DoIdleJob( AUTOCOMPLETE_WORDS, sal_False );
+            if ( !DoIdleJob( WORD_COUNT, false ) )
+                if ( !DoIdleJob( SMART_TAGS, false ) )
+                    if ( !DoIdleJob( ONLINE_SPELLING, false ) )
+                        DoIdleJob( AUTOCOMPLETE_WORDS, false );
         }
 
         bool bInValid = false;
         const SwViewOption& rVOpt = *pImp->GetShell()->GetViewOptions();
         const SwViewShell* pViewShell = pImp->GetShell();
         // See conditions in DoIdleJob()
-        const sal_Bool bSpell     = rVOpt.IsOnlineSpell();
-        const sal_Bool bACmplWrd  = rVOpt.IsAutoCompleteWords();
-        const sal_Bool bWordCount = pViewShell->getIDocumentStatistics()->GetDocStat().bModified;
+        const bool bSpell     = rVOpt.IsOnlineSpell();
+        const bool bACmplWrd  = rVOpt.IsAutoCompleteWords();
+        const bool bWordCount = pViewShell->getIDocumentStatistics()->GetDocStat().bModified;
         const bool bSmartTags = !pViewShell->GetDoc()->GetDocShell()->IsHelpDocument() &&
                                 !pViewShell->GetDoc()->isXForms() &&
                                 SwSmartTagMgr::Get().IsSmartTagsEnabled();
@@ -2305,7 +2305,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
         }
     }
 
-    pImp->GetShell()->EnableSmooth( sal_True );
+    pImp->GetShell()->EnableSmooth( true );
 
     if( pImp->IsAccessible() )
         pImp->FireAccessibleEvents();
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index d7aa2e89cd5c..baa24c18aaf2 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -187,7 +187,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                         {
                             /*  Open Paragraph Record */
                             aIo.OpenRec( SW_LAYCACHE_IO_REC_PARA );
-                            sal_Bool bFollow = ((SwTxtFrm*)pTmp)->IsFollow();
+                            bool bFollow = ((SwTxtFrm*)pTmp)->IsFollow();
                             aIo.OpenFlagRec( bFollow ? 0x01 : 0x00,
                                             bFollow ? 8 : 4 );
                             nNdIdx -= nStartOfContent;
@@ -314,10 +314,10 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
 }
 
 #ifdef DBG_UTIL
-sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
+bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
 {
     if( !pImpl )
-        return sal_True;
+        return true;
     const SwRootFrm *pRootFrm = rDoc.GetCurrentLayout();
     if( pRootFrm )
     {
@@ -330,7 +330,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
         while( pPage )
         {
             if( nIndex >= pImpl->size() )
-                return sal_False;
+                return false;
 
             SwLayoutFrm* pLay = pPage->FindBodyCont();
             SwFrm* pTmp = pLay ? pLay->ContainsAny() : NULL;
@@ -343,7 +343,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
                     sal_uLong nNdIdx = ((SwTxtFrm*)pTmp)->GetNode()->GetIndex();
                     if( nNdIdx > nStartOfContent )
                     {
-                        sal_Bool bFollow = ((SwTxtFrm*)pTmp)->IsFollow();
+                        bool bFollow = ((SwTxtFrm*)pTmp)->IsFollow();
                         nNdIdx -= nStartOfContent;
                         if( pImpl->GetBreakIndex( nIndex ) != nNdIdx ||
                             SW_LAYCACHE_IO_REC_PARA !=
@@ -351,7 +351,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
                             ( bFollow ? ((SwTxtFrm*)pTmp)->GetOfst()
                               : COMPLETE_STRING ) != pImpl->GetBreakOfst( nIndex ) )
                         {
-                            return sal_False;
+                            return false;
                         }
                         ++nIndex;
                     }
@@ -388,7 +388,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
                                 pImpl->GetBreakType( nIndex ) ||
                                nOfst != pImpl->GetBreakOfst( nIndex ) )
                             {
-                                return sal_False;
+                                return false;
                             }
                             ++nIndex;
                         }
@@ -421,7 +421,7 @@ sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
             pPage = (SwPageFrm*)pPage->GetNext();
         }
     }
-    return sal_True;
+    return true;
 }
 #endif
 
@@ -462,7 +462,7 @@ SwActualSection::SwActualSection( SwActualSection *pUp,
  * a guess, but a guess with statistical background.
  */
 SwLayHelper::SwLayHelper( SwDoc *pD, SwFrm* &rpF, SwFrm* &rpP, SwPageFrm* &rpPg,
-                          SwLayoutFrm* &rpL, SwActualSection* &rpA, sal_Bool &rB,
+                          SwLayoutFrm* &rpL, SwActualSection* &rpA, bool &rB,
                           sal_uLong nNodeIndex, bool bCache )
     : rpFrm( rpF )
     , rpPrv( rpP )
@@ -606,13 +606,13 @@ bool SwLayHelper::CheckInsertPage()
             SwFmtPageDesc aFollowDesc( pDesc );
             oPgNum = aFollowDesc.GetNumOffset();
             if ( oPgNum )
-                ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(sal_True);
+                ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(true);
         }
         else
         {
             oPgNum = rDesc.GetNumOffset();
             if ( oPgNum )
-                ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(sal_True);
+                ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(true);
         }
         bool bNextPageOdd = !rpPage->OnRightPage();
         bool bInsertEmpty = false;
@@ -624,7 +624,7 @@ bool SwLayHelper::CheckInsertPage()
         // If the page style is changing, we'll have a first page.
         bool bNextPageFirst = pDesc != rpPage->GetPageDesc();
         ::InsertNewPage( (SwPageDesc&)*pDesc, rpPage->GetUpper(),
-                         bNextPageOdd, bNextPageFirst, bInsertEmpty, sal_False, rpPage->GetNext() );
+                         bNextPageOdd, bNextPageFirst, bInsertEmpty, false, rpPage->GetNext() );
         if ( bEnd )
         {
             OSL_ENSURE( rpPage->GetNext(), "No new page?" );
@@ -735,7 +735,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                 sal_uInt16 nType = SW_LAYCACHE_IO_REC_PAGES;
                 if( bLongTab )
                 {
-                    rbBreakAfter = sal_True;
+                    rbBreakAfter = true;
                     nOfst = static_cast<sal_Int32>(nRowCount + nMaxRowPerPage);
                 }
                 else
@@ -748,7 +748,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                     {
                         nType = pImpl->GetBreakType( nIndex );
                         nOfst = pImpl->GetBreakOfst( nIndex++ );
-                        rbBreakAfter = sal_True;
+                        rbBreakAfter = true;
                     }
                 }
 
@@ -862,7 +862,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                     else
                     {
                         pSct = new SwSectionFrm(
-                            *rpActualSection->GetSectionFrm(), sal_False );
+                            *rpActualSection->GetSectionFrm(), false );
                         rpActualSection->GetSectionFrm()->SimpleFormat();
                         bInit = true;
                     }
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 59b1ef229f70..bb8728354872 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -98,7 +98,7 @@ class SwLayHelper
     SwPageFrm* &rpPage;
     SwLayoutFrm* &rpLay;
     SwActualSection* &rpActualSection;
-    sal_Bool &rbBreakAfter;
+    bool &rbBreakAfter;
     SwDoc* pDoc;
     SwLayCacheImpl* pImpl;
     sal_uLong nMaxParaPerPage;
@@ -110,7 +110,7 @@ class SwLayHelper
     void _CheckFlyCache( SwPageFrm* pPage );
 public:
     SwLayHelper( SwDoc *pD, SwFrm* &rpF, SwFrm* &rpP, SwPageFrm* &rpPg,
-            SwLayoutFrm* &rpL, SwActualSection* &rpA, sal_Bool &rBrk,
+            SwLayoutFrm* &rpL, SwActualSection* &rpA, bool &rBrk,
             sal_uLong nNodeIndex, bool bCache );
     ~SwLayHelper();
     sal_uLong CalcPageCount();
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index ff9426a981b1..87201c552018 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -264,12 +264,12 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm )
     }
 }
 
-sal_Bool SwLayouter::StartLooping( SwPageFrm* pPage )
+bool SwLayouter::StartLooping( SwPageFrm* pPage )
 {
     if( pLooping )
-        return sal_False;
+        return false;
     pLooping = new SwLooping( pPage );
-    return sal_True;
+    return true;
 }
 
 void SwLayouter::EndLoopControl()
@@ -286,10 +286,10 @@ void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect )
     pDoc->GetLayouter()->_CollectEndnotes( pSect );
 }
 
-sal_Bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn )
+bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn )
 {
     if( !pDoc->GetLayouter() )
-        return sal_False;
+        return false;
     SwLayouter *pLayouter = pDoc->GetLayouter();
     if( pLayouter->pEndnoter && pLayouter->pEndnoter->GetSect() && pSect &&
         ( pLayouter->pEndnoter->GetSect()->IsAnFollow( pSect ) ||
@@ -297,12 +297,12 @@ sal_Bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFt
     {
         if( pFtn )
             pLayouter->CollectEndnote( pFtn );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage )
+bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage )
 {
     OSL_ENSURE( pDoc, "No doc, no fun" );
     if( !pDoc->GetLayouter() )
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index ef68f120bbd0..0d5bd8590921 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -37,7 +37,7 @@
 
 SwLayVout     *SwRootFrm::pVout = 0;
 bool           SwRootFrm::bInPaint = false;
-sal_Bool           SwRootFrm::bNoVirDev = sal_False;
+bool           SwRootFrm::bNoVirDev = false;
 
 SwCache *SwFrm::mpCache = 0;
 
@@ -480,7 +480,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
     pTimerAccess->StopIdling();
     // For creating the Flys by MakeFrms()
     pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() );
-    bCallbackActionEnabled = sal_False; // needs to be set to sal_True before leaving!
+    bCallbackActionEnabled = false; // needs to be set to sal_True before leaving!
 
     SdrModel *pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel();
     if ( pMd )
@@ -524,14 +524,14 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
             bIsVirtPageNum = true;
     }
     else
-        bIsVirtPageNum = sal_False;
+        bIsVirtPageNum = false;
     if ( !pDesc )
         pDesc = &pDoc->GetPageDesc( 0 );
     const bool bOdd = !oPgNum || 0 != ( oPgNum.get() % 2 );
     bool bFirst = !oPgNum || 1 == oPgNum.get();
 
     // Create a page and put it in the layout
-    SwPageFrm *pPage = ::InsertNewPage( *pDesc, this, bOdd, bFirst, false, sal_False, 0 );
+    SwPageFrm *pPage = ::InsertNewPage( *pDesc, this, bOdd, bFirst, false, false, 0 );
 
     // Find the first page in the Bodytext section.
     SwLayoutFrm *pLay = pPage->FindBodyCont();
@@ -539,7 +539,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
         pLay = (SwLayoutFrm*)pLay->Lower();
 
     SwNodeIndex aTmp( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode(), 1 );
-    ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), sal_True );
+    ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), true );
     //Remove masters that haven't been replaced yet from the list.
     RemoveMasterObjs( pDrawPage );
     if( pSettingAccess->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
@@ -552,7 +552,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
     }
 
     pTimerAccess->StartIdling();
-    bCallbackActionEnabled = sal_True;
+    bCallbackActionEnabled = true;
 
     SwViewShell *pViewSh  = GetCurrShell();
     if (pViewSh)
@@ -561,7 +561,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
 
 SwRootFrm::~SwRootFrm()
 {
-    bTurboAllowed = sal_False;
+    bTurboAllowed = false;
     pTurbo = 0;
     // fdo#39510 crash on document close with footnotes
     // Object ownership in writer and esp. in layout are a mess: Before the
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index fb443fb745b3..f1307bcdd443 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -161,7 +161,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
         Prt().Height( Frm().Height() );
         Prt().Width( Frm().Width() );
     }
-    mbValidSize = mbValidPrtArea = sal_True;
+    mbValidSize = mbValidPrtArea = true;
 }
 
 SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
@@ -170,22 +170,22 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
     pDesc( pPgDsc ),
     nPhyPageNum( 0 )
 {
-    SetDerivedVert( sal_False );
-    SetDerivedR2L( sal_False );
+    SetDerivedVert( false );
+    SetDerivedR2L( false );
     if( pDesc )
     {
-        bHasGrid = sal_True;
+        bHasGrid = true;
         SwTextGridItem const*const pGrid(GetGridItem(this));
         if( !pGrid )
-            bHasGrid = sal_False;
+            bHasGrid = false;
     }
     else
-        bHasGrid = sal_False;
+        bHasGrid = false;
     SetMaxFtnHeight( pPgDsc->GetFtnInfo().GetHeight() ?
                      pPgDsc->GetFtnInfo().GetHeight() : LONG_MAX ),
     mnType = FRMC_PAGE;
-    bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = sal_True;
-    bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = sal_False;
+    bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true;
+    bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = false;
 
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -202,9 +202,9 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
 
     // create and insert body area if it is not a blank page
     SwDoc *pDoc = pFmt->GetDoc();
-    if ( sal_False == (bEmptyPage = (pFmt == pDoc->GetEmptyPageFmt())) )
+    if ( false == (bEmptyPage = (pFmt == pDoc->GetEmptyPageFmt())) )
     {
-        bEmptyPage = sal_False;
+        bEmptyPage = false;
         Calc();                     // so that the PrtArea is correct
         SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrmFmt(), this );
         pBodyFrm->ChgSize( Prt().SSize() );
@@ -278,10 +278,10 @@ SwPageFrm::~SwPageFrm()
     }
 }
 
-void SwPageFrm::CheckGrid( sal_Bool bInvalidate )
+void SwPageFrm::CheckGrid( bool bInvalidate )
 {
-    sal_Bool bOld = bHasGrid;
-    bHasGrid = sal_True;
+    bool bOld = bHasGrid;
+    bHasGrid = true;
     SwTextGridItem const*const pGrid(GetGridItem(this));
     bHasGrid = 0 != pGrid;
     if( bInvalidate || bOld != bHasGrid )
@@ -309,38 +309,38 @@ void SwPageFrm::CheckDirection( bool bVert )
     {
         if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir )
         {
-            mbVertLR = 0;
-            mbVertical = 0;
+            mbVertLR = false;
+            mbVertical = false;
         }
         else
         {
             const SwViewShell *pSh = getRootFrm()->GetCurrShell();
             if( pSh && pSh->GetViewOptions()->getBrowseMode() )
             {
-                mbVertLR = 0;
-                mbVertical = 0;
+                mbVertLR = false;
+                mbVertical = false;
             }
             else
             {
-                mbVertical = 1;
+                mbVertical = true;
 
                 if(FRMDIR_VERT_TOP_RIGHT == nDir)
-                    mbVertLR = 0;
+                    mbVertLR = false;
                     else if(FRMDIR_VERT_TOP_LEFT==nDir)
-                       mbVertLR = 1;
+                       mbVertLR = true;
             }
         }
 
-        mbReverse = 0;
-        mbInvalidVert = 0;
+        mbReverse = false;
+        mbInvalidVert = false;
     }
     else
     {
         if( FRMDIR_HORI_RIGHT_TOP == nDir )
-            mbRightToLeft = 1;
+            mbRightToLeft = true;
         else
-            mbRightToLeft = 0;
-        mbInvalidR2L = 0;
+            mbRightToLeft = false;
+        mbInvalidR2L = false;
     }
 }
 
@@ -440,7 +440,7 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage )
     }
 }
 
-void SwPageFrm::PreparePage( sal_Bool bFtn )
+void SwPageFrm::PreparePage( bool bFtn )
 {
     SetFtnPage( bFtn );
 
@@ -583,7 +583,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
             SwViewShell *pSh = getRootFrm()->GetCurrShell();
             if( pSh && pSh->GetViewOptions()->getBrowseMode() )
             {
-                mbValidSize = sal_False;
+                mbValidSize = false;
                 // OD 28.10.2002 #97265# - Don't call <SwPageFrm::MakeAll()>
                 // Calculation of the page is not necessary, because its size is
                 // is invalidated here and further invalidation is done in the
@@ -654,7 +654,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 SetMaxFtnHeight( LONG_MAX );
             SetColMaxFtnHeight();
             // here, the page might be destroyed:
-            ((SwRootFrm*)GetUpper())->RemoveFtns( 0, sal_False, sal_True );
+            ((SwRootFrm*)GetUpper())->RemoveFtns( 0, false, true );
             break;
         case RES_FRAMEDIR :
             CheckDirChange();
@@ -773,8 +773,8 @@ SwPageDesc *SwPageFrm::FindPageDesc()
 // Notify if the RootFrm changes its size
 void AdjustSizeChgNotify( SwRootFrm *pRoot )
 {
-    const sal_Bool bOld = pRoot->IsSuperfluous();
-    pRoot->bCheckSuperfluous = sal_False;
+    const bool bOld = pRoot->IsSuperfluous();
+    pRoot->bCheckSuperfluous = false;
     SwViewShell *pSh = pRoot->GetCurrShell();
     if ( pSh )
     {
@@ -963,7 +963,7 @@ void SwPageFrm::PrepareRegisterChg()
  * @param bNotifyFields
  * @param ppPrev
  */
-void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, SwPageFrm** ppPrev )
+void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** ppPrev )
 {
     OSL_ENSURE( pStart, "no starting page." );
 
@@ -991,9 +991,9 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, SwPageFrm
     {
         // obtain PageDesc and FrmFmt
         SwPageDesc *pDesc = pPage->FindPageDesc();
-        sal_Bool bCheckEmpty = pPage->IsEmptyPage();
-        sal_Bool bActOdd = pPage->OnRightPage();
-        sal_Bool bOdd = pPage->WannaRightPage();
+        bool bCheckEmpty = pPage->IsEmptyPage();
+        bool bActOdd = pPage->OnRightPage();
+        bool bOdd = pPage->WannaRightPage();
         bool bFirst = pPage->OnFirstPage();
         SwFrmFmt *pFmtWish = (bOdd)
             ? pDesc->GetRightFmt(bFirst) : pDesc->GetLeftFmt(bFirst);
@@ -1056,7 +1056,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, SwPageFrm
                     pDesc = ((SwPageFrm*)pPage->GetPrev())->GetPageDesc();
                 SwPageFrm *pTmp = new SwPageFrm( pDoc->GetEmptyPageFmt(),pRoot,pDesc);
                 pTmp->Paste( pRoot, pPage );
-                pTmp->PreparePage( sal_False );
+                pTmp->PreparePage( false );
                 pPage = pTmp;
             }
             else if ( pPage->GetPageDesc() != pDesc )           //4.
@@ -1151,7 +1151,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, SwPageFrm
 #endif
 }
 
-SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn )
+SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn )
 {
     SwRootFrm *pRoot = (SwRootFrm*)pPrevPage->GetUpper();
     SwPageFrm *pSibling = (SwPageFrm*)pPrevPage->GetNext();
@@ -1172,7 +1172,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn )
             ::boost::optional<sal_uInt16> oNumOffset = rDesc.GetNumOffset();
             bWishedOdd = ((oNumOffset ? oNumOffset.get() : 0) % 2) ? true : false;
             // use the opportunity to set the flag at root
-            pRoot->SetVirtPageNum( sal_True );
+            pRoot->SetVirtPageNum( true );
         }
     }
     if ( !pDesc )
@@ -1200,7 +1200,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn )
             SwPageFrm *pDel = pSibling;
             pSibling = (SwPageFrm*)pSibling->GetNext();
             if ( !pDoc->GetFtnIdxs().empty() )
-                pRoot->RemoveFtns( pDel, sal_True );
+                pRoot->RemoveFtns( pDel, true );
             pDel->Cut();
             delete pDel;
         }
@@ -1221,7 +1221,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn )
         SwPageFrm *pDel = pSibling;
         pSibling = (SwPageFrm*)pSibling->GetNext();
         if ( !pDoc->GetFtnIdxs().empty() )
-            pRoot->RemoveFtns( pDel, sal_True );
+            pRoot->RemoveFtns( pDel, true );
         pDel->Cut();
         delete pDel;
     }
@@ -1232,7 +1232,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn )
     {
         if ( bCheckPages )
         {
-            CheckPageDescs( pSibling, sal_False );
+            CheckPageDescs( pSibling, false );
             SwViewShell *pSh = getRootFrm()->GetCurrShell();
             SwViewImp *pImp = pSh ? pSh->Imp() : 0;
             if ( pImp && pImp->IsAction() && !pImp->GetLayAction().IsCheckPages() )
@@ -1278,14 +1278,14 @@ sw::sidebarwindows::SidebarPosition SwPageFrm::SidebarPosition() const
     }
 }
 
-SwTwips SwRootFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
+SwTwips SwRootFrm::GrowFrm( SwTwips nDist, bool bTst, bool )
 {
     if ( !bTst )
         Frm().SSize().Height() += nDist;
     return nDist;
 }
 
-SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool )
+SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool )
 {
     OSL_ENSURE( nDist >= 0, "nDist < 0." );
     OSL_ENSURE( nDist <= Frm().Height(), "nDist > als aktuelle Groesse." );
@@ -1304,7 +1304,7 @@ void SwRootFrm::RemoveSuperfluous()
 
     if ( !IsSuperfluous() )
         return;
-    bCheckSuperfluous = sal_False;
+    bCheckSuperfluous = false;
 
     SwPageFrm *pPage = GetLastPage();
     long nDocPos = LONG_MAX;
@@ -1369,7 +1369,7 @@ void SwRootFrm::RemoveSuperfluous()
             SwPageFrm *pEmpty = pPage;
             pPage = (SwPageFrm*)pPage->GetPrev();
             if ( !GetFmt()->GetDoc()->GetFtnIdxs().empty() )
-                RemoveFtns( pEmpty, sal_True );
+                RemoveFtns( pEmpty, true );
             pEmpty->Cut();
             delete pEmpty;
             nDocPos = pPage ? pPage->Frm().Top() : 0;
@@ -1390,7 +1390,7 @@ void SwRootFrm::AssertFlyPages()
 {
     if ( !IsAssertFlyPages() )
         return;
-    bAssertFlyPages = sal_False;
+    bAssertFlyPages = false;
 
     SwDoc *pDoc = GetFmt()->GetDoc();
     const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts();
@@ -1416,7 +1416,7 @@ void SwRootFrm::AssertFlyPages()
     if ( nMaxPg > pPage->GetPhyPageNum() )
     {
         // Continue pages based on the rules of the PageDesc after the last page.
-        sal_Bool bOdd = (pPage->GetPhyPageNum() % 2) ? sal_True : sal_False;
+        bool bOdd = (pPage->GetPhyPageNum() % 2) ? sal_True : sal_False;
         SwPageDesc *pDesc = pPage->GetPageDesc();
         SwFrm *pSibling = pPage->GetNext();
         for ( i = pPage->GetPhyPageNum(); i < nMaxPg; ++i  )
@@ -1426,7 +1426,7 @@ void SwRootFrm::AssertFlyPages()
                 // Insert empty page (but Flys will be stored in the next page)
                 pPage = new SwPageFrm( pDoc->GetEmptyPageFmt(), this, pDesc );
                 pPage->Paste( this, pSibling );
-                pPage->PreparePage( sal_False );
+                pPage->PreparePage( false );
                 bOdd = bOdd ? sal_False : sal_True;
                 ++i;
             }
@@ -1434,7 +1434,7 @@ void SwRootFrm::AssertFlyPages()
                     SwPageFrm( (bOdd ? pDesc->GetRightFmt() :
                                        pDesc->GetLeftFmt()), this, pDesc );
             pPage->Paste( this, pSibling );
-            pPage->PreparePage( sal_False );
+            pPage->PreparePage( false );
             bOdd = bOdd ? sal_False : sal_True;
             pDesc = pDesc->GetFollow();
         }
@@ -1451,7 +1451,7 @@ void SwRootFrm::AssertFlyPages()
                 bOdd = pPage->OnRightPage();
                 if ( pPage->GetFmt() !=
                      (bOdd ? pTmpDesc->GetRightFmt() : pTmpDesc->GetLeftFmt()) )
-                    RemoveFtns( pPage, sal_False, sal_True );
+                    RemoveFtns( pPage, false, true );
             }
         }
     }
@@ -1503,31 +1503,31 @@ Size SwRootFrm::ChgSize( const Size& aNewSize )
 {
     Frm().SSize() = aNewSize;
     _InvalidatePrt();
-    mbFixSize = sal_False;
+    mbFixSize = false;
     return Frm().SSize();
 }
 
 void SwRootFrm::MakeAll()
 {
     if ( !mbValidPos )
-    {   mbValidPos = sal_True;
+    {   mbValidPos = true;
         maFrm.Pos().setX(DOCUMENTBORDER);
         maFrm.Pos().setY(DOCUMENTBORDER);
     }
     if ( !mbValidPrtArea )
-    {   mbValidPrtArea = sal_True;
+    {   mbValidPrtArea = true;
         maPrt.Pos().setX(0);
         maPrt.Pos().setY(0);
         maPrt.SSize( maFrm.SSize() );
     }
     if ( !mbValidSize )
         // SSize is set by the pages (Cut/Paste).
-        mbValidSize = sal_True;
+        mbValidSize = true;
 }
 
 void SwRootFrm::ImplInvalidateBrowseWidth()
 {
-    bBrowseWidthValid = sal_False;
+    bBrowseWidthValid = false;
     SwFrm *pPg = Lower();
     while ( pPg )
     {
@@ -1553,7 +1553,7 @@ void SwRootFrm::ImplCalcBrowseWidth()
     if ( !pFrm )
         return;
 
-    bBrowseWidthValid = sal_True;
+    bBrowseWidthValid = true;
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
     nBrowseWidth = pSh
                     ? MINLAY + 2 * pSh->GetOut()->
@@ -1602,7 +1602,7 @@ void SwRootFrm::ImplCalcBrowseWidth()
                 // #i28701#
                 SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i];
                 const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
-                const sal_Bool bFly = pAnchoredObj->ISA(SwFlyFrm);
+                const bool bFly = pAnchoredObj->ISA(SwFlyFrm);
                 if ((bFly && (FAR_AWAY == pAnchoredObj->GetObjRect().Width()))
                     || rFmt.GetFrmSize().GetWidthPercent())
                 {
@@ -1671,13 +1671,13 @@ void SwRootFrm::StartAllAction()
         } while ( pSh != GetCurrShell() );
 }
 
-void SwRootFrm::EndAllAction( sal_Bool bVirDev )
+void SwRootFrm::EndAllAction( bool bVirDev )
 {
     SwViewShell *pSh = GetCurrShell();
     if ( pSh )
         do
         {
-            const sal_Bool bOldEndActionByVirDev = pSh->IsEndActionByVirDev();
+            const bool bOldEndActionByVirDev = pSh->IsEndActionByVirDev();
             pSh->SetEndActionByVirDev( bVirDev );
             if ( pSh->ISA( SwCrsrShell ) )
             {
@@ -1706,8 +1706,8 @@ void SwRootFrm::UnoRemoveAllActions()
             if ( !pSh->IsInEndAction() )
             {
                 OSL_ENSURE(!pSh->GetRestoreActions(), "Restore action count is already set!");
-                sal_Bool bCrsr = pSh->ISA( SwCrsrShell );
-                sal_Bool bFE = pSh->ISA( SwFEShell );
+                bool bCrsr = pSh->ISA( SwCrsrShell );
+                bool bFE = pSh->ISA( SwFEShell );
                 sal_uInt16 nRestore = 0;
                 while( pSh->ActionCount() )
                 {
@@ -1724,7 +1724,7 @@ void SwRootFrm::UnoRemoveAllActions()
                 }
                 pSh->SetRestoreActions(nRestore);
             }
-            pSh->LockView(sal_True);
+            pSh->LockView(true);
             pSh = (SwViewShell*)pSh->GetNext();
 
         } while ( pSh != GetCurrShell() );
@@ -1745,7 +1745,7 @@ void SwRootFrm::UnoRestoreAllActions()
                     pSh->StartAction();
             }
             pSh->SetRestoreActions(0);
-            pSh->LockView(sal_False);
+            pSh->LockView(false);
             pSh = (SwViewShell*)pSh->GetNext();
 
         } while ( pSh != GetCurrShell() );
@@ -1914,8 +1914,8 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
 
     Calc();
 
-    const sal_Bool bOldCallbackActionEnabled = IsCallbackActionEnabled();
-    SetCallbackActionEnabled( sal_False );
+    const bool bOldCallbackActionEnabled = IsCallbackActionEnabled();
+    SetCallbackActionEnabled( false );
 
     maPageRects.clear();
 
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index b825aa4156d6..e7641f2fbcfb 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -48,8 +48,8 @@ SwPageDesc::SwPageDesc( const OUString& rName, SwFrmFmt *pFmt, SwDoc *pDc ) :
     nRegHeight( 0 ),
     nRegAscent( 0 ),
     eUse( (UseOnPage)(nsUseOnPage::PD_ALL | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE | nsUseOnPage::PD_FIRSTSHARE ) ),
-    bLandscape( sal_False ),
-    bHidden( sal_False ),
+    bLandscape( false ),
+    bHidden( false ),
     aFtnInfo()
 {
 }
@@ -122,7 +122,7 @@ void SwPageDesc::Mirror()
     aLeft.SetFmtAttr( aSet );
 }
 
-void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
+void SwPageDesc::ResetAllAttr( bool bLeft )
 {
     SwFrmFmt& rFmt = bLeft ? GetLeft() : GetMaster();
 
@@ -248,7 +248,7 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd )
         pMod = 0;
 
     Point aNullPt;
-    return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0, sal_False )
+    return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0, false )
                 : 0;
 }
 
@@ -262,7 +262,7 @@ const SwPageDesc* SwPageDesc::GetPageDescOfNode(const SwNode& rNd)
 }
 
 const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd,
-                                              sal_Bool bCheckForThisPgDc ) const
+                                              bool bCheckForThisPgDc ) const
 {
     // which PageDescFormat is valid for this node?
     const SwFrmFmt* pRet;
@@ -286,9 +286,9 @@ const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd,
     return pRet;
 }
 
-sal_Bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
+bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( GetFollow() && this != GetFollow() )
     {
         const SwFrm* pChkFrm = lcl_GetFrmOfNode( rNd );
@@ -297,7 +297,7 @@ sal_Bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const
             ( !pChkFrm->GetNext() || GetFollow() ==
                         ((SwPageFrm*)pChkFrm->GetNext())->GetPageDesc() ))
             // the page on which the follow points was found
-            bRet = sal_True;
+            bRet = true;
     }
     return bRet;
 }
@@ -316,12 +316,12 @@ SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
             : 0;
 }
 
-sal_Bool SwPageDesc::IsFirstShared() const
+bool SwPageDesc::IsFirstShared() const
 {
     return eUse & nsUseOnPage::PD_FIRSTSHARE ? sal_True : sal_False;
 }
 
-void SwPageDesc::ChgFirstShare( sal_Bool bNew )
+void SwPageDesc::ChgFirstShare( bool bNew )
 {
     if ( bNew )
         eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FIRSTSHARE);
@@ -392,7 +392,7 @@ SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy )
     return *this;
 }
 
-sal_Bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
+bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
 {
     return ( nMaxHeight == rCmp.GetHeight() &&
              nLineWidth == rCmp.nLineWidth &&
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 1c91e5ce87bd..284942f66dbb 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -148,7 +148,7 @@ public:
     SvxBorderStyle       GetStyle() const { return nStyle; }
     const SwTabFrm      *GetTab()   const { return pTab;  }
     void  SetPainted()                    { bPainted = true; }
-    void  Lock( sal_Bool bLock )              { if ( bLock )
+    void  Lock( bool bLock )              { if ( bLock )
                                                 ++nLock;
                                             else if ( nLock )
                                                 --nLock;
@@ -192,7 +192,7 @@ public:
                       const SwTabFrm *pTab, const sal_uInt8 nSCol );
     void ConnectEdges( OutputDevice *pOut );
     void PaintLines  ( OutputDevice *pOut );
-    void LockLines( sal_Bool bLock );
+    void LockLines( bool bLock );
 
     //Limit lines to 100
     bool isFull() const { return aLineRects.size()>100 ? true : false; }
@@ -230,7 +230,7 @@ static SwViewShell *pGlobalShell = 0;
 
 //Only repaint the Fly content as well as the background of the Fly content if
 //a metafile is taken of the Fly.
-static sal_Bool bFlyMetafile = sal_False;
+static bool bFlyMetafile = false;
 static OutputDevice *pFlyMetafileOut = 0;
 
 //Retouch for transparent Flys is done by the background of the Flys.
@@ -268,7 +268,7 @@ static SfxProgress *pProgress = 0;
 static SwFlyFrm *pFlyOnlyDraw = 0;
 
 //So the flys can also be painted right for the hack.
-static sal_Bool bTableHack = sal_False;
+static bool bTableHack = false;
 
 //To optimize the expensive RetouchColor determination
 Color aGlobalRetoucheColor;
@@ -301,17 +301,17 @@ bool isTableBoundariesEnabled()
 void SwCalcPixStatics( OutputDevice *pOut )
 {
     // determine 'small' twip-to-pixel relation
-    sal_Bool bSmallTwipToPxRelW = sal_False;
-    sal_Bool bSmallTwipToPxRelH = sal_False;
+    bool bSmallTwipToPxRelW = false;
+    bool bSmallTwipToPxRelH = false;
     {
         Size aCheckTwipToPxRelSz( pOut->PixelToLogic( Size( 100, 100 )) );
         if ( (aCheckTwipToPxRelSz.Width()/100.0) < 2.0 )
         {
-            bSmallTwipToPxRelW = sal_True;
+            bSmallTwipToPxRelW = true;
         }
         if ( (aCheckTwipToPxRelSz.Height()/100.0) < 2.0 )
         {
-            bSmallTwipToPxRelH = sal_True;
+            bSmallTwipToPxRelH = true;
         }
     }
 
@@ -354,8 +354,8 @@ void SwCalcPixStatics( OutputDevice *pOut )
 //To be able to save the statics so the paint is more or lees reentrant.
 class SwSavePaintStatics
 {
-    sal_Bool            bSFlyMetafile;
-    SwViewShell          *pSGlobalShell;
+    bool                bSFlyMetafile;
+    SwViewShell        *pSGlobalShell;
     OutputDevice       *pSFlyMetafileOut;
     SwFlyFrm           *pSRetoucheFly,
                        *pSRetoucheFly2,
@@ -401,7 +401,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
     aSScaleX            ( aScaleX           ),
     aSScaleY            ( aScaleY           )
 {
-    bFlyMetafile = sal_False;
+    bFlyMetafile = false;
     pFlyMetafileOut = 0;
     pRetoucheFly  = 0;
     pRetoucheFly2 = 0;
@@ -935,7 +935,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
     }
 }
 
-void SwLineRects::LockLines( sal_Bool bLock )
+void SwLineRects::LockLines( bool bLock )
 {
     for (iterator it = aLineRects.begin(); it != aLineRects.end(); ++it)
        (*it).Lock( bLock );
@@ -1776,7 +1776,7 @@ static inline void lcl_DrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush,
 // Pixel-align coordinations for drawing graphic.
 // Outsource code for drawing background of the graphic
 //     with a background color in method <lcl_DrawGraphicBackgrd>
-//     Also, change type of <bGrfNum> and <bClip> from <sal_Bool> to <bool>.
+//     Also, change type of <bGrfNum> and <bClip> from <bool> to <bool>.
 static void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut,
                       SwViewShell &rSh, const SwRect &rGrf, const SwRect &rOut,
                       bool bClip, bool bGrfNum,
@@ -1789,7 +1789,7 @@ static void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut,
     SwRect aAlignedGrfRect = rGrf;
     ::SwAlignRect( aAlignedGrfRect, &rSh );
 
-    // Change type from <sal_Bool> to <bool>.
+    // Change type from <bool> to <bool>.
     const bool bNotInside = bClip && !rOut.IsInside( aAlignedGrfRect );
     if ( bNotInside )
     {
@@ -1890,7 +1890,7 @@ void DrawGraphic(
     const SwRect &rOrg,
     const SwRect &rOut,
     const sal_uInt8 nGrfNum,
-    const sal_Bool bConsiderBackgroundTransparency )
+    const bool bConsiderBackgroundTransparency )
     // Add 6th parameter to indicate that method should
     // consider background transparency, saved in the color of the brush item
 {
@@ -3061,7 +3061,7 @@ namespace
                                     const sdr::contact::ViewObjectContact& rOriginal,
                                     const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE
             {
-                sal_Bool bPaint( sal_True );
+                bool bPaint( true );
 
                 SdrObject* pObj = rOriginal.GetViewContact().TryToGetSdrObject();
                 if ( pObj )
@@ -3149,8 +3149,8 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
     {
         ((SwRootFrm*)this)->ResetTurbo();
         SwLayAction aAction( (SwRootFrm*)this, pSh->Imp() );
-        aAction.SetPaint( sal_False );
-        aAction.SetComplete( sal_False );
+        aAction.SetPaint( false );
+        aAction.SetComplete( false );
         aAction.SetReschedule( pProgress ? sal_True : sal_False );
         aAction.Action();
         ((SwRootFrm*)this)->ResetTurboFlag();
@@ -3169,8 +3169,8 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
     // load the linguistic, which in turn can cause a reformat
     // of the document. Dangerous! We better set this flag to
     // avoid the reformat.
-    const sal_Bool bOldAction = IsCallbackActionEnabled();
-    ((SwRootFrm*)this)->SetCallbackActionEnabled( sal_False );
+    const bool bOldAction = IsCallbackActionEnabled();
+    ((SwRootFrm*)this)->SetCallbackActionEnabled( false );
 
     const SwPageFrm *pPage = pSh->Imp()->GetFirstVisPage();
 
@@ -3276,11 +3276,11 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
                 // calls, paint <hell> or <heaven>
                 const Color aPageBackgrdColor = pPage->GetDrawBackgrdColor();
 
-                pPage->PaintBaBo( aPaintRect, pPage, sal_True );
+                pPage->PaintBaBo( aPaintRect, pPage, true );
 
                 if ( pSh->Imp()->HasDrawView() )
                 {
-                    pLines->LockLines( sal_True );
+                    pLines->LockLines( true );
                     const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
                     pSh->Imp()->PaintLayer( pIDDMA->GetHellId(),
                                             pPrintData,
@@ -3289,11 +3289,11 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
                                             (pPage->IsRightToLeft() ? true : false),
                                             &aSwRedirector );
                     pLines->PaintLines( pSh->GetOut() );
-                    pLines->LockLines( sal_False );
+                    pLines->LockLines( false );
                 }
 
                 if ( pSh->GetDoc()->get( IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS ) )
-                    pPage->PaintBaBo( aPaintRect, pPage, sal_True, /*bOnlyTxtBackground=*/true );
+                    pPage->PaintBaBo( aPaintRect, pPage, true, /*bOnlyTxtBackground=*/true );
 
                 if( pSh->GetWin() )
                 {
@@ -3513,8 +3513,8 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         return;
 
     SwShortCut aShortCut( *pFrm, rRect );
-    sal_Bool bCnt;
-    if ( sal_True == (bCnt = pFrm->IsCntntFrm()) )
+    bool bCnt;
+    if ( (bCnt = pFrm->IsCntntFrm()) )
         pFrm->Calc();
 
     if ( pFrm->IsFtnContFrm() )
@@ -3576,7 +3576,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 {
                     pGlobalShell->InvalidateWindows( aPaintRect );
                     pFrm = pFrm->GetNext();
-                    if ( pFrm && (sal_True == (bCnt = pFrm->IsCntntFrm())) )
+                    if ( pFrm && (bCnt = pFrm->IsCntntFrm()) )
                         pFrm->Calc();
                     continue;
                 }
@@ -3608,7 +3608,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 
         pFrm = pFrm->GetNext();
 
-        if ( pFrm && (sal_True == (bCnt = pFrm->IsCntntFrm())) )
+        if ( pFrm && (bCnt = pFrm->IsCntntFrm()) )
             pFrm->Calc();
     }
 }
@@ -3695,7 +3695,7 @@ void SwPageFrm::PaintBreak( ) const
                 SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin();
                 SwFrameControlsManager& rMngr = rEditWin.GetFrameControlsManager();
 
-                if ( pFlowFrm && pFlowFrm->IsPageBreak( sal_True ) )
+                if ( pFlowFrm && pFlowFrm->IsPageBreak( true ) )
                     rMngr.SetPageBreakControl( this );
                 else
                     rMngr.RemoveControlsByType( PageBreak, this );
@@ -3719,7 +3719,7 @@ void SwColumnFrm::PaintBreak( ) const
         if ( pBodyFrm )
         {
             const SwCntntFrm *pCnt = static_cast< const SwLayoutFrm* >( pBodyFrm )->ContainsCntnt();
-            if ( pCnt && pCnt->IsColBreak( sal_True ) )
+            if ( pCnt && pCnt->IsColBreak( true ) )
             {
                 // Paint the break only if:
                 //    * Not in header footer edition, to avoid conflicts with the
@@ -3933,15 +3933,15 @@ bool SwFlyFrm::IsShadowTransparent() const
     return GetFmt()->IsShadowTransparent();
 };
 
-sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
+bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
 {
     SdrObjUserCall *pUserCall;
 
     if ( 0 == ( pUserCall = GetUserCall(pObj) ) )
-        return sal_True;
+        return true;
 
     //Attribute dependent, don't paint for printer or Preview
-    sal_Bool bPaint =  pFlyOnlyDraw ||
+    bool bPaint =  pFlyOnlyDraw ||
                        ((SwContact*)pUserCall)->GetFmt()->GetPrint().GetValue();
     if ( !bPaint )
         bPaint = pSh->GetWin() && !pSh->IsPreview();
@@ -3958,7 +3958,7 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
         {
             SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
             if ( pFlyOnlyDraw && pFlyOnlyDraw == pFly )
-                return sal_True;
+                return true;
 
             //Try to avoid displaying the intermediate stage, Flys which don't
             //overlap with the page on which they are anchored won't be
@@ -4019,10 +4019,10 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh )
                 bPaint = SwFlyFrm::IsPaint( pAnch->FindFlyFrm()->GetVirtDrawObj(),
                                             pSh );
             else if ( pFlyOnlyDraw )
-                bPaint = sal_False;
+                bPaint = false;
         }
         else
-            bPaint = sal_False;
+            bPaint = false;
     }
     return bPaint;
 }
@@ -4054,7 +4054,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     SwViewShell *pShell = getRootFrm()->GetCurrShell();
     if (pShell && pShell->GetDoc() && pShell->GetDoc()->GetDocShell())
     {
-        sal_Bool bInGenerateThumbnail = pShell->GetDoc()->GetDocShell()->IsInGenerateAndStoreThumbnail();
+        bool bInGenerateThumbnail = pShell->GetDoc()->GetDocShell()->IsInGenerateAndStoreThumbnail();
         if (bInGenerateThumbnail)
         {
             SwRect aVisRect = pShell->VisArea();
@@ -4066,7 +4066,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     //because of the overlapping of frames and drawing objects the flys have to
     //paint their borders (and those of the internal ones) directly.
     //e.g. #33066#
-    pLines->LockLines(sal_True);
+    pLines->LockLines(true);
     BorderLinesGuard blg; // this should not paint borders added from PaintBaBo
 
     SwRect aRect( rRect );
@@ -4101,7 +4101,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
             // OD 16.04.2003 #i13147# - add 2nd parameter with value <sal_True>
             // to indicate that method is called for paint in order to avoid
             // load of the intrinsic graphic.
-            bContour = GetContour( aPoly, sal_True );
+            bContour = GetContour( aPoly, true );
         }
 
         // #i47804# - distinguish complete background paint
@@ -4163,7 +4163,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                 const SwBorderAttrs &rAttrs = *aAccess.Get();
                 SwRect aPaintRect( aRect );
                 aPaintRect._Intersection( pParentFlyFrm->Frm() );
-                pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs, sal_False, sal_False );
+                pParentFlyFrm->PaintBackground( aPaintRect, pPage, rAttrs, false, false );
 
                 pRetoucheFly2 = pOldRet;
             }
@@ -4212,12 +4212,12 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
                         pOut->SetClipRegion(Region(aPoly));
                     }
                     for ( sal_uInt16 i = 0; i < aRegion.size(); ++i )
-                        PaintBackground( aRegion[i], pPage, rAttrs, sal_False, sal_True );
+                        PaintBackground( aRegion[i], pPage, rAttrs, false, true );
                     pOut->Pop();
                 }
                 else
                     for ( sal_uInt16 i = 0; i < aRegion.size(); ++i )
-                        PaintBackground( aRegion[i], pPage, rAttrs, sal_False, sal_True );
+                        PaintBackground( aRegion[i], pPage, rAttrs, false, true );
             }
 
             // OD 06.08.2002 #99657# - paint border before painting background
@@ -4241,7 +4241,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         if ( pSubsLines )
         {
             // Lock already existing subsidiary lines
-            pSubsLines->LockLines( sal_True );
+            pSubsLines->LockLines( true );
             bSubsLineRectsCreated = false;
         }
         else
@@ -4255,7 +4255,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         if ( pSpecSubsLines )
         {
             // Lock already existing special subsidiary lines
-            pSpecSubsLines->LockLines( sal_True );
+            pSpecSubsLines->LockLines( true );
             bSpecSubsLineRectsCreated = false;
         }
         else
@@ -4271,14 +4271,14 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         pSubsLines->PaintSubsidiary( pOut, pLines );
         if ( !bSubsLineRectsCreated )
             // unlock subsidiary lines
-            pSubsLines->LockLines( sal_False );
+            pSubsLines->LockLines( false );
         else
             // delete created subsidiary lines container
             DELETEZ( pSubsLines );
 
         if ( !bSpecSubsLineRectsCreated )
             // unlock special subsidiary lines
-            pSpecSubsLines->LockLines( sal_False );
+            pSpecSubsLines->LockLines( false );
         else
         {
             // delete created special subsidiary lines container
@@ -4293,7 +4293,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
     // OD 19.12.2002 #106318# - first paint lines added by fly frame paint
     // and then unlock other lines.
     pLines->PaintLines( pOut );
-    pLines->LockLines( sal_False );
+    pLines->LockLines( false );
     // have to paint frame borders added in heaven layer here...
     ProcessPrimitives(g_pBorderLines->GetBorderLines_Clear());
 
@@ -4567,7 +4567,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
 {
     SvxShadowItem rShadow = rAttrs.GetShadow();
 
-    const sal_Bool bCnt    = IsCntntFrm();
+    const bool bCnt    = IsCntntFrm();
     const bool bTop    = !bCnt || rAttrs.GetTopLine  ( *(this) );
     const bool bBottom = !bCnt || rAttrs.GetBottomLine( *(this) );
 
@@ -4647,7 +4647,7 @@ static void lcl_SubTopBottom( SwRect&              _iorRect,
                                    const SwRectFn&      _rRectFn,
                                    const bool       _bPrtOutputDev )
 {
-    const sal_Bool bCnt = _rFrm.IsCntntFrm();
+    const bool bCnt = _rFrm.IsCntntFrm();
     if ( _rBox.GetTop() && _rBox.GetTop()->GetInWidth() &&
          ( !bCnt || _rAttrs.GetTopLine( _rFrm ) )
        )
@@ -5418,7 +5418,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
             pPage = FindPageFrm();
 
         ::lcl_CalcBorderRect( aRect, this, rAttrs, true );
-        rAttrs.SetGetCacheLine( sal_True );
+        rAttrs.SetGetCacheLine( true );
         if ( bShadow )
             PaintShadow( rRect, aRect, rAttrs );
         // OD 27.09.2002 #103636# - suspend drawing of border
@@ -5467,7 +5467,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
                 }
             }
         }
-        rAttrs.SetGetCacheLine( sal_False );
+        rAttrs.SetGetCacheLine( false );
     }
 }
 
@@ -5598,7 +5598,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
             aInter.Intersection( rRect );
             if( aInter.HasArea() )
             {
-                sal_Bool bGrid = pGrid->GetRubyTextBelow();
+                bool bGrid = pGrid->GetRubyTextBelow();
                 bool bCell = GRID_LINES_CHARS == pGrid->GetGridType();
                 long nGrid = pGrid->GetBaseHeight();
                 const SwDoc* pDoc = GetFmt()->GetDoc();
@@ -5930,7 +5930,7 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect,
 
 const sal_Int8 SwPageFrm::mnShadowPxWidth = 9;
 
-sal_Bool SwPageFrm::IsRightShadowNeeded() const
+bool SwPageFrm::IsRightShadowNeeded() const
 {
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bIsLTR = getRootFrm()->IsLeftToRightViewLayout();
@@ -5943,7 +5943,7 @@ sal_Bool SwPageFrm::IsRightShadowNeeded() const
 
 }
 
-sal_Bool SwPageFrm::IsLeftShadowNeeded() const
+bool SwPageFrm::IsLeftShadowNeeded() const
 {
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bIsLTR = getRootFrm()->IsLeftToRightViewLayout();
@@ -6347,7 +6347,7 @@ SwRect SwPageFrm::GetBoundRect() const
 }
 
 void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage,
-                       const sal_Bool bLowerBorder, const bool bOnlyTxtBackground ) const
+                       const bool bLowerBorder, const bool bOnlyTxtBackground ) const
 {
     if ( !pPage )
         pPage = FindPageFrm();
@@ -6374,7 +6374,7 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage,
 
     // paint background
     {
-        PaintBackground( rRect, pPage, rAttrs, sal_False, bLowerBorder, bOnlyTxtBackground );
+        PaintBackground( rRect, pPage, rAttrs, false, bLowerBorder, bOnlyTxtBackground );
     }
 
     // OD 06.08.2002 #99657# - paint border before painting background
@@ -6394,9 +6394,9 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage,
 /// Do not paint background for fly frames without a background brush by
 /// calling <PaintBaBo> at the page or at the fly frame its anchored
 void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
-                              const SwBorderAttrs & rAttrs,
-                             const sal_Bool bLowerMode,
-                             const sal_Bool bLowerBorder,
+                             const SwBorderAttrs & rAttrs,
+                             const bool bLowerMode,
+                             const bool bLowerBorder,
                              const bool bOnlyTxtBackground ) const
 {
     // OD 20.01.2003 #i1837# - no paint of table background, if corresponding
@@ -6423,12 +6423,12 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
     const Color* pCol;
     SwRect aOrigBackRect;
     const bool bPageFrm = IsPageFrm();
-    sal_Bool bLowMode = sal_True;
+    bool bLowMode = true;
 
     //UUUU
     FillAttributesPtr aFillAttributes;
 
-    sal_Bool bBack = GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, bLowerMode );
+    bool bBack = GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, bLowerMode );
     //- Output if a separate background is used.
     bool bNoFlyBackground = !bFlyMetafile && !bBack && IsFlyFrm();
     if ( bNoFlyBackground )
@@ -6475,13 +6475,13 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
 
     SwRect aPaintRect( Frm() );
     if( IsTxtFrm() || IsSctFrm() )
-        aPaintRect = UnionFrm( sal_True );
+        aPaintRect = UnionFrm( true );
 
     if ( aPaintRect.IsOver( rRect ) )
     {
         if ( bBack || bPageFrm || !bLowerMode )
         {
-            const sal_Bool bBrowse = pSh->GetViewOptions()->getBrowseMode();
+            const bool bBrowse = pSh->GetViewOptions()->getBrowseMode();
             SwRect aRect;
             if ( (bPageFrm && bBrowse) ||
                  (IsTxtFrm() && Prt().SSize() == Frm().SSize()) )
@@ -6528,7 +6528,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
                 //     have to be considered for drawing.
                 //     --> Status Quo: background transparency have to be
                 //        considered for fly frames
-                const sal_Bool bConsiderBackgroundTransparency = IsFlyFrm();
+                const bool bConsiderBackgroundTransparency = IsFlyFrm();
                 bool bDone(false);
 
                 if(pOut && aFillAttributes.get() && aFillAttributes->isUsed())
@@ -6643,7 +6643,7 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const
 void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage,
                                         const SwRect &rRect ) const
 {
-    const sal_Bool bSubsOpt   = IS_SUBS;
+    const bool bSubsOpt   = IS_SUBS;
     if ( bSubsOpt )
         PaintSubsidiaryLines( pPage, rRect );
 
@@ -7288,7 +7288,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
         {
             SwRect &rRetouche = aRegion[i];
 
-            GetUpper()->PaintBaBo( rRetouche, pPage, sal_True );
+            GetUpper()->PaintBaBo( rRetouche, pPage, true );
 
             //Hell and Heaven need to be refreshed too.
             //To avoid recursion my retouch flag needs to be reset first!
@@ -7365,12 +7365,12 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
 
     @return true, if a background brush for the frame is found
 */
-sal_Bool SwFrm::GetBackgroundBrush(
+bool SwFrm::GetBackgroundBrush(
     FillAttributesPtr& rFillAttributes,
     const SvxBrushItem* & rpBrush,
     const Color*& rpCol,
     SwRect &rOrigRect,
-    sal_Bool bLowerMode ) const
+    bool bLowerMode ) const
 {
     const SwFrm *pFrm = this;
     SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -7379,7 +7379,7 @@ sal_Bool SwFrm::GetBackgroundBrush(
     rpCol = NULL;
     do
     {   if ( pFrm->IsPageFrm() && !pOpt->IsPageBack() )
-            return sal_False;
+            return false;
 
         //UUUU
         const SwLayoutFrm* pSwLayoutFrm = dynamic_cast< const SwLayoutFrm* >(pFrm);
@@ -7428,7 +7428,7 @@ sal_Bool SwFrm::GetBackgroundBrush(
         //     determine, if background draw of frame <pFrm> considers transparency
         //     --> Status Quo: background transparency have to be
         //                     considered for fly frames
-        const sal_Bool bConsiderBackgroundTransparency = pFrm->IsFlyFrm();
+        const bool bConsiderBackgroundTransparency = pFrm->IsFlyFrm();
         // OD 20.08.2002 #99657#
         //     add condition:
         //     If <bConsiderBackgroundTransparency> is set - see above -,
@@ -7467,13 +7467,13 @@ sal_Bool SwFrm::GetBackgroundBrush(
                 }
             }
 
-            return sal_True;
+            return true;
         }
 
         if ( bLowerMode )
         {
             // Do not try to get background brush from parent (anchor/upper)
-            return sal_False;
+            return false;
         }
 
         // get parent frame - anchor or upper - for next loop
@@ -7488,7 +7488,7 @@ sal_Bool SwFrm::GetBackgroundBrush(
         }
     } while ( pFrm );
 
-    return sal_False;
+    return false;
 }
 
 void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pO,
@@ -7558,7 +7558,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
         Window *pWin = pSh->GetWin();
         sal_uInt16 nZoom = pSh->GetViewOptions()->GetZoom();
         ::SetOutDevAndWin( pSh, &aDev, 0, 100 );
-        bFlyMetafile = sal_True;
+        bFlyMetafile = true;
         pFlyMetafileOut = pWin;
 
         SwViewImp *pImp = pSh->Imp();
@@ -7588,7 +7588,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
         pFlyOnlyDraw = 0;
 
         pFlyMetafileOut = 0;
-        bFlyMetafile = sal_False;
+        bFlyMetafile = false;
         ::SetOutDevAndWin( pSh, pOld, pWin, nZoom );
 
         // #i92711# end Pre/PostPaint encapsulation when pOut is back and content is painted
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 1b0ab34f3375..8991fd405ecc 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -69,7 +69,7 @@ SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib )
     CalcEndAtEndFlag();
 }
 
-SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, sal_Bool bMaster ) :
+SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, bool bMaster ) :
     SwLayoutFrm( rSect.GetFmt(), rSect.getRootFrm() ),
     SwFlowFrm( (SwFrm&)*this ),
     pSection( rSect.GetSection() ),
@@ -159,7 +159,7 @@ SwSectionFrm::~SwSectionFrm()
     }
 }
 
-void SwSectionFrm::DelEmpty( sal_Bool bRemove )
+void SwSectionFrm::DelEmpty( bool bRemove )
 {
     if( IsColLocked() )
     {
@@ -218,10 +218,10 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove )
 
 void SwSectionFrm::Cut()
 {
-    _Cut( sal_True );
+    _Cut( true );
 }
 
-void SwSectionFrm::_Cut( sal_Bool bRemove )
+void SwSectionFrm::_Cut( bool bRemove )
 {
     OSL_ENSURE( GetUpper(), "Cut ohne Upper()." );
 
@@ -361,10 +361,10 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 
         InsertGroupBefore( pParent, pSibling, pSect );
         pSect->Init();
-        (pSect->*fnRect->fnMakePos)( pSect->GetUpper(), pSect->GetPrev(), sal_True);
+        (pSect->*fnRect->fnMakePos)( pSect->GetUpper(), pSect->GetPrev(), true);
         if( !((SwLayoutFrm*)pParent)->Lower() )
         {
-            SwSectionFrm::MoveCntntAndDelete( (SwSectionFrm*)pParent, sal_False );
+            SwSectionFrm::MoveCntntAndDelete( (SwSectionFrm*)pParent, false );
             pParent = this;
         }
     }
@@ -404,10 +404,10 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 |*  Initiall, all superior sections are broken up. Later on that could
 |*  be made configurable.
 |*/
-sal_Bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
+bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
 {
     if( !pFrm->IsSctFrm() )
-        return sal_False;
+        return false;
 
     SwSectionFmt *pTmp = (SwSectionFmt*)GetFmt();
 
@@ -416,9 +416,9 @@ sal_Bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
     {
         pTmp = pTmp->GetParent();
         if( !pTmp )
-            return sal_False;
+            return false;
         if( pTmp == pOtherFmt )
-            return sal_True;
+            return true;
     } while( true ); // ( pTmp->GetSect().GetValue() );
 }
 
@@ -467,15 +467,15 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt )
 |*  This is required when inserting an inner section, because the MoveFwd
 |*  cannot have the desired effect within a frame or a table cell.
 |*/
-sal_Bool SwSectionFrm::SplitSect( SwFrm* pFrm, sal_Bool bApres )
+bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres )
 {
     OSL_ENSURE( pFrm, "SplitSect: Why?" );
     SwFrm* pOther = bApres ? pFrm->FindNext() : pFrm->FindPrev();
     if( !pOther )
-        return sal_False;
+        return false;
     SwSectionFrm* pSect = pOther->FindSctFrm();
     if( pSect != this )
-        return sal_False;
+        return false;
     // Put the content aside
     SwFrm* pSav = ::SaveCntnt( this, bApres ? pOther : pFrm );
     OSL_ENSURE( pSav, "SplitSect: What's on?" );
@@ -485,7 +485,7 @@ sal_Bool SwSectionFrm::SplitSect( SwFrm* pFrm, sal_Bool bApres )
         pNew->InsertBehind( pSect->GetUpper(), pSect );
         pNew->Init();
         SWRECTFN( this )
-        (pNew->*fnRect->fnMakePos)( NULL, pSect, sal_True );
+        (pNew->*fnRect->fnMakePos)( NULL, pSect, true );
         // OD 25.03.2003 #108339# - restore content:
         // determine layout frame for restoring content after the initialization
         // of the section frame. In the section initialization the columns are
@@ -503,9 +503,9 @@ sal_Bool SwSectionFrm::SplitSect( SwFrm* pFrm, sal_Bool bApres )
             pNew->SetFollow( GetFollow() );
             SetFollow( NULL );
         }
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /**
@@ -586,7 +586,7 @@ static SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd )
                     ? pLayFrm->GetNextLayoutLeaf() \
                     : pLayFrm )
 
-void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, sal_Bool bSave )
+void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave )
 {
     bool bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm();
     SwFrm* pPrv = pDel->GetPrev();
@@ -624,13 +624,13 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, sal_Bool bSave )
 
     // Now the content is put aside and the frame is destroyed
     SwFrm *pSave = bSave ? ::SaveCntnt( pDel ) : NULL;
-    sal_Bool bOldFtn = sal_True;
+    bool bOldFtn = true;
     if( pSave && pUp->IsFtnFrm() )
     {
         bOldFtn = ((SwFtnFrm*)pUp)->IsColLocked();
         ((SwFtnFrm*)pUp)->ColLock();
     }
-    pDel->DelEmpty( sal_True );
+    pDel->DelEmpty( true );
     delete pDel;
     if( pParent )
     {   // Search for the appropriate insert position
@@ -667,7 +667,7 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, sal_Bool bSave )
                 pPrvSct->InsertBehind( pUp, pPrv );
                 pPrvSct->Init();
                 SWRECTFN( pUp )
-                (pPrvSct->*fnRect->fnMakePos)( pUp, pPrv, sal_True );
+                (pPrvSct->*fnRect->fnMakePos)( pUp, pPrv, true );
                 pUp = FIRSTLEAF( pPrvSct );
                 pPrv = NULL;
             }
@@ -705,10 +705,10 @@ void SwSectionFrm::MakeAll()
             if( GetUpper() )
             {
                 SWRECTFN( GetUpper() )
-                (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), sal_False );
+                (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), false );
             }
         }
-        mbValidSize = mbValidPos = mbValidPrtArea = sal_True;
+        mbValidSize = mbValidPos = mbValidPrtArea = true;
         return;
     }
     LockJoin(); // I don't let myself to be destroyed on the way
@@ -738,8 +738,8 @@ void SwSectionFrm::MakeAll()
 
     // A section with Follow uses all the space until the lower edge of the
     // Upper. If it moves, its size can grow or decrease...
-    if( !mbValidPos && ToMaximize( sal_False ) )
-        mbValidSize = sal_False;
+    if( !mbValidPos && ToMaximize( false ) )
+        mbValidSize = false;
 
 #if OSL_DEBUG_LEVEL > 1
     const SwFmtCol &rCol = GetFmt()->GetCol();
@@ -748,7 +748,7 @@ void SwSectionFrm::MakeAll()
     SwLayoutFrm::MakeAll();
     UnlockJoin();
     if( pSection && IsSuperfluous() )
-        DelEmpty( sal_False );
+        DelEmpty( false );
 }
 
 bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, bool , bool & )
@@ -771,7 +771,7 @@ const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const
 }
 
 static void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm,
-    SwFrm* pFrm, sal_Bool &rbChkFtn )
+    SwFrm* pFrm, bool &rbChkFtn )
 {
     if( pFrm )
     {
@@ -823,7 +823,7 @@ SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode )
                 break;
         } while( true );
     }
-    sal_Bool bFtnFound = nMode == FINDMODE_ENDNOTE;
+    bool bFtnFound = nMode == FINDMODE_ENDNOTE;
     do
     {
         lcl_FindCntntFrm( pRet, pFtnFrm, pSect->Lower(), bFtnFound );
@@ -837,16 +837,16 @@ SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode )
     return pRet;
 }
 
-sal_Bool SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const
+bool SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const
 {
-    if( ToMaximize( sal_True ) )
+    if( ToMaximize( true ) )
     {
         SWRECTFN( this )
         rMinDiff = (GetUpper()->*fnRect->fnGetPrtBottom)();
         rMinDiff = (Frm().*fnRect->fnBottomDist)( rMinDiff );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 /**
@@ -910,7 +910,7 @@ static void lcl_ColumnRefresh( SwSectionFrm* pSect, bool bFollow )
 {
     while( pSect )
     {
-        sal_Bool bOldLock = pSect->IsColLocked();
+        bool bOldLock = pSect->IsColLocked();
         pSect->ColLock();
         if( pSect->Lower() && pSect->Lower()->IsColumnFrm() )
         {
@@ -961,7 +961,7 @@ void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter )
 |*
 |*  @note: perform calculation of content, only if height has changed (OD 18.09.2002 #100522#)
 |*/
-void SwSectionFrm::_CheckClipping( sal_Bool bGrow, sal_Bool bMaximize )
+void SwSectionFrm::_CheckClipping( bool bGrow, bool bMaximize )
 {
     SWRECTFN( this )
     long nDiff;
@@ -1062,8 +1062,8 @@ void SwSectionFrm::SimpleFormat()
     {
         // assure notifications on position changes.
         const SwLayNotify aNotify( this );
-        (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), sal_False );
-        mbValidPos = sal_True;
+        (this->*fnRect->fnMakePos)( GetUpper(), GetPrev(), false );
+        mbValidPos = true;
     }
     SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)();
     // OD 22.10.2002 #97265# - call always method <lcl_ColumnRefresh(..)>, in
@@ -1224,14 +1224,14 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
 #ifdef DBG_UTIL
         OSL_ENSURE( getRootFrm()->IsInDelList( this ), "SectionFrm without Section" );
 #endif
-        mbValidSize = mbValidPos = mbValidPrtArea = sal_True;
+        mbValidSize = mbValidPos = mbValidPrtArea = true;
         return;
     }
     SWRECTFN( this )
     if ( !mbValidPrtArea )
     {
         PROTOCOL( this, PROT_PRTAREA, 0, 0 )
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
         SwTwips nUpper = CalcUpperSpace();
 
         // #109700# LRSpace for sections
@@ -1240,7 +1240,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
 
         if( nUpper != (this->*fnRect->fnGetTopMargin)() )
         {
-            mbValidSize = sal_False;
+            mbValidSize = false;
             SwFrm* pOwn = ContainsAny();
             if( pOwn )
                 pOwn->_InvalidatePos();
@@ -1252,15 +1252,15 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
     {
         PROTOCOL_ENTER( this, PROT_SIZE, 0, 0 )
         const long nOldHeight = (Frm().*fnRect->fnGetHeight)();
-        sal_Bool bOldLock = IsColLocked();
+        bool bOldLock = IsColLocked();
         ColLock();
 
-        mbValidSize = sal_True;
+        mbValidSize = true;
 
         // The size is only determined by the content, if the SectFrm does not have a
         // Follow. Otherwise it fills (occupies) the Upper down to the lower edge.
         // It is not responsible for the text flow, but the content is.
-        sal_Bool bMaximize = ToMaximize( sal_False );
+        bool bMaximize = ToMaximize( false );
 
         // OD 2004-05-17 #i28701# - If the wrapping style has to be considered
         // on object positioning, an extra formatting has to be performed
@@ -1282,7 +1282,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
         // which still have a width of 0.
         const bool bHasColumns = Lower() && Lower()->IsColumnFrm();
         if ( bHasColumns && Lower()->GetNext() )
-            AdjustColumns( 0, sal_False );
+            AdjustColumns( 0, false );
 
         if( GetUpper() )
         {
@@ -1299,8 +1299,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
             // method <_CheckClipping(..)>.
             const SwViewShell *pSh = getRootFrm()->GetCurrShell();
             _CheckClipping( pSh && pSh->GetViewOptions()->getBrowseMode(), bMaximize );
-            bMaximize = ToMaximize( sal_False );
-            mbValidSize = sal_True;
+            bMaximize = ToMaximize( false );
+            mbValidSize = true;
         }
 
         // Check the width of the columns and adjust if necessary
@@ -1327,11 +1327,11 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
                            !GetFollow()->ContainsAny( true ) )
                     {
                         SwFrm* pOld = GetFollow();
-                        GetFollow()->DelEmpty( sal_False );
+                        GetFollow()->DelEmpty( false );
                         if( pOld == GetFollow() )
                             break;
                     }
-                    bMaximize = ToMaximize( sal_False );
+                    bMaximize = ToMaximize( false );
                     nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)();
                 }
                 else
@@ -1364,7 +1364,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
                     long nTmpDiff = (*fnRect->fnYDiff)( nBottom, nDeadLine );
                     if( nTmpDiff > 0 )
                     {
-                        nTmpDiff = GetUpper()->Grow( nTmpDiff, sal_True );
+                        nTmpDiff = GetUpper()->Grow( nTmpDiff, true );
                         nDeadLine = (*fnRect->fnYInc)( nDeadLine, nTmpDiff );
                         nTmpDiff = (*fnRect->fnYDiff)( nBottom, nDeadLine );
                         if( nTmpDiff > 0 )
@@ -1416,7 +1416,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
         // Do not exceed the lower edge of the Upper.
         // Do not extend below the lower edge with Sections with Follows
         if ( GetUpper() )
-            _CheckClipping( sal_True, bMaximize );
+            _CheckClipping( true, bMaximize );
         if( !bOldLock )
             ColUnlock();
         long nDiff = nOldHeight - (Frm().*fnRect->fnGetHeight)();
@@ -1428,7 +1428,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
                 GetUpper()->Shrink( nDiff );
         }
         if( IsUndersized() )
-            mbValidPrtArea = sal_True;
+            mbValidPrtArea = true;
     }
 }
 
@@ -1502,8 +1502,8 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
     }
 
     // Always end up in the same section: Body again inside Body etc.
-    const sal_Bool bBody = IsInDocBody();
-    const sal_Bool bFtnPage = FindPageFrm()->IsFtnPage();
+    const bool bBody = IsInDocBody();
+    const bool bFtnPage = FindPageFrm()->IsFtnPage();
 
     SwLayoutFrm *pLayLeaf;
     // A shortcut for TabFrms such that not all cells need to be visited
@@ -1569,7 +1569,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
             ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT ) )
         {
             InsertPage(pOldLayLeaf ? pOldLayLeaf->FindPageFrm() : FindPageFrm(),
-                       sal_False );
+                       false );
             // and again the whole thing
             pLayLeaf = pOldLayLeaf ? pOldLayLeaf : GetNextLayoutLeaf();
             continue;
@@ -1595,11 +1595,11 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
             return pLayLeaf;
         else
         {
-            pNew = new SwSectionFrm( *pSect, sal_False );
+            pNew = new SwSectionFrm( *pSect, false );
             pNew->InsertBefore( pLayLeaf, pLayLeaf->Lower() );
             pNew->Init();
             SWRECTFN( pNew )
-            (pNew->*fnRect->fnMakePos)( pLayLeaf, NULL, sal_True );
+            (pNew->*fnRect->fnMakePos)( pLayLeaf, NULL, true );
 
             // If our section frame has a successor then that has to be
             // moved behind the new Follow of the section frames
@@ -1633,13 +1633,13 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
                 }
                 if( pNxtCntnt )
                 {
-                    SwFtnBossFrm* pOldBoss = pSect->FindFtnBossFrm( sal_True );
-                    if( pOldBoss == pNxtCntnt->FindFtnBossFrm( sal_True ) )
+                    SwFtnBossFrm* pOldBoss = pSect->FindFtnBossFrm( true );
+                    if( pOldBoss == pNxtCntnt->FindFtnBossFrm( true ) )
                     {
                         SwSaveFtnHeight aHeight( pOldBoss,
                             pOldBoss->Frm().Top() + pOldBoss->Frm().Height() );
                         pSect->GetUpper()->MoveLowerFtns( pNxtCntnt, pOldBoss,
-                                    pLayLeaf->FindFtnBossFrm( sal_True ), sal_False );
+                                    pLayLeaf->FindFtnBossFrm( true ), false );
                     }
                 }
                 ((SwFlowFrm*)pNxt)->MoveSubTree( pLayLeaf, pNew->GetNext() );
@@ -1678,7 +1678,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
                 if( ((SwLayoutFrm*)pCol->Lower())->Lower() )
                 {
                     if( bJump )     // Did we skip a blank page?
-                        SwFlowFrm::SetMoveBwdJump( sal_True );
+                        SwFlowFrm::SetMoveBwdJump( true );
                     return (SwLayoutFrm*)pCol->Lower();  // The columnm body
                 }
                 bJump = true;
@@ -1693,7 +1693,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
     }
 
     if( bJump )     // Did we skip a blank page?
-        SwFlowFrm::SetMoveBwdJump( sal_True );
+        SwFlowFrm::SetMoveBwdJump( true );
 
     // Within sections in tables or section in headers/footers there can
     // be only one column change be made, one of the above shortcuts should
@@ -1731,8 +1731,8 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
         }
     }
 
-    const sal_Bool bBody = IsInDocBody();
-    const sal_Bool bFly  = IsInFly();
+    const bool bBody = IsInDocBody();
+    const bool bFly  = IsInFly();
 
     SwLayoutFrm *pLayLeaf = GetPrevLayoutLeaf();
     SwLayoutFrm *pPrevLeaf = 0;
@@ -1770,7 +1770,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
             pPrevLeaf = pLayLeaf;
             pLayLeaf = pLayLeaf->GetPrevLayoutLeaf();
             if ( pLayLeaf )
-                SwFlowFrm::SetMoveBwdJump( sal_True );
+                SwFlowFrm::SetMoveBwdJump( true );
         }
         else if ( bFly )
             break;  // Cntnts in Flys every layout sheet should be right. Why?
@@ -1803,11 +1803,11 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
     }
     if( !pNew )
     {
-        pNew = new SwSectionFrm( *pSect, sal_True );
+        pNew = new SwSectionFrm( *pSect, true );
         pNew->InsertBefore( pLayLeaf, NULL );
         pNew->Init();
         SWRECTFN( pNew )
-        (pNew->*fnRect->fnMakePos)( pLayLeaf, pNew->GetPrev(), sal_True );
+        (pNew->*fnRect->fnMakePos)( pLayLeaf, pNew->GetPrev(), true );
 
         pLayLeaf = FIRSTLEAF( pNew );
         if( !pNew->Lower() )    // Format single column sections
@@ -1836,7 +1836,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
             if( pLayLeaf != pTmpLay )
             {
                 pLayLeaf = pTmpLay;
-                SwFlowFrm::SetMoveBwdJump( sal_True );
+                SwFlowFrm::SetMoveBwdJump( true );
             }
         }
     }
@@ -1862,17 +1862,17 @@ static SwTwips lcl_DeadLine( const SwFrm* pFrm )
 }
 
 /// checks whether the SectionFrm is still able to grow, as case may be the environment has to be asked
-sal_Bool SwSectionFrm::Growable() const
+bool SwSectionFrm::Growable() const
 {
     SWRECTFN( this )
     if( (*fnRect->fnYDiff)( lcl_DeadLine( this ),
         (Frm().*fnRect->fnGetBottom)() ) > 0 )
-        return sal_True;
+        return true;
 
-    return ( GetUpper() && ((SwFrm*)GetUpper())->Grow( LONG_MAX, sal_True ) );
+    return ( GetUpper() && ((SwFrm*)GetUpper())->Grow( LONG_MAX, true ) );
 }
 
-SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst )
+SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst )
 {
     if ( !IsColLocked() && !HasFixSize() )
     {
@@ -1906,7 +1906,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst )
             }
             SwTwips nSpace = nGrow;
             if( !bInCalcCntnt && nGrow < nDist && GetUpper() )
-                nGrow += GetUpper()->Grow( LONG_MAX, sal_True );
+                nGrow += GetUpper()->Grow( LONG_MAX, true );
 
             if( nGrow > nDist )
                 nGrow = nDist;
@@ -1926,7 +1926,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst )
                 if( bInCalcCntnt )
                     _InvalidateSize();
                 else if( nSpace < nGrow &&  nDist != nSpace + GetUpper()->
-                         Grow( nGrow - nSpace, sal_False ) )
+                         Grow( nGrow - nSpace, false ) )
                     InvalidateSize();
                 else
                 {
@@ -1990,11 +1990,11 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst )
     return 0L;
 }
 
-SwTwips SwSectionFrm::_Shrink( SwTwips nDist, sal_Bool bTst )
+SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst )
 {
     if ( Lower() && !IsColLocked() && !HasFixSize() )
     {
-        if( ToMaximize( sal_False ) )
+        if( ToMaximize( false ) )
         {
             if( !bTst )
                 InvalidateSize();
@@ -2085,12 +2085,12 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, sal_Bool bTst )
 |*  This routine is used in the TxtFormatter to decided whether it's allowed to
 |*  create a (paragraph-)Follow or whether the paragraph has to stick together
 |*/
-sal_Bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
+bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
 {
     // Is there a Follow or is the Frame not in the last column?
     if( HasFollow() || ( pFrm->GetUpper()->IsColBodyFrm() &&
         pFrm->GetUpper()->GetUpper()->GetNext() ) )
-        return sal_True;
+        return true;
     if( pFrm->IsInFtn() )
     {
         if( IsInFtn() )
@@ -2098,11 +2098,11 @@ sal_Bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
             if( GetUpper()->IsInSct() )
             {
                 if( Growable() )
-                    return sal_False;
+                    return false;
                 return GetUpper()->FindSctFrm()->MoveAllowed( this );
             }
             else
-                return sal_True;
+                return true;
         }
         // The content of footnote inside a columned sectionfrm is moveable
         // except in the last column
@@ -2123,19 +2123,19 @@ sal_Bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const
                     bRet = true;
             }
             if( bRet && ( IsFtnAtEnd() || !Growable() ) )
-                return sal_True;
+                return true;
         }
     }
     // Or can the section still grow?
     if( !IsColLocked() && Growable() )
-        return sal_False;
+        return false;
     // Now it has to be examined whether there is a layout sheet wherein
     // a section Follow can be created
     if( IsInTab() || ( !IsInDocBody() && FindFooterOrHeader() ) )
-        return sal_False; // It doesn't work in tables/headers/footers
+        return false; // It doesn't work in tables/headers/footers
     if( IsInFly() ) // In column based or chained frames
         return 0 != ((SwFrm*)GetUpper())->GetNextLeaf( MAKEPAGE_NONE );
-    return sal_True;
+    return true;
 }
 
 /** Called for a frame inside a section with no direct previous frame (or only
@@ -2208,25 +2208,25 @@ SwFrm* SwFrm::_GetIndNext()
     return NULL;
 }
 
-sal_Bool SwSectionFrm::IsDescendantFrom( const SwSectionFmt* pFmt ) const
+bool SwSectionFrm::IsDescendantFrom( const SwSectionFmt* pFmt ) const
 {
     if( !pSection || !pFmt )
-        return sal_False;
+        return false;
     const SwSectionFmt *pMyFmt = pSection->GetFmt();
     while( pFmt != pMyFmt )
     {
         if( pMyFmt->GetRegisteredIn()->ISA( SwSectionFmt ) )
             pMyFmt = (SwSectionFmt*)pMyFmt->GetRegisteredIn();
         else
-            return sal_False;
+            return false;
     }
-    return sal_True;
+    return true;
 }
 
 void SwSectionFrm::CalcFtnAtEndFlag()
 {
     SwSectionFmt *pFmt = GetSection()->GetFmt();
-    sal_uInt16 nVal = pFmt->GetFtnAtTxtEnd( sal_False ).GetValue();
+    sal_uInt16 nVal = pFmt->GetFtnAtTxtEnd( false ).GetValue();
     bFtnAtEnd = FTNEND_ATPGORDOCEND != nVal;
     bOwnFtnNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
                  FTNEND_ATTXTEND_OWNNUMANDFMT == nVal;
@@ -2236,7 +2236,7 @@ void SwSectionFrm::CalcFtnAtEndFlag()
             pFmt = (SwSectionFmt*)pFmt->GetRegisteredIn();
         else
             break;
-        nVal = pFmt->GetFtnAtTxtEnd( sal_False ).GetValue();
+        nVal = pFmt->GetFtnAtTxtEnd( false ).GetValue();
         if( FTNEND_ATPGORDOCEND != nVal )
         {
             bFtnAtEnd = true;
@@ -2248,20 +2248,20 @@ void SwSectionFrm::CalcFtnAtEndFlag()
 
 bool SwSectionFrm::IsEndnoteAtMyEnd() const
 {
-    return pSection->GetFmt()->GetEndAtTxtEnd( sal_False ).IsAtEnd();
+    return pSection->GetFmt()->GetEndAtTxtEnd( false ).IsAtEnd();
 }
 
 void SwSectionFrm::CalcEndAtEndFlag()
 {
     SwSectionFmt *pFmt = GetSection()->GetFmt();
-    bEndnAtEnd = pFmt->GetEndAtTxtEnd( sal_False ).IsAtEnd();
+    bEndnAtEnd = pFmt->GetEndAtTxtEnd( false ).IsAtEnd();
     while( !bEndnAtEnd )
     {
         if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) )
             pFmt = (SwSectionFmt*)pFmt->GetRegisteredIn();
         else
             break;
-        bEndnAtEnd = pFmt->GetEndAtTxtEnd( sal_False ).IsAtEnd();
+        bEndnAtEnd = pFmt->GetEndAtTxtEnd( false ).IsAtEnd();
     }
 }
 
@@ -2374,7 +2374,7 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
                 if (bOld != IsFtnAtEnd())
                 {
                     const SwFmtCol& rNewCol = GetFmt()->GetCol();
-                    ChgColumns( rNewCol, rNewCol, sal_True );
+                    ChgColumns( rNewCol, rNewCol, true );
                     rInvFlags |= 0x01;
                 }
             }
@@ -2389,7 +2389,7 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
                 if (bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd())
                 {
                     const SwFmtCol& rNewCol = GetFmt()->GetCol();
-                    ChgColumns( rNewCol, rNewCol, sal_True );
+                    ChgColumns( rNewCol, rNewCol, true );
                     rInvFlags |= 0x01;
                 }
             }
@@ -2399,7 +2399,7 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
             break;
 
         case RES_FRAMEDIR :
-            SetDerivedR2L( sal_False );
+            SetDerivedR2L( false );
             CheckDirChange();
             break;
 
@@ -2429,28 +2429,28 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew
 }
 
 /// A follow or a ftncontainer at the end of the page causes a maximal Size of the sectionframe.
-sal_Bool SwSectionFrm::ToMaximize( sal_Bool bCheckFollow ) const
+bool SwSectionFrm::ToMaximize( bool bCheckFollow ) const
 {
     if( HasFollow() )
     {
         if( !bCheckFollow ) // Don't check superfluous follows
-            return sal_True;
+            return true;
         const SwSectionFrm* pFoll = GetFollow();
         while( pFoll && pFoll->IsSuperfluous() )
             pFoll = pFoll->GetFollow();
         if( pFoll )
-            return sal_True;
+            return true;
     }
     if( IsFtnAtEnd() )
-        return sal_False;
+        return false;
     const SwFtnContFrm* pCont = ContainsFtnCont();
     if( !IsEndnAtEnd() )
         return 0 != pCont;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     while( pCont && !bRet )
     {
         if( pCont->FindFootNote() )
-            bRet = sal_True;
+            bRet = true;
         else
             pCont = ContainsFtnCont( pCont );
     }
@@ -2464,7 +2464,7 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const
     const SwLayoutFrm* pLay;
     if( pCont )
     {
-        pLay = pCont->FindFtnBossFrm( 0 );
+        pLay = pCont->FindFtnBossFrm( false );
         OSL_ENSURE( IsAnLower( pLay ), "ConatainsFtnCont: Wrong FtnContainer" );
         pLay = (SwLayoutFrm*)pLay->GetNext();
     }
@@ -2503,13 +2503,13 @@ void SwSectionFrm::InvalidateFtnPos()
  * otherwise Null.
  * If necessary the undersized-flag is corrected.
  */
-long SwSectionFrm::Undersize( sal_Bool bOverSize )
+long SwSectionFrm::Undersize( bool bOverSize )
 {
-    m_bUndersized = sal_False;
+    m_bUndersized = false;
     SWRECTFN( this )
     long nRet = InnerHeight() - (Prt().*fnRect->fnGetHeight)();
     if( nRet > 0 )
-        m_bUndersized = sal_True;
+        m_bUndersized = true;
     else if( !bOverSize )
         nRet = 0;
     return nRet;
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index e09f78d8e532..5f20641b0a47 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -88,7 +88,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
                 }
             }
             else // No soft page break if there's a "hard" page break attribute
-            if( pFirst2 == pFrm && !pFrm->IsPageBreak( sal_True ) )
+            if( pFirst2 == pFrm && !pFrm->IsPageBreak( true ) )
                 rBreak.insert( pFrm->GetOfst() );
         }
     }
@@ -113,7 +113,7 @@ bool SwTableLine::hasSoftPageBreak() const
             //   master table frames with "hard" page break attribute
             if( pTab->GetIndPrev() || pTab->FindFooterOrHeader()
                 || pTab->IsInFly() || pTab->GetUpper()->IsInTab() ||
-                ( !pTab->IsFollow() && pTab->IsPageBreak( sal_True ) ) )
+                ( !pTab->IsFollow() && pTab->IsPageBreak( true ) ) )
                 return false;
             const SwPageFrm* pPage = pTab->FindPageFrm();
             // No soft page break at the first page of the document
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index f1bdbaccaa81..73fe6030dbe8 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -64,55 +64,55 @@ long SwFrm::GetPrtRight() const
 long SwFrm::GetPrtTop() const
     { return Frm().Top() + Prt().Top(); }
 
-sal_Bool SwFrm::SetMinLeft( long nDeadline )
+bool SwFrm::SetMinLeft( long nDeadline )
 {
     SwTwips nDiff = nDeadline - Frm().Left();
     if( nDiff > 0 )
     {
         Frm().Left( nDeadline );
         Prt().Width( Prt().Width() - nDiff );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwFrm::SetMaxBottom( long nDeadline )
+bool SwFrm::SetMaxBottom( long nDeadline )
 {
     SwTwips nDiff = Frm().Top() + Frm().Height() - nDeadline;
     if( nDiff > 0 )
     {
         Frm().Height( Frm().Height() - nDiff );
         Prt().Height( Prt().Height() - nDiff );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwFrm::SetMinTop( long nDeadline )
+bool SwFrm::SetMinTop( long nDeadline )
 {
     SwTwips nDiff = nDeadline - Frm().Top();
     if( nDiff > 0 )
     {
         Frm().Top( nDeadline );
         Prt().Height( Prt().Height() - nDiff );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwFrm::SetMaxRight( long nDeadline )
+bool SwFrm::SetMaxRight( long nDeadline )
 {
     SwTwips nDiff = Frm().Left() + Frm().Width() - nDeadline;
     if( nDiff > 0 )
     {
         Frm().Width( Frm().Width() - nDiff );
         Prt().Width( Prt().Width() - nDiff );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-void SwFrm::MakeBelowPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify )
+void SwFrm::MakeBelowPos( const SwFrm* pUp, const SwFrm* pPrv, bool bNotify )
 {
     if( pPrv )
     {
@@ -128,7 +128,7 @@ void SwFrm::MakeBelowPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify
         maFrm.Pos().Y() += 1;
 }
 
-void SwFrm::MakeUpperPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify )
+void SwFrm::MakeUpperPos( const SwFrm* pUp, const SwFrm* pPrv, bool bNotify )
 {
     if( pPrv )
     {
@@ -145,7 +145,7 @@ void SwFrm::MakeUpperPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify
         maFrm.Pos().Y() -= 1;
 }
 
-void SwFrm::MakeLeftPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify )
+void SwFrm::MakeLeftPos( const SwFrm* pUp, const SwFrm* pPrv, bool bNotify )
 {
     if( pPrv )
     {
@@ -162,7 +162,7 @@ void SwFrm::MakeLeftPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify )
         maFrm.Pos().X() -= 1;
 }
 
-void SwFrm::MakeRightPos( const SwFrm* pUp, const SwFrm* pPrv, sal_Bool bNotify )
+void SwFrm::MakeRightPos( const SwFrm* pUp, const SwFrm* pPrv, bool bNotify )
 {
     if( pPrv )
     {
@@ -210,10 +210,10 @@ void SwFrm::CheckDirChange()
     bool bOldVert = GetVerticalFlag();
     bool bOldRev = IsReverse();
     bool bOldR2L = GetRightToLeftFlag();
-    SetInvalidVert( sal_True );
-    SetInvalidR2L( sal_True );
+    SetInvalidVert( true );
+    SetInvalidR2L( true );
     bool bChg = bOldR2L != IsRightToLeft();
-    sal_Bool bOldVertL2R = IsVertLR();
+    bool bOldVertL2R = IsVertLR();
     if( ( IsVertical() != bOldVert ) || bChg || IsReverse() != bOldRev || bOldVertL2R != IsVertLR() )
     {
         InvalidateAll();
@@ -264,7 +264,7 @@ void SwFrm::CheckDirChange()
                 pFrm = pFrm->GetNext();
             }
             if( pCol )
-                pBody->AdjustColumns( pCol, sal_True );
+                pBody->AdjustColumns( pCol, true );
         }
         else if( IsTxtFrm() )
             ((SwTxtFrm*)this)->Prepare( PREP_CLEAR );
@@ -301,7 +301,7 @@ void SwFrm::CheckDirChange()
 /// returns the position for anchors based on frame direction
 // OD 2004-03-10 #i11860# - consider lower space and line spacing of
 // previous frame according to new option 'Use former object positioning'
-Point SwFrm::GetFrmAnchorPos( sal_Bool bIgnoreFlysAnchoredAtThisFrame ) const
+Point SwFrm::GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const
 {
     Point aAnchor = Frm().Pos();
 
@@ -572,7 +572,7 @@ const SwRect SwFrm::PaintArea() const
     // NEW TABLES
     // Cell frames may not leave their upper:
     SwRect aRect = IsRowFrm() ? GetUpper()->Frm() : Frm();
-    const sal_Bool bVert = IsVertical();
+    const bool bVert = IsVertical();
     SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
     long nRight = (aRect.*fnRect->fnGetRight)();
     long nLeft  = (aRect.*fnRect->fnGetLeft)();
@@ -613,7 +613,7 @@ const SwRect SwFrm::PaintArea() const
         }
         else if( pTmp->IsColumnFrm() )  // nobody enters neightbour columns
         {
-            sal_Bool bR2L = pTmp->IsRightToLeft();
+            bool bR2L = pTmp->IsRightToLeft();
             // the first column has _no_ influence to the left range
             if( bR2L ? pTmp->GetNext() : pTmp->GetPrev() )
             {
@@ -661,9 +661,9 @@ const SwRect SwFrm::PaintArea() const
 |*  The unionframe is the framearea (Frm()) of a frame expanded by the
 |*  printarea, if there's a negative margin at the left or right side.
 |*/
-const SwRect SwFrm::UnionFrm( sal_Bool bBorder ) const
+const SwRect SwFrm::UnionFrm( bool bBorder ) const
 {
-    sal_Bool bVert = IsVertical();
+    bool bVert = IsVertical();
     SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
     long nLeft = (Frm().*fnRect->fnGetLeft)();
     long nWidth = (Frm().*fnRect->fnGetWidth)();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index ce092c361789..7ac3764d6adf 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -77,12 +77,12 @@ SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib ):
 {
     bComplete = bCalcLowers = bONECalcLowers = bLowersFormatted = bLockBackMove =
     bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine =
-    bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False;
+    bRestrictTableGrowth = bRemoveFollowFlowLinePending = false;
     // #i26945#
-    bConsiderObjsForMinCellHeight = sal_True;
-    bObjsDoesFit = sal_True;
+    bConsiderObjsForMinCellHeight = true;
+    bObjsDoesFit = true;
     mbInRecalcLowerRow = false;
-    mbFixSize = sal_False;     //Don't fall for import filter again.
+    mbFixSize = false;     //Don't fall for import filter again.
     mnType = FRMC_TAB;
 
     //Create the lines and insert them.
@@ -109,12 +109,12 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab ) :
 {
     bComplete = bONECalcLowers = bCalcLowers = bLowersFormatted = bLockBackMove =
     bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine =
-    bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False;
+    bRestrictTableGrowth = bRemoveFollowFlowLinePending = false;
     // #i26945#
-    bConsiderObjsForMinCellHeight = sal_True;
-    bObjsDoesFit = sal_True;
+    bConsiderObjsForMinCellHeight = true;
+    bObjsDoesFit = true;
     mbInRecalcLowerRow = false;
-    mbFixSize = sal_False;     //Don't fall for import filter again.
+    mbFixSize = false;     //Don't fall for import filter again.
     mnType = FRMC_TAB;
 
     SetFollow( rTab.GetFollow() );
@@ -204,7 +204,7 @@ static bool lcl_InnerCalcLayout( SwFrm *pFrm,
 // control, if floating screen objects have to be considered for the minimal
 // cell height.
 static SwTwips lcl_CalcMinRowHeight( const SwRowFrm *pRow,
-                                          const sal_Bool _bConsiderObjs );
+                                     const bool _bConsiderObjs );
 static SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& );
 
 static SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount )
@@ -230,7 +230,7 @@ static SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpR
     OSL_ENSURE( rTmpRow.IsRowFrm(), "No row frame to copy for FollowFlowLine" );
     const SwRowFrm& rRow = (SwRowFrm&)rTmpRow;
 
-    rTab.SetFollowFlowLine( sal_True );
+    rTab.SetFollowFlowLine( true );
     SwRowFrm *pFollowFlowLine = new SwRowFrm(*rRow.GetTabLine(), &rTab, false );
     pFollowFlowLine->SetRowSpanLine( bRowSpanLine );
     SwFrm* pFirstRow = rTab.GetFollow()->GetFirstNonHeadlineRow();
@@ -452,9 +452,9 @@ static void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm&
 {
     if ( !rSource.GetFmt()->GetDoc()->GetFtnIdxs().empty() )
     {
-        SwFtnBossFrm* pOldBoss = rSource.FindFtnBossFrm( sal_True );
-        SwFtnBossFrm* pNewBoss = rDest.FindFtnBossFrm( sal_True );
-        rRowFrm.MoveLowerFtns( 0, pOldBoss, pNewBoss, sal_True );
+        SwFtnBossFrm* pOldBoss = rSource.FindFtnBossFrm( true );
+        SwFtnBossFrm* pNewBoss = rDest.FindFtnBossFrm( true );
+        rRowFrm.MoveLowerFtns( 0, pOldBoss, pNewBoss, true );
     }
 }
 
@@ -614,9 +614,9 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
     lcl_PreprocessRowsInCells( rTab, rLastLine, rFollowLine, nRemainingSpaceForLastRow );
 
     // Here the recalculation process starts:
-    rTab.SetRebuildLastLine( sal_True );
+    rTab.SetRebuildLastLine( true );
     // #i26945#
-    rTab.SetDoesObjsFit( sal_True );
+    rTab.SetDoesObjsFit( true );
     SWRECTFN( rTab.GetUpper() )
 
     // #i26945# - invalidate and move floating screen
@@ -627,9 +627,9 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
 
     // #i26945# - Do *not* consider floating screen objects
     // for the minimal cell height.
-    rTab.SetConsiderObjsForMinCellHeight( sal_False );
+    rTab.SetConsiderObjsForMinCellHeight( false );
     ::lcl_ShrinkCellsAndAllContent( rLastLine );
-    rTab.SetConsiderObjsForMinCellHeight( sal_True );
+    rTab.SetConsiderObjsForMinCellHeight( true );
 
     // invalidate last line
     ::SwInvalidateAll( &rLastLine, LONG_MAX );
@@ -731,9 +731,9 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
         ::SwInvalidateAll( &rLastLine, LONG_MAX );
     }
 
-    rTab.SetRebuildLastLine( sal_False );
+    rTab.SetRebuildLastLine( false );
     // #i26945#
-    rTab.SetDoesObjsFit( sal_True );
+    rTab.SetDoesObjsFit( true );
 
     return bRet;
 }
@@ -808,7 +808,7 @@ bool SwTabFrm::RemoveFollowFlowLine()
     // We have to reset the flag here, because lcl_MoveRowContent
     // calls a GrowFrm(), which has a different bahavior if
     // this flag is set.
-    SetFollowFlowLine( sal_False );
+    SetFollowFlowLine( false );
 
     // #140081# Make code robust.
     if ( !pFollowFlowLine || !pLastLine )
@@ -1575,7 +1575,7 @@ static void lcl_RecalcTable( SwTabFrm& rTab,
         if ( !pFirstRow )
         {
             pFirstRow = (SwLayoutFrm*)rTab.Lower();
-            rNotify.SetLowersComplete( sal_True );
+            rNotify.SetLowersComplete( true );
         }
         ::SwInvalidatePositions( pFirstRow, LONG_MAX );
         lcl_RecalcRow( static_cast<SwRowFrm&>(*pFirstRow), LONG_MAX );
@@ -1708,7 +1708,7 @@ void SwTabFrm::MakeAll()
     SwLayNotify aNotify( this );    //does the notification in the DTor
     // If pos is invalid, we have to call a SetInvaKeep at aNotify.
     // Otherwise the keep attribute would not work in front of a table.
-    const sal_Bool bOldValidPos = GetValidPosFlag();
+    const bool bOldValidPos = GetValidPosFlag();
 
     //If my neighbour is my Follow at the same time, I'll swallow it up.
     // OD 09.04.2003 #108698# - join all follows, which are placed on the
@@ -1731,16 +1731,16 @@ void SwTabFrm::MakeAll()
     {
         if ( RemoveFollowFlowLine() )
             Join();
-        SetRemoveFollowFlowLinePending( sal_False );
+        SetRemoveFollowFlowLinePending( false );
     }
 
     if ( bResizeHTMLTable ) //Optimized interplay with grow/shrink of the content
     {
-        bResizeHTMLTable = sal_False;
+        bResizeHTMLTable = false;
         SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
         if ( pLayout )
             bCalcLowers = pLayout->Resize(
-                            pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
+                            pLayout->GetBrowseWidthByTabFrm( *this ), false );
     }
 
     // as long as bMakePage is true, a new page can be created (exactly once)
@@ -1754,7 +1754,7 @@ void SwTabFrm::MakeAll()
     bool bSplit = false;
     const bool bFtnsInDoc = !GetFmt()->GetDoc()->GetFtnIdxs().empty();
     bool bMoveable;
-    const sal_Bool bFly     = IsInFly();
+    const bool bFly     = IsInFly();
 
     SwBorderAttrAccess  *pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
     const SwBorderAttrs *pAttrs = pAccess->Get();
@@ -1828,7 +1828,7 @@ void SwTabFrm::MakeAll()
         SwFrm *pPre = GetPrev();
         if ( pPre && pPre->IsTabFrm() && ((SwTabFrm*)pPre)->GetFollow() == this)
         {
-            if ( !MoveFwd( bMakePage, sal_False ) )
+            if ( !MoveFwd( bMakePage, false ) )
                 bMakePage = false;
             bMovedFwd = true;
         }
@@ -1842,7 +1842,7 @@ void SwTabFrm::MakeAll()
             if ( CheckMoveFwd( bMakePage, bKeep && KEEPTAB, bMovedBwd ) )
             {
                 bMovedFwd = true;
-                bCalcLowers = sal_True;
+                bCalcLowers = true;
                 // #i99267#
                 // reset <bSplit> after forward move to assure that follows
                 // can be joined, if further space is available.
@@ -1861,19 +1861,19 @@ void SwTabFrm::MakeAll()
                 {
                     delete pAccess;
                     bCalcLowers |= pLayout->Resize(
-                        pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
+                        pLayout->GetBrowseWidthByTabFrm( *this ), false );
                     pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this );
                     pAttrs = pAccess->Get();
                 }
 
-                mbValidPrtArea = sal_False;
-                aNotify.SetLowersComplete( sal_False );
+                mbValidPrtArea = false;
+                aNotify.SetLowersComplete( false );
             }
             SwFrm *pPre;
             if ( bKeep || (0 != (pPre = FindPrev()) &&
                 pPre->GetAttrSet()->GetKeep().GetValue()) )
             {
-                bCalcLowers = sal_True;
+                bCalcLowers = true;
                 // #i99267#
                 // reset <bSplit> after forward move to assure that follows
                 // can be joined, if further space is available.
@@ -1905,12 +1905,12 @@ void SwTabFrm::MakeAll()
             {
                 delete pAccess;
                 bCalcLowers |= pLayout->Resize(
-                    pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
+                    pLayout->GetBrowseWidthByTabFrm( *this ), false );
                 pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
                 pAttrs = pAccess->Get();
             }
             if ( aOldPrtPos != (Prt().*fnRect->fnGetPos)() )
-                aNotify.SetLowersComplete( sal_False );
+                aNotify.SetLowersComplete( false );
         }
 
         // If this is the first one in a chain, check if this can flow
@@ -1933,15 +1933,15 @@ void SwTabFrm::MakeAll()
                         pMaster->InvalidatePos();
                 }
             }
-            SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( sal_True ) : 0;
+            SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( true ) : 0;
             bool bReformat;
             if ( MoveBwd( bReformat ) )
             {
                 SWREFRESHFN( this )
                 bMovedBwd = true;
-                aNotify.SetLowersComplete( sal_False );
+                aNotify.SetLowersComplete( false );
                 if ( bFtnsInDoc )
-                    MoveLowerFtns( 0, pOldBoss, 0, sal_True );
+                    MoveLowerFtns( 0, pOldBoss, 0, true );
                 if ( bReformat || bKeep )
                 {
                     long nOldTop = (Frm().*fnRect->fnGetTop)();
@@ -1955,17 +1955,17 @@ void SwTabFrm::MakeAll()
                             delete pAccess;
                             bCalcLowers |= pHTMLLayout->Resize(
                                 pHTMLLayout->GetBrowseWidthByTabFrm( *this ),
-                                sal_False );
+                                false );
 
                             pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
                             pAttrs = pAccess->Get();
                         }
 
-                        mbValidPrtArea = sal_False;
+                        mbValidPrtArea = false;
                         Format( pAttrs );
                     }
                     lcl_RecalcTable( *this, 0, aNotify );
-                    bLowersFormatted = sal_True;
+                    bLowersFormatted = true;
                     if ( bKeep && KEEPTAB )
                     {
 
@@ -1977,7 +1977,7 @@ void SwTabFrm::MakeAll()
                         // content.
                         if ( 0 != sw_FormatNextCntntForKeep( this ) && !GetNext() )
                         {
-                            mbValidPos = sal_False;
+                            mbValidPos = false;
                         }
                     }
                 }
@@ -2025,7 +2025,7 @@ void SwTabFrm::MakeAll()
                     SwFrm *pTmp = GetUpper();
                     SwTwips nDeadLine = (pTmp->*fnRect->fnGetPrtBottom)();
                     if ( bBrowseMode )
-                        nDeadLine += pTmp->Grow( LONG_MAX, sal_True );
+                        nDeadLine += pTmp->Grow( LONG_MAX, true );
                     if( (Frm().*fnRect->fnBottomDist)( nDeadLine ) > 0 )
                     {
                         // First, we remove an existing follow flow line.
@@ -2037,9 +2037,9 @@ void SwTabFrm::MakeAll()
                             if ( pLastLine )
                             {
                                 ::SwInvalidateAll( pLastLine, LONG_MAX );
-                                SetRebuildLastLine( sal_True );
+                                SetRebuildLastLine( true );
                                 lcl_RecalcRow( static_cast<SwRowFrm&>(*pLastLine), LONG_MAX );
-                                SetRebuildLastLine( sal_False );
+                                SetRebuildLastLine( false );
                             }
 
                             SwFrm* pRow = GetFollow()->GetFirstNonHeadlineRow();
@@ -2072,7 +2072,7 @@ void SwTabFrm::MakeAll()
 
                             SwFtnBossFrm *pOldBoss = 0;
                             if ( bMoveFtns )
-                                pOldBoss = pRowToMove->FindFtnBossFrm( sal_True );
+                                pOldBoss = pRowToMove->FindFtnBossFrm( true );
 
                             SwFrm* pNextRow = pRowToMove->GetNext();
 
@@ -2089,7 +2089,7 @@ void SwTabFrm::MakeAll()
 
                             //Displace the footnotes!
                             if ( bMoveFtns )
-                                if ( ((SwLayoutFrm*)pRowToMove)->MoveLowerFtns( 0, pOldBoss, FindFtnBossFrm( sal_True ), sal_True ) )
+                                if ( ((SwLayoutFrm*)pRowToMove)->MoveLowerFtns( 0, pOldBoss, FindFtnBossFrm( true ), true ) )
                                     GetUpper()->Calc();
 
                             pRowToMove = pNextRow;
@@ -2145,7 +2145,7 @@ void SwTabFrm::MakeAll()
                     // In this case we do a magic trick:
                     if ( !bKeep && !GetNext() && pTmpNxt && pTmpNxt->IsValid() )
                     {
-                        mbValidPos = sal_False;
+                        mbValidPos = false;
                         bLastRowHasToMoveToFollow = true;
                     }
                 }
@@ -2156,13 +2156,13 @@ void SwTabFrm::MakeAll()
                 if ( bCalcLowers )
                 {
                     lcl_RecalcTable( *this, 0, aNotify );
-                    bLowersFormatted = sal_True;
-                    bCalcLowers = sal_False;
+                    bLowersFormatted = true;
+                    bCalcLowers = false;
                 }
                 else if ( bONECalcLowers )
                 {
                     lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX );
-                    bONECalcLowers = sal_False;
+                    bONECalcLowers = false;
                 }
             }
             continue;
@@ -2179,13 +2179,13 @@ void SwTabFrm::MakeAll()
             if ( bCalcLowers && IsValid() )
             {
                 lcl_RecalcTable( *this, 0, aNotify );
-                bLowersFormatted = sal_True;
-                bCalcLowers = sal_False;
+                bLowersFormatted = true;
+                bCalcLowers = false;
             }
             else if ( bONECalcLowers )
             {
                 lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX );
-                bONECalcLowers = sal_False;
+                bONECalcLowers = false;
             }
 
             // It does not make sense to cut off the last line if we are
@@ -2198,8 +2198,8 @@ void SwTabFrm::MakeAll()
         if ( bCalcLowers && IsValid() )
         {
             lcl_RecalcTable( *this, 0, aNotify );
-            bLowersFormatted = sal_True;
-            bCalcLowers = sal_False;
+            bLowersFormatted = true;
+            bCalcLowers = false;
             if( !IsValid() )
                 continue;
         }
@@ -2240,15 +2240,15 @@ void SwTabFrm::MakeAll()
                 SwTwips nDeadLine = (GetUpper()->*fnRect->fnGetPrtBottom)();
                 if( IsInSct() || GetUpper()->IsInTab() ) // TABLE IN TABLE)
                     nDeadLine = (*fnRect->fnYInc)( nDeadLine,
-                                        GetUpper()->Grow( LONG_MAX, sal_True ) );
+                                        GetUpper()->Grow( LONG_MAX, true ) );
 
                 {
                     SetInRecalcLowerRow( true );
                     ::lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), nDeadLine );
                     SetInRecalcLowerRow( false );
                 }
-                bLowersFormatted = sal_True;
-                aNotify.SetLowersComplete( sal_True );
+                bLowersFormatted = true;
+                aNotify.SetLowersComplete( true );
 
                 // One more check if its really necessary to split the table.
                 // 1. The table either has to exceed the deadline or
@@ -2299,7 +2299,7 @@ void SwTabFrm::MakeAll()
                 // if we do not have an (in)direkt Prev, we split anyway.
                 if( (*fnRect->fnYDiff)(nDeadLine, nBreakLine) >=0 || !pIndPrev )
                 {
-                    aNotify.SetLowersComplete( sal_False );
+                    aNotify.SetLowersComplete( false );
                     bSplit = true;
 
                     // An existing follow flow line has to be removed.
@@ -2336,7 +2336,7 @@ void SwTabFrm::MakeAll()
                     if ( bSplitError && bTryToSplit ) // no restart if we did not try to split: i72847, i79426
                     {
                         lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX );
-                        mbValidPos = sal_False;
+                        mbValidPos = false;
                         bTryToSplit = false;
                         continue;
                     }
@@ -2370,7 +2370,7 @@ void SwTabFrm::MakeAll()
                             pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
                             pAttrs = pAccess->Get();
 
-                            ((SwTabFrm*)GetFollow())->SetLowersFormatted(sal_False);
+                            ((SwTabFrm*)GetFollow())->SetLowersFormatted(false);
                             // #i43913# - lock follow table
                             // to avoid its formatting during the format of
                             // its content.
@@ -2412,7 +2412,7 @@ void SwTabFrm::MakeAll()
                             --nStack;
                         }
                         else if ( GetFollow() == GetNext() )
-                            ((SwTabFrm*)GetFollow())->MoveFwd( sal_True, sal_False );
+                            ((SwTabFrm*)GetFollow())->MoveFwd( true, false );
                     }
                     continue;
                 }
@@ -2434,7 +2434,7 @@ void SwTabFrm::MakeAll()
         const SwFrm* pOldUpper = GetUpper();
 
         //Let's see if we find some place anywhere...
-        if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) )
+        if ( !bMovedFwd && !MoveFwd( bMakePage, false ) )
             bMakePage = false;
 
         // #i29771# Reset bSplitError flag on change of upper
@@ -2445,9 +2445,9 @@ void SwTabFrm::MakeAll()
         }
 
         SWREFRESHFN( this )
-        bCalcLowers = sal_True;
+        bCalcLowers = true;
         bMovedFwd = true;
-        aNotify.SetLowersComplete( sal_False );
+        aNotify.SetLowersComplete( false );
         if ( IsFollow() )
         {
             //To avoid oscillations now invalid master should drop behind.
@@ -2455,7 +2455,7 @@ void SwTabFrm::MakeAll()
             if ( pTab->GetUpper() )
                 pTab->GetUpper()->Calc();
             pTab->Calc();
-            pTab->SetLowersFormatted( sal_False );
+            pTab->SetLowersFormatted( false );
         }
 
         //If my neighbour is my Follow at the same time, I'll swallow it up.
@@ -2484,8 +2484,8 @@ void SwTabFrm::MakeAll()
             if ( nDistToUpperPrtBottom >= 0 || bTryToSplit )
             {
                 lcl_RecalcTable( *this, 0, aNotify );
-                bLowersFormatted = sal_True;
-                bCalcLowers = sal_False;
+                bLowersFormatted = true;
+                bCalcLowers = false;
             }
 #if OSL_DEBUG_LEVEL > 0
             else
@@ -2506,7 +2506,7 @@ void SwTabFrm::MakeAll()
             pPre->InvalidatePos();
     }
 
-    bCalcLowers = bONECalcLowers = sal_False;
+    bCalcLowers = bONECalcLowers = false;
     delete pAccess;
     UnlockJoin();
     if ( bMovedFwd || bMovedBwd || !bOldValidPos )
@@ -2514,11 +2514,11 @@ void SwTabFrm::MakeAll()
 }
 
 /// Calculate the offsets arising because of FlyFrames
-sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
+bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
                                long& rLeftOffset,
                                long& rRightOffset ) const
 {
-    sal_Bool bInvalidatePrtArea = sal_False;
+    bool bInvalidatePrtArea = false;
     const SwPageFrm *pPage = FindPageFrm();
     const SwFlyFrm* pMyFly = FindFlyFrm();
 
@@ -2615,7 +2615,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
                         long nBottom = (aFlyRect.*fnRect->fnGetBottom)();
                         if( (*fnRect->fnYDiff)( nPrtPos, nBottom ) < 0 )
                             nPrtPos = nBottom;
-                        bInvalidatePrtArea = sal_True;
+                        bInvalidatePrtArea = true;
                     }
                     if ( (SURROUND_RIGHT    == rSur.GetSurround() ||
                           SURROUND_PARALLEL == rSur.GetSurround())&&
@@ -2625,7 +2625,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
                             (aFlyRect.*fnRect->fnGetRight)(),
                             (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetLeft)() );
                         rLeftOffset = std::max( rLeftOffset, nWidth );
-                        bInvalidatePrtArea = sal_True;
+                        bInvalidatePrtArea = true;
                     }
                     if ( (SURROUND_LEFT     == rSur.GetSurround() ||
                           SURROUND_PARALLEL == rSur.GetSurround())&&
@@ -2635,7 +2635,7 @@ sal_Bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
                             (pFly->GetAnchorFrm()->Frm().*fnRect->fnGetRight)(),
                             (aFlyRect.*fnRect->fnGetLeft)() );
                         rRightOffset = std::max( rRightOffset, nWidth );
-                        bInvalidatePrtArea = sal_True;
+                        bInvalidatePrtArea = true;
                     }
                 }
             }
@@ -2674,7 +2674,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
     long nTmpRight = -1000000,
          nLeftOffset  = 0;
     if( CalcFlyOffsets( nUpper, nLeftOffset, nTmpRight ) )
-        mbValidPrtArea = sal_False;
+        mbValidPrtArea = false;
     long nRightOffset = std::max( 0L, nTmpRight );
 
     SwTwips nLower = pAttrs->CalcBottomLine();
@@ -2683,7 +2683,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
         nLower += GetBottomLineSize();
 
     if ( !mbValidPrtArea )
-    {   mbValidPrtArea = sal_True;
+    {   mbValidPrtArea = true;
 
         //The width of the PrtArea is given by the FrmFmt, the borders have to
         //be set accordingly.
@@ -2705,7 +2705,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
         //the value applies to the screen width in the BrowseView.
         const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
         // OD 14.03.2003 #i9040# - adjust variable name.
-        const SwTwips nWishedTableWidth = CalcRel( rSz, sal_True );
+        const SwTwips nWishedTableWidth = CalcRel( rSz, true );
 
         bool bCheckBrowseWidth = false;
 
@@ -2880,12 +2880,12 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
         }
 
         if ( nOldHeight != (Prt().*fnRect->fnGetHeight)() )
-            mbValidSize = sal_False;
+            mbValidSize = false;
     }
 
     if ( !mbValidSize )
     {
-        mbValidSize = sal_True;
+        mbValidSize = true;
 
         //The size is defined by the content plus the borders.
         SwTwips nRemaining = 0, nDiff;
@@ -2906,7 +2906,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
     }
 }
 
-SwTwips SwTabFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SWRECTFN( this )
     SwTwips nHeight =(Frm().*fnRect->fnGetHeight)();
@@ -3093,7 +3093,7 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 if ( !GetPrev() )
                     CheckPageDescs( pPage );
                 if ( pPage && GetFmt()->GetPageDesc().GetNumOffset() )
-                    ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( sal_True );
+                    ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( true );
                 SwDocPosUpdate aMsgHnt( pPage->Frm().Top() );
                 GetFmt()->GetDoc()->UpdatePageFlds( &aMsgHnt );
             }
@@ -3108,7 +3108,7 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 rInvFlags |= 0x40;
             break;
         case RES_FRAMEDIR :
-            SetDerivedR2L( sal_False );
+            SetDerivedR2L( false );
             CheckDirChange();
             break;
         case RES_COLLAPSING_BORDERS :
@@ -3291,7 +3291,7 @@ bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool &rReformat )
 
                     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
                     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-                        nSpace += pNewUpper->Grow( LONG_MAX, sal_True );
+                        nSpace += pNewUpper->Grow( LONG_MAX, true );
                 }
             }
             else if( !bLockBackMove )
@@ -3401,7 +3401,7 @@ void SwTabFrm::Cut()
         {
             if ( pUp->GetUpper() )
             {
-                pSct->DelEmpty( sal_False );
+                pSct->DelEmpty( false );
                 pSct->_InvalidateSize();
             }
         }
@@ -3473,7 +3473,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
             const SwPageDesc *pDesc = GetFmt()->GetPageDesc().GetPageDesc();
             if ( (pDesc && pDesc != pPage->GetPageDesc()) ||
                  (!pDesc && pPage->GetPageDesc() != &GetFmt()->GetDoc()->GetPageDesc(0)) )
-                CheckPageDescs( pPage, sal_True );
+                CheckPageDescs( pPage, true );
         }
     }
 }
@@ -3566,7 +3566,7 @@ void SwRowFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
 void SwRowFrm::MakeAll()
 {
     if ( !GetNext() )
-        mbValidSize = sal_False;
+        mbValidSize = false;
     SwLayoutFrm::MakeAll();
 }
 
@@ -3705,8 +3705,8 @@ static SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm& rCell, const SwBor
 // control, if floating screen objects have to be considered for the minimal
 // cell height.
 static SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell,
-                                           const sal_Bool _bConsiderObjs,
-                                           const SwBorderAttrs *pAttrs = 0 )
+                                      const bool _bConsiderObjs,
+                                      const SwBorderAttrs *pAttrs = 0 )
 {
     SWRECTFN( _pCell )
     SwTwips nHeight = 0;
@@ -3762,7 +3762,7 @@ static SwTwips lcl_CalcMinCellHeight( const SwLayoutFrm *_pCell,
 // #i26945# - add parameter <_bConsiderObjs> in order to control,
 // if floating screen objects have to be considered for the minimal cell height
 static SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
-                                          const sal_Bool _bConsiderObjs )
+                                     const bool _bConsiderObjs )
 {
     SWRECTFN( _pRow )
 
@@ -3914,13 +3914,13 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
     SWRECTFN( this )
     OSL_ENSURE( pAttrs, "SwRowFrm::Format without Attrs." );
 
-    const sal_Bool bFix = mbFixSize;
+    const bool bFix = mbFixSize;
 
     if ( !mbValidPrtArea )
     {
         //RowFrms don't have borders and so on therefore the PrtArea always
         //matches the Frm.
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
         maPrt.Left( 0 );
         maPrt.Top( 0 );
         maPrt.Width ( maFrm.Width() );
@@ -4028,7 +4028,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
 
     while ( !mbValidSize )
     {
-        mbValidSize = sal_True;
+        mbValidSize = true;
 
 #if OSL_DEBUG_LEVEL > 0
         if ( HasFixSize() )
@@ -4045,9 +4045,9 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
                                     FindTabFrm()->IsConsiderObjsForMinCellHeight() ) );
         if ( nDiff )
         {
-            mbFixSize = sal_False;
+            mbFixSize = false;
             if ( nDiff > 0 )
-                Shrink( nDiff, sal_False, sal_True );
+                Shrink( nDiff, false, true );
             else if ( nDiff < 0 )
                 Grow( -nDiff );
             mbFixSize = bFix;
@@ -4066,15 +4066,15 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
         } while ( pSibling );
         if ( nDiff > 0 )
         {
-            mbFixSize = sal_False;
+            mbFixSize = false;
             Grow( nDiff );
             mbFixSize = bFix;
-            mbValidSize = sal_True;
+            mbValidSize = true;
         }
     }
 }
 
-void SwRowFrm::AdjustCells( const SwTwips nHeight, const sal_Bool bHeight )
+void SwRowFrm::AdjustCells( const SwTwips nHeight, const bool bHeight )
 {
     SwFrm *pFrm = Lower();
     if ( bHeight )
@@ -4203,7 +4203,7 @@ void SwRowFrm::Cut()
     SwLayoutFrm::Cut();
 }
 
-SwTwips SwRowFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwRowFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SwTwips nReal = 0;
 
@@ -4238,7 +4238,7 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     }
 
     if ( bRestrictTableGrowth )
-        pTab->SetRestrictTableGrowth( sal_True );
+        pTab->SetRestrictTableGrowth( true );
     else
     {
         // Ok, this looks like a hack, indeed, it is a hack.
@@ -4247,19 +4247,19 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
         // be allowed to grow. In fact, setting bRestrictTableGrowth
         // to 'false' does not work, because the surrounding RowFrm
         // would set this to 'true'.
-        pTab->SetFollowFlowLine( sal_False );
+        pTab->SetFollowFlowLine( false );
     }
 
     nReal += SwLayoutFrm::GrowFrm( nDist, bTst, bInfo);
 
-    pTab->SetRestrictTableGrowth( sal_False );
+    pTab->SetRestrictTableGrowth( false );
     pTab->SetFollowFlowLine( bHasFollowFlowLine );
 
     //Update the height of the cells to the newest value.
     if ( !bTst )
     {
         SWRECTFNX( this )
-        AdjustCells( (Prt().*fnRectX->fnGetHeight)() + nReal, sal_True );
+        AdjustCells( (Prt().*fnRectX->fnGetHeight)() + nReal, true );
         if ( nReal )
             SetCompletePaint();
     }
@@ -4267,18 +4267,18 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     return nReal;
 }
 
-SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SWRECTFN( this )
     if( HasFixSize() )
     {
-        AdjustCells( (Prt().*fnRect->fnGetHeight)(), sal_True );
+        AdjustCells( (Prt().*fnRect->fnGetHeight)(), true );
         return 0L;
     }
 
     // bInfo may be set to sal_True by SwRowFrm::Format; we need to hangle this
     // here accordingly
-    const sal_Bool bShrinkAnyway = bInfo;
+    const bool bShrinkAnyway = bInfo;
 
     //Only shrink as much as the content of the biggest cell allows.
     SwTwips nRealDist = nDist;
@@ -4355,7 +4355,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
                 pMasterTab->InvalidatePos();
             }
         }
-        AdjustCells( (Prt().*fnRect->fnGetHeight)() - nReal, sal_True );
+        AdjustCells( (Prt().*fnRect->fnGetHeight)() - nReal, true );
     }
     return nReal;
 }
@@ -4672,7 +4672,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
 
     if ( !mbValidPrtArea )
     {
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
 
         //Adjust position.
         if ( Lower() )
@@ -4705,7 +4705,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
                       0;
     if ( !mbValidSize )
     {
-        mbValidSize = sal_True;
+        mbValidSize = true;
 
         //The VarSize of the CellFrms is always the width.
         //The width is not variable though, it is defined by the format.
@@ -4800,14 +4800,14 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
                 //Validate again if no growth happened. Invalidation is done
                 //through AdjustCells of the row.
                 if ( !Grow( nDiffHeight ) )
-                    mbValidSize = mbValidPrtArea = sal_True;
+                    mbValidSize = mbValidPrtArea = true;
             }
             else
             {
                 //Only keep invalidated if shrinking was done; this can be
                 //dismissed because all adjoined cells have to be the same size.
                 if ( !Shrink( -nDiffHeight ) )
-                    mbValidSize = mbValidPrtArea = sal_True;
+                    mbValidSize = mbValidPrtArea = true;
             }
         }
     }
@@ -4956,7 +4956,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
     if ( bAttrSetChg &&
          SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_FRAMEDIR, false, &pItem ) )
     {
-        SetDerivedVert( sal_False );
+        SetDerivedVert( false );
         CheckDirChange();
     }
 
@@ -5317,7 +5317,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
                 {
                     if ( 1 == pLower2->GetTabBox()->getRowSpan() )
                     {
-                        const SwTwips nCellHeight = lcl_CalcMinCellHeight( pLower2, sal_True );
+                        const SwTwips nCellHeight = lcl_CalcMinCellHeight( pLower2, true );
                         nMaxHeight = std::max( nCellHeight, nMaxHeight );
                     }
                     pLower2 = static_cast<const SwCellFrm*>(pLower2->GetNext());
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 3e0efb871351..1e31b45dcb45 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -429,7 +429,7 @@ bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
                              SwCrsrMoveState* pCMS, bool bTestBackground ) const
 {
     const bool bOldAction = IsCallbackActionEnabled();
-    ((SwRootFrm*)this)->SetCallbackActionEnabled( sal_False );
+    ((SwRootFrm*)this)->SetCallbackActionEnabled( false );
     OSL_ENSURE( (Lower() && Lower()->IsPageFrm()), "No PageFrm found." );
     if( pCMS && pCMS->pFill )
         ((SwCrsrMoveState*)pCMS)->bFillRet = false;
@@ -659,14 +659,14 @@ static bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm,
 //MA 1998-01-26: Chg also skip other protected areas
 //FME: Skip follow flow cells
 static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
-                                                       GetNxtPrvCnt fnNxtPrv,
-                                                       sal_Bool bMissHeadline,
-                                                       sal_Bool bInReadOnly,
-                                                       sal_Bool bMissFollowFlowLine )
+                                                   GetNxtPrvCnt fnNxtPrv,
+                                                   bool bMissHeadline,
+                                                   bool bInReadOnly,
+                                                   bool bMissFollowFlowLine )
 {
     if ( pCnt && pCnt->IsInTab() )
     {
-        sal_Bool bProtect = sal_True;
+        bool bProtect = true;
         while ( pCnt && bProtect )
         {
             const SwLayoutFrm *pCell = pCnt->GetUpper();
@@ -677,7 +677,7 @@ static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
                       ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) &&
                       ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) &&
                        !pCell->IsCoveredCell()) ) )
-                bProtect = sal_False;
+                bProtect = false;
             else
                 pCnt = (*fnNxtPrv)( pCnt );
         }
@@ -989,7 +989,7 @@ sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum )
     OSL_ENSURE( Lower() && Lower()->IsPageFrm(), "No page available." );
 
     SwPageFrm *pPage = (SwPageFrm*)Lower();
-    sal_Bool bEnd =sal_False;
+    bool bEnd =false;
     while ( !bEnd && pPage->GetPhyPageNum() != nPageNum )
     {   if ( pPage->GetNext() )
             pPage = (SwPageFrm*)pPage->GetNext();
@@ -1006,7 +1006,7 @@ sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum )
             if ( pPage->GetNext() )
                 pPage = (SwPageFrm*)pPage->GetNext();
             else
-                bEnd = sal_True;
+                bEnd = true;
         }
     }
     //pPage now points to the 'requested' page. Now we have to create the PaM
@@ -1089,18 +1089,18 @@ SwWhichPage fnPageNext = GetNextFrm;
  * Returns the first/last Contentframe (controlled using the parameter fnPosPage)
  * of the current/previous/next page (controlled using the parameter fnWhichPage).
  */
-sal_Bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
+bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
                    SwPosPage fnPosPage, SwPaM *pPam )
 {
     //First find the requested page, at first the current, then the one which
     //was requests through fnWichPage.
     const SwLayoutFrm *pLayoutFrm = pCnt->FindPageFrm();
     if ( !pLayoutFrm || (0 == (pLayoutFrm = (*fnWhichPage)(pLayoutFrm))) )
-        return sal_False;
+        return false;
 
     //Now the desired CntntFrm below the page
     if( 0 == (pCnt = (*fnPosPage)(pLayoutFrm)) )
-        return sal_False;
+        return false;
     else
     {
         // repeated headlines in tables
@@ -1120,7 +1120,7 @@ sal_Bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
                         // of the next row
                         pCnt = pRow->ContainsCntnt();
                         if ( ! pCnt )
-                            return sal_False;
+                            return false;
                     }
                 }
             }
@@ -1135,7 +1135,7 @@ sal_Bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage,
             nIdx = pCnt->GetFollow() ?
                     ((SwTxtFrm*)pCnt)->GetFollow()->GetOfst()-1 : pCNd->Len();
         pPam->GetPoint()->nContent.Assign( pCNd, nIdx );
-        return sal_True;
+        return true;
     }
 }
 
@@ -1182,11 +1182,11 @@ static const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt )
  * @return The 'semantically correct' position inside the PrtArea of the found CntntFrm.
  */
 const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
-                                            const sal_Bool bDontLeave,
-                                            const sal_Bool bBodyOnly,
-                                            const sal_Bool bCalc,
+                                            const bool bDontLeave,
+                                            const bool bBodyOnly,
+                                            const bool bCalc,
                                             const SwCrsrMoveState *pCMS,
-                                            const sal_Bool bDefaultExpand ) const
+                                            const bool bDefaultExpand ) const
 {
     //Determine the first CntntFrm.
     const SwLayoutFrm *pStart = (!bDontLeave && bDefaultExpand && GetPrev()) ?
@@ -1218,8 +1218,8 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
                 //If the Cntnt lies in a protected area (cell, Ftn, section),
                 //we search the next Cntnt which is not protected.
                 const SwCntntFrm *pComp = pCntnt;
-                pCntnt = ::lcl_MissProtectedFrames( pCntnt, lcl_GetNxtCnt, sal_False,
-                                        pCMS ? pCMS->bSetInReadOnly : sal_False, sal_False );
+                pCntnt = ::lcl_MissProtectedFrames( pCntnt, lcl_GetNxtCnt, false,
+                                        pCMS && pCMS->bSetInReadOnly, false );
                 if ( pComp != pCntnt )
                     continue;
 
@@ -1258,12 +1258,12 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
                         ( !pCntnt->IsInFtn() || pInside->IsFtnContFrm() ) ) )
                     {
                         const sal_uInt64 nDiff = ::CalcDiff(aCntntPoint, rPoint);
-                        sal_Bool bBetter = nDiff < nDistance;  // This one is nearer
+                        bool bBetter = nDiff < nDistance;  // This one is nearer
                         if( !pInside )
                         {
                             pInside = lcl_Inside( pCntnt, rPoint );
                             if( pInside )  // In the "right" page area
-                                bBetter = sal_True;
+                                bBetter = true;
                         }
                         if( bBetter )
                         {
@@ -1333,7 +1333,7 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
         const SwTabFrm *pTab = pActual->FindTabFrm();
         if ( pTab->IsFollow() && pTab->IsInHeadline( *pActual ) )
         {
-            ((SwCrsrMoveState*)pCMS)->bStop = sal_True;
+            ((SwCrsrMoveState*)pCMS)->bStop = true;
             return 0;
         }
     }
@@ -1476,14 +1476,14 @@ class DisableCallbackAction
 {
     private:
         SwRootFrm& mrRootFrm;
-        sal_Bool mbOldCallbackActionState;
+        bool mbOldCallbackActionState;
 
     public:
         DisableCallbackAction( const SwRootFrm& _rRootFrm ) :
             mrRootFrm( const_cast<SwRootFrm&>(_rRootFrm) ),
             mbOldCallbackActionState( _rRootFrm.IsCallbackActionEnabled() )
         {
-            mrRootFrm.SetCallbackActionEnabled( sal_False );
+            mrRootFrm.SetCallbackActionEnabled( false );
         }
 
         ~DisableCallbackAction()
@@ -1498,7 +1498,7 @@ class DisableCallbackAction
  * @note Only the nearest vertically one will be searched.
  * @note JP 11.10.2001: only in tables we try to find the right column - Bug 72294
  */
-Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, sal_Bool bNext ) const
+Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const
 {
     // #123110# - disable creation of an action by a callback
     // event during processing of this method. Needed because formatting is
@@ -1625,10 +1625,10 @@ SwPageFrm* SwRootFrm::GetPageByPageNum( sal_uInt16 _nPageNum ) const
 /**
  * @return sal_True, when the given physical pagenumber does't exist or this page is an empty page.
  */
-sal_Bool SwRootFrm::IsDummyPage( sal_uInt16 nPageNum ) const
+bool SwRootFrm::IsDummyPage( sal_uInt16 nPageNum ) const
 {
     if( !Lower() || !nPageNum || nPageNum > GetPageNum() )
-        return sal_True;
+        return true;
 
     const SwPageFrm *pPage = (const SwPageFrm*)Lower();
     while( pPage && nPageNum < pPage->GetPhyPageNum() )
@@ -1640,7 +1640,7 @@ sal_Bool SwRootFrm::IsDummyPage( sal_uInt16 nPageNum ) const
  *
  * Also Fly in Fly in ... and Footnotes
  */
-sal_Bool SwFrm::IsProtected() const
+bool SwFrm::IsProtected() const
 {
     if (this->IsCntntFrm() && ((SwCntntFrm*)this)->GetNode())
     {
@@ -1648,7 +1648,7 @@ sal_Bool SwFrm::IsProtected() const
         bool isFormProtected=pDoc->get(IDocumentSettingAccess::PROTECT_FORM );
         if (isFormProtected)
         {
-            return sal_False; // TODO a hack for now, well deal with it later, I we return true here we have a "double" locking
+            return false; // TODO a hack for now, well deal with it later, I we return true here we have a "double" locking
         }
     }
     //The Frm can be protected in borders, cells or sections.
@@ -1660,16 +1660,16 @@ sal_Bool SwFrm::IsProtected() const
         {
             if ( ((SwCntntFrm*)pFrm)->GetNode() &&
                  ((SwCntntFrm*)pFrm)->GetNode()->IsInProtectSect() )
-                return sal_True;
+                return true;
         }
         else
         {
             if ( ((SwLayoutFrm*)pFrm)->GetFmt() &&
                  ((SwLayoutFrm*)pFrm)->GetFmt()->
                  GetProtect().IsCntntProtected() )
-                return sal_True;
+                return true;
             if ( pFrm->IsCoveredCell() )
-                return sal_True;
+                return true;
         }
         if ( pFrm->IsFlyFrm() )
         {
@@ -1682,7 +1682,7 @@ sal_Bool SwFrm::IsProtected() const
                 {   pMaster = pMaster->GetPrevLink();
                 } while ( pMaster->GetPrevLink() );
                 if ( pMaster->IsProtected() )
-                    return sal_True;
+                    return true;
             }
             pFrm = ((SwFlyFrm*)pFrm)->GetAnchorFrm();
         }
@@ -1693,7 +1693,7 @@ sal_Bool SwFrm::IsProtected() const
 
     } while ( pFrm );
 
-    return sal_False;
+    return false;
 }
 
 /** @return the physical page number */
@@ -1714,11 +1714,11 @@ sal_uInt16 SwFrm::GetPhyPageNum() const
  * If there is no number offset, we take the physical page number instead,
  * but a previous empty page don't count.
  */
-sal_Bool SwFrm::WannaRightPage() const
+bool SwFrm::WannaRightPage() const
 {
     const SwPageFrm *pPage = FindPageFrm();
     if ( !pPage || !pPage->GetUpper() )
-        return sal_True;
+        return true;
 
     const SwFrm *pFlow = pPage->FindFirstBodyCntnt();
     const SwPageDesc *pDesc = 0;
@@ -1749,7 +1749,7 @@ sal_Bool SwFrm::WannaRightPage() const
         }
     }
     OSL_ENSURE( pDesc, "No pagedescriptor" );
-    sal_Bool bOdd;
+    bool bOdd;
     if( oPgNum )
         bOdd = (oPgNum.get() % 2) ? sal_True : sal_False;
     else
@@ -1761,9 +1761,9 @@ sal_Bool SwFrm::WannaRightPage() const
     if( !pPage->IsEmptyPage() )
     {
         if( !pDesc->GetRightFmt() )
-            bOdd = sal_False;
+            bOdd = false;
         else if( !pDesc->GetLeftFmt() )
-            bOdd = sal_True;
+            bOdd = true;
     }
     return bOdd;
 }
@@ -1890,7 +1890,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
 
         SwSelBoxes aNew;
 
-        const sal_Bool bReadOnlyAvailable = rTblCrsr.IsReadOnlyAvailable();
+        const bool bReadOnlyAvailable = rTblCrsr.IsReadOnlyAvailable();
 
         for ( sal_uInt16 i = 0; i < aUnions.size(); ++i )
         {
@@ -1989,7 +1989,7 @@ inline void Sub( SwRegionRects& rRegion, const SwRect& rRect )
  */
 void SwRootFrm::CalcFrmRects(
     SwShellCrsr &rCrsr,
-    const sal_Bool bIsTblMode)
+    const bool bIsTblMode)
 {
     SwPosition *pStartPos = rCrsr.Start(),
                *pEndPos   = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() : rCrsr.GetPoint();
@@ -2104,8 +2104,8 @@ void SwRootFrm::CalcFrmRects(
         } while( false );
 
         SwCrsrMoveState aTmpState( MV_NONE );
-        aTmpState.b2Lines = sal_True;
-        aTmpState.bNoScroll = sal_True;
+        aTmpState.b2Lines = true;
+        aTmpState.bNoScroll = true;
         aTmpState.nCursorBidiLevel = pStartFrm->IsRightToLeft() ? 1 : 0;
 
         //CntntRects to Start- and EndFrms.
@@ -2118,16 +2118,16 @@ void SwRootFrm::CalcFrmRects(
         pEndFrm->GetCharRect( aEndRect, *pEndPos, &aTmpState );
         Sw2LinesPos *pEnd2Pos = aTmpState.p2Lines;
 
-        SwRect aStFrm ( pStartFrm->UnionFrm( sal_True ) );
+        SwRect aStFrm ( pStartFrm->UnionFrm( true ) );
         aStFrm.Intersection( pStartFrm->PaintArea() );
-        SwRect aEndFrm( pStartFrm == pEndFrm ? aStFrm : pEndFrm->UnionFrm( sal_True ) );
+        SwRect aEndFrm( pStartFrm == pEndFrm ? aStFrm : pEndFrm->UnionFrm( true ) );
         if( pStartFrm != pEndFrm )
         {
             aEndFrm.Intersection( pEndFrm->PaintArea() );
         }
         SWRECTFN( pStartFrm )
-        const sal_Bool bR2L = pStartFrm->IsRightToLeft();
-        const sal_Bool bEndR2L = pEndFrm->IsRightToLeft();
+        const bool bR2L = pStartFrm->IsRightToLeft();
+        const bool bEndR2L = pEndFrm->IsRightToLeft();
 
         // If there's no doubleline portion involved or start and end are both
         // in the same doubleline portion, all works fine, but otherwise
@@ -2144,7 +2144,7 @@ void SwRootFrm::CalcFrmRects(
                 SwRect aTmp( aStRect );
 
                 // BiDi-Portions are swimming against the current.
-                const sal_Bool bPorR2L = ( MT_BIDI == pSt2Pos->nMultiType ) ?
+                const bool bPorR2L = ( MT_BIDI == pSt2Pos->nMultiType ) ?
                     ! bR2L :
                 bR2L;
 
@@ -2220,7 +2220,7 @@ void SwRootFrm::CalcFrmRects(
                 SwRect aTmp( aEndRect );
 
                 // BiDi-Portions are swimming against the current.
-                const sal_Bool bPorR2L = ( MT_BIDI == pEnd2Pos->nMultiType ) ?
+                const bool bPorR2L = ( MT_BIDI == pEnd2Pos->nMultiType ) ?
                                            ! bEndR2L :
                                              bEndR2L;
 
@@ -2361,7 +2361,7 @@ void SwRootFrm::CalcFrmRects(
 
         if( pStartFrm == pEndFrm )
         {
-            sal_Bool bSameRotatedOrBidi = pSt2Pos && pEnd2Pos &&
+            bool bSameRotatedOrBidi = pSt2Pos && pEnd2Pos &&
                 ( MT_BIDI & pSt2Pos->nMultiType ) &&
                 pSt2Pos->aPortion == pEnd2Pos->aPortion;
             //case 1: (Same frame and same row)
@@ -2500,7 +2500,7 @@ void SwRootFrm::CalcFrmRects(
                 if ( bBody == pCntnt->IsInDocBody() &&
                     ( !pCellBox || pCellBox == pTmpCellBox ) )
                 {
-                    SwRect aCRect( pCntnt->UnionFrm( sal_True ) );
+                    SwRect aCRect( pCntnt->UnionFrm( true ) );
                     aCRect.Intersection( pCntnt->PaintArea() );
                     if( aCRect.IsOver( aRegion.GetOrigin() ))
                     {
@@ -2580,7 +2580,7 @@ void SwRootFrm::CalcFrmRects(
                     if ( aSortObjs.Contains( *pAnchoredObj ) )
                         continue;
 
-                    sal_Bool bSub = sal_True;
+                    bool bSub = true;
                     const sal_uInt32 nPos = pObj->GetOrdNum();
                     for ( sal_uInt16 k = 0; bSub && k < aSortObjs.Count(); ++k )
                     {
@@ -2591,7 +2591,7 @@ void SwRootFrm::CalcFrmRects(
                         {
                             if ( nPos < pTmp->GetVirtDrawObj()->GetOrdNumDirect() )
                             {
-                                bSub = sal_False;
+                                bSub = false;
                             }
                             else
                             {
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index aaae3e523f94..5c141488a774 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -57,21 +57,21 @@ inline DbgRect::DbgRect( OutputDevice *pOutDev, const Rectangle &rRect,
  * and destroyed in _FrmFinit.
  * */
 
-sal_Bool SwRootFrm::FlushVout()
+bool SwRootFrm::FlushVout()
 {
     if( SwRootFrm::pVout->IsFlushable() )
     {
         SwRootFrm::pVout->_Flush();
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwRootFrm::HasSameRect( const SwRect& rRect )
+bool SwRootFrm::HasSameRect( const SwRect& rRect )
 {
     if( SwRootFrm::pVout->IsFlushable() )
         return ( rRect == SwRootFrm::pVout->GetOrgRect() );
-    return sal_False;
+    return false;
 }
 
 /** method to set mapping/pixel offset for virtual output device
@@ -114,14 +114,14 @@ void SetMappingForVirtDev(  const Point&    _rNewOrigin,
 }
 
 // rSize must be pixel coordinates!
-sal_Bool SwLayVout::DoesFit( const Size &rNew )
+bool SwLayVout::DoesFit( const Size &rNew )
 {
     if( rNew.Height() > VIRTUALHEIGHT )
-        return sal_False;
+        return false;
     if( rNew.Width() <= 0 || rNew.Height() <= 0 )
-        return sal_False;
+        return false;
     if( rNew.Width() <= aSize.Width() )
-        return sal_True;
+        return true;
     if( !pVirDev )
     {
         pVirDev = new VirtualDevice();
@@ -141,10 +141,10 @@ sal_Bool SwLayVout::DoesFit( const Size &rNew )
             delete pVirDev;
             pVirDev = NULL;
             aSize.Width() = 0;
-            return sal_False;
+            return false;
         }
     }
-    return sal_True;
+    return true;
 }
 
 /// OD 27.09.2002 #103636# - change 2nd parameter <rRect> - no longer <const>
@@ -152,7 +152,7 @@ sal_Bool SwLayVout::DoesFit( const Size &rNew )
 ///     output is used.
 ///     <aRect> contains the rectangle that represents the area the virtual
 ///     output device is used for and that is flushed at the end.
-void SwLayVout::Enter(  SwViewShell *pShell, SwRect &rRect, sal_Bool bOn )
+void SwLayVout::Enter(  SwViewShell *pShell, SwRect &rRect, bool bOn )
 {
     Flush();
 
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index 1a754dfa4df0..f3b007375bd1 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -39,20 +39,20 @@ private:
     Size            aSize;
     sal_uInt16          nCount;
 
-    sal_Bool DoesFit( const Size &rOut );
+    bool DoesFit( const Size &rOut );
 
 public:
     SwLayVout() : pSh(0), pOut(0), pVirDev(0), aSize(0, VIRTUALHEIGHT), nCount(0) {}
     ~SwLayVout() { delete pVirDev; }
 
     /// OD 27.09.2002 #103636# - change 2nd parameter <rRect> - no longer <const>
-    void Enter( SwViewShell *pShell, SwRect &rRect, sal_Bool bOn );
+    void Enter( SwViewShell *pShell, SwRect &rRect, bool bOn );
     void Leave() { --nCount; Flush(); }
 
     void SetOrgRect( SwRect &rRect ) { aOrgRect = rRect; }
     const SwRect& GetOrgRect() const { return aOrgRect; }
 
-    sal_Bool IsFlushable() const { return 0 != pOut; }
+    bool IsFlushable() const { return 0 != pOut; }
     void _Flush();
     void Flush() { if( pOut ) _Flush(); }
 };
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 0842b9330b86..383d77a75a20 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -77,19 +77,19 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
     mpPrev( 0 ),
     mpDrawObjs( 0 ),
     mnType(0),
-    mbInfBody( sal_False ),
-    mbInfTab ( sal_False ),
-    mbInfFly ( sal_False ),
-    mbInfFtn ( sal_False ),
-    mbInfSct ( sal_False )
+    mbInfBody( false ),
+    mbInfTab ( false ),
+    mbInfFly ( false ),
+    mbInfFtn ( false ),
+    mbInfSct ( false )
 {
     OSL_ENSURE( pMod, "No frame format given." );
-    mbInvalidR2L = mbInvalidVert = 1;
-    mbDerivedR2L = mbDerivedVert = mbRightToLeft = mbVertical = mbReverse = mbVertLR = 0;
+    mbInvalidR2L = mbInvalidVert = true;
+    mbDerivedR2L = mbDerivedVert = mbRightToLeft = mbVertical = mbReverse = mbVertLR = false;
 
     mbValidPos = mbValidPrtArea = mbValidSize = mbValidLineNum = mbRetouche =
-    mbFixSize = mbColLocked = sal_False;
-    mbCompletePaint = mbInfInvalid = sal_True;
+    mbFixSize = mbColLocked = false;
+    mbCompletePaint = mbInfInvalid = true;
 }
 
 const IDocumentDrawModelAccess* SwFrm::getIDocumentDrawModelAccess()
@@ -107,40 +107,40 @@ void SwFrm::RegisterToFormat( SwFmt& rFmt )
     rFmt.Add( this );
 }
 
-void SwFrm::CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_Bool bBrowse )
+void SwFrm::CheckDir( sal_uInt16 nDir, bool bVert, bool bOnlyBiDi, bool bBrowse )
 {
     if( FRMDIR_ENVIRONMENT == nDir || ( bVert && bOnlyBiDi ) )
     {
-        mbDerivedVert = 1;
+        mbDerivedVert = true;
         if( FRMDIR_ENVIRONMENT == nDir )
-            mbDerivedR2L = 1;
+            mbDerivedR2L = true;
         SetDirFlags( bVert );
     }
     else if( bVert )
     {
-        mbInvalidVert = 0;
+        mbInvalidVert = false;
         if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir
             || bBrowse )
         {
-            mbVertical = 0;
-            mbVertLR = 0;
+            mbVertical = false;
+            mbVertLR = false;
         }
         else
            {
-            mbVertical = 1;
+            mbVertical = true;
             if(FRMDIR_VERT_TOP_RIGHT == nDir)
-                mbVertLR = 0;
+                mbVertLR = false;
                else if(FRMDIR_VERT_TOP_LEFT==nDir)
-                       mbVertLR = 1;
+                       mbVertLR = true;
         }
     }
     else
     {
-        mbInvalidR2L = 0;
+        mbInvalidR2L = false;
         if( FRMDIR_HORI_RIGHT_TOP == nDir )
-            mbRightToLeft = 1;
+            mbRightToLeft = true;
         else
-            mbRightToLeft = 0;
+            mbRightToLeft = false;
     }
 }
 
@@ -150,13 +150,13 @@ void SwFrm::CheckDirection( bool bVert )
     {
         if( !IsHeaderFrm() && !IsFooterFrm() )
         {
-            mbDerivedVert = 1;
+            mbDerivedVert = true;
             SetDirFlags( bVert );
         }
     }
     else
     {
-        mbDerivedR2L = 1;
+        mbDerivedR2L = true;
         SetDirFlags( bVert );
     }
 }
@@ -210,7 +210,7 @@ void SwCellFrm::CheckDirection( bool bVert )
     // Check if the item is set, before actually
     // using it. Otherwise the dynamic pool default is used, which may be set
     // to LTR in case of OOo 1.0 documents.
-    if( pFmt && SFX_ITEM_SET == pFmt->GetItemState( RES_FRAMEDIR, sal_True, &pItem ) )
+    if( pFmt && SFX_ITEM_SET == pFmt->GetItemState( RES_FRAMEDIR, true, &pItem ) )
     {
         const SvxFrameDirectionItem* pFrmDirItem = static_cast<const SvxFrameDirectionItem*>(pItem);
         const SwViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -324,7 +324,7 @@ void SwFrm::_UpdateAttrFrm( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                     SwTabFrm* pTab = FindTabFrm();
                     if ( bInFollowFlowRow )
                         pTab = pTab->FindMaster();
-                    pTab->SetRemoveFollowFlowLinePending( sal_True );
+                    pTab->SetRemoveFollowFlowLinePending( true );
                 }
             }
             break;
@@ -460,7 +460,7 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const
 
 Size SwFrm::ChgSize( const Size& aNewSize )
 {
-    mbFixSize = sal_True;
+    mbFixSize = true;
     const Size aOldSize( Frm().SSize() );
     if ( aNewSize == aOldSize )
         return aOldSize;
@@ -938,7 +938,7 @@ void SwCntntFrm::Cut()
                 if ( pMasterTab )
                 {
                     pMasterTab->_InvalidatePos();
-                    pMasterTab->SetRemoveFollowFlowLinePending( sal_True );
+                    pMasterTab->SetRemoveFollowFlowLinePending( true );
                 }
             }
         }
@@ -983,7 +983,7 @@ void SwCntntFrm::Cut()
                     if ( pSct->IsColLocked() || !pSct->IsInFtn() ||
                          ( pUp->IsFtnFrm() && pUp->IsColLocked() ) )
                     {
-                        pSct->DelEmpty( sal_False );
+                        pSct->DelEmpty( false );
                         // If a locked section may not be deleted then at least
                         // its size became invalid after removing its last
                         // content.
@@ -991,7 +991,7 @@ void SwCntntFrm::Cut()
                     }
                     else
                     {
-                        pSct->DelEmpty( sal_True );
+                        pSct->DelEmpty( true );
                         delete pSct;
                     }
                 }
@@ -1161,7 +1161,7 @@ void SwLayoutFrm::Cut()
     }
 }
 
-SwTwips SwFrm::Grow( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwFrm::Grow( SwTwips nDist, bool bTst, bool bInfo )
 {
     OSL_ENSURE( nDist >= 0, "Negative growth?" );
 
@@ -1205,7 +1205,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     return 0L;
 }
 
-SwTwips SwFrm::Shrink( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwFrm::Shrink( SwTwips nDist, bool bTst, bool bInfo )
 {
     OSL_ENSURE( nDist >= 0, "Negative reduction?" );
 
@@ -1266,7 +1266,7 @@ SwTwips SwFrm::Shrink( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
  *
  * @param nDiff the value around which the space has to be allocated
  */
-SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst )
+SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst )
 {
     PROTOCOL_ENTER( this, PROT_ADJUSTN, 0, &nDiff );
 
@@ -1390,7 +1390,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst )
                 //Prt.
                 const long nOldFrmHeight = Frm().Height();
                 const long nOldPrtHeight = Prt().Height();
-                const sal_Bool bOldComplete = IsCompletePaint();
+                const bool bOldComplete = IsCompletePaint();
                 if ( IsBodyFrm() )
                     Prt().SSize().Height() = nOldFrmHeight;
 
@@ -1574,7 +1574,7 @@ void SwFrm::ImplInvalidateSize()
 {
     if ( _InvalidationAllowed( INVALID_SIZE ) )
     {
-        mbValidSize = sal_False;
+        mbValidSize = false;
         if ( IsFlyFrm() )
             ((SwFlyFrm*)this)->_Invalidate();
         else
@@ -1589,7 +1589,7 @@ void SwFrm::ImplInvalidatePrt()
 {
     if ( _InvalidationAllowed( INVALID_PRTAREA ) )
     {
-        mbValidPrtArea = sal_False;
+        mbValidPrtArea = false;
         if ( IsFlyFrm() )
             ((SwFlyFrm*)this)->_Invalidate();
         else
@@ -1604,7 +1604,7 @@ void SwFrm::ImplInvalidatePos()
 {
     if ( _InvalidationAllowed( INVALID_POS ) )
     {
-        mbValidPos = sal_False;
+        mbValidPos = false;
         if ( IsFlyFrm() )
         {
             ((SwFlyFrm*)this)->_Invalidate();
@@ -1623,7 +1623,7 @@ void SwFrm::ImplInvalidateLineNum()
 {
     if ( _InvalidationAllowed( INVALID_LINENUM ) )
     {
-        mbValidLineNum = sal_False;
+        mbValidLineNum = false;
         OSL_ENSURE( IsTxtFrm(), "line numbers are implemented for text only" );
         InvalidatePage();
 
@@ -1638,7 +1638,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags()
     if ( ATT_VAR_SIZE == rFmtSize.GetHeightSizeType() ||
          ATT_MIN_SIZE == rFmtSize.GetHeightSizeType())
     {
-        mbFixSize = sal_False;
+        mbFixSize = false;
         if ( GetType() & (FRM_HEADER | FRM_FOOTER | FRM_ROW) )
         {
             SwFrm *pFrm = ((SwLayoutFrm*)this)->Lower();
@@ -1682,9 +1682,9 @@ void SwFrm::ValidateThisAndAllLowers( const sal_uInt16 nStage )
 
     if ( !bOnlyObject || ISA(SwFlyFrm) )
     {
-        mbValidSize = sal_True;
-        mbValidPrtArea = sal_True;
-        mbValidPos = sal_True;
+        mbValidSize = true;
+        mbValidPrtArea = true;
+        mbValidPos = true;
     }
 
     if ( bIncludeObjects )
@@ -1715,7 +1715,7 @@ void SwFrm::ValidateThisAndAllLowers( const sal_uInt16 nStage )
     }
 }
 
-SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SWRECTFN( this )
 
@@ -1818,7 +1818,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     return nReal;
 }
 
-SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     SWRECTFN( this )
     OSL_ENSURE( nDist >= 0, "nDist < 0" );
@@ -2024,7 +2024,7 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
                 if ( !GetPrev() )
                     CheckPageDescs( pPage );
                 if ( GetAttrSet()->GetPageDesc().GetNumOffset() )
-                    ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( sal_True );
+                    ((SwRootFrm*)pPage->GetUpper())->SetVirtPageNum( true );
                 SwDocPosUpdate aMsgHnt( pPage->Frm().Top() );
                 pPage->GetFmt()->GetDoc()->UpdatePageFlds( &aMsgHnt );
             }
@@ -2160,7 +2160,7 @@ SwLayoutFrm::SwLayoutFrm( SwFrmFmt* pFmt, SwFrm* pSib ):
 {
     const SwFmtFrmSize &rFmtSize = pFmt->GetFrmSize();
     if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE )
-        mbFixSize = sal_True;
+        mbFixSize = true;
 }
 
 // #i28701#
@@ -2204,7 +2204,7 @@ SwTwips SwLayoutFrm::InnerHeight() const
     return nRet;
 }
 
-SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -2363,7 +2363,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
     return nReal;
 }
 
-SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
+SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo )
 {
     const SwViewShell *pSh = getRootFrm()->GetCurrShell();
     const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
@@ -2524,7 +2524,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
             if ( pCnt->IsFollow() )
             {   // If we are in an other column/page than the frame with the
                 // reference, we don't need to invalidate its master.
-                SwFrm *pTmp = pCnt->FindFtnBossFrm(sal_True) == FindFtnBossFrm(sal_True)
+                SwFrm *pTmp = pCnt->FindFtnBossFrm(true) == FindFtnBossFrm(true)
                               ?  pCnt->FindMaster()->GetFrm() : pCnt;
                 pTmp->Prepare( PREP_ADJUST_FRM );
                 pTmp->InvalidateSize();
@@ -2598,7 +2598,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
         //      contains invalid section frames.
         if( pLowerFrm->IsSctFrm() )
             pLowerFrm = ((SwSectionFrm*)pLowerFrm)->GetSection() &&
-                   !((SwSectionFrm*)pLowerFrm)->ToMaximize( sal_False ) ?
+                   !((SwSectionFrm*)pLowerFrm)->ToMaximize( false ) ?
                    ((SwSectionFrm*)pLowerFrm)->FindLastCntnt() : NULL;
 
         // continue with found last lower, probably the last content of a section
@@ -2629,7 +2629,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                 pLowerFrm->InvalidatePage( pPage );
                 if( !pLowerFrm->IsFlowFrm() ||
                     !SwFlowFrm::CastFlowFrm( pLowerFrm )->HasFollow() )
-                    pLowerFrm->InvalidateNextPos( sal_True );
+                    pLowerFrm->InvalidateNextPos( true );
                 if ( pLowerFrm->IsTxtFrm() )
                     ((SwCntntFrm*)pLowerFrm)->Prepare( PREP_ADJUST_FRM );
             }
@@ -2926,7 +2926,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
         }
 
         if ( pColAttr->IsOrtho() && pColAttr->GetNumCols() > 1 )
-            AdjustColumns( pColAttr, sal_False );
+            AdjustColumns( pColAttr, false );
     }
 }
 
@@ -2950,7 +2950,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
     SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
     if ( !mbValidPrtArea )
     {
-        mbValidPrtArea = sal_True;
+        mbValidPrtArea = true;
         (this->*fnRect->fnSetXMargins)( nLeft, nRight );
         (this->*fnRect->fnSetYMargins)( nUpper, nLower );
     }
@@ -2963,7 +2963,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
             const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
             SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0;
             do
-            {   mbValidSize = sal_True;
+            {   mbValidSize = true;
 
                 //The size in VarSize is calculated using the content plus the
                 // borders.
@@ -3000,7 +3000,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
                     if( (this->*fnRect->fnSetLimit)( nLimit ) &&
                         nOldLeft == (Frm().*fnRect->fnGetLeft)() &&
                         nOldTop  == (Frm().*fnRect->fnGetTop)() )
-                        mbValidSize = mbValidPrtArea = sal_True;
+                        mbValidSize = mbValidPrtArea = true;
                 }
             } while ( !mbValidSize );
         }
@@ -3009,12 +3009,12 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
             do
             {   if ( Frm().Height() != pAttrs->GetSize().Height() )
                     ChgSize( Size( Frm().Width(), pAttrs->GetSize().Height()));
-                mbValidSize = sal_True;
+                mbValidSize = true;
                 MakePos();
             } while ( !mbValidSize );
         }
         else
-            mbValidSize = sal_True;
+            mbValidSize = true;
     }
 }
 
@@ -3083,7 +3083,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff )
         } while ( pFrm && IsAnLower( pFrm ) ) ;
 }
 
-long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, sal_Bool ) const
+long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, bool ) const
 {
     long nRet     = rSz.GetWidth(),
          nPercent = rSz.GetWidthPercent();
@@ -3220,14 +3220,14 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
 
         long nMinimum = nMinHeight;
         long nMaximum;
-        sal_Bool bNoBalance = sal_False;
+        bool bNoBalance = false;
         SWRECTFN( this )
         if( IsSctFrm() )
         {
             nMaximum = (Frm().*fnRect->fnGetHeight)() - nBorder +
                        (Frm().*fnRect->fnBottomDist)(
                                         (GetUpper()->*fnRect->fnGetPrtBottom)() );
-            nMaximum += GetUpper()->Grow( LONG_MAX, sal_True );
+            nMaximum += GetUpper()->Grow( LONG_MAX, true );
             if( nMaximum < nMinimum )
             {
                 if( nMaximum < 0 )
@@ -3293,7 +3293,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
             if ( pImp )
                 pImp->CheckWaitCrsr();
 
-            mbValidSize = sal_True;
+            mbValidSize = true;
             //First format the column as this will relieve the stack a bit.
             //Also set width and height of the column (if they are wrong)
             //while we are at it.
@@ -3302,7 +3302,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
             // #i27399#
             // Simply setting the column width based on the values returned by
             // CalcColWidth does not work for automatic column width.
-            AdjustColumns( &rCol, sal_False );
+            AdjustColumns( &rCol, false );
 
             for ( sal_uInt16 i = 0; i < nNumCols; ++i )
             {
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 7067fdf64bea..72896f38caad 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -891,7 +891,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
     const SwPageFrm* pObjPage = rFlyAtCntFrm.FindPageFrm();
     const SwFrm* pObjContext = ::FindKontext( &rAnchorTxtFrm, FRM_COLUMN );
     sal_uLong nObjIndex = rAnchorTxtFrm.GetTxtNode()->GetIndex();
-    SwOrderIter aIter( pObjPage, sal_True );
+    SwOrderIter aIter( pObjPage, true );
     const SwFlyFrm* pFly = ((SwVirtFlyDrawObj*)aIter.Bottom())->GetFlyFrm();
     while ( pFly && nObjOrdNum > pFly->GetVirtDrawObj()->GetOrdNumDirect() )
     {
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 6b31e7f3e3b7..ed1f130b6e60 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -109,13 +109,13 @@ static bool lcl_DoesVertPosFits( const SwTwips _nRelPosY,
         {
             SwSectionFrm* pSctFrm =
                     const_cast<SwSectionFrm*>(_pUpperOfOrientFrm->FindSctFrm());
-            bVertPosFits = pSctFrm->GetUpper()->Grow( _nRelPosY - _nAvail, sal_True ) > 0;
+            bVertPosFits = pSctFrm->GetUpper()->Grow( _nRelPosY - _nAvail, true ) > 0;
             // Note: do not provide a layout frame for a grow.
         }
         else
         {
             bVertPosFits = const_cast<SwLayoutFrm*>(_pUpperOfOrientFrm)->
-                                        Grow( _nRelPosY - _nAvail, sal_True ) > 0;
+                                        Grow( _nRelPosY - _nAvail, true ) > 0;
             if ( bVertPosFits )
                 _orpLayoutFrmToGrow = const_cast<SwLayoutFrm*>(_pUpperOfOrientFrm);
         }
@@ -125,7 +125,7 @@ static bool lcl_DoesVertPosFits( const SwTwips _nRelPosY,
         // #i45085# - check, if upper frame would grow the
         // excepted amount of twips.
         const SwTwips nTwipsGrown = const_cast<SwLayoutFrm*>(_pUpperOfOrientFrm)->
-                                        Grow( _nRelPosY - _nAvail, sal_True );
+                                        Grow( _nRelPosY - _nAvail, true );
         bVertPosFits = ( nTwipsGrown == ( _nRelPosY - _nAvail ) );
         if ( bVertPosFits )
             _orpLayoutFrmToGrow = const_cast<SwLayoutFrm*>(_pUpperOfOrientFrm);
@@ -657,7 +657,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                                     eMakePage = MAKEPAGE_NOSECTION;
 
                                 const SwLayoutFrm* pTmp =
-                                    pUpperOfOrientFrm->GetLeaf( eMakePage, sal_True, &rAnchorTxtFrm );
+                                    pUpperOfOrientFrm->GetLeaf( eMakePage, true, &rAnchorTxtFrm );
                                 if ( pTmp &&
                                      ( !bInSct ||
                                        pUpperOfOrientFrm->FindSctFrm()->IsAnFollow( pTmp->FindSctFrm() ) ) )
@@ -814,7 +814,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                      !pOrientFrm->GetIndPrev() )
                 {
                     const_cast<SwTabFrm*>(pOrientFrm->FindTabFrm())
-                                                    ->SetDoesObjsFit( sal_False );
+                                                    ->SetDoesObjsFit( false );
                 }
                 else
                 {
@@ -859,7 +859,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                          pOrientFrm == &rAnchorTxtFrm && !pOrientFrm->GetIndPrev() )
                     {
                         const_cast<SwTabFrm*>(pOrientFrm->FindTabFrm())
-                                                        ->SetDoesObjsFit( sal_False );
+                                                        ->SetDoesObjsFit( false );
                     }
                 }
             }
@@ -895,7 +895,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                                     ( bInSct
                                       ? MAKEPAGE_NOSECTION
                                       : ( bInFtn ? MAKEPAGE_NONE : MAKEPAGE_APPEND ) ),
-                                    sal_True, &rAnchorTxtFrm );
+                                    true, &rAnchorTxtFrm );
                     // correction:
                     // If anchor is in footnote and proposed next layout environment
                     // isn't a footnote frame, object can't follow the text flow
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index ab74b74b0258..81528f2799eb 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -214,7 +214,7 @@ SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
     SwNoTxtNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
     aOLEObj( xObj ),
     pGraphic(0),
-    bOLESizeInvalid( sal_False ),
+    bOLESizeInvalid( false ),
     mpObjectLink( NULL )
 {
     aOLEObj.SetNode( this );
@@ -228,7 +228,7 @@ SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
     SwNoTxtNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
     aOLEObj( rString, nAspect ),
     pGraphic(0),
-    bOLESizeInvalid( sal_False ),
+    bOLESizeInvalid( false ),
     mpObjectLink( NULL )
 {
     aOLEObj.SetNode( this );
@@ -450,13 +450,13 @@ SwCntntNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     pOLENd->SetContour( HasContour(), HasAutomaticContour() );
     pOLENd->SetAspect( GetAspect() ); // the replacement image must be already copied
 
-    pOLENd->SetOLESizeInvalid( sal_True );
+    pOLENd->SetOLESizeInvalid( true );
     pDoc->SetOLEPrtNotifyPending();
 
     return pOLENd;
 }
 
-sal_Bool SwOLENode::IsInGlobalDocSection() const
+bool SwOLENode::IsInGlobalDocSection() const
 {
     // suche den "Body Anchor"
     sal_uLong nEndExtraIdx = GetNodes().GetEndOfExtras().GetIndex();
@@ -464,18 +464,18 @@ sal_Bool SwOLENode::IsInGlobalDocSection() const
     do {
         SwFrmFmt* pFlyFmt = pAnchorNd->GetFlyFmt();
         if( !pFlyFmt )
-            return sal_False;
+            return false;
 
         const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor();
         if( !rAnchor.GetCntntAnchor() )
-            return sal_False;
+            return false;
 
         pAnchorNd = &rAnchor.GetCntntAnchor()->nNode.GetNode();
     } while( pAnchorNd->GetIndex() < nEndExtraIdx );
 
     const SwSectionNode* pSectNd = pAnchorNd->FindSectionNode();
     if( !pSectNd )
-        return sal_False;
+        return false;
 
     while( pSectNd )
     {
@@ -490,9 +490,9 @@ sal_Bool SwOLENode::IsInGlobalDocSection() const
             pSectNd->GetIndex() > nEndExtraIdx;
 }
 
-sal_Bool SwOLENode::IsOLEObjectDeleted() const
+bool SwOLENode::IsOLEObjectDeleted() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( aOLEObj.xOLERef.is() )
     {
         SfxObjectShell* p = GetDoc()->GetPersist();
@@ -510,9 +510,9 @@ void SwOLENode::GetNewReplacement()
         aOLEObj.xOLERef.UpdateReplacement();
 }
 
-sal_Bool SwOLENode::UpdateLinkURL_Impl()
+bool SwOLENode::UpdateLinkURL_Impl()
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if ( mpObjectLink )
     {
@@ -541,7 +541,7 @@ sal_Bool SwOLENode::UpdateLinkURL_Impl()
                     xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() );
 
                     maLinkURL = aNewLinkURL;
-                    bResult = sal_True;
+                    bResult = true;
 
                     if ( nCurState != embed::EmbedStates::LOADED )
                         xObj->changeState( nCurState );
@@ -759,7 +759,7 @@ OUString SwOLEObj::GetStyleString()
     return strStyle;
 }
 
-sal_Bool SwOLEObj::IsOleRef() const
+bool SwOLEObj::IsOleRef() const
 {
     return xOLERef.is();
 }
@@ -822,9 +822,9 @@ svt::EmbeddedObjectRef& SwOLEObj::GetObject()
     return xOLERef;
 }
 
-sal_Bool SwOLEObj::UnloadObject()
+bool SwOLEObj::UnloadObject()
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if ( pOLENd )
     {
         const SwDoc* pDoc = pOLENd->GetDoc();
@@ -834,12 +834,12 @@ sal_Bool SwOLEObj::UnloadObject()
     return bRet;
 }
 
-sal_Bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj, const SwDoc* pDoc, sal_Int64 nAspect )
+bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj, const SwDoc* pDoc, sal_Int64 nAspect )
 {
     if ( !pDoc )
-        return sal_False;
+        return false;
 
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
        sal_Int32 nState = xObj.is() ? xObj->getCurrentState() : embed::EmbedStates::LOADED;
        bool bIsActive = ( nState != embed::EmbedStates::LOADED && nState != embed::EmbedStates::RUNNING );
     sal_Int64 nMiscStatus = xObj->getStatus( nAspect );
@@ -871,11 +871,11 @@ sal_Bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj,
                 }
                 catch ( uno::Exception& )
                 {
-                    bRet = sal_False;
+                    bRet = false;
                 }
             }
             else
-                bRet = sal_False;
+                bRet = false;
         }
     }
 
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index d0b84af303a1..02fb48327617 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -55,7 +55,7 @@ SwFmtDrop::SwFmtDrop()
     nReadFmt( USHRT_MAX ),
     nLines( 0 ),
     nChars( 0 ),
-    bWholeWord( sal_False )
+    bWholeWord( false )
 {
 }
 
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 82344c28f69c..8bae7020bc3c 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -70,7 +70,7 @@ bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >&  rStg,
     {
         ((SwEditShell*)rDShell.GetWrtShell())->_CopySelToDoc( pDoc );
         nRet = aBlk.PutDoc();
-        aBlk.AddName ( rShort, rShort, sal_False );
+        aBlk.AddName ( rShort, rShort, false );
         if( !IsError( nRet ) )
             nRet = aBlk.GetText( rShort, rLong );
     }
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 668bba9862ea..b3b2f6ef3980 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -65,7 +65,7 @@ SwXMLTextBlockImport::SwXMLTextBlockImport(
     const uno::Reference< uno::XComponentContext > xContext,
     SwXMLTextBlocks &rBlocks,
     OUString & rNewText,
-    sal_Bool bNewTextOnly )
+    bool bNewTextOnly )
 :   SvXMLImport(xContext, "", IMPORT_ALL ),
     rBlockList ( rBlocks ),
     bTextOnly ( bNewTextOnly ),
diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx
index b338b11fb0b3..b2f273b85bc0 100644
--- a/sw/source/core/swg/SwXMLBlockListContext.cxx
+++ b/sw/source/core/swg/SwXMLBlockListContext.cxx
@@ -86,7 +86,7 @@ SwXMLBlockContext::SwXMLBlockContext(
     OUString aShort;
     OUString aLong;
     OUString aPackageName;
-    sal_Bool bTextOnly = sal_False;
+    bool bTextOnly = false;
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for (sal_Int16 i=0; i < nAttrCount; i++)
@@ -112,7 +112,7 @@ SwXMLBlockContext::SwXMLBlockContext(
             else if ( IsXMLToken ( aLocalName, XML_UNFORMATTED_TEXT ) )
             {
                 if ( IsXMLToken ( rAttrValue, XML_TRUE ) )
-                    bTextOnly = sal_True;
+                    bTextOnly = true;
             }
         }
     }
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index eea9eea900da..2a881946e929 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -64,7 +64,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
     SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
     if( !pDocSh->DoInitNew( 0 ) )
         return;
-    bReadOnly = sal_True;
+    bReadOnly = true;
     pDoc = pDocSh->GetDoc();
     xDocShellRef = pDocSh;
     pDoc->SetOle2Link( Link() );
@@ -76,7 +76,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
     try
     {
         refStg  = comphelper::OStorageHelper::GetStorageFromURL( rFile, embed::ElementModes::READWRITE );
-        bReadOnly = sal_False;
+        bReadOnly = false;
     }
     catch(const uno::Exception&)
     {
@@ -96,7 +96,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
     InitBlockMode ( refStg );
     ReadInfo();
     ResetBlockMode ();
-    bInfoChanged = sal_False;
+    bInfoChanged = false;
 }
 
 SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg, const OUString& rName )
@@ -109,7 +109,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg
     SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
     if( !pDocSh->DoInitNew( 0 ) )
         return;
-    bReadOnly = sal_False;
+    bReadOnly = false;
     pDoc = pDocSh->GetDoc();
     xDocShellRef = pDocSh;
     pDoc->SetOle2Link( Link() );
@@ -118,7 +118,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg
 
     InitBlockMode ( rStg );
     ReadInfo();
-    bInfoChanged = sal_False;
+    bInfoChanged = false;
 }
 
 SwXMLTextBlocks::~SwXMLTextBlocks()
@@ -142,7 +142,7 @@ void SwXMLTextBlocks::ClearDoc()
     pDoc->ClearDoc();
     pDocShell->ClearEmbeddedObjects();
 }
-void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong, sal_Bool bOnlyTxt )
+void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong, bool bOnlyTxt )
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     SwBlockName* pNew = NULL;
@@ -155,13 +155,13 @@ void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong, sa
     aPackageName = GeneratePackageName( rShort );
     pNew = new SwBlockName( rShort, rLong, aPackageName );
 
-    pNew->bIsOnlyTxtFlagInit = sal_True;
+    pNew->bIsOnlyTxtFlagInit = true;
     pNew->bIsOnlyTxt = bOnlyTxt;
     aNames.insert( pNew );
-    bInfoChanged = sal_True;
+    bInfoChanged = true;
 }
 void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong,
-                               const OUString& rPackageName, sal_Bool bOnlyTxt )
+                               const OUString& rPackageName, bool bOnlyTxt )
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     if( nIdx != (sal_uInt16) -1 )
@@ -170,10 +170,10 @@ void SwXMLTextBlocks::AddName( const OUString& rShort, const OUString& rLong,
         aNames.erase( aNames.begin() + nIdx );
     }
     SwBlockName* pNew = new SwBlockName( rShort, rLong, rPackageName );
-    pNew->bIsOnlyTxtFlagInit = sal_True;
+    pNew->bIsOnlyTxtFlagInit = true;
     pNew->bIsOnlyTxt = bOnlyTxt;
     aNames.insert( pNew );
-    bInfoChanged = sal_True;
+    bInfoChanged = true;
 }
 
 sal_uLong SwXMLTextBlocks::Delete( sal_uInt16 n )
@@ -252,10 +252,10 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort,
                                                     const OUString& rLong)
 {
     sal_uLong nError = 0;
-    OpenFile(sal_True);
-    rDestImp.OpenFile(sal_False);
+    OpenFile(true);
+    rDestImp.OpenFile(false);
     const OUString aGroup( rShort );
-    sal_Bool bTextOnly = IsOnlyTextBlock ( rShort ) ;//pImp->pBlkRoot->IsStream( aGroup );
+    bool bTextOnly = IsOnlyTextBlock ( rShort ) ;//pImp->pBlkRoot->IsStream( aGroup );
     sal_uInt16 nIndex = GetIndex ( rShort );
     OUString sDestShortName( GetPackageName (nIndex) );
     sal_uInt16 nIdx = 0;
@@ -327,7 +327,7 @@ sal_uLong SwXMLTextBlocks::BeginPutDoc( const OUString& rShort, const OUString&
     aShort = rShort;
     aLong = rLong;
     aPackageName = GeneratePackageName( rShort );
-    SetIsTextOnly( rShort, sal_False);
+    SetIsTextOnly( rShort, false);
     return StartPutBlock (rShort, aPackageName);
 }
 
@@ -342,9 +342,9 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
     ::GetXMLWriter ( OUString(), GetBaseURL(), xWrt);
     SwWriter aWriter (xRoot, *pDoc );
 
-    xWrt->bBlock = sal_True;
+    xWrt->bBlock = true;
     nRes = aWriter.Write ( xWrt );
-    xWrt->bBlock = sal_False;
+    xWrt->bBlock = false;
     // Save OLE objects if there are some
     SwDocShell *pDocSh = pDoc->GetDocShell();
 
@@ -355,7 +355,7 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
         // TODO/LATER: it is only a temporary solution, that should be changed soon, the used methods should be
         // called without optimization
 
-        sal_Bool bOK = sal_False;
+        bool bOK = false;
 
         if ( xRoot.is() )
         {
@@ -370,7 +370,7 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
                 // TODO/LATER: no progress bar?!
                 // TODO/MBA: strange construct
                 pTmpMedium = new SfxMedium( xTempStorage, GetBaseURL() );
-                sal_Bool bTmpOK = pDocSh->SaveAsChildren( *pTmpMedium );
+                bool bTmpOK = pDocSh->SaveAsChildren( *pTmpMedium );
                 if( bTmpOK )
                     bTmpOK = pDocSh->SaveCompletedChildren( false );
 
@@ -434,9 +434,9 @@ sal_uLong SwXMLTextBlocks::MakeBlockList()
     return 0;
 }
 
-sal_Bool SwXMLTextBlocks::PutMuchEntries( sal_Bool bOn )
+bool SwXMLTextBlocks::PutMuchEntries( bool bOn )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( bOn )
     {
         if( bInPutMuchBlocks )
@@ -445,11 +445,11 @@ sal_Bool SwXMLTextBlocks::PutMuchEntries( sal_Bool bOn )
         }
         else if( !IsFileChanged() )
         {
-            bRet = 0 == OpenFile( sal_False );
+            bRet = 0 == OpenFile( false );
             if( bRet )
             {
                 nFlags |= SWXML_NOROOTCOMMIT;
-                bInPutMuchBlocks = sal_True;
+                bInPutMuchBlocks = true;
             }
         }
     }
@@ -466,8 +466,8 @@ sal_Bool SwXMLTextBlocks::PutMuchEntries( sal_Bool bOn )
                 MakeBlockList();
                 CloseFile();
                 Touch();
-                bInPutMuchBlocks = sal_False;
-                bRet = sal_True;
+                bInPutMuchBlocks = false;
+                bRet = true;
             }
             catch (const uno::Exception&)
             {
@@ -477,7 +477,7 @@ sal_Bool SwXMLTextBlocks::PutMuchEntries( sal_Bool bOn )
     return bRet;
 }
 
-sal_uLong SwXMLTextBlocks::OpenFile( sal_Bool bRdOnly )
+sal_uLong SwXMLTextBlocks::OpenFile( bool bRdOnly )
 {
     if( bAutocorrBlock )
         return 0;
@@ -507,34 +507,34 @@ void SwXMLTextBlocks::CloseFile()
     }
 }
 
-void SwXMLTextBlocks::SetIsTextOnly( const OUString& rShort, sal_Bool bNewValue )
+void SwXMLTextBlocks::SetIsTextOnly( const OUString& rShort, bool bNewValue )
 {
     sal_uInt16 nIdx = GetIndex ( rShort );
     if (nIdx != (sal_uInt16) -1  && nIdx != USHRT_MAX)
         aNames[nIdx]->bIsOnlyTxt = bNewValue;
 }
 
-void SwXMLTextBlocks::SetIsTextOnly( sal_uInt16 nIdx, sal_Bool bNewValue )
+void SwXMLTextBlocks::SetIsTextOnly( sal_uInt16 nIdx, bool bNewValue )
 {
     aNames[nIdx]->bIsOnlyTxt = bNewValue;
 }
 
-sal_Bool SwXMLTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
+bool SwXMLTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
 {
     sal_uInt16 nIdx = GetIndex ( rShort );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if (nIdx != (sal_uInt16) -1  && nIdx != USHRT_MAX)
     {
         bRet = aNames[nIdx]->bIsOnlyTxt;
     }
     return bRet;
 }
-sal_Bool SwXMLTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
+bool SwXMLTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
 {
     return aNames[nIdx]->bIsOnlyTxt;
 }
 
-sal_Bool SwXMLTextBlocks::IsFileUCBStorage( const OUString & rFileName)
+bool SwXMLTextBlocks::IsFileUCBStorage( const OUString & rFileName)
 {
     OUString aName( rFileName );
     INetURLObject aObj( aName );
@@ -547,7 +547,7 @@ sal_Bool SwXMLTextBlocks::IsFileUCBStorage( const OUString & rFileName)
     }
 
     SvStream * pStm = ::utl::UcbStreamHelper::CreateStream( aName, STREAM_STD_READ );
-    sal_Bool bRet = UCBStorage::IsStorageFile( pStm );
+    bool bRet = UCBStorage::IsStorageFile( pStm );
     delete pStm;
     return bRet;
 }
@@ -587,7 +587,7 @@ sal_uLong SwXMLTextBlocks::PutText( const OUString& rShort, const OUString& rNam
     aShort = rShort;
     aLong = rName;
     aCur = rText;
-    SetIsTextOnly( aShort, sal_True );
+    SetIsTextOnly( aShort, true );
     aPackageName = GeneratePackageName( rShort );
     ClearDoc();
     nRes = PutBlockText( rShort, rName, rText, aPackageName );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 9b134d8cf334..1193b2aa1599 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -59,9 +59,9 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx )
             xRoot = xBlkRoot->openStorageElement( aFolderName, embed::ElementModes::READ );
             xMedium = new SfxMedium( xRoot, GetBaseURL(), OUString( "writer8" ) );
             SwReader aReader( *xMedium, aFolderName, pDoc );
-            ReadXML->SetBlockMode( sal_True );
+            ReadXML->SetBlockMode( true );
             aReader.Read( *ReadXML );
-            ReadXML->SetBlockMode( sal_False );
+            ReadXML->SetBlockMode( false );
             // Ole objects fails to display when inserted into document
             // because the ObjectReplacement folder ( and contents are missing )
             OUString sObjReplacements( "ObjectReplacements" );
@@ -102,7 +102,7 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx )
 
             // get filter
             // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( *this, aCur, sal_True );
-            uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, *this, aCur, sal_True );
+            uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, *this, aCur, true );
 
             // connect parser and filter
             uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext);
@@ -126,7 +126,7 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx )
                 // re throw ?
             }
 
-            bInfoChanged = sal_False;
+            bInfoChanged = false;
             MakeBlockText(aCur);
         }
         catch( uno::Exception& )
@@ -149,7 +149,7 @@ const struct SvEventDescription aAutotextEvents[] =
 
 sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
                                       SvxMacroTableDtor& rMacroTbl,
-                                      sal_Bool bFileAlreadyOpen )
+                                      bool bFileAlreadyOpen )
 {
     // set current auto text
 
@@ -163,7 +163,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
     if( !bFileAlreadyOpen )
     {
         CloseFile();
-        nRet = OpenFile ( sal_True );
+        nRet = OpenFile ( true );
     }
     if ( 0 == nRet )
     {
@@ -268,7 +268,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
 sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText )
 {
     sal_uLong n = 0;
-    sal_Bool bTextOnly = sal_True;
+    bool bTextOnly = true;
     OUString aFolderName = GeneratePackageName ( rShort );
     OUString aStreamName = aFolderName + ".xml";
     rText = "";
@@ -279,7 +279,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText
         uno::Reference < container::XNameAccess > xAccess( xRoot, uno::UNO_QUERY );
         if ( !xAccess->hasByName( aStreamName ) || !xRoot->isStreamElement( aStreamName ) )
         {
-            bTextOnly = sal_False;
+            bTextOnly = false;
             aStreamName = "content.xml";
         }
 
@@ -452,7 +452,7 @@ void SwXMLTextBlocks::ReadInfo( void )
 }
 void SwXMLTextBlocks::WriteInfo( void )
 {
-    if ( xBlkRoot.is() || 0 == OpenFile ( sal_False ) )
+    if ( xBlkRoot.is() || 0 == OpenFile ( false ) )
     {
         uno::Reference< uno::XComponentContext > xContext =
             comphelper::getProcessComponentContext();
@@ -496,7 +496,7 @@ void SwXMLTextBlocks::WriteInfo( void )
         {
         }
 
-        bInfoChanged = sal_False;
+        bInfoChanged = false;
         return;
     }
 }
@@ -504,7 +504,7 @@ void SwXMLTextBlocks::WriteInfo( void )
 sal_uLong SwXMLTextBlocks::SetMacroTable(
     sal_uInt16 nIdx,
     const SvxMacroTableDtor& rMacroTbl,
-    sal_Bool bFileAlreadyOpen )
+    bool bFileAlreadyOpen )
 {
     // set current autotext
     aShort = aNames[nIdx]->aShort;
@@ -528,7 +528,7 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
     if( !bFileAlreadyOpen )
     {
         CloseFile();    // close (it may be open in read-only-mode)
-        nRes = OpenFile ( sal_False );
+        nRes = OpenFile ( false );
     }
 
     if ( 0 == nRes )
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 0a6b0716e579..b5dd5b6ae019 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -56,7 +56,7 @@ sal_uInt16 SwImpBlocks::Hash( const OUString& r )
 
 SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong )
     : aShort( rShort ), aLong( rLong ), aPackageName (rShort),
-    bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ), bInPutMuchBlocks(false)
+    bIsOnlyTxtFlagInit( false ), bIsOnlyTxt( false ), bInPutMuchBlocks(false)
 {
     nHashS = SwImpBlocks::Hash( rShort );
     nHashL = SwImpBlocks::Hash( rLong );
@@ -64,7 +64,7 @@ SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong )
 
 SwBlockName::SwBlockName( const OUString& rShort, const OUString& rLong, const OUString& rPackageName)
     : aShort( rShort ), aLong( rLong ), aPackageName (rPackageName),
-    bIsOnlyTxtFlagInit( sal_False ), bIsOnlyTxt( sal_False ), bInPutMuchBlocks(false)
+    bIsOnlyTxtFlagInit( false ), bIsOnlyTxt( false ), bInPutMuchBlocks(false)
 {
     nHashS = SwImpBlocks::Hash( rShort );
     nHashL = SwImpBlocks::Hash( rLong );
@@ -84,12 +84,12 @@ short SwImpBlocks::GetFileType( const OUString& rFile )
     return SWBLK_NONE;
 }
 
-SwImpBlocks::SwImpBlocks( const OUString& rFile, sal_Bool )
+SwImpBlocks::SwImpBlocks( const OUString& rFile, bool )
     : aFile( rFile ),
     aDateModified( Date::EMPTY ),
     aTimeModified( Time::EMPTY ),
     pDoc( 0 ), nCur( (sal_uInt16)-1 ),
-    bReadOnly( sal_True ), bInPutMuchBlocks( sal_False ),
+    bReadOnly( true ), bInPutMuchBlocks( false ),
     bInfoChanged(false)
 {
     FStatHelper::GetModifiedDateTimeOfFile( rFile,
@@ -176,7 +176,7 @@ OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const
 }
 
 void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong,
-                            sal_Bool bOnlyTxt )
+                           bool bOnlyTxt )
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     if( nIdx != (sal_uInt16) -1 )
@@ -185,12 +185,12 @@ void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong,
         aNames.erase( aNames.begin() + nIdx );
     }
     SwBlockName* pNew = new SwBlockName( rShort, rLong );
-    pNew->bIsOnlyTxtFlagInit = sal_True;
+    pNew->bIsOnlyTxtFlagInit = true;
     pNew->bIsOnlyTxt = bOnlyTxt;
     aNames.insert( pNew );
 }
 
-sal_Bool SwImpBlocks::IsFileChanged() const
+bool SwImpBlocks::IsFileChanged() const
 {
     Date aTempDateModified( aDateModified );
     Time aTempTimeModified( aTimeModified );
@@ -206,25 +206,25 @@ void SwImpBlocks::Touch()
                                             &aDateModified, &aTimeModified );
 }
 
-sal_Bool SwImpBlocks::IsOnlyTextBlock( const OUString& ) const
+bool SwImpBlocks::IsOnlyTextBlock( const OUString& ) const
 {
-    return sal_False;
+    return false;
 }
 
-sal_uLong SwImpBlocks::GetMacroTable( sal_uInt16, SvxMacroTableDtor&, sal_Bool )
+sal_uLong SwImpBlocks::GetMacroTable( sal_uInt16, SvxMacroTableDtor&, bool )
 {
     return 0;
 }
 
 sal_uLong SwImpBlocks::SetMacroTable( sal_uInt16 ,
-                                const SvxMacroTableDtor& , sal_Bool )
+                                const SvxMacroTableDtor& , bool )
 {
     return 0;
 }
 
-sal_Bool SwImpBlocks::PutMuchEntries( sal_Bool )
+bool SwImpBlocks::PutMuchEntries( bool )
 {
-    return sal_False;
+    return false;
 }
 
 SwTextBlocks::SwTextBlocks( const OUString& rFile )
@@ -257,15 +257,15 @@ void SwTextBlocks::SetName( const OUString& r )
         pImp->SetName( r );
 }
 
-sal_Bool SwTextBlocks::IsOld() const
+bool SwTextBlocks::IsOld() const
 {
     if (pImp)
     {
         short nType = pImp->GetFileType();
         if (SWBLK_SW3 == nType || SWBLK_SW2 == nType )
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
 sal_uInt16 SwTextBlocks::GetCount() const
@@ -297,13 +297,13 @@ OUString SwTextBlocks::GetLongName( sal_uInt16 n ) const
     return OUString();
 }
 
-sal_Bool SwTextBlocks::Delete( sal_uInt16 n )
+bool SwTextBlocks::Delete( sal_uInt16 n )
 {
     if( pImp && !pImp->bInPutMuchBlocks )
     {
         if( pImp->IsFileChanged() )
             nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
-        else if( 0 == (nErr = pImp->OpenFile( sal_False ) ))
+        else if( 0 == (nErr = pImp->OpenFile( false ) ))
         {
             nErr = pImp->Delete( n );
             if( !nErr )
@@ -319,9 +319,9 @@ sal_Bool SwTextBlocks::Delete( sal_uInt16 n )
         pImp->CloseFile();
         pImp->Touch();
 
-        return sal_Bool( nErr == 0 );
+        return ( nErr == 0 );
     }
-    return sal_False;
+    return false;
 }
 
 sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l )
@@ -344,14 +344,14 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
 
         if( pImp->IsFileChanged() )
             nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
-        else if( 0 == ( nErr = pImp->OpenFile( sal_False )))
+        else if( 0 == ( nErr = pImp->OpenFile( false )))
         {
             // Vorher den neuen Eintrag in die Liste setzen!
             aNew = GetAppCharClass().uppercase( aNew );
              nErr = pImp->Rename( n, aNew, aLong );
             if( !nErr )
             {
-                sal_Bool bOnlyTxt = pImp->aNames[ n ]->bIsOnlyTxt;
+                bool bOnlyTxt = pImp->aNames[ n ]->bIsOnlyTxt;
                 delete pImp->aNames[n];
                 pImp->aNames.erase( pImp->aNames.begin() + n );
                 pImp->AddName( aNew, aLong, bOnlyTxt );
@@ -385,7 +385,7 @@ sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort,
     return nErr;
 }
 
-sal_Bool SwTextBlocks::BeginGetDoc( sal_uInt16 n )
+bool SwTextBlocks::BeginGetDoc( sal_uInt16 n )
 {
     if( pImp && !pImp->bInPutMuchBlocks )
     {
@@ -396,7 +396,7 @@ sal_Bool SwTextBlocks::BeginGetDoc( sal_uInt16 n )
 
         if( pImp->IsFileChanged() )
             nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
-        else if( 0 == ( nErr = pImp->OpenFile( sal_True )))
+        else if( 0 == ( nErr = pImp->OpenFile( true )))
         {
             pImp->ClearDoc();
             nErr = pImp->GetDoc( n );
@@ -405,9 +405,9 @@ sal_Bool SwTextBlocks::BeginGetDoc( sal_uInt16 n )
             else
                 pImp->nCur = n;
         }
-        return sal_Bool( nErr == 0 );
+        return ( nErr == 0 );
     }
-    return sal_False;
+    return false;
 }
 
 void SwTextBlocks::EndGetDoc()
@@ -416,17 +416,17 @@ void SwTextBlocks::EndGetDoc()
         pImp->CloseFile();
 }
 
-sal_Bool SwTextBlocks::BeginPutDoc( const OUString& s, const OUString& l )
+bool SwTextBlocks::BeginPutDoc( const OUString& s, const OUString& l )
 {
     if( pImp )
     {
-        sal_Bool bOk = pImp->bInPutMuchBlocks;
+        bool bOk = pImp->bInPutMuchBlocks;
         if( !bOk )
         {
             if( pImp->IsFileChanged() )
                 nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
             else
-                nErr = pImp->OpenFile( sal_False );
+                nErr = pImp->OpenFile( false );
             bOk = 0 == nErr;
         }
         if( bOk )
@@ -475,13 +475,13 @@ sal_uInt16 SwTextBlocks::PutText( const OUString& rShort, const OUString& rName,
     sal_uInt16 nIdx = (sal_uInt16) -1;
     if( pImp )
     {
-        sal_Bool bOk = pImp->bInPutMuchBlocks;
+        bool bOk = pImp->bInPutMuchBlocks;
         if( !bOk )
         {
             if( pImp->IsFileChanged() )
                 nErr = ERR_TXTBLOCK_NEWFILE_ERROR;
             else
-                nErr = pImp->OpenFile( sal_False );
+                nErr = pImp->OpenFile( false );
             bOk = 0 == nErr;
         }
         if( bOk )
@@ -496,7 +496,7 @@ sal_uInt16 SwTextBlocks::PutText( const OUString& rShort, const OUString& rName,
                     pImp->aNames[ nIdx ]->aLong = rName;
                 else
                 {
-                    pImp->AddName( pImp->aShort, rName, sal_True );
+                    pImp->AddName( pImp->aShort, rName, true );
                     nIdx = pImp->GetIndex( pImp->aShort );
                 }
                 if( !pImp->bInPutMuchBlocks )
@@ -533,22 +533,22 @@ OUString SwTextBlocks::GetFileName() const
     return pImp->GetFileName();
 }
 
-sal_Bool SwTextBlocks::IsReadOnly() const
+bool SwTextBlocks::IsReadOnly() const
 {
     return pImp->bReadOnly;
 }
 
-sal_Bool SwTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
+bool SwTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( pImp && !pImp->bInPutMuchBlocks )
     {
         SwBlockName* pBlkNm = const_cast<SwBlockName*>( pImp->aNames[ nIdx ] );
         if( !pBlkNm->bIsOnlyTxtFlagInit &&
-            !pImp->IsFileChanged() && !pImp->OpenFile( sal_True ) )
+            !pImp->IsFileChanged() && !pImp->OpenFile( true ) )
         {
             pBlkNm->bIsOnlyTxt = pImp->IsOnlyTextBlock( pBlkNm->aShort );
-            pBlkNm->bIsOnlyTxtFlagInit = sal_True;
+            pBlkNm->bIsOnlyTxtFlagInit = true;
             pImp->CloseFile();
         }
         bRet = pBlkNm->bIsOnlyTxt;
@@ -556,7 +556,7 @@ sal_Bool SwTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
     return bRet;
 }
 
-sal_Bool SwTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
+bool SwTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
 {
     sal_uInt16 nIdx = pImp->GetIndex( rShort );
     if( USHRT_MAX != nIdx )
@@ -567,38 +567,38 @@ sal_Bool SwTextBlocks::IsOnlyTextBlock( const OUString& rShort ) const
     }
 
     OSL_ENSURE( !this, "ungueltiger Name" );
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwTextBlocks::GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl )
+bool SwTextBlocks::GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if ( pImp && !pImp->bInPutMuchBlocks )
         bRet = ( 0 == pImp->GetMacroTable( nIdx, rMacroTbl ) );
     return bRet;
 }
 
-sal_Bool SwTextBlocks::SetMacroTable( sal_uInt16 nIdx,
+bool SwTextBlocks::SetMacroTable( sal_uInt16 nIdx,
                                 const SvxMacroTableDtor& rMacroTbl )
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if ( pImp && !pImp->bInPutMuchBlocks )
         bRet = ( 0 == pImp->SetMacroTable( nIdx, rMacroTbl ) );
     return bRet;
 }
 
-sal_Bool SwTextBlocks::StartPutMuchBlockEntries()
+bool SwTextBlocks::StartPutMuchBlockEntries()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !IsOld() && pImp )
-        bRet = pImp->PutMuchEntries( sal_True );
+        bRet = pImp->PutMuchEntries( true );
     return bRet;
 }
 
 void SwTextBlocks::EndPutMuchBlockEntries()
 {
     if( pImp )
-        pImp->PutMuchEntries( sal_False );
+        pImp->PutMuchEntries( false );
 }
 
 OUString SwTextBlocks::GetBaseURL() const
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 2342ac9fd293..90110110a00a 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -81,7 +81,7 @@ the undo object to notify, maybe empty
 @return sal_True for compatibility reasons with OldMerge(..)
 */
 
-sal_Bool SwTable::NewMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
+bool SwTable::NewMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
      const SwSelBoxes& rMerged, SwTableBox*, SwUndoTblMerge* pUndo )
 {
     if( pUndo )
@@ -89,7 +89,7 @@ sal_Bool SwTable::NewMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     DeleteSel( pDoc, rBoxes, &rMerged, 0, true, true );
 
     CHECK_TABLE( *this )
-    return sal_True;
+    return true;
 }
 
 /** lcl_CheckMinMax helps evaluating (horizontal) min/max of boxes
@@ -1086,7 +1086,7 @@ static void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, Sw
 */
 
 static void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt,
-    sal_Bool bSameHeight )
+    bool bSameHeight )
 {
     SwSelBoxes aBoxes;
     lcl_getAllMergedBoxes( rTable, aBoxes, rBox );
@@ -1397,8 +1397,8 @@ static sal_uInt16 lcl_LineIndex( const SwTable& rTable, const SwSelBoxes& rBoxes
 /** SwTable::NewSplitRow(..) splits all selected boxes horizontally.
 */
 
-sal_Bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
-    sal_Bool bSameHeight )
+bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
+                           bool bSameHeight )
 {
     CHECK_TABLE( *this )
     ++nCnt;
@@ -1446,7 +1446,7 @@ sal_Bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16
     else
     {
         aFndBox.DelFrms( *this );
-        bSameHeight = sal_False;
+        bSameHeight = false;
     }
     if( !bSameHeight )
     {
@@ -1476,7 +1476,7 @@ sal_Bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16
     //Layout updaten
     aFndBox.MakeFrms( *this );
 
-    return sal_True;
+    return true;
 }
 
 /** SwTable::InsertRow(..) inserts one or more rows before or behind the selected
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 2b4354dc368e..1607856404de 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -75,7 +75,7 @@ TYPEINIT1( SwTableLineFmt, SwFrmFmt );
 #define COLFUZZY 20
 
 void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
-                    sal_Bool bChgAlign,sal_uLong nNdPos );
+                    bool bChgAlign, sal_uLong nNdPos );
 
 class SwTableBox_Impl
 {
@@ -249,7 +249,7 @@ SwTable::SwTable( SwTableFmt* pFmt )
     nGrfsThatResize( 0 ),
     nRowsToRepeat( 1 ),
     bModifyLocked( false ),
-    bNewModel( sal_True )
+    bNewModel( true )
 {
     // default value set in the options
     eTblChgMode = (TblChgMode)GetTblChgDefaultMode();
@@ -416,14 +416,14 @@ static void lcl_RefreshHidden( SwTabCols &rToFill, size_t nPos )
     {
         if ( std::abs(static_cast<long>(nPos) - rToFill[i]) <= COLFUZZY )
         {
-            rToFill.SetHidden( i, sal_False );
+            rToFill.SetHidden( i, false );
             break;
         }
     }
 }
 
 static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
-                   const SwFrmFmt *pTabFmt, const sal_Bool bHidden,
+                   const SwFrmFmt *pTabFmt, const bool bHidden,
                    const bool bRefreshHidden )
 {
     const long nWish = pTabFmt->GetFrmSize().GetWidth();
@@ -545,7 +545,7 @@ static void lcl_ProcessBoxGet( const SwTableBox *pBox, SwTabCols &rToFill,
         }
     }
     else
-        ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, sal_False, bRefreshHidden );
+        ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, false, bRefreshHidden );
 }
 
 static void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill,
@@ -555,7 +555,7 @@ static void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill,
     {
         const SwTableBox *pBox = pLine->GetTabBoxes()[i];
         if ( pBox->GetSttNd() )
-            ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, sal_True, false );
+            ::lcl_SortedTabColInsert( rToFill, pBox, pTabFmt, true, false );
         else
             for ( sal_uInt16 j = 0; j < pBox->GetTabLines().size(); ++j )
                 ::lcl_ProcessLineGet( pBox->GetTabLines()[j], rToFill, pTabFmt );
@@ -563,7 +563,7 @@ static void lcl_ProcessLineGet( const SwTableLine *pLine, SwTabCols &rToFill,
 }
 
 void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
-              sal_Bool bRefreshHidden, sal_Bool bCurRowOnly ) const
+              bool bRefreshHidden, bool bCurRowOnly ) const
 {
     // Optimization: if bHidden is set, we only update the Hidden Array.
     if ( bRefreshHidden )
@@ -579,7 +579,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
 
         // All are hidden, so add the visible ones.
         for ( size_t i = 0; i < rToFill.Count(); ++i )
-            rToFill.SetHidden( i, sal_True );
+            rToFill.SetHidden( i, true );
     }
     else
     {
@@ -616,7 +616,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
         const SwTableBoxes &rBoxes2 = pLine->GetTabBoxes();
         for ( sal_uInt16 k = 0; k < rBoxes2.size(); ++k )
             ::lcl_SortedTabColInsert( rToFill, rBoxes2[k],
-                                      pTabFmt, sal_False, bRefreshHidden );
+                                      pTabFmt, false, bRefreshHidden );
         pLine = pLine->GetUpper() ? pLine->GetUpper()->GetUpper() : 0;
     }
 
@@ -862,7 +862,7 @@ static void lcl_AdjustBox( SwTableBox *pBox, const long nDiff, Parm &rParm )
 }
 
 void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
-                          const SwTableBox *pStart, sal_Bool bCurRowOnly )
+                          const SwTableBox *pStart, bool bCurRowOnly )
 {
     CHECK_TABLE( *this )
 
@@ -902,8 +902,8 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
             SwFmtHoriOrient aOri( pFmt->GetHoriOrient() );
             if(text::HoriOrientation::NONE != aOri.GetHoriOrient())
             {
-                const sal_Bool bLeftDist = rNew.GetLeft() != nShLeft;
-                const sal_Bool bRightDist = rNew.GetRight() + nShRight != rNew.GetRightMax();
+                const bool bLeftDist = rNew.GetLeft() != nShLeft;
+                const bool bRightDist = rNew.GetRight() + nShRight != rNew.GetRightMax();
                 if(!bLeftDist && !bRightDist)
                     aOri.SetHoriOrient( text::HoriOrientation::FULL );
                 else if(!bRightDist && rNew.GetLeft() > nShLeft )
@@ -1206,7 +1206,7 @@ static void lcl_CalcNewWidths( std::list<sal_uInt16> &rSpanPos, ChangeList& rCha
 }
 
 void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
-    const SwTabCols &rOld, const SwTableBox *pStart, sal_Bool bCurRowOnly )
+    const SwTabCols &rOld, const SwTableBox *pStart, bool bCurRowOnly )
 {
 #if OSL_DEBUG_LEVEL > 1
     static int nCallCount = 0;
@@ -1327,7 +1327,7 @@ static bool lcl_IsValidRowName( const OUString& rStr )
 
 // #i80314#
 // add 3rd parameter and its handling
-sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, sal_Bool bFirstPart,
+sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, bool bFirstPart,
                             const bool bPerformValidCheck )
 {
     sal_uInt16 nRet = 0;
@@ -1403,7 +1403,7 @@ const SwTableBox* SwTable::GetTblBox( const OUString& rName,
                 --nBox;
         }
 
-        nLine = SwTable::_GetBoxNum( aNm, sal_False, bPerformValidCheck );
+        nLine = SwTable::_GetBoxNum( aNm, false, bPerformValidCheck );
 
         // determine line
         if( !nLine || nLine > pLines->size() )
@@ -1583,7 +1583,7 @@ void SwTableLine::ChgFrmFmt( SwTableLineFmt *pNewFmt )
                 if ( bInFirstNonHeadlineRow || bInFollowFlowRow )
                     pTab = pTab->FindMaster();
 
-                pTab->SetRemoveFollowFlowLinePending( sal_True );
+                pTab->SetRemoveFollowFlowLinePending( true );
                 pTab->InvalidatePos();
             }
         }
@@ -1719,8 +1719,8 @@ SwTableBoxFmt* SwTableBox::CheckBoxFmt( SwTableBoxFmt* pFmt )
 {
     // We might need to create a new format here, because the box must be
     // added to the format solely if pFmt has a value or formular.
-    if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) ||
-        SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_FORMULA, sal_False ) )
+    if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_VALUE, false ) ||
+        SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_FORMULA, false ) )
     {
         SwTableBox* pOther = SwIterator<SwTableBox,SwFmt>::FirstElement( *pFmt );
         if( pOther )
@@ -1789,7 +1789,7 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt )
             pCell->InvalidateSize();
             pCell->_InvalidatePrt();
             pCell->SetCompletePaint();
-            pCell->SetDerivedVert( sal_False );
+            pCell->SetDerivedVert( false );
             pCell->CheckDirChange();
 
             // #i47489#
@@ -1869,10 +1869,10 @@ OUString SwTableBox::GetName() const
     return sNm;
 }
 
-sal_Bool SwTableBox::IsInHeadline( const SwTable* pTbl ) const
+bool SwTableBox::IsInHeadline( const SwTable* pTbl ) const
 {
     if( !GetUpper() )           // should only happen upon merge.
-        return sal_False;
+        return false;
 
     if( !pTbl )
         pTbl = &pSttNd->FindTableNode()->GetTable();
@@ -1957,13 +1957,13 @@ void SwTable::SetHTMLTableLayout( SwHTMLTableLayout *p )
 }
 
 void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
-                    sal_Bool bChgAlign )
+                    bool bChgAlign )
 {
-    sal_uLong nNdPos = rBox.IsValidNumTxtNd( sal_True );
+    sal_uLong nNdPos = rBox.IsValidNumTxtNd( true );
     ChgTextToNum( rBox,rTxt,pCol,bChgAlign,nNdPos);
 }
 void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
-                    sal_Bool bChgAlign,sal_uLong nNdPos )
+                    bool bChgAlign,sal_uLong nNdPos )
 {
 
     if( ULONG_MAX != nNdPos )
@@ -2064,7 +2064,7 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
         // assign vertical orientation
         if( bChgAlign &&
             ( SFX_ITEM_SET != rBox.GetFrmFmt()->GetItemState(
-                RES_VERT_ORIENT, sal_True, &pItem ) ||
+                RES_VERT_ORIENT, true, &pItem ) ||
                 text::VertOrientation::TOP == ((SwFmtVertOrient*)pItem)->GetVertOrient() ))
         {
             rBox.GetFrmFmt()->SetFmtAttr( SwFmtVertOrient( 0, text::VertOrientation::BOTTOM ));
@@ -2074,12 +2074,12 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
 
 void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
 {
-    sal_uLong nNdPos = rBox.IsValidNumTxtNd( sal_False );
+    sal_uLong nNdPos = rBox.IsValidNumTxtNd( false );
     if( ULONG_MAX != nNdPos )
     {
         SwDoc* pDoc = rBox.GetFrmFmt()->GetDoc();
         SwTxtNode* pTNd = pDoc->GetNodes()[ nNdPos ]->GetTxtNode();
-        sal_Bool bChgAlign = pDoc->IsInsTblAlignNum();
+        bool bChgAlign = pDoc->IsInsTblAlignNum();
         const SfxPoolItem* pItem;
 
         Color* pCol = 0;
@@ -2153,7 +2153,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
         // assign vertical orientation
         if( bChgAlign &&
             SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState(
-            RES_VERT_ORIENT, sal_False, &pItem ) &&
+            RES_VERT_ORIENT, false, &pItem ) &&
             text::VertOrientation::BOTTOM == ((SwFmtVertOrient*)pItem)->GetVertOrient() )
         {
             rBox.GetFrmFmt()->SetFmtAttr( SwFmtVertOrient( 0, text::VertOrientation::TOP ));
@@ -2204,9 +2204,9 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         {
             GetDoc()->SetFieldsDirty(true, NULL, 0);
 
-            if( SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMAT, sal_False ) ||
-                SFX_ITEM_SET == GetItemState( RES_BOXATR_VALUE, sal_False ) ||
-                SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMULA, sal_False ) )
+            if( SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMAT, false ) ||
+                SFX_ITEM_SET == GetItemState( RES_BOXATR_VALUE, false ) ||
+                SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMULA, false ) )
             {
                 // fetch the box
                 SwIterator<SwTableBox,SwFmt> aIter( *this );
@@ -2221,13 +2221,13 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         nNewFmt = pNewFmt->GetValue();
                         // new formatting
                         // is it newer or has the current been removed?
-                        if( SFX_ITEM_SET != GetItemState( RES_BOXATR_VALUE, sal_False ))
+                        if( SFX_ITEM_SET != GetItemState( RES_BOXATR_VALUE, false ))
                             pNewFmt = 0;
                     }
                     else
                     {
                         // fetch the current Item
-                        GetItemState( RES_BOXATR_FORMAT, sal_False,
+                        GetItemState( RES_BOXATR_FORMAT, false,
                                             (const SfxPoolItem**)&pNewFmt );
                         nOldFmt = GetTblBoxNumFmt().GetValue();
                         nNewFmt = pNewFmt ? pNewFmt->GetValue() : nOldFmt;
@@ -2239,7 +2239,7 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         if( NUMBERFORMAT_TEXT != nNewFmt )
                         {
                             if( SFX_ITEM_SET == GetItemState(
-                                                RES_BOXATR_VALUE, sal_False ))
+                                                RES_BOXATR_VALUE, false ))
                                 nOldFmt = NUMBERFORMAT_TEXT;
                             else
                                 nNewFmt = NUMBERFORMAT_TEXT;
@@ -2267,10 +2267,10 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                         bool bChgTxt = true;
                         double fVal = 0;
                         if( !pNewVal && SFX_ITEM_SET != GetItemState(
-                            RES_BOXATR_VALUE, sal_False, (const SfxPoolItem**)&pNewVal ))
+                            RES_BOXATR_VALUE, false, (const SfxPoolItem**)&pNewVal ))
                         {
                             // so far, no value has been set, so try to evaluate the content
-                            sal_uLong nNdPos = pBox->IsValidNumTxtNd( sal_True );
+                            sal_uLong nNdPos = pBox->IsValidNumTxtNd( true );
                             if( ULONG_MAX != nNdPos )
                             {
                                 sal_uInt32 nTmpFmtIdx = nNewFmt;
@@ -2285,7 +2285,7 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
                                     // JP 22.04.98: Bug 49659 -
                                     //  Special casing for percent
-                                    sal_Bool bIsNumFmt = sal_False;
+                                    bool bIsNumFmt = false;
                                     if( NUMBERFORMAT_PERCENT ==
                                         pNumFmtr->GetType( nNewFmt ))
                                     {
@@ -2354,11 +2354,11 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     SwFrmFmt::Modify( pOld, pNew );
 }
 
-sal_Bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
-                            sal_Bool& rIsEmptyTxtNd ) const
+bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
+                            bool& rIsEmptyTxtNd ) const
 {
-    sal_Bool bRet = sal_False;
-    sal_uLong nNdPos = IsValidNumTxtNd( sal_True );
+    bool bRet = false;
+    sal_uLong nNdPos = IsValidNumTxtNd( true );
     if( ULONG_MAX != nNdPos )
     {
         OUString aTxt( pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->
@@ -2370,7 +2370,7 @@ sal_Bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
 
         const SfxPoolItem* pItem;
         if( SFX_ITEM_SET == GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT,
-                sal_False, &pItem ))
+                false, &pItem ))
         {
             rFmtIndex = ((SwTblBoxNumFormat*)pItem)->GetValue();
             // Special casing for percent
@@ -2389,29 +2389,29 @@ sal_Bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
         bRet = pNumFmtr->IsNumberFormat( aTxt, rFmtIndex, rNum );
     }
     else
-        rIsEmptyTxtNd = sal_False;
+        rIsEmptyTxtNd = false;
     return bRet;
 }
 
-sal_Bool SwTableBox::IsNumberChanged() const
+bool SwTableBox::IsNumberChanged() const
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
 
-    if( SFX_ITEM_SET == GetFrmFmt()->GetItemState( RES_BOXATR_FORMULA, sal_False ))
+    if( SFX_ITEM_SET == GetFrmFmt()->GetItemState( RES_BOXATR_FORMULA, false ))
     {
         const SwTblBoxNumFormat *pNumFmt;
         const SwTblBoxValue *pValue;
 
-        if( SFX_ITEM_SET != GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, sal_False,
+        if( SFX_ITEM_SET != GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, false,
             (const SfxPoolItem**)&pValue ))
             pValue = 0;
-        if( SFX_ITEM_SET != GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT, sal_False,
+        if( SFX_ITEM_SET != GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT, false,
             (const SfxPoolItem**)&pNumFmt ))
             pNumFmt = 0;
 
         sal_uLong nNdPos;
         if( pNumFmt && pValue &&
-            ULONG_MAX != ( nNdPos = IsValidNumTxtNd( sal_True ) ) )
+            ULONG_MAX != ( nNdPos = IsValidNumTxtNd( true ) ) )
         {
             OUString sNewTxt, sOldTxt( pSttNd->GetNodes()[ nNdPos ]->
                                     GetTxtNode()->GetRedlineTxt() );
@@ -2430,7 +2430,7 @@ sal_Bool SwTableBox::IsNumberChanged() const
     return bRet;
 }
 
-sal_uLong SwTableBox::IsValidNumTxtNd( sal_Bool bCheckAttr ) const
+sal_uLong SwTableBox::IsValidNumTxtNd( bool bCheckAttr ) const
 {
     sal_uLong nPos = ULONG_MAX;
     if( pSttNd )
@@ -2513,9 +2513,9 @@ sal_uInt16 SwTableBox::IsFormulaOrValueBox() const
     sal_uInt16 nWhich = 0;
     const SwTxtNode* pTNd;
     SwFrmFmt* pFmt = GetFrmFmt();
-    if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_FORMULA, sal_False ))
+    if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_FORMULA, false ))
         nWhich = RES_BOXATR_FORMULA;
-    else if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) &&
+    else if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_VALUE, false ) &&
             !pFmt->GetDoc()->GetNumberFormatter()->IsTextFormat(
                 pFmt->GetTblBoxNumFmt().GetValue() ))
         nWhich = RES_BOXATR_VALUE;
@@ -2531,15 +2531,15 @@ void SwTableBox::ActualiseValueBox()
 {
     const SfxPoolItem *pFmtItem, *pValItem;
     SwFrmFmt* pFmt = GetFrmFmt();
-    if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_FORMAT, sal_True, &pFmtItem )
-        && SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_VALUE, sal_True, &pValItem ))
+    if( SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_FORMAT, true, &pFmtItem )
+        && SFX_ITEM_SET == pFmt->GetItemState( RES_BOXATR_VALUE, true, &pValItem ))
     {
         const sal_uLong nFmtId = ((SwTblBoxNumFormat*)pFmtItem)->GetValue();
         sal_uLong nNdPos = ULONG_MAX;
         SvNumberFormatter* pNumFmtr = pFmt->GetDoc()->GetNumberFormatter();
 
         if( !pNumFmtr->IsTextFormat( nFmtId ) &&
-            ULONG_MAX != (nNdPos = IsValidNumTxtNd( sal_True )) )
+            ULONG_MAX != (nNdPos = IsValidNumTxtNd( true )) )
         {
             double fVal = ((SwTblBoxValue*)pValItem)->GetValue();
             Color* pCol = 0;
@@ -2548,7 +2548,7 @@ void SwTableBox::ActualiseValueBox()
 
             const OUString& rTxt = pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetTxt();
             if( rTxt != sNewTxt )
-                ChgTextToNum( *this, sNewTxt, pCol, sal_False ,nNdPos);
+                ChgTextToNum( *this, sNewTxt, pCol, false ,nNdPos);
         }
     }
 }
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 79346409a0e1..da2fc68e2ec9 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1409,7 +1409,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
     if( bFieldInfo && ( nWidth30 < nX || bRightOver || bLeftOver ||
         ( pPor->InNumberGrp() && !pPor->IsFtnNumPortion() ) ||
         ( pPor->IsMarginPortion() && nWidth > nX + 30 ) ) )
-        ((SwCrsrMoveState*)pCMS)->bPosCorr = sal_True;
+        ((SwCrsrMoveState*)pCMS)->bPosCorr = true;
 
     // #i27615#
     if (pCMS)
@@ -1418,7 +1418,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
         {
             if (! (2 * nX < nWidth && pPor->InNumberGrp() &&
                    !pPor->IsFtnNumPortion()))
-                pCMS->bInFrontOfLabel = sal_False;
+                pCMS->bInFrontOfLabel = false;
         }
     }
 
@@ -1430,16 +1430,16 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
         if( pCMS )
         {
             if( pPor->IsFlyPortion() && bFieldInfo )
-                ((SwCrsrMoveState*)pCMS)->bPosCorr = sal_True;
+                ((SwCrsrMoveState*)pCMS)->bPosCorr = true;
 
             if (!bRightOver && nX)
             {
                 if( pPor->IsFtnNumPortion())
-                    ((SwCrsrMoveState*)pCMS)->bFtnNoInfo = sal_True;
+                    ((SwCrsrMoveState*)pCMS)->bFtnNoInfo = true;
                 else if (pPor->InNumberGrp() ) // #i23726#
                 {
                     ((SwCrsrMoveState*)pCMS)->nInNumPostionOffset = nX;
-                    ((SwCrsrMoveState*)pCMS)->bInNumPortion = sal_True;
+                    ((SwCrsrMoveState*)pCMS)->bInNumPortion = true;
                 }
             }
         }
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index df3bd3f7bcc7..1b1024d8b1ab 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -140,8 +140,8 @@ SwTOXMark::SwTOXMark()
     , SwModify( 0 )
     ,
     pTxtAttr( 0 ), nLevel( 0 ),
-    bAutoGenerated(sal_False),
-    bMainEntry(sal_False)
+    bAutoGenerated(false),
+    bMainEntry(false)
 {
 }
 
@@ -150,8 +150,8 @@ SwTOXMark::SwTOXMark( const SwTOXType* pTyp )
     , SwModify( const_cast<SwTOXType*>(pTyp) )
     ,
     pTxtAttr( 0 ), nLevel( 0 ),
-    bAutoGenerated(sal_False),
-    bMainEntry(sal_False)
+    bAutoGenerated(false),
+    bMainEntry(false)
 {
 }
 
@@ -264,11 +264,11 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy)
 SwForm::SwForm( TOXTypes eTyp ) // #i21237#
     : eType( eTyp ), nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )),
 //  nFirstTabPos( lNumIndent ),
-    bCommaSeparated(sal_False)
+    bCommaSeparated(false)
 {
     //bHasFirstTabPos =
-    bGenerateTabPos = sal_False;
-    bIsRelTabPos = sal_True;
+    bGenerateTabPos = false;
+    bIsRelTabPos = true;
 
     // The table of contents has a certain number of headlines + headings
     // The user has 10 levels + headings
@@ -417,7 +417,7 @@ void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
             continue;
         }
 
-        const SvxTabStopItem* pTabStops = pColl != NULL ? &pColl->GetTabStops(sal_False) : 0;
+        const SvxTabStopItem* pTabStops = pColl != NULL ? &pColl->GetTabStops(false) : 0;
         const sal_uInt16 nTabCount = pTabStops != NULL ? pTabStops->Count() : 0;
         if( pTabStops != NULL
             && nTabCount != 0 )
@@ -480,19 +480,19 @@ SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm,
     , nCreateType(nCreaType)
     , nOLEOptions(0)
     , eCaptionDisplay(CAPTION_COMPLETE)
-    , bProtected( sal_True )
-    , bFromChapter(sal_False)
-    , bFromObjectNames(sal_False)
-    , bLevelFromChapter(sal_False)
+    , bProtected( true )
+    , bFromChapter(false)
+    , bFromObjectNames(false)
+    , bLevelFromChapter(false)
     , maMSTOCExpression()
-    , mbKeepExpression(sal_True)
+    , mbKeepExpression(true)
 {
     aData.nOptions = 0;
 }
 
 SwTOXBase::SwTOXBase( const SwTOXBase& rSource, SwDoc* pDoc )
     : SwClient( rSource.GetRegisteredInNonConst() )
-    , mbKeepExpression(sal_True)
+    , mbKeepExpression(true)
 {
     CopyTOXBase( pDoc, rSource );
 }
@@ -665,7 +665,7 @@ OUString SwFormToken::GetString() const
             sData += OUString::number( nTabStopPosition ) + ","
                   +  OUString::number( static_cast< sal_Int32 >(eTabAlign) ) + ","
                   +  OUString(cTabFillChar) + ","
-                  +  OUString::number( bWithTab );
+                  +  OUString::number( bWithTab ? 1 : 0 );
             break;
         case TOKEN_CHAPTER_INFO:
         case TOKEN_ENTRY_NO:
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 8c7a78655b25..26aeb734c1c1 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -57,7 +57,7 @@ OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rTxt,
     return sRet;
 }
 
-OUString IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
+OUString IndexEntrySupplierWrapper::GetFollowingText( bool bMorePages ) const
 {
     OUString sRet;
     try {
@@ -85,11 +85,11 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local
     return sRet;
 }
 
-sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
+bool IndexEntrySupplierWrapper::LoadAlgorithm(
         const ::com::sun::star::lang::Locale& rLcl,
         const OUString& sSortAlgorithm, long nOptions ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try {
         bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
     }
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index d72c4d3c3851..faf2b81581b5 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -115,7 +115,7 @@ SwFmtFld::~SwFmtFld()
     // bei einige FeldTypen muessen wir den FeldTypen noch loeschen
     if( pType && pType->IsLastDepend() )
     {
-        sal_Bool bDel = sal_False;
+        bool bDel = false;
         switch( pType->Which() )
         {
         case RES_USERFLD:
@@ -290,7 +290,7 @@ bool SwFmtFld::IsFldInDoc() const
            && mpTxtFld->IsFldInDoc();
 }
 
-sal_Bool SwFmtFld::IsProtect() const
+bool SwFmtFld::IsProtect() const
 {
     return mpTxtFld != NULL
            && mpTxtFld->GetpTxtNode() != NULL
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 173314fac52a..5176b30c2db4 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -176,7 +176,7 @@ void SwFmtFtn::GetFtnText( OUString& rStr ) const
 }
 
     // returnt den anzuzeigenden String der Fuss-/Endnote
-OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, sal_Bool bInclStrings ) const
+OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, bool bInclStrings ) const
 {
     OUString sRet( GetNumStr() );
     if( sRet.isEmpty() )
@@ -239,7 +239,7 @@ SwTxtFtn::~SwTxtFtn()
     SetStartNode( 0 );
 }
 
-void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, sal_Bool bDelNode )
+void SwTxtFtn::SetStartNode( const SwNodeIndex *pNewNode, bool bDelNode )
 {
     if( pNewNode )
     {
@@ -362,7 +362,7 @@ void SwTxtFtn::CopyFtn(
         SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() );
         sal_uLong  nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1;
 
-        m_pTxtNode->GetDoc()->CopyWithFlyInFly( aRg, 0, aEnd, NULL, sal_True );
+        m_pTxtNode->GetDoc()->CopyWithFlyInFly( aRg, 0, aEnd, NULL, true );
 
         // in case the destination section was not empty, delete the old nodes
         // before:   Src: SxxxE,  Dst: SnE
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index f1d35c2743b0..f0bb2d00d4a9 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -490,7 +490,7 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal,
             const uno::Type& rType = ::getBooleanCppuType();
             if(rVal.hasValue() && rVal.getValueType() == rType)
             {
-                sal_Bool bAbove = *(sal_Bool*)rVal.getValue();
+                bool bAbove = *(sal_Bool*)rVal.getValue();
                 nPosition = bAbove ? 0 : 1;
             }
         }
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index d935ec72f7a5..104c8ccc8c25 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -69,7 +69,7 @@ long SwFntObj::nPixWidth;
 MapMode* SwFntObj::pPixMap = NULL;
 OutputDevice* SwFntObj::pPixOut = NULL;
 
-extern sal_uInt16 UnMapDirection( sal_uInt16 nDir, const sal_Bool bVertFormat );
+extern sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool bVertFormat );
 sal_uInt16 GetDefaultFontHeight( SwDrawTextInfo &rInf )
 {
     SwDocShell* pDocShell = rInf.GetShell()->GetDoc()->GetDocShell();
@@ -171,15 +171,15 @@ struct CalcLinePosData
     SwDrawTextInfo& rInf;
     Font& rFont;
     sal_Int32 nCnt;
-    const sal_Bool bSwitchH2V;
-    const sal_Bool bSwitchL2R;
+    const bool bSwitchH2V;
+    const bool bSwitchL2R;
     long nHalfSpace;
     sal_Int32* pKernArray;
-    const sal_Bool bBidiPor;
+    const bool bBidiPor;
 
     CalcLinePosData( SwDrawTextInfo& _rInf, Font& _rFont,
-                      sal_Int32 _nCnt, const sal_Bool _bSwitchH2V, const sal_Bool _bSwitchL2R,
-                      long _nHalfSpace, sal_Int32* _pKernArray, const sal_Bool _bBidiPor) :
+                      sal_Int32 _nCnt, const bool _bSwitchH2V, const bool _bSwitchL2R,
+                      long _nHalfSpace, sal_Int32* _pKernArray, const bool _bBidiPor) :
         rInf( _rInf ),
         rFont( _rFont ),
         nCnt( _nCnt ),
@@ -855,11 +855,11 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     // HACK: UNDERLINE_WAVE must not be abused any more, hence the grey wave
     // line of the ExtendedAttributeSets will appear in the font color first
 
-    const sal_Bool bSwitchH2V = rInf.GetFrm() && rInf.GetFrm()->IsVertical();
+    const bool bSwitchH2V = rInf.GetFrm() && rInf.GetFrm()->IsVertical();
     const bool bSwitchL2R = rInf.GetFrm() && rInf.GetFrm()->IsRightToLeft() &&
                             ! rInf.IsIgnoreFrmRTL();
     const sal_uLong nMode = rInf.GetOut().GetLayoutMode();
-    const sal_Bool bBidiPor = ( bSwitchL2R !=
+    const bool bBidiPor = ( bSwitchL2R !=
                             ( 0 != ( TEXT_LAYOUT_BIDI_RTL & nMode ) ) );
 
     // be sure to have the correct layout mode at the printer
@@ -884,7 +884,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     }
 
     Color aOldColor( pTmpFont->GetColor() );
-    sal_Bool bChgColor = rInf.ApplyAutoColor( pTmpFont );
+    bool bChgColor = rInf.ApplyAutoColor( pTmpFont );
     if( !pTmpFont->IsSameInstance( rInf.GetOut().GetFont() ) )
         rInf.GetOut().SetFont( *pTmpFont );
     if ( bChgColor )
@@ -1330,7 +1330,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
             const long nTmpWidth = GetTextSize( rInf ).Width();
 
             const Color aSaveColor( pTmpFont->GetColor() );
-            const sal_Bool bColorChanged = rInf.ApplyAutoColor( pTmpFont );
+            const bool bColorChanged = rInf.ApplyAutoColor( pTmpFont );
 
             if( bColorChanged )
             {
@@ -1354,9 +1354,9 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
         const OUString* pStr = &rInf.GetText();
         OUString aStr;
         OUString aBulletOverlay;
-        sal_Bool bBullet = rInf.GetBullet();
+        bool bBullet = rInf.GetBullet();
         if( bSymbol )
-            bBullet = sal_False;
+            bBullet = false;
         sal_Int32 *pKernArray = new sal_Int32[ rInf.GetLen() ];
         CreateScrFont( *rInf.GetShell(), rInf.GetOut() );
         long nScrPos;
@@ -2171,7 +2171,7 @@ sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
 
 SwFntAccess::SwFntAccess( const void* &rMagic,
                 sal_uInt16 &rIndex, const void *pOwn, SwViewShell *pSh,
-                sal_Bool bCheck ) :
+                bool bCheck ) :
   SwCacheAccess( *pFntCache, rMagic, rIndex ),
   pShell( pSh )
 {
@@ -2186,7 +2186,7 @@ SwFntAccess::SwFntAccess( const void* &rMagic,
     }
     else
     {   // Font not known, must be searched
-        bCheck = sal_False;
+        bCheck = false;
     }
 
     {
@@ -2479,7 +2479,7 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
 
 extern Color aGlobalRetoucheColor;
 
-sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont )
+bool SwDrawTextInfo::ApplyAutoColor( Font* pFont )
 {
     const Font& rFnt = pFont ? *pFont : GetOut().GetFont();
     bool bPrt = GetShell() && ! GetShell()->GetWin();
@@ -2526,7 +2526,7 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont )
                 /// OD 21.08.2002 #99657#
                 ///     There is a user defined setting for the background, if there
                 ///     is a background brush and its color is *not* "no fill"/"auto fill".
-                if( GetFrm()->GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, sal_False ) )
+                if( GetFrm()->GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, false ) )
                 {
                     if ( !pCol )
                     {
@@ -2598,10 +2598,10 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont )
                 GetOut().SetOverlineColor( aNewColor );
         }
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index e4b0d23b38fd..47fe0bd1248e 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -137,7 +137,7 @@ Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf )
     Point aPos;
     rInf.SetPos( aPos );
     rInf.SetSpace( 0 );
-    rInf.SetDrawSpace( sal_False );
+    rInf.SetDrawSpace( false );
     SwDoGetCapitalSize aDo( rInf );
     DoOnCapitals( aDo );
     Size aTxtSize( aDo.GetSize() );
@@ -213,13 +213,13 @@ sal_Int32 SwFont::GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut,
     // Start:
     Point aPos( 0, 0 );
     SwDrawTextInfo aInfo(pSh, *(OutputDevice*)pOut, pScript, rTxt, nIdx, nLen,
-        0, sal_False);
+        0, false);
     aInfo.SetPos( aPos );
     aInfo.SetSpace( 0 );
     aInfo.SetWrong( NULL );
     aInfo.SetGrammarCheck( NULL );
     aInfo.SetSmartTags( NULL );
-    aInfo.SetDrawSpace( sal_False );
+    aInfo.SetDrawSpace( false );
     aInfo.SetKern( CheckKerning() );
     aInfo.SetKanaComp( pScript ? 0 : 100 );
     aInfo.SetFont( this );
@@ -259,8 +259,8 @@ void SwDoDrawCapital::Do()
         pUpperFnt->DrawText( rInf );
     else
     {
-        sal_Bool bOldBullet = rInf.GetBullet();
-        rInf.SetBullet( sal_False );
+        bool bOldBullet = rInf.GetBullet();
+        rInf.SetBullet( false );
         pLowerFnt->DrawText( rInf );
         rInf.SetBullet( bOldBullet );
     }
@@ -282,7 +282,7 @@ void SwDoDrawCapital::DrawSpace( Point &rPos )
        rInf.GetFrm()->SwitchLTRtoRTL( aPos );
 
     const sal_uLong nMode = rInf.GetpOut()->GetLayoutMode();
-    const sal_Bool bBidiPor = ( bSwitchL2R !=
+    const bool bBidiPor = ( bSwitchL2R !=
                             ( 0 != ( TEXT_LAYOUT_BIDI_RTL & nMode ) ) );
 
     if ( bBidiPor )
@@ -350,7 +350,7 @@ void SwDoCapitalCrsrOfst::Do()
                                      rInf.GetScriptInfo(),
                                      rInf.GetText(),
                                      rInf.GetIdx(),
-                                     rInf.GetLen(), 0, sal_False );
+                                     rInf.GetLen(), 0, false );
             aDrawInf.SetOfst( nOfst );
             aDrawInf.SetKern( rInf.GetKern() );
             aDrawInf.SetKanaComp( rInf.GetKanaComp() );
@@ -379,7 +379,7 @@ sal_Int32 SwSubFont::GetCapitalCrsrOfst( SwDrawTextInfo& rInf )
     SwDoCapitalCrsrOfst aDo( rInf, rInf.GetOfst() );
     Point aPos;
     rInf.SetPos( aPos );
-    rInf.SetDrawSpace( sal_False );
+    rInf.SetDrawSpace( false );
     DoOnCapitals( aDo );
     rInf.SetKern( nOldKern );
     return aDo.GetCrsr();
@@ -424,7 +424,7 @@ void SwDoDrawStretchCapital::Do()
         rInf.ApplyAutoColor();
 
         Point aPos( rInf.GetPos() );
-        const sal_Bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() &&
+        const bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() &&
                               ! rInf.IsIgnoreFrmRTL();
 
         if ( bSwitchL2R )
@@ -484,7 +484,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
     // text is different. If yes, do special handling.
     OUString aNewText;
     SwCapitalInfo aCapInf(oldText);
-    sal_Bool bCaseMapLengthDiffers(aTxt.getLength() != oldText.getLength());
+    bool bCaseMapLengthDiffers(aTxt.getLength() != oldText.getLength());
     if ( bCaseMapLengthDiffers )
         rDo.SetCapInf( aCapInf );
 
@@ -499,10 +499,10 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
     SwSubFont aFont( *this );
     Point aStartPos( rDo.GetInf().GetPos() );
 
-    const sal_Bool bTextLines = aFont.GetUnderline() != UNDERLINE_NONE
+    const bool bTextLines = aFont.GetUnderline() != UNDERLINE_NONE
                          || aFont.GetOverline()  != UNDERLINE_NONE
                          || aFont.GetStrikeout() != STRIKEOUT_NONE;
-    const sal_Bool bWordWise = bTextLines && aFont.IsWordLineMode() &&
+    const bool bWordWise = bTextLines && aFont.IsWordLineMode() &&
                            rDo.GetInf().GetDrawSpace();
     const long nTmpKern = rDo.GetInf().GetKern();
 
@@ -510,7 +510,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
     {
         if ( bWordWise )
         {
-            aFont.SetWordLineMode( sal_False );
+            aFont.SetWordLineMode( false );
             pSpaceFontAccess = new SwFntAccess( pMagic2, nIndex2, &aFont,
                                                 rDo.GetInf().GetShell() );
             pSpaceFont = pSpaceFontAccess->Get();
@@ -594,7 +594,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
                 rDo.GetInf().SetLen( nPos - nOldPos );
             }
 
-            rDo.GetInf().SetUpper( sal_False );
+            rDo.GetInf().SetUpper( false );
             rDo.GetInf().SetOut( *pOutSize );
             Size aPartSize = pSmallFont->GetTextSize( rDo.GetInf() );
             nKana += rDo.GetInf().GetKanaDiff();
@@ -622,7 +622,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
 
             do
             {
-                rDo.GetInf().SetUpper( sal_True );
+                rDo.GetInf().SetUpper( true );
                 pLastFont = pBigFont;
                 pLastFont->SetDevFont( rDo.GetInf().GetShell(), rDo.GetOut() );
                 sal_Int32 nTmp;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 0de9a3cbec9d..3fe745125946 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -470,7 +470,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
         if ( IsInCache() )
         {
             SwFrm::GetCache().Delete( this );
-            SetInCache( sal_False );
+            SetInCache( false );
         }
 
         UnlockModify(); // Benachrichtigungen wieder freischalten
@@ -687,7 +687,7 @@ SwCntntNode *SwTxtNode::JoinNext()
         if( pTxtNode->HasAnyIndex() )
         {
             // alle Crsr/StkCrsr/UnoCrsr aus dem Loeschbereich verschieben
-            pDoc->CorrAbs( aIdx, SwPosition( *this ), nOldLen, sal_True );
+            pDoc->CorrAbs( aIdx, SwPosition( *this ), nOldLen, true );
         }
         rNds.Delete(aIdx);
         SetWrong( pList, false );
@@ -781,7 +781,7 @@ SwCntntNode *SwTxtNode::JoinPrev()
         if( pTxtNode->HasAnyIndex() )
         {
             // alle Crsr/StkCrsr/UnoCrsr aus dem Loeschbereich verschieben
-            pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, sal_True );
+            pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, true );
         }
         rNds.Delete(aIdx);
         SetWrong( pList, false );
@@ -892,8 +892,8 @@ void SwTxtNode::Update(
             const sal_uInt16 coArrSz =
                 static_cast<sal_uInt16>(RES_TXTATR_WITHEND_END) - static_cast<sal_uInt16>(RES_CHRATR_BEGIN);
 
-            sal_Bool aDontExp[ coArrSz ];
-            memset( &aDontExp, 0, coArrSz * sizeof(sal_Bool) );
+            bool aDontExp[ coArrSz ];
+            memset( &aDontExp, 0, coArrSz * sizeof(bool) );
 
             for ( sal_uInt16 n = 0; n < m_pSwpHints->Count(); ++n )
             {
@@ -946,12 +946,12 @@ void SwTxtNode::Update(
                             {
                                 bNoExp = true;
                                 aDontExp[ static_cast<sal_uInt16>(RES_TXTATR_CHARFMT) - static_cast<sal_uInt16>(RES_CHRATR_BEGIN) ]
-                                    = sal_True;
+                                    = true;
                                 aDontExp[ static_cast<sal_uInt16>(RES_TXTATR_INETFMT) - static_cast<sal_uInt16>(RES_CHRATR_BEGIN) ]
-                                    = sal_True;
+                                    = true;
                             }
                             else
-                                aDontExp[ nWhPos ] = sal_True;
+                                aDontExp[ nWhPos ] = true;
                         }
                         else if( bNoExp )
                         {
@@ -2440,7 +2440,7 @@ SwNumRule* SwTxtNode::_GetNumRule(bool bInParent) const
             SwTxtFmtColl* pColl = GetTxtColl();
             if ( pColl )
             {
-                const SwNumRuleItem& rDirectItem = pColl->GetNumRule( sal_False );
+                const SwNumRuleItem& rDirectItem = pColl->GetNumRule( false );
                 if ( rDirectItem.GetValue().isEmpty() )
                 {
                     pRet = 0L;
@@ -2471,9 +2471,9 @@ void SwTxtNode::NumRuleChgd()
     if( IsInCache() )
     {
         SwFrm::GetCache().Delete( this );
-        SetInCache( sal_False );
+        SetInCache( false );
     }
-    SetInSwFntCache( sal_False );
+    SetInSwFntCache( false );
 
     // Sending "noop" modify in order to cause invalidations of registered
     // <SwTxtFrm> instances to get the list style change respectively the change
@@ -2580,7 +2580,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
         if( !bNext && bRemoveFromCache && IsInCache() )
         {
             SwFrm::GetCache().Delete( this );
-            SetInCache( sal_False );
+            SetInCache( false );
         }
     }
     SwNodes& rNds = GetNodes();
@@ -2625,7 +2625,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, bool bNext,
             if ( ClearItemsFromAttrSet( aClearWhichIds ) != 0 && IsInCache() )
             {
                 SwFrm::GetCache().Delete( this );
-                SetInCache( sal_False );
+                SetInCache( false );
             }
         }
     }
@@ -2764,7 +2764,7 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings,
         {
             return pRule->MakeNumString( GetNum()->GetNumberVector(),
                                      _bInclPrefixAndSuffixStrings ? sal_True : sal_False,
-                                     sal_False,
+                                     false,
                                      _nRestrictToThisLevel );
         }
     }
@@ -2991,8 +2991,8 @@ static void Replace0xFF(
     OUStringBuffer & rTxt,
     sal_Int32 & rTxtStt,
     sal_Int32 nEndPos,
-    sal_Bool const bExpandFlds,
-    sal_Bool const bExpandFtn = sal_True )
+    bool const bExpandFlds,
+    bool const bExpandFtn = true )
 {
     if (rNode.GetpSwpHints())
     {
@@ -3589,7 +3589,7 @@ namespace {
                 {
                     lcl_ResetParAttrs(rTxtNode);
                     // #i70748#
-                    if ( dynamic_cast<const SfxUInt16Item &>(rTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, sal_False )).GetValue() > 0 )
+                    if ( dynamic_cast<const SfxUInt16Item &>(rTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, false )).GetValue() > 0 )
                     {
                         rTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
                     }
@@ -4540,28 +4540,28 @@ namespace {
     // End of class <HandleSetAttrAtTxtNode>
 }
 
-sal_Bool SwTxtNode::SetAttr( const SfxPoolItem& pItem )
+bool SwTxtNode::SetAttr( const SfxPoolItem& pItem )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
     HandleSetAttrAtTxtNode aHandleSetAttr( *this, pItem );
 
-    sal_Bool bRet = SwCntntNode::SetAttr( pItem );
+    bool bRet = SwCntntNode::SetAttr( pItem );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
     return bRet;
 }
 
-sal_Bool SwTxtNode::SetAttr( const SfxItemSet& rSet )
+bool SwTxtNode::SetAttr( const SfxItemSet& rSet )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
     HandleSetAttrAtTxtNode aHandleSetAttr( *this, rSet );
 
-    sal_Bool bRet = SwCntntNode::SetAttr( rSet );
+    bool bRet = SwCntntNode::SetAttr( rSet );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
@@ -4809,7 +4809,7 @@ namespace {
             // #i70748#
             // #i105562#
             else if ( mrTxtNode.GetpSwAttrSet() &&
-                      dynamic_cast<const SfxUInt16Item &>(mrTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, sal_False )).GetValue() > 0 )
+                      dynamic_cast<const SfxUInt16Item &>(mrTxtNode.GetAttr( RES_PARATR_OUTLINELEVEL, false )).GetValue() > 0 )
             {
                 mrTxtNode.SetEmptyListStyleDueToSetOutlineLevelAttr();
             }
@@ -4840,28 +4840,28 @@ namespace {
     // End of class <HandleResetAttrAtTxtNode>
 }
 
-sal_Bool SwTxtNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwTxtNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
     HandleResetAttrAtTxtNode aHandleResetAttr( *this, nWhich1, nWhich2 );
 
-    sal_Bool bRet = SwCntntNode::ResetAttr( nWhich1, nWhich2 );
+    bool bRet = SwCntntNode::ResetAttr( nWhich1, nWhich2 );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
     return bRet;
 }
 
-sal_Bool SwTxtNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
+bool SwTxtNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
 {
     const bool bOldIsSetOrResetAttr( mbInSetOrResetAttr );
     mbInSetOrResetAttr = true;
 
     HandleResetAttrAtTxtNode aHandleResetAttr( *this, rWhichArr );
 
-    sal_Bool bRet = SwCntntNode::ResetAttr( rWhichArr );
+    bool bRet = SwCntntNode::ResetAttr( rWhichArr );
 
     mbInSetOrResetAttr = bOldIsSetOrResetAttr;
 
diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx
index 1d0e6fef5fb5..a27d15a1f93a 100644
--- a/sw/source/core/txtnode/swfntcch.cxx
+++ b/sw/source/core/txtnode/swfntcch.cxx
@@ -57,7 +57,7 @@ SwFontObj *SwFontAccess::Get( )
 
 SwCacheObj *SwFontAccess::NewObj( )
 {
-    ((SwTxtFmtColl*)pOwner)->SetInSwFntCache( sal_True );
+    ((SwTxtFmtColl*)pOwner)->SetInSwFntCache( true );
     return new SwFontObj( pOwner, pShell );
 }
 
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index dfbec390f10f..49a57b7d09f3 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -71,7 +71,7 @@ void SwFont::SetBackColor( Color* pNewColor )
 {
     delete pBackColor;
     pBackColor = pNewColor;
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -84,7 +84,7 @@ void SwFont::SetTopBorder( const editeng::SvxBorderLine* pTopBorder )
         m_aTopBorder = boost::none;
         m_nTopBorderDist = 0;
     }
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -97,7 +97,7 @@ void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder )
         m_aBottomBorder = boost::none;
         m_nBottomBorderDist = 0;
     }
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -110,7 +110,7 @@ void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder )
         m_aRightBorder = boost::none;
         m_nRightBorderDist = 0;
     }
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -123,7 +123,7 @@ void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder )
         m_aLeftBorder = boost::none;
         m_nLeftBorderDist = 0;
     }
-    bFntChg = sal_True;
+    bFntChg = true;
     aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
@@ -366,7 +366,7 @@ sal_uInt16 SwFont::CalcShadowSpace(
 }
 
 // maps directions for vertical layout
-sal_uInt16 MapDirection( sal_uInt16 nDir, const sal_Bool bVertFormat )
+sal_uInt16 MapDirection( sal_uInt16 nDir, const bool bVertFormat )
 {
     if ( bVertFormat )
     {
@@ -393,7 +393,7 @@ sal_uInt16 MapDirection( sal_uInt16 nDir, const sal_Bool bVertFormat )
 
 // maps the absolute direction set at the font to its logical conterpart
 // in the rotated environment
-sal_uInt16 UnMapDirection( sal_uInt16 nDir, const sal_Bool bVertFormat )
+sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool bVertFormat )
 {
     if ( bVertFormat )
     {
@@ -418,19 +418,19 @@ sal_uInt16 UnMapDirection( sal_uInt16 nDir, const sal_Bool bVertFormat )
     return nDir;
 }
 
-sal_uInt16 SwFont::GetOrientation( const sal_Bool bVertFormat ) const
+sal_uInt16 SwFont::GetOrientation( const bool bVertFormat ) const
 {
     return UnMapDirection( aSub[nActual].GetOrientation(), bVertFormat );
 }
 
-void SwFont::SetVertical( sal_uInt16 nDir, const sal_Bool bVertFormat )
+void SwFont::SetVertical( sal_uInt16 nDir, const bool bVertFormat )
 {
     // map direction if frame has vertical layout
     nDir = MapDirection( nDir, bVertFormat );
 
     if( nDir != aSub[0].GetOrientation() )
     {
-        bFntChg = sal_True;
+        bFntChg = true;
         aSub[0].SetVertical( nDir, bVertFormat );
         aSub[1].SetVertical( nDir, bVertFormat || nDir > 1000 );
         aSub[2].SetVertical( nDir, bVertFormat );
@@ -605,7 +605,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
             true, &pItem ))
             SetEmphasisMark( ((SvxEmphasisMarkItem*)pItem)->GetEmphasisMark() );
 
-        SetTransparent( sal_True );
+        SetTransparent( true );
         SetAlign( ALIGN_BASELINE );
         if( SFX_ITEM_SET == pAttrSet->GetItemState( RES_CHRATR_CONTOUR,
             true, &pItem ))
@@ -695,11 +695,11 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
     else
     {
         Invalidate();
-        bNoHyph = sal_False;
-        bBlink = sal_False;
+        bNoHyph = false;
+        bBlink = false;
     }
-    bPaintBlank = sal_False;
-    bPaintWrong = sal_False;
+    bPaintBlank = false;
+    bPaintWrong = false;
     OSL_ENSURE( aSub[SW_LATIN].IsTransparent(), "SwFont: Transparent revolution" );
 }
 
@@ -731,7 +731,7 @@ SwFont::SwFont( const SwFont &rFont )
     bFntChg = rFont.bFntChg;
     bOrgChg = rFont.bOrgChg;
     bPaintBlank = rFont.bPaintBlank;
-    bPaintWrong = sal_False;
+    bPaintWrong = false;
     bURL = rFont.bURL;
     bGreyWave = rFont.bGreyWave;
     bNoColReplace = rFont.bNoColReplace;
@@ -747,14 +747,14 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
     nRefCnt = 0;
     m_nMetaCount = 0;
     m_nInputFieldCount = 0;
-    bPaintBlank = sal_False;
-    bPaintWrong = sal_False;
-    bURL = sal_False;
-    bGreyWave = sal_False;
-    bNoColReplace = sal_False;
+    bPaintBlank = false;
+    bPaintWrong = false;
+    bURL = false;
+    bGreyWave = false;
+    bNoColReplace = false;
     bNoHyph = pAttrSet->GetNoHyphenHere().GetValue();
     bBlink = pAttrSet->GetBlink().GetValue();
-    bOrgChg = sal_True;
+    bOrgChg = true;
     {
         const SvxFontItem& rFont = pAttrSet->GetFont();
         aSub[SW_LATIN].SetFamily( rFont.GetFamily() );
@@ -816,7 +816,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
     SetEmphasisMark( pAttrSet->GetEmphasisMark().GetEmphasisMark() );
     SetStrikeout( pAttrSet->GetCrossedOut().GetStrikeout() );
     SetColor( pAttrSet->GetColor().GetValue() );
-    SetTransparent( sal_True );
+    SetTransparent( true );
     SetAlign( ALIGN_BASELINE );
     SetOutline( pAttrSet->GetContour().GetValue() );
     SetShadow( pAttrSet->GetShadowed().GetValue() );
@@ -949,7 +949,7 @@ SwFont& SwFont::operator=( const SwFont &rFont )
     bFntChg = rFont.bFntChg;
     bOrgChg = rFont.bOrgChg;
     bPaintBlank = rFont.bPaintBlank;
-    bPaintWrong = sal_False;
+    bPaintWrong = false;
     bURL = rFont.bURL;
     bGreyWave = rFont.bGreyWave;
     bNoColReplace = rFont.bNoColReplace;
@@ -961,20 +961,20 @@ SwFont& SwFont::operator=( const SwFont &rFont )
 void SwFont::GoMagic( SwViewShell *pSh, sal_uInt8 nWhich )
 {
     SwFntAccess aFntAccess( aSub[nWhich].pMagic, aSub[nWhich].nFntIndex,
-                            &aSub[nWhich], pSh, sal_True );
+                            &aSub[nWhich], pSh, true );
 }
 
-sal_Bool SwSubFont::IsSymbol( SwViewShell *pSh )
+bool SwSubFont::IsSymbol( SwViewShell *pSh )
 {
-    SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, sal_False );
+    SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, false );
     return aFntAccess.Get()->IsSymbol();
 }
 
-sal_Bool SwSubFont::ChgFnt( SwViewShell *pSh, OutputDevice& rOut )
+bool SwSubFont::ChgFnt( SwViewShell *pSh, OutputDevice& rOut )
 {
     if ( pLastFont )
         pLastFont->Unlock();
-    SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, sal_True );
+    SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, true );
     SV_STAT( nChangeFont );
 
     pLastFont = aFntAccess.Get();
@@ -999,7 +999,7 @@ void SwFont::ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut )
         aSub[nActual].nOrgHeight = aFntAccess.Get()->GetFontHeight( pSh, rOut );
         aSub[nActual].nOrgAscent = aFntAccess.Get()->GetFontAscent( pSh, rOut );
         SetProportion( nOldProp );
-        bOrgChg = sal_False;
+        bOrgChg = false;
     }
 
     if( bFntChg )
@@ -1163,7 +1163,7 @@ Size SwSubFont::_GetTxtSize( SwDrawTextInfo& rInf )
     return aTxtSize;
 }
 
-void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey )
+void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey )
 {
     rInf.SetGreyWave( bGrey );
     sal_Int32 nLn = rInf.GetText().getLength();
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 1d398b9aab04..60336fb18174 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1276,7 +1276,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                     // des Zeichens. Sonst muesste das immer  ausserhalb
                     // erfolgen (Fehleranfaellig !)
                     const SwFmtAnchor* pAnchor = 0;
-                    pFmt->GetItemState( RES_ANCHOR, sal_False,
+                    pFmt->GetItemState( RES_ANCHOR, false,
                         (const SfxPoolItem**)&pAnchor );
 
                     SwIndex aIdx( this, *pAttr->GetStart() );
@@ -1699,7 +1699,7 @@ void SwTxtNode::DeleteAttributes(
                 // Check if character format contains hidden attribute:
                 const SwCharFmt* pFmt = pTxtHt->GetCharFmt().GetCharFmt();
                 const SfxPoolItem* pItem;
-                if ( SFX_ITEM_SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, sal_True, &pItem ) )
+                if ( SFX_ITEM_SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) )
                     SetCalcHiddenCharFlags();
             }
             // #i75430# Recalc hidden flags if necessary
@@ -2963,7 +2963,7 @@ bool SwpHints::TryInsertHint(
         // Check if character format contains hidden attribute:
         const SwCharFmt* pFmt = pHint->GetCharFmt().GetCharFmt();
         const SfxPoolItem* pItem;
-        if ( SFX_ITEM_SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, sal_True, &pItem ) )
+        if ( SFX_ITEM_SET == pFmt->GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) )
             rNode.SetCalcHiddenCharFlags();
 
         ((SwTxtCharFmt*)pHint)->ChgTxtNode( &rNode );
@@ -3030,7 +3030,7 @@ bool SwpHints::TryInsertHint(
             // gehts ins normale Nodes-Array?
             if( rNode.GetNodes().IsDocNodes() )
             {
-                sal_Bool bInsFldType = sal_False;
+                bool bInsFldType = false;
                 switch( pFld->GetTyp()->Which() )
                 {
                 case RES_SETEXPFLD:
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index c0714c4e21b2..c8f8daa56c37 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -185,7 +185,7 @@ bool SwTxtINetFmt::GetInfo( SfxPoolItem& rInfo ) const
     return false;
 }
 
-sal_Bool SwTxtINetFmt::IsProtect( ) const
+bool SwTxtINetFmt::IsProtect( ) const
 {
     return m_pTxtNode && m_pTxtNode->IsProtect();
 }
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 3373a75e9e22..8ed3059f7342 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -184,7 +184,7 @@ static SwRect lcl_CalculateRepaintRect( SwTxtFrm& rTxtFrm, sal_Int32 nChgStart,
     SwNodeIndex aNdIdx( *pNode );
     SwPosition aPos( aNdIdx, SwIndex( pNode, nChgEnd ) );
     SwCrsrMoveState aTmpState( MV_NONE );
-    aTmpState.b2Lines = sal_True;
+    aTmpState.b2Lines = true;
     rTxtFrm.GetCharRect( aRect, aPos, &aTmpState );
     // information about end of repaint area
     Sw2LinesPos* pEnd2Pos = aTmpState.p2Lines;
@@ -697,7 +697,7 @@ OUString SwTxtNode::GetCurWord( sal_Int32 nPos ) const
 
 SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
     const LanguageType* pLang, const ModelToViewHelper& rConvMap,
-    sal_uInt16 nType, sal_Int32 nStart, sal_Int32 nEnde, sal_Bool bClp )
+    sal_uInt16 nType, sal_Int32 nStart, sal_Int32 nEnde, bool bClp )
     : rNode( rNd )
     , aPreDashReplacementText(rTxt)
     , pLanguage( pLang )
@@ -786,7 +786,7 @@ namespace
     }
 }
 
-sal_Bool SwScanner::NextWord()
+bool SwScanner::NextWord()
 {
     nBegin = nBegin + nLen;
     Boundary aBound;
@@ -822,7 +822,7 @@ sal_Bool SwScanner::NextWord()
         }
 
         if ( nBegin >= aText.getLength() || nBegin >= nEndPos )
-            return sal_False;
+            return false;
 
         // get the word boundaries
         aBound = g_pBreakIt->GetBreakIter()->getWordBoundary( aText, nBegin,
@@ -838,7 +838,7 @@ sal_Bool SwScanner::NextWord()
 
         //no word boundaries could be found
         if(aBound.endPos == aBound.startPos)
-            return sal_False;
+            return false;
 
         //if a word before is found it has to be searched for the next
         if(aBound.endPos == nBegin)
@@ -909,14 +909,14 @@ sal_Bool SwScanner::NextWord()
     }
 
     if( ! nLen )
-        return sal_False;
+        return false;
 
     if ( nWordType == i18n::WordType::WORD_COUNT )
         nLen = forceEachAsianCodePointToWord(aText, nBegin, nLen);
 
     aWord = aPreDashReplacementText.copy( nBegin, nLen );
 
-    return sal_True;
+    return true;
 }
 
 sal_uInt16 SwTxtNode::Spell(SwSpellArgs* pArgs)
@@ -1164,7 +1164,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
                 pEditShell->Push();             // save current cursor on stack
                 pEditShell->SetSelection( aCurPaM );
                 bool bIsAsianScript = (SCRIPTTYPE_ASIAN == pEditShell->GetScriptType());
-                pEditShell->Pop( sal_False );   // restore cursor from stack
+                pEditShell->Pop( false );   // restore cursor from stack
 
                 if (!bIsAsianScript && rArgs.bAllowImplicitChangesForNotConvertibleText)
                 {
@@ -1316,7 +1316,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV
             // within the word
             LanguageType eActLang = aScanner.GetCurrentLanguage();
 
-            sal_Bool bSpell = xSpell.is() ? xSpell->hasLanguage( eActLang ) : sal_False;
+            bool bSpell = xSpell.is() ? xSpell->hasLanguage( eActLang ) : sal_False;
             if( bSpell && !rWord.isEmpty() )
             {
                 // check for: bAlter => xHyphWord.is()
diff --git a/sw/source/core/uibase/app/appenv.cxx b/sw/source/core/uibase/app/appenv.cxx
index 50acd4ada9e2..afce13a19041 100644
--- a/sw/source/core/uibase/app/appenv.cxx
+++ b/sw/source/core/uibase/app/appenv.cxx
@@ -266,7 +266,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
             // Here it goes (insert)
             pSh->StartUndo(UNDO_UI_INSERT_ENVELOPE, NULL);
             pSh->StartAllAction();
-            pSh->SttEndDoc(sal_True);
+            pSh->SttEndDoc(true);
 
             if (bEnvChange)
             {
@@ -274,8 +274,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
                 pFollow = pSh->GetPageDesc(pSh->GetCurPageDesc()).GetFollow();
 
                 // Delete text from the first page
-                if ( !pSh->SttNxtPg(sal_True) )
-                    pSh->EndPg(sal_True);
+                if ( !pSh->SttNxtPg(true) )
+                    pSh->EndPg(true);
                 pSh->DelRight();
                 // Delete frame of the first page
                 if ( pSh->GotoFly(sSendMark) )
@@ -288,7 +288,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
                     pSh->EnterSelFrmMode();
                     pSh->DelRight();
                 }
-                pSh->SttEndDoc(sal_True);
+                pSh->SttEndDoc(true);
             }
             else
                 // Followup template: page 1
@@ -298,21 +298,21 @@ void SwModule::InsertEnv( SfxRequest& rReq )
             if ( pSh->IsCrsrInTbl() )
             {
                 pSh->SplitNode();
-                pSh->Right( CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+                pSh->Right( CRSR_SKIP_CHARS, false, 1, false );
                 SfxItemSet aBreakSet( pSh->GetAttrPool(), RES_BREAK, RES_BREAK, 0 );
                 aBreakSet.Put( SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
                 pSh->SetTblAttr( aBreakSet );
             }
             else
                 pSh->InsertPageBreak(0, boost::none);
-            pSh->SttEndDoc(sal_True);
+            pSh->SttEndDoc(true);
         }
         else
         {
             pFollow = &pSh->GetPageDesc(pSh->GetCurPageDesc());
             // Let's go (print)
             pSh->StartAllAction();
-            pSh->DoUndo(sal_False);
+            pSh->DoUndo(false);
 
             // Again, copy the new collections "Sender" and "Receiver" to
             // a new document
@@ -374,10 +374,10 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         rFmt.SetFmtAttr(aULMargin);
 
         // Header and footer
-        rFmt.SetFmtAttr(SwFmtHeader(sal_False));
-        pDesc->ChgHeaderShare(sal_False);
-        rFmt.SetFmtAttr(SwFmtFooter(sal_False));
-        pDesc->ChgFooterShare(sal_False);
+        rFmt.SetFmtAttr(SwFmtHeader(false));
+        pDesc->ChgHeaderShare(false);
+        rFmt.SetFmtAttr(SwFmtFooter(false));
+        pDesc->ChgFooterShare(false);
 
         // Page numbering
         pDesc->SetUseOn(nsUseOnPage::PD_ALL);
@@ -403,14 +403,14 @@ void SwModule::InsertEnv( SfxRequest& rReq )
 
         sal_uInt16 nPos;
         pSh->FindPageDescByName( pDesc->GetName(),
-                                    sal_False,
+                                    false,
                                     &nPos );
 
         pSh->ChgPageDesc( nPos, *pDesc);
         pSh->ChgCurPageDesc(*pDesc);
 
         // Insert Frame
-        SwFlyFrmAttrMgr aMgr(sal_False, pSh, FRMMGR_TYPE_ENVELP);
+        SwFlyFrmAttrMgr aMgr(false, pSh, FRMMGR_TYPE_ENVELP);
         SwFldMgr aFldMgr;
         aMgr.SetHeightSizeType(ATT_VAR_SIZE);
 
@@ -422,7 +422,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         // Sender
         if (rItem.bSend)
         {
-            pSh->SttEndDoc(sal_True);
+            pSh->SttEndDoc(true);
             aMgr.InsertFlyFrm(FLY_AT_PAGE,
                 Point(rItem.lSendFromLeft + lLeft, rItem.lSendFromTop  + lUpper),
                 Size (rItem.lAddrFromLeft - rItem.lSendFromLeft, 0));
@@ -437,7 +437,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         }
 
         // Addressee
-        pSh->SttEndDoc(sal_True);
+        pSh->SttEndDoc(true);
 
         aMgr.InsertFlyFrm(FLY_AT_PAGE,
             Point(rItem.lAddrFromLeft + lLeft, rItem.lAddrFromTop  + lUpper),
@@ -454,12 +454,12 @@ void SwModule::InsertEnv( SfxRequest& rReq )
             pSh->SetPageObjsNewPage(aFlyArr, 1);
 
         // Finished
-        pSh->SttEndDoc(sal_True);
+        pSh->SttEndDoc(true);
 
         pSh->EndAllAction();
 
         if (nMode == ENV_NEWDOC)
-            pSh->DoUndo(sal_True);
+            pSh->DoUndo(true);
         else
             pSh->EndUndo(UNDO_UI_INSERT_ENVELOPE);
 
diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx
index b1149cac780f..502a336d633a 100644
--- a/sw/source/core/uibase/app/apphdl.cxx
+++ b/sw/source/core/uibase/app/apphdl.cxx
@@ -130,7 +130,7 @@ void SwModule::StateOther(SfxItemSet &rSet)
     sal_uInt16 nWhich = aIter.FirstWhich();
 
     SwView* pActView = ::GetActiveView();
-    sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pActView);
+    bool bWebView = 0 != PTR_CAST(SwWebView, pActView);
 
     while(nWhich)
     {
@@ -300,7 +300,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
             nRestartPage = m_pView->GetMailMergeRestartPage();
             if(m_pView->IsMailMergeSourceView())
                 m_pMMConfig->SetSourceView( m_pView );
-            m_pView->SetMailMergeConfigItem(0, 0, sal_True);
+            m_pView->SetMailMergeConfigItem(0, 0, true);
             SfxViewFrame* pViewFrame = m_pView->GetViewFrame();
             pViewFrame->ShowChildWindow(FN_MAILMERGE_CHILDWINDOW, false);
             OSL_ENSURE(m_pMMConfig, "no MailMergeConfigItem available");
@@ -613,7 +613,7 @@ void SwModule::ExecOther(SfxRequest& rReq)
                 case FUNIT_POINT:
                 {
                     SwView* pActView = ::GetActiveView();
-                    sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pActView);
+                    bool bWebView = 0 != PTR_CAST(SwWebView, pActView);
                     ::SetDfltMetric(eUnit, bWebView);
                 }
                 break;
@@ -624,7 +624,7 @@ void SwModule::ExecOther(SfxRequest& rReq)
 
         case FN_SET_MODOPT_TBLNUMFMT:
             {
-                sal_Bool bWebView = 0 != PTR_CAST(SwWebView, ::GetActiveView() ),
+                bool bWebView = 0 != PTR_CAST(SwWebView, ::GetActiveView() ),
                      bSet;
 
                 if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(
@@ -707,7 +707,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     {
         if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME))
         {
-            ::GetGlossaries()->UpdateGlosPath( sal_False );
+            ::GetGlossaries()->UpdateGlosPath( false );
             SwGlossaryList* pList = ::GetGlossaryList();
             if(pList->IsActive())
                 pList->Update();
@@ -758,7 +758,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
 {
     if( pBrdCst == pUserOptions )
     {
-        bAuthorInitialised = sal_False;
+        bAuthorInitialised = false;
     }
     else if ( pBrdCst == pColorConfig || pBrdCst == pAccessibilityOptions )
     {
@@ -861,18 +861,18 @@ SvtUserOptions& SwModule::GetUserOptions()
     return *pUserOptions;
 }
 
-const SwMasterUsrPref *SwModule::GetUsrPref(sal_Bool bWeb) const
+const SwMasterUsrPref *SwModule::GetUsrPref(bool bWeb) const
 {
     SwModule* pNonConstModule = (SwModule*)this;
     if(bWeb && !pWebUsrPref)
     {
         // The SpellChecker is needed in SwMasterUsrPref's Load, but it must not
         // be created there #58256#
-        pNonConstModule->pWebUsrPref = new SwMasterUsrPref(sal_True);
+        pNonConstModule->pWebUsrPref = new SwMasterUsrPref(true);
     }
     else if(!bWeb && !pUsrPref)
     {
-        pNonConstModule->pUsrPref = new SwMasterUsrPref(sal_False);
+        pNonConstModule->pUsrPref = new SwMasterUsrPref(false);
     }
     return  bWeb ? pWebUsrPref : pUsrPref;
 }
diff --git a/sw/source/core/uibase/app/applab.cxx b/sw/source/core/uibase/app/applab.cxx
index db2951ebab16..20078757761a 100644
--- a/sw/source/core/uibase/app/applab.cxx
+++ b/sw/source/core/uibase/app/applab.cxx
@@ -98,7 +98,7 @@ static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem
                                text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
     aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist,
                                text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
-    const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True,  &rFmt );  // Insert Fly
+    const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, true,  &rFmt );  // Insert Fly
     OSL_ENSURE( pFmt, "Fly not inserted" );
 
     rSh.UnSelectFrm();  //Frame was selected automatically
@@ -113,7 +113,7 @@ static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem
         if ( fnSetActGroup )
             (*fnSetActGroup)( rItem.sGlossaryGroup );
         SwGlossaryHdl* pGlosHdl = rSh.GetView().GetGlosHdl();
-        pGlosHdl->SetCurGroup(rItem.sGlossaryGroup, sal_True);
+        pGlosHdl->SetCurGroup(rItem.sGlossaryGroup, true);
         pGlosHdl->InsertGlossary( rItem.sGlossaryBlockName );
     }
 
@@ -122,7 +122,7 @@ static const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem
 
 static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem,
                         SwFrmFmt &rFmt, SwFldMgr& rFldMgr,
-                        sal_uInt16 nCol, sal_uInt16 nRow, sal_Bool bLast )
+                        sal_uInt16 nCol, sal_uInt16 nRow, bool bLast )
 {
     SfxItemSet aSet(rSh.GetAttrPool(), RES_ANCHOR, RES_ANCHOR,
                         RES_VERT_ORIENT, RES_VERT_ORIENT, RES_HORI_ORIENT, RES_HORI_ORIENT, 0 );
@@ -135,7 +135,7 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte
                                text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
     aSet.Put( SwFmtVertOrient( rItem.lUpper + nRow * rItem.lVDist,
                                text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ) );
-    const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, sal_True,  &rFmt );  // Insert Fly
+    const SwFrmFmt *pFmt = rSh.NewFlyFrm(aSet, true,  &rFmt );  // Insert Fly
     OSL_ENSURE( pFmt, "Fly not inserted" );
 
     rSh.UnSelectFrm();  //Frame was selected automatically
@@ -154,7 +154,7 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte
     return pFmt;
 }
 
-void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
+void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
 {
     static sal_uInt16 nLabelTitleNo = 0;
     static sal_uInt16 nBCTitleNo = 0;
@@ -234,7 +234,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
 
             SET_CURR_SHELL(pSh);
             pSh->SetLabelDoc(rItem.bSynchron);
-            pSh->DoUndo( sal_False );
+            pSh->DoUndo( false );
             pSh->StartAllAction();
 
             pSh->SetNewDoc();       // Avoid performance problems
@@ -253,10 +253,10 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
             rFmt.SetFmtAttr(aULMargin);
 
             // Header and footer
-            rFmt.SetFmtAttr(SwFmtHeader(sal_Bool(sal_False)));
-            aDesc.ChgHeaderShare(sal_False);
-            rFmt.SetFmtAttr(SwFmtFooter(sal_Bool(sal_False)));
-            aDesc.ChgFooterShare(sal_False);
+            rFmt.SetFmtAttr(SwFmtHeader(false));
+            aDesc.ChgHeaderShare(false);
+            rFmt.SetFmtAttr(SwFmtFooter(false));
+            aDesc.ChgFooterShare(false);
 
             aDesc.SetUseOn(nsUseOnPage::PD_ALL);                // Site numbering
 
@@ -286,7 +286,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
 
             // Insert frame
             boost::scoped_ptr<SwFldMgr> pFldMgr(new SwFldMgr);
-            pFldMgr->SetEvalExpFlds(sal_False);
+            pFldMgr->SetEvalExpFlds(false);
 
             // Prepare border template
             SwFrmFmt* pFmt = pSh->GetFrmFmtFromPool( RES_POOLFRM_LABEL );
@@ -329,11 +329,11 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
                                 // dont leave the fly!!!
                                 pSh->Push();
                                 pSh->SttDoc();
-                                sal_Bool bInFly = 0 != pSh->WizzardGetFly();
+                                bool bInFly = 0 != pSh->WizzardGetFly();
                                 pSh->Pop( bInFly );
 
                                 if( bInFly )
-                                    pSh->EndDoc(sal_True);  // select all content
+                                    pSh->EndDoc(true);  // select all content
                                                         // in the fly
                                 else
                                     pSh->SetMark();     // set only the mark
@@ -355,10 +355,10 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
                             aSect.SetProtectFlag(true);
                             pSh->Insert(".");   // Dummytext to allocate the Section
                             pSh->SttDoc();
-                            pSh->EndDoc(sal_True);  // Select everything in the frame
+                            pSh->EndDoc(true);  // Select everything in the frame
                             pSh->InsertSection(aSect);
                         }
-                        pSh->Pop( sal_False );
+                        pSh->Pop( false );
                     }
                 }
             }
@@ -367,7 +367,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
                 pFirstFlyFmt = bLabel ?
                     lcl_InsertLabText( *pSh, rItem, *pFmt, *pFldMgr,
                             static_cast< sal_uInt16 >(rItem.nCol - 1),
-                            static_cast< sal_uInt16 >(rItem.nRow - 1), sal_True ) :
+                            static_cast< sal_uInt16 >(rItem.nRow - 1), true ) :
                     lcl_InsertBCText(*pSh, rItem, *pFmt,
                             static_cast< sal_uInt16 >(rItem.nCol - 1),
                             static_cast< sal_uInt16 >(rItem.nRow - 1));
@@ -382,16 +382,16 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
                 SwLabDlgUpdateFieldInformation(xModel, rItem);
             }
 
-            pFldMgr->SetEvalExpFlds(sal_True);
+            pFldMgr->SetEvalExpFlds(true);
             pFldMgr->EvalExpFlds(pSh);
 
             pFldMgr.reset();
 
             if (pFirstFlyFmt)
-                pSh->GotoFly(pFirstFlyFmt->GetName(), FLYCNTTYPE_ALL, sal_False);
+                pSh->GotoFly(pFirstFlyFmt->GetName(), FLYCNTTYPE_ALL, false);
 
             pSh->EndAllAction();
-            pSh->DoUndo( sal_True );
+            pSh->DoUndo( true );
         }
 
         if( rItem.aWriting.indexOf( '<' ) >= 0 )
diff --git a/sw/source/core/uibase/app/appopt.cxx b/sw/source/core/uibase/app/appopt.cxx
index 8917790e1396..9af525d744ad 100644
--- a/sw/source/core/uibase/app/appopt.cxx
+++ b/sw/source/core/uibase/app/appopt.cxx
@@ -263,12 +263,12 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
 
         if(!aViewOpt.IsViewMetaChars())
         {
-            if(     (!aViewOpt.IsTab( sal_True ) &&  pDocDispItem->bTab) ||
-                    (!aViewOpt.IsBlank( sal_True ) && pDocDispItem->bSpace) ||
-                    (!aViewOpt.IsParagraph( sal_True ) && pDocDispItem->bParagraphEnd) ||
-                    (!aViewOpt.IsLineBreak( sal_True ) && pDocDispItem->bManualBreak) )
+            if(     (!aViewOpt.IsTab( true ) &&  pDocDispItem->bTab) ||
+                    (!aViewOpt.IsBlank( true ) && pDocDispItem->bSpace) ||
+                    (!aViewOpt.IsParagraph( true ) && pDocDispItem->bParagraphEnd) ||
+                    (!aViewOpt.IsLineBreak( true ) && pDocDispItem->bManualBreak) )
             {
-                aViewOpt.SetViewMetaChars(sal_True);
+                aViewOpt.SetViewMetaChars(true);
                 if(pBindings)
                     pBindings->Invalidate(FN_VIEW_META_CHARS);
             }
@@ -350,7 +350,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
 
         aViewOpt.SetSnap( pGridItem->GetUseGridSnap() );
         aViewOpt.SetSynchronize(pGridItem->GetSynchronize());
-        if( aViewOpt.IsGridVisible() != (pGridItem->GetGridVisible() ? 1 : 0) )
+        if( aViewOpt.IsGridVisible() != pGridItem->GetGridVisible() )
             aViewOpt.SetGridVisible( pGridItem->GetGridVisible());
         Size aSize = Size( pGridItem->GetFldDrawX()  ,
                             pGridItem->GetFldDrawY()  );
diff --git a/sw/source/core/uibase/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx
index 240c8ead1514..e3c0e48947ef 100644
--- a/sw/source/core/uibase/app/docsh.cxx
+++ b/sw/source/core/uibase/app/docsh.cxx
@@ -146,7 +146,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
                                     SwCrsrShell *pCrsrShell,
                                     SwPaM* pPaM )
 {
-    sal_Bool bAPICall = sal_False;
+    bool bAPICall = false;
     const SfxPoolItem* pApiItem;
     const SfxItemSet* pMedSet;
     if( 0 != ( pMedSet = rMedium.GetItemSet() ) && SFX_ITEM_SET ==
@@ -283,7 +283,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
 
     delete pRdr;
 
-    SW_MOD()->SetEmbeddedLoadSave( sal_False );
+    SW_MOD()->SetEmbeddedLoadSave( false );
 
     SetError( nErr, OUString(  OSL_LOG_PREFIX  ) );
     bool bOk = !IsError( nErr );
@@ -329,16 +329,16 @@ bool SwDocShell::Save()
             {
                 WriterRef xWrt;
                 ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
-                xWrt->SetOrganizerMode( sal_True );
+                xWrt->SetOrganizerMode( true );
                 SwWriter aWrt( *GetMedium(), *pDoc );
                 nErr = aWrt.Write( xWrt );
-                xWrt->SetOrganizerMode( sal_False );
+                xWrt->SetOrganizerMode( false );
             }
             break;
 
         case SFX_CREATE_MODE_EMBEDDED:
             // Suppress SfxProgress, if we are Embedded
-            SW_MOD()->SetEmbeddedLoadSave( sal_True );
+            SW_MOD()->SetEmbeddedLoadSave( true );
             // no break;
 
         case SFX_CREATE_MODE_STANDARD:
@@ -359,11 +359,11 @@ bool SwDocShell::Save()
                 WriterRef xWrt;
                 ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt );
 
-                sal_Bool bLockedView(sal_False);
+                bool bLockedView(false);
                 if ( pWrtShell )
                 {
                     bLockedView = pWrtShell->IsViewLocked();
-                    pWrtShell->LockView( sal_True );    //lock visible section
+                    pWrtShell->LockView( true );    //lock visible section
                 }
 
                 SwWriter aWrt( *GetMedium(), *pDoc );
@@ -374,7 +374,7 @@ bool SwDocShell::Save()
             }
             break;
         }
-        SW_MOD()->SetEmbeddedLoadSave( sal_False );
+        SW_MOD()->SetEmbeddedLoadSave( false );
     }
     SetError( nErr ? nErr : nVBWarning, OUString(  OSL_LOG_PREFIX  ) );
 
@@ -470,7 +470,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
 
         // Remember and preserve Modified-Flag without calling the Link
         // (for OLE; after Statement from MM)
-        sal_Bool bIsModified = pDoc->IsModified();
+        bool bIsModified = pDoc->IsModified();
         pDoc->GetIDocumentUndoRedo().LockUndoNoModifiedPosition();
         Link aOldOLELnk( pDoc->GetOle2Link() );
         pDoc->SetOle2Link( Link() );
@@ -482,11 +482,11 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
         WriterRef xWrt;
         ::GetXMLWriter( aEmptyOUStr, rMedium.GetBaseURL( true ), xWrt );
 
-        sal_Bool bLockedView(sal_False);
+        bool bLockedView(false);
         if ( pWrtShell )
         {
             bLockedView = pWrtShell->IsViewLocked();
-            pWrtShell->LockView( sal_True );    //lock visible section
+            pWrtShell->LockView( true );    //lock visible section
         }
 
         SwWriter aWrt( rMedium, *pDoc );
@@ -502,7 +502,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
         }
         pDoc->SetOle2Link( aOldOLELnk );
 
-        SW_MOD()->SetEmbeddedLoadSave( sal_False );
+        SW_MOD()->SetEmbeddedLoadSave( false );
 
         // Increase RSID
         pDoc->setRsid( pDoc->getRsid() );
@@ -552,7 +552,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
 
     if( pDoc->ContainsMSVBasic() )
     {
-        sal_Bool bSave = pFlt->GetUserData() == "CWW8"
+        bool bSave = pFlt->GetUserData() == "CWW8"
              && SvtFilterOptions::Get().IsLoadWordBasicStorage();
 
         if ( bSave )
@@ -641,9 +641,9 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
             nSaveType = 2;
 
         // Change Flags of the Document accordingly
-        sal_Bool bIsHTMLModeSave = GetDoc()->get(IDocumentSettingAccess::HTML_MODE);
-        sal_Bool bIsGlobalDocSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT);
-        sal_Bool bIsGlblDocSaveLinksSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS);
+        bool bIsHTMLModeSave = GetDoc()->get(IDocumentSettingAccess::HTML_MODE);
+        bool bIsGlobalDocSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT);
+        bool bIsGlblDocSaveLinksSave = GetDoc()->get(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS);
         if( nMyType != nSaveType )
         {
             GetDoc()->set(IDocumentSettingAccess::HTML_MODE, 1 == nSaveType);
@@ -714,16 +714,16 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
     {
         SwWait aWait( *this, true );
         // #i106906#
-        const sal_Bool bFormerLockView = pWrtShell->IsViewLocked();
-        pWrtShell->LockView( sal_True );
+        const bool bFormerLockView = pWrtShell->IsViewLocked();
+        pWrtShell->LockView( true );
         pWrtShell->StartAllAction();
         pWrtShell->Push();
-        SwWriter aWrt( rMedium, *pWrtShell, sal_True );
+        SwWriter aWrt( rMedium, *pWrtShell, true );
         nErrno = aWrt.Write( xWriter, &aFileName );
         //JP 16.05.97: In case the SFX revokes the View while saving
         if( pWrtShell )
         {
-            pWrtShell->Pop(sal_False);
+            pWrtShell->Pop(false);
             pWrtShell->EndAllAction();
             // #i106906#
             pWrtShell->LockView( bFormerLockView );
@@ -745,7 +745,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
         }
     }
 
-    SW_MOD()->SetEmbeddedLoadSave( sal_False );
+    SW_MOD()->SetEmbeddedLoadSave( false );
     SetError( nErrno ? nErrno : nVBWarning, OUString(  OSL_LOG_PREFIX  ) );
     if( !rMedium.IsStorage() )
         rMedium.CloseOutStream();
@@ -769,7 +769,7 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor
 
     if( pOLEChildList )
     {
-        sal_Bool bResetModified = IsEnableSetModified();
+        bool bResetModified = IsEnableSetModified();
         if( bResetModified )
             EnableSetModified( false );
 
@@ -794,8 +794,8 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
                                sal_uInt16 nAspect )
 {
     //fix #25341# Draw should not affect the Modified
-    sal_Bool bResetModified;
-    if ( sal_True == (bResetModified = IsEnableSetModified()) )
+    bool bResetModified;
+    if ( (bResetModified = IsEnableSetModified()) )
         EnableSetModified( false );
 
     // When there is a JobSetup connected to the Document, we copy it to
@@ -818,7 +818,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
     pDev->SetFillColor();
     pDev->SetLineColor();
     pDev->SetBackground();
-    sal_Bool bWeb = 0 != PTR_CAST(SwWebDocShell, this);
+    bool bWeb = 0 != PTR_CAST(SwWebDocShell, this);
     SwPrintData aOpts;
     SwViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect );
     pDev->Pop();
@@ -850,7 +850,7 @@ void SwDocShell::SetVisArea( const Rectangle &rRect )
         aRect.Move( nMoveX, nMoveY );
 
         // Calls SfxInPlaceObject::SetVisArea()!
-        pView->SetVisArea( aRect, sal_True );
+        pView->SetVisArea( aRect, true );
     }
     else
         SfxObjectShell::SetVisArea( aRect );
@@ -864,7 +864,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const
         SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 1 );
         SwCntntNode* pNd = pDoc->GetNodes().GoNext( &aIdx );
 
-        const SwRect aPageRect = pNd->FindPageFrmRect( sal_False, 0, sal_False );
+        const SwRect aPageRect = pNd->FindPageFrmRect( false, 0, false );
         return aPageRect.SVRect();
     }
     return SfxObjectShell::GetVisArea( nAspect );
@@ -938,7 +938,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
         {
         case SID_PRINTPREVIEW:
         {
-            sal_Bool bDisable = IsInPlaceActive();
+            bool bDisable = IsInPlaceActive();
             // Disable "multiple layout"
             if ( !bDisable )
             {
@@ -948,7 +948,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
                     if ( PTR_CAST(SwView, pTmpFrm->GetViewShell()) &&
                          ((SwView*)pTmpFrm->GetViewShell())->GetWrtShell().GetViewOptions()->getBrowseMode() )
                     {
-                        bDisable = sal_True;
+                        bDisable = true;
                         break;
                     }
                     pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this);
@@ -970,7 +970,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
         {
             SfxViewShell* pCurrView = GetView() ? (SfxViewShell*)GetView()
                                         : SfxViewShell::Current();
-            sal_Bool bSourceView = 0 != PTR_CAST(SwSrcView, pCurrView);
+            bool bSourceView = 0 != PTR_CAST(SwSrcView, pCurrView);
             rSet.Put(SfxBoolItem(SID_SOURCEVIEW, bSourceView));
         }
         break;
@@ -996,7 +996,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
         case SID_BROWSER_MODE:
         case FN_PRINT_LAYOUT:
             {
-                sal_Bool bState = GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE);
+                bool bState = GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE);
                 if(FN_PRINT_LAYOUT == nWhich)
                     bState = !bState;
                 rSet.Put( SfxBoolItem( nWhich, bState));
@@ -1020,7 +1020,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
 
         case SID_ATTR_YEAR2000:
             {
-                const SvNumberFormatter* pFmtr = pDoc->GetNumberFormatter(sal_False);
+                const SvNumberFormatter* pFmtr = pDoc->GetNumberFormatter(false);
                 rSet.Put( SfxUInt16Item( nWhich,
                         static_cast< sal_uInt16 >(
                         pFmtr ? pFmtr->GetYear2000()
@@ -1038,9 +1038,9 @@ void SwDocShell::GetState(SfxItemSet& rSet)
             //pDoc->UpdateFlds( NULL, false );
             sfx2::LinkManager& rLnkMgr = pDoc->GetLinkManager();
             const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
-            sal_Bool bRet = sal_False;
+            bool bRet = false;
             if( !rLnks.empty() )
-                bRet = sal_True;
+                bRet = true;
             else
             {
                 //sections with hidden flag, hidden character attribute, hidden paragraph/text or conditional text fields
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index a75632cd3885..8cdac97949cb 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -146,7 +146,7 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
 
 // Disable "multiple layout"
 
-void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
+void SwDocShell::ToggleBrowserMode(bool bSet, SwView* _pView )
 {
     GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet );
     UpdateFontList();
@@ -169,7 +169,7 @@ void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
                 pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, false);
         }
         const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions();
-        pTempView->GetWrtShell().CheckBrowseView( sal_True );
+        pTempView->GetWrtShell().CheckBrowseView( true );
         pTempView->CheckVisArea();
         if( bSet )
         {
@@ -191,7 +191,7 @@ void SwDocShell::DoFlushDocInfo()
     bool bUnlockView(true);
     if ( pWrtShell ) {
         bUnlockView = !pWrtShell->IsViewLocked();
-        pWrtShell->LockView( sal_True );    // lock visible section
+        pWrtShell->LockView( true );    // lock visible section
         pWrtShell->StartAllAction();
     }
 
@@ -200,7 +200,7 @@ void SwDocShell::DoFlushDocInfo()
     if ( pWrtShell ) {
         pWrtShell->EndAllAction();
         if ( bUnlockView ) {
-            pWrtShell->LockView( sal_False );
+            pWrtShell->LockView( false );
         }
     }
 }
@@ -261,7 +261,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
         if( pWrtShell )
         {
             bUnlockView = !pWrtShell->IsViewLocked();
-            pWrtShell->LockView( sal_True );    //lock visible section
+            pWrtShell->LockView( true );    //lock visible section
             pWrtShell->StartAllAction();
         }
         switch( nAction )
@@ -297,7 +297,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
         {
             pWrtShell->EndAllAction();
             if( bUnlockView )
-                pWrtShell->LockView( sal_False );
+                pWrtShell->LockView( false );
         }
     }
 }
@@ -328,7 +328,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
     sal_uInt16 nWhich = rReq.GetSlot();
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     switch ( nWhich )
     {
         case SID_AUTO_CORRECT_DLG:
@@ -397,12 +397,12 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
         case SID_PRINTPREVIEW:
             {
-                sal_Bool bSet = sal_False;
+                bool bSet = false;
                 bool bFound = false, bOnly = true;
                 SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this);
                 SfxViewShell* pViewShell = SfxViewShell::Current();
                 SwView* pCurrView = dynamic_cast< SwView *> ( pViewShell );
-                sal_Bool bCurrent = IS_TYPE( SwPagePreview, pViewShell );
+                bool bCurrent = IS_TYPE( SwPagePreview, pViewShell );
 
                 while( pTmpFrm )    // search Preview
                 {
@@ -452,11 +452,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
         case SID_TEMPLATE_LOAD:
             {
                 OUString aFileName;
-                static sal_Bool bText = sal_True;
-                static sal_Bool bFrame = sal_False;
-                static sal_Bool bPage =  sal_False;
-                static sal_Bool bNum =   sal_False;
-                static sal_Bool bMerge = sal_False;
+                static bool bText = true;
+                static bool bFrame = false;
+                static bool bPage =  false;
+                static bool bNum =   false;
+                static bool bMerge = false;
                 sal_uInt16 nRet = USHRT_MAX;
 
                 sal_uInt16 nFlags = bFrame ? SFX_LOAD_FRAME_STYLES : 0;
@@ -563,7 +563,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     bMerge = 0 != (nFlags&SFX_MERGE_STYLES);
                     aOpt.SetMerge( !bMerge );
 
-                    SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( OSL_LOG_PREFIX ));
+                    SetError( LoadStylesFromFile( aFileName, aOpt, false ), OUString( OSL_LOG_PREFIX ));
                     if ( !GetError() )
                         rReq.Done();
                 }
@@ -586,7 +586,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                     SwIoSystem::GetFilterOfFormat(
                                         OUString("HTML"),
                                         SwWebDocShell::Factory().GetFilterContainer() );
-                    sal_Bool bLocalHasName = HasName();
+                    bool bLocalHasName = HasName();
                     if(bLocalHasName)
                     {
                         //check for filter type
@@ -597,7 +597,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                 "SaveAsHTMLDialog", "modules/swriter/ui/saveashtmldialog.ui");
 
                             if(RET_YES == aQuery.Execute())
-                                bLocalHasName = sal_False;
+                                bLocalHasName = false;
                             else
                                 break;
                         }
@@ -640,7 +640,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         utl::TempFile aTempFile;
                         aTempFile.EnableKillingFile();
                         pSrcView->SaveContent(aTempFile.GetURL());
-                        bDone = sal_True;
+                        bDone = true;
                         SvxMacro aMac(aEmptyOUStr, aEmptyOUStr, STARBASIC);
                         SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this);
                         SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this);
@@ -754,7 +754,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
         case FN_OUTLINE_TO_CLIPBOARD:
         case FN_OUTLINE_TO_IMPRESS:
             {
-                sal_Bool bEnable = IsEnableSetModified();
+                bool bEnable = IsEnableSetModified();
                 EnableSetModified( false );
                 WriterRef xWrt;
                 // mba: looks as if relative URLs don't make sense here
@@ -845,7 +845,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
         case FN_NEW_HTML_DOC:
         case FN_NEW_GLOBAL_DOC:
             {
-                bDone = sal_False;
+                bDone = false;
                 bool bCreateHtml = FN_NEW_HTML_DOC == nWhich;
 
                 bool bCreateByOutlineLevel = false;
@@ -1109,7 +1109,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     pViewShell = pVFrame ? pVFrame->GetViewShell() : 0;
                     pCurrView = dynamic_cast<SwView*>( pViewShell );
                 }
-                pDoc->GetNumberFormatter(sal_True)->SetYear2000(nYear2K);
+                pDoc->GetNumberFormatter(true)->SetYear2000(nYear2K);
             }
         break;
         case FN_OPEN_FILE:
@@ -1227,7 +1227,7 @@ void SwDocShell::SetModified( bool bSet )
             EnableSetModified( false );
             if( bSet )
             {
-                sal_Bool bOld = pDoc->IsModified();
+                bool bOld = pDoc->IsModified();
                 pDoc->SetModified();
                 if( !bOld )
                 {
@@ -1278,7 +1278,7 @@ class SwReloadFromHtmlReader : public SwReader
 
 void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView )
 {
-    sal_Bool bModified = IsModified();
+    bool bModified = IsModified();
 
     // The HTTP-Header fields have to be removed, otherwise
     // there are some from Meta-Tags dublicated or triplicated afterwards.
@@ -1326,7 +1326,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
         }
     }
 #endif
-    sal_Bool bWasBrowseMode = pDoc->get(IDocumentSettingAccess::BROWSE_MODE);
+    bool bWasBrowseMode = pDoc->get(IDocumentSettingAccess::BROWSE_MODE);
     RemoveLink();
 
     // now also the UNO-Model has to be informed about the new Doc #51535#
@@ -1368,7 +1368,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
     {
         SwWrtShell& rWrtSh = pCurrView->GetWrtShell();
         if( rWrtSh.GetLayout())
-            rWrtSh.CheckBrowseView( sal_True );
+            rWrtSh.CheckBrowseView( true );
     }
 
     // Take HTTP-Header-Attibutes over into the DokInfo again.
@@ -1383,7 +1383,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
 }
 
 sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
-                    SwgReaderOption& rOpt, sal_Bool bUnoCall )
+                    SwgReaderOption& rOpt, bool bUnoCall )
 {
     sal_uLong nErr = 0;
 
diff --git a/sw/source/core/uibase/app/docshini.cxx b/sw/source/core/uibase/app/docshini.cxx
index 0bd856042912..9f06c234d354 100644
--- a/sw/source/core/uibase/app/docshini.cxx
+++ b/sw/source/core/uibase/app/docshini.cxx
@@ -98,7 +98,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
     {
         AddLink();      // create pDoc / pIo if applicable
 
-        sal_Bool bWeb = ISA( SwWebDocShell );
+        bool bWeb = ISA( SwWebDocShell );
         if ( bWeb )
             bHTMLTemplSet = SetHTMLTemplate( *GetDoc() );// Styles from HTML.vor
         else if( ISA( SwGlobalDocShell ) )
@@ -275,7 +275,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                 nFontHeight = pStdFont->GetDefaultHeightFor( aFontIdPoolId[nIdx], eLanguage );
             if(!pColl)
                 pColl = pDoc->GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]);
-            SvxFontHeightItem aFontHeight( (const SvxFontHeightItem&)pColl->GetFmtAttr( nFontHeightWhich, sal_True ));
+            SvxFontHeightItem aFontHeight( (const SvxFontHeightItem&)pColl->GetFmtAttr( nFontHeightWhich, true ));
             if(aFontHeight.GetHeight() != sal::static_int_cast<sal_uInt32, sal_Int32>(nFontHeight))
             {
                 aFontHeight.SetHeight(nFontHeight);
@@ -496,10 +496,10 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
                 {
                     if( ReadXML )
                     {
-                        ReadXML->SetOrganizerMode( sal_True );
+                        ReadXML->SetOrganizerMode( true );
                         SwReader aRdr( rMedium, aEmptyOUStr, pDoc );
                         nErr = aRdr.Read( *ReadXML );
-                        ReadXML->SetOrganizerMode( sal_False );
+                        ReadXML->SetOrganizerMode( false );
                     }
                 }
                 break;
@@ -511,7 +511,7 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
                     SwTransferable::InitOle( this, *pDoc );
                 }
                 // suppress SfxProgress, when we are Embedded
-                SW_MOD()->SetEmbeddedLoadSave( sal_True );
+                SW_MOD()->SetEmbeddedLoadSave( true );
                 // no break;
 
             case SFX_CREATE_MODE_STANDARD:
@@ -560,7 +560,7 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
         }
 
         // suppress SfxProgress, when we are Embedded
-        SW_MOD()->SetEmbeddedLoadSave( sal_False );
+        SW_MOD()->SetEmbeddedLoadSave( false );
     }
 
     return bRet;
@@ -587,10 +587,10 @@ bool  SwDocShell::LoadFrom( SfxMedium& rMedium )
                 mxBasePool = new SwDocStyleSheetPool( *pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
                 if( ReadXML )
                 {
-                    ReadXML->SetOrganizerMode( sal_True );
+                    ReadXML->SetOrganizerMode( true );
                     SwReader aRdr( rMedium, aEmptyOUStr, pDoc );
                     nErr = aRdr.Read( *ReadXML );
-                    ReadXML->SetOrganizerMode( sal_False );
+                    ReadXML->SetOrganizerMode( false );
                 }
             }
         }
@@ -619,7 +619,7 @@ void SwDocShell::SubInitNew()
     pDoc->setLinkUpdateMode( GLOBALSETTING );
     pDoc->setFieldUpdateFlags( AUTOUPD_GLOBALSETTING );
 
-    sal_Bool bWeb = ISA(SwWebDocShell);
+    bool bWeb = ISA(SwWebDocShell);
 
     sal_uInt16 nRange[] =   {
         RES_PARATR_ADJUST, RES_PARATR_ADJUST,
@@ -656,7 +656,7 @@ void SwDocShell::SubInitNew()
 
         aDfltSet.Put( aHyp );
 
-        sal_uInt16 nNewPos = static_cast< sal_uInt16 >(SW_MOD()->GetUsrPref(sal_False)->GetDefTab());
+        sal_uInt16 nNewPos = static_cast< sal_uInt16 >(SW_MOD()->GetUsrPref(false)->GetDefTab());
         if( nNewPos )
             aDfltSet.Put( SvxTabStopItem( 1, nNewPos,
                                           SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ) );
@@ -668,7 +668,7 @@ void SwDocShell::SubInitNew()
     //default page mode for text grid
     if(!bWeb)
     {
-        sal_Bool bSquaredPageMode = SW_MOD()->GetUsrPref(sal_False)->IsSquaredPageMode();
+        bool bSquaredPageMode = SW_MOD()->GetUsrPref(false)->IsSquaredPageMode();
         pDoc->SetDefaultPageMode( bSquaredPageMode );
     }
 
diff --git a/sw/source/core/uibase/app/docst.cxx b/sw/source/core/uibase/app/docst.cxx
index 8d90be0aa462..75e38c6c1c49 100644
--- a/sw/source/core/uibase/app/docst.cxx
+++ b/sw/source/core/uibase/app/docst.cxx
@@ -156,7 +156,7 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
                         nMask = SWSTYLEBIT_HTML;
                     else
                     {
-                        const int nSelection = pShell->GetFrmType(0,sal_True);
+                        const int nSelection = pShell->GetFrmType(0,true);
                         if(pShell->GetCurTOX())
                             nMask = SWSTYLEBIT_IDX  ;
                         else if(nSelection & FRMTYPE_HEADER     ||
@@ -198,7 +198,7 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
                     rSet.DisableItem( nWhich );
                 else
                 {
-                    sal_uInt16 n = pShell->GetCurPageDesc( sal_False );
+                    sal_uInt16 n = pShell->GetCurPageDesc( false );
                     if( n < pShell->GetPageDescCnt() )
                         aName = pShell->GetPageDesc( n ).GetName();
 
@@ -281,7 +281,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                 false, &pItem ))
                 sParent = ((const SfxStringItem*)pItem)->GetValue();
 
-            nRet = Edit( sName, sParent, nFamily, nMask, sal_True, OString(), 0, rReq.IsAPI() );
+            nRet = Edit( sName, sParent, nFamily, nMask, true, OString(), 0, rReq.IsAPI() );
         }
         break;
 
@@ -441,7 +441,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                 switch(nSlot)
                 {
                     case SID_STYLE_EDIT:
-                        nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, sal_False, OString(), pActShell );
+                        nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, false, OString(), pActShell );
                         break;
                     case SID_STYLE_DELETE:
                         nRet = Delete(aParam, nFamily);
@@ -608,16 +608,16 @@ sal_uInt16 SwDocShell::Edit(
     const OUString &rParent,
     const sal_uInt16 nFamily,
     sal_uInt16 nMask,
-    const sal_Bool bNew,
+    const bool bNew,
     const OString& sPage,
     SwWrtShell* pActShell,
-    const sal_Bool bBasic )
+    const bool bBasic )
 {
     assert( GetWrtShell() );
     SfxStyleSheetBase *pStyle = 0;
 
     sal_uInt16 nRet = nMask;
-    sal_Bool bModified = pDoc->IsModified();
+    bool bModified = pDoc->IsModified();
 
     if( bNew )
     {
@@ -1215,7 +1215,7 @@ sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
 
 void  SwDocShell::LoadStyles( SfxObjectShell& rSource )
 {
-    _LoadStyles(rSource, sal_False);
+    _LoadStyles(rSource, false);
 }
 /* --------------------------------------------------
     bPreserveCurrentDocument determines whether SetFixFields() is called
@@ -1224,7 +1224,7 @@ void  SwDocShell::LoadStyles( SfxObjectShell& rSource )
     Calls of ::LoadStyles() normally use files especially loaded for the purpose
     of importing styles.
  --------------------------------------------------*/
-void SwDocShell::_LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument )
+void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument )
 {
 /*  [Description]
 
@@ -1256,7 +1256,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrent
         }
         else
         {
-            sal_Bool bModified = pDoc->IsModified();
+            bool bModified = pDoc->IsModified();
             pDoc->ReplaceStyles( *((SwDocShell&)rSource).pDoc );
             if( !bModified && pDoc->IsModified() && !pView )
             {
@@ -1275,7 +1275,7 @@ void SwDocShell::FormatPage(
     const OString& rPageId,
     SwWrtShell& rActShell )
 {
-    Edit( rPage, aEmptyOUStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell);
+    Edit( rPage, aEmptyOUStr, SFX_STYLE_FAMILY_PAGE, 0, false, rPageId, &rActShell);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
index d2b14a8aa429..55db367c9ff6 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -133,7 +133,7 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
     {
         if(pFmt)
         {
-            pStyle->SetPhysical(sal_True);
+            pStyle->SetPhysical(true);
             SwFmt* p = pFmt->DerivedFrom();
             if( p && !p->IsDefault() )
                 pStyle->PresetParent( p->GetName() );
@@ -141,7 +141,7 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
                 pStyle->PresetParent( OUString() );
         }
         else
-            pStyle->SetPhysical(sal_False);
+            pStyle->SetPhysical(false);
     }
     return pFmt;
 }
@@ -170,7 +170,7 @@ static SwTxtFmtColl* lcl_FindParaFmt(  SwDoc& rDoc,
     {
         if(pColl)
         {
-            pStyle->SetPhysical(sal_True);
+            pStyle->SetPhysical(true);
             if( pColl->DerivedFrom() && !pColl->DerivedFrom()->IsDefault() )
                 pStyle->PresetParent( pColl->DerivedFrom()->GetName() );
             else
@@ -180,7 +180,7 @@ static SwTxtFmtColl* lcl_FindParaFmt(  SwDoc& rDoc,
             pStyle->PresetFollow(rNext.GetName());
         }
         else
-            pStyle->SetPhysical(sal_False);
+            pStyle->SetPhysical(false);
     }
     return pColl;
 }
@@ -207,14 +207,14 @@ static SwFrmFmt* lcl_FindFrmFmt(   SwDoc& rDoc,
     {
         if(pFmt)
         {
-            pStyle->SetPhysical(sal_True);
+            pStyle->SetPhysical(true);
             if( pFmt->DerivedFrom() && !pFmt->DerivedFrom()->IsDefault() )
                 pStyle->PresetParent( pFmt->DerivedFrom()->GetName() );
             else
                 pStyle->PresetParent( OUString() );
         }
         else
-            pStyle->SetPhysical(sal_False);
+            pStyle->SetPhysical(false);
     }
     return pFmt;
 }
@@ -242,14 +242,14 @@ static const SwPageDesc* lcl_FindPageDesc( SwDoc&  rDoc,
     {
         if(pDesc)
         {
-            pStyle->SetPhysical(sal_True);
+            pStyle->SetPhysical(true);
             if(pDesc->GetFollow())
                 pStyle->PresetFollow(pDesc->GetFollow()->GetName());
             else
                 pStyle->PresetParent( OUString() );
         }
         else
-            pStyle->SetPhysical(sal_False);
+            pStyle->SetPhysical(false);
     }
     return pDesc;
 }
@@ -276,11 +276,11 @@ static const SwNumRule* lcl_FindNumRule(   SwDoc&  rDoc,
     {
         if(pRule)
         {
-            pStyle->SetPhysical(sal_True);
+            pStyle->SetPhysical(true);
             pStyle->PresetParent( OUString() );
         }
         else
-            pStyle->SetPhysical(sal_False);
+            pStyle->SetPhysical(false);
     }
     return pRule;
 }
@@ -381,7 +381,7 @@ SwDocStyleSheet::SwDocStyleSheet(   SwDoc&          rDocument,
             FN_PARAM_FTN_INFO,      FN_PARAM_FTN_INFO,              // [21123
             FN_COND_COLL,           FN_COND_COLL,                   // [22401
             0),
-    bPhysical(sal_False)
+    bPhysical(false)
 {
     nHelpId = UCHAR_MAX;
 }
@@ -409,7 +409,7 @@ void  SwDocStyleSheet::Reset()
     aName = "";
     aFollow = "";
     aParent = "";
-    SetPhysical(sal_False);
+    SetPhysical(false);
 }
 
 void SwDocStyleSheet::SetGrabBagItem(const uno::Any& rVal)
@@ -560,7 +560,7 @@ void SwDocStyleSheet::SetHidden( bool bValue )
 
 bool SwDocStyleSheet::IsHidden( ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SwFmt* pFmt = 0;
     switch(nFamily)
@@ -1317,7 +1317,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
             if ( bResetIndentAttrsAtParagraphStyle &&
                  rSet.GetItemState( RES_PARATR_NUMRULE, false, 0 ) == SFX_ITEM_SET &&
                  rSet.GetItemState( RES_LR_SPACE, false, 0 ) != SFX_ITEM_SET &&
-                 pColl->GetItemState( RES_LR_SPACE, sal_False, 0 ) == SFX_ITEM_SET )
+                 pColl->GetItemState( RES_LR_SPACE, false, 0 ) == SFX_ITEM_SET )
             {
                 rDoc.ResetAttrAtFormat( RES_LR_SPACE, *pColl );
             }
@@ -1631,9 +1631,9 @@ static void lcl_DeleteInfoStyles( sal_uInt16 nFamily, std::vector<void*>& rArr,
 }
 
 // determine the format
-sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
+bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt16 nPoolId = USHRT_MAX;
     SwFmt* pFmt = 0;
 
@@ -1866,7 +1866,7 @@ void SwDocStyleSheet::Create()
                     rDoc.MakeNumRule( sTmpNm, 0, false,
                                       // #i89178#
                                       numfunc::GetDefaultPositionAndSpaceMode() ) ];
-                pRule->SetAutoRule( sal_False );
+                pRule->SetAutoRule( false );
                 if( aName.isEmpty() )
                 {
                     // #i91400#
@@ -1877,7 +1877,7 @@ void SwDocStyleSheet::Create()
             break;
         default:; //prevent warning
     }
-    bPhysical = sal_True;
+    bPhysical = true;
     aCoreSet.ClearItem();
 }
 
@@ -1932,7 +1932,7 @@ void SwDocStyleSheet::PresetNameAndFamily(const OUString& rName)
 }
 
 // Is the format physically present yet
-void SwDocStyleSheet::SetPhysical(sal_Bool bPhys)
+void SwDocStyleSheet::SetPhysical(bool bPhys)
 {
     bPhysical = bPhys;
 
@@ -2113,7 +2113,7 @@ void  SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
 }
 
 // methods for DocStyleSheetPool
-SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, sal_Bool bOrg )
+SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, bool bOrg )
 : SfxStyleSheetBasePool( rDocument.GetAttrPool() )
 , mxStyleSheet( new SwDocStyleSheet( rDocument, OUString(), this, SFX_STYLE_FAMILY_CHAR, 0 ) )
 , rDoc( rDocument )
@@ -2144,7 +2144,7 @@ SfxStyleSheetBase&   SwDocStyleSheetPool::Make( const OUString&   rName,
     mxStyleSheet->PresetFollow(OUString());
     mxStyleSheet->SetMask(_nMask) ;
     mxStyleSheet->SetFamily(eFam);
-    mxStyleSheet->SetPhysical(sal_True);
+    mxStyleSheet->SetPhysical(true);
     mxStyleSheet->Create();
 
     return *mxStyleSheet.get();
@@ -2400,10 +2400,10 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
     const bool bSearchUsed = ( n != SFXSTYLEBIT_ALL && n & SFXSTYLEBIT_USED );
     const SwModify* pMod = 0;
 
-    mxStyleSheet->SetPhysical( sal_False );
+    mxStyleSheet->SetPhysical( false );
     mxStyleSheet->PresetName( rName );
     mxStyleSheet->SetFamily( eFam );
-    sal_Bool bFnd = mxStyleSheet->FillStyleSheet( SwDocStyleSheet::FillOnlyName );
+    bool bFnd = mxStyleSheet->FillStyleSheet( SwDocStyleSheet::FillOnlyName );
 
     if( mxStyleSheet->IsPhysical() )
     {
@@ -2434,7 +2434,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
                             ? !(pRule->GetPoolFmtId() & USER_FMT)
                                 // searched for used and found none
                             : bSearchUsed ))
-                    bFnd = sal_False;
+                    bFnd = false;
             }
             break;
 
@@ -2454,7 +2454,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName,
             ? !(nId & USER_FMT)
                 // searched for used and found none
             : bSearchUsed )
-            bFnd = sal_False;
+            bFnd = false;
     }
     return bFnd ? mxStyleSheet.get() : 0;
 }
@@ -2465,7 +2465,7 @@ SwStyleSheetIterator::SwStyleSheetIterator( SwDocStyleSheetPool* pBase,
     mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), OUString(), pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ),
     mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), OUString(), pBase, SFX_STYLE_FAMILY_CHAR, 0 ) )
 {
-    bFirstCalled = sal_False;
+    bFirstCalled = false;
     nLastPos = 0;
     StartListening( *pBase );
 }
@@ -2489,7 +2489,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::operator[]( sal_uInt16 nIdx )
     if( !bFirstCalled )
         First();
     mxStyleSheet->PresetNameAndFamily( aLst[ nIdx ] );
-    mxStyleSheet->SetPhysical( sal_False );
+    mxStyleSheet->SetPhysical( false );
     mxStyleSheet->FillStyleSheet( SwDocStyleSheet::FillOnlyName );
 
     return mxStyleSheet.get();
@@ -2498,7 +2498,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::operator[]( sal_uInt16 nIdx )
 SfxStyleSheetBase*  SwStyleSheetIterator::First()
 {
     // Delete old list
-    bFirstCalled = sal_True;
+    bFirstCalled = true;
     nLastPos = 0;
     aLst.Erase();
 
@@ -2507,12 +2507,12 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
 
     SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc();
     const sal_uInt16 nSrchMask = nMask;
-    const sal_Bool bIsSearchUsed = SearchUsed();
+    const bool bIsSearchUsed = SearchUsed();
 
     bool bSearchHidden = ( nMask & SFXSTYLEBIT_HIDDEN );
     bool bOnlyHidden = nMask == SFXSTYLEBIT_HIDDEN;
 
-    const sal_Bool bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode();
+    const bool bOrganizer = ((SwDocStyleSheetPool*)pBasePool)->IsOrganizerMode();
     bool bAll = ( nSrchMask & SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE;
 
     if( nSearchFamily == SFX_STYLE_FAMILY_CHAR
@@ -2855,7 +2855,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::Next()
     if(!aLst.empty() && nLastPos < aLst.size())
     {
         mxIterSheet->PresetNameAndFamily(aLst[nLastPos]);
-        mxIterSheet->SetPhysical( sal_False );
+        mxIterSheet->SetPhysical( false );
         mxIterSheet->SetMask( nMask );
         if(mxIterSheet->pSet)
         {
@@ -2881,7 +2881,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::Find(const OUString& rName)
         // new name is set, so determine its Data
         mxStyleSheet->FillStyleSheet( SwDocStyleSheet::FillOnlyName );
         if( !mxStyleSheet->IsPhysical() )
-            mxStyleSheet->SetPhysical( sal_False );
+            mxStyleSheet->SetPhysical( false );
 
         return mxStyleSheet.get();
     }
@@ -2889,11 +2889,11 @@ SfxStyleSheetBase*  SwStyleSheetIterator::Find(const OUString& rName)
 }
 
 void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList,
-                                            sal_Bool bTestUsed, sal_Bool bTestHidden, bool bOnlyHidden,
+                                            bool bTestUsed, bool bTestHidden, bool bOnlyHidden,
                                             sal_uInt16 nSection, char cType )
 {
     SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc();
-    sal_Bool bUsed = sal_False;
+    bool bUsed = false;
     for ( sal_uInt16 i=0; i < rList.size(); ++i )
     {
         bool bHidden = false;
diff --git a/sw/source/core/uibase/app/swmodul1.cxx b/sw/source/core/uibase/app/swmodul1.cxx
index bfdf01078a70..4c3733a15966 100644
--- a/sw/source/core/uibase/app/swmodul1.cxx
+++ b/sw/source/core/uibase/app/swmodul1.cxx
@@ -143,10 +143,10 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
     SwView* pCurrView = pActView;
     SwViewShell* pSh = pCurrView ? &pCurrView->GetWrtShell() : 0;
 
-    SwMasterUsrPref* pPref = (SwMasterUsrPref*)GetUsrPref( static_cast< sal_Bool >(
-                                         VIEWOPT_DEST_WEB == nDest ? sal_True  :
-                                         VIEWOPT_DEST_TEXT== nDest ? sal_False :
-                                         pCurrView && pCurrView->ISA(SwWebView) ));
+    SwMasterUsrPref* pPref = (SwMasterUsrPref*)GetUsrPref(
+                                         VIEWOPT_DEST_WEB == nDest ? true  :
+                                         VIEWOPT_DEST_TEXT== nDest ? false :
+                                         pCurrView && pCurrView->ISA(SwWebView) );
 
     // with Uno, only sdbcx::View, but not the Module should be changed
     bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
@@ -176,7 +176,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
         return;
 
     // Passing on to CORE
-    sal_Bool bReadonly;
+    bool bReadonly;
     const SwDocShell* pDocSh = pCurrView->GetDocShell();
     if (pDocSh)
         bReadonly = pDocSh->IsReadOnly();
@@ -202,7 +202,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
     lcl_SetUIPrefs(*xViewOpt, pCurrView, pSh);
 
     // in the end the Idle-Flag is set again
-    pPref->SetIdle(sal_True);
+    pPref->SetIdle(true);
 }
 
 void SwModule::ApplyUserMetric( FieldUnit eMetric, bool bWeb )
@@ -211,13 +211,13 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, bool bWeb )
         if(bWeb)
         {
             if(!pWebUsrPref)
-                GetUsrPref(sal_True);
+                GetUsrPref(true);
             pPref = pWebUsrPref;
         }
         else
         {
             if(!pUsrPref)
-                GetUsrPref(sal_False);
+                GetUsrPref(false);
             pPref = pUsrPref;
         }
         FieldUnit eOldMetric = pPref->GetMetric();
@@ -241,19 +241,19 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, bool bWeb )
         }
 }
 
-void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool bWeb )
+void SwModule::ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb )
 {
     SwMasterUsrPref* pPref;
     if(bWeb)
     {
         if(!pWebUsrPref)
-            GetUsrPref(sal_True);
+            GetUsrPref(true);
         pPref = pWebUsrPref;
     }
     else
     {
         if(!pUsrPref)
-            GetUsrPref(sal_False);
+            GetUsrPref(false);
         pPref = pUsrPref;
     }
     if( bHorizontal )
@@ -277,22 +277,22 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool b
 }
 
 //set the usrpref 's char unit attribute and set rulers unit as char if the "apply char unit" is checked
-void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, bool bWeb)
+void SwModule::ApplyUserCharUnit(bool bApplyChar, bool bWeb)
 {
     SwMasterUsrPref* pPref;
     if(bWeb)
     {
         if(!pWebUsrPref)
-            GetUsrPref(sal_True);
+            GetUsrPref(true);
         pPref = pWebUsrPref;
     }
     else
     {
         if(!pUsrPref)
-            GetUsrPref(sal_False);
+            GetUsrPref(false);
         pPref = pUsrPref;
     }
-    sal_Bool bOldApplyCharUnit = pPref->IsApplyCharUnit();
+    bool bOldApplyCharUnit = pPref->IsApplyCharUnit();
     bool bHasChanged = false;
     if(bOldApplyCharUnit != bApplyChar)
     {
@@ -345,15 +345,15 @@ SwNavigationConfig*  SwModule::GetNavigationConfig()
     return pNavigationConfig;
 }
 
-SwPrintOptions*     SwModule::GetPrtOptions(sal_Bool bWeb)
+SwPrintOptions*     SwModule::GetPrtOptions(bool bWeb)
 {
     if(bWeb && !pWebPrtOpt)
     {
-        pWebPrtOpt = new SwPrintOptions(sal_True);
+        pWebPrtOpt = new SwPrintOptions(true);
     }
     else if(!bWeb && !pPrtOpt)
     {
-        pPrtOpt = new SwPrintOptions(sal_False);
+        pPrtOpt = new SwPrintOptions(false);
     }
 
     return bWeb ? pWebPrtOpt : pPrtOpt;
@@ -366,7 +366,7 @@ SwChapterNumRules*  SwModule::GetChapterNumRules()
     return pChapterNumRules;
 }
 
-void SwModule::ShowDBObj(SwView& rView, const SwDBData& rData, sal_Bool /*bOnlyIfAvailable*/)
+void SwModule::ShowDBObj(SwView& rView, const SwDBData& rData, bool /*bOnlyIfAvailable*/)
 {
     Reference<XFrame> xFrame = rView.GetViewFrame()->GetFrame().GetFrameInterface();
     Reference<XDispatchProvider> xDP(xFrame, uno::UNO_QUERY);
@@ -403,14 +403,14 @@ sal_uInt16 SwModule::GetRedlineAuthor()
             if (sActAuthor.isEmpty())
                 sActAuthor = SW_RESSTR( STR_REDLINE_UNKNOWN_AUTHOR );
         }
-        bAuthorInitialised = sal_True;
+        bAuthorInitialised = true;
     }
     return InsertRedlineAuthor( sActAuthor );
 }
 
 void SwModule::SetRedlineAuthor(const OUString &rAuthor)
 {
-    bAuthorInitialised = sal_True;
+    bAuthorInitialised = true;
     sActAuthor = rAuthor;
     InsertRedlineAuthor( sActAuthor );
 }
@@ -526,17 +526,17 @@ sal_uInt16 SwModule::GetRedlineMarkPos()
     return pModuleConfig->GetMarkAlignMode();
 }
 
-sal_Bool SwModule::IsInsTblFormatNum(sal_Bool bHTML) const
+bool SwModule::IsInsTblFormatNum(bool bHTML) const
 {
     return pModuleConfig->IsInsTblFormatNum(bHTML);
 }
 
-sal_Bool SwModule::IsInsTblChangeNumFormat(sal_Bool bHTML) const
+bool SwModule::IsInsTblChangeNumFormat(bool bHTML) const
 {
     return pModuleConfig->IsInsTblChangeNumFormat(bHTML);
 }
 
-sal_Bool SwModule::IsInsTblAlignNum(sal_Bool bHTML) const
+bool SwModule::IsInsTblAlignNum(bool bHTML) const
 {
     return pModuleConfig->IsInsTblAlignNum(bHTML);
 }
@@ -546,7 +546,7 @@ const Color &SwModule::GetRedlineMarkColor()
     return pModuleConfig->GetMarkAlignColor();
 }
 
-const SwViewOption* SwModule::GetViewOption(sal_Bool bWeb)
+const SwViewOption* SwModule::GetViewOption(bool bWeb)
 {
     return GetUsrPref( bWeb );
 }
@@ -557,50 +557,50 @@ OUString SwModule::GetDocStatWordDelim() const
 }
 
 // Passing-through of the ModuleConfig's Metric (for HTML-Export)
-sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
+sal_uInt16 SwModule::GetMetric( bool bWeb ) const
 {
     SwMasterUsrPref* pPref;
     if(bWeb)
     {
         if(!pWebUsrPref)
-            GetUsrPref(sal_True);
+            GetUsrPref(true);
         pPref = pWebUsrPref;
     }
     else
     {
         if(!pUsrPref)
-            GetUsrPref(sal_False);
+            GetUsrPref(false);
         pPref = pUsrPref;
     }
     return static_cast< sal_uInt16 >(pPref->GetMetric());
 }
 
 // Pass-through Update-Status
-sal_uInt16 SwModule::GetLinkUpdMode( sal_Bool ) const
+sal_uInt16 SwModule::GetLinkUpdMode( bool ) const
 {
     if(!pUsrPref)
-        GetUsrPref(sal_False);
+        GetUsrPref(false);
     return (sal_uInt16)pUsrPref->GetUpdateLinkMode();
 }
 
-SwFldUpdateFlags SwModule::GetFldUpdateFlags( sal_Bool ) const
+SwFldUpdateFlags SwModule::GetFldUpdateFlags( bool ) const
 {
     if(!pUsrPref)
-        GetUsrPref(sal_False);
+        GetUsrPref(false);
     return pUsrPref->GetFldUpdateFlags();
 }
 
 void SwModule::ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags)
 {
     if(!pUsrPref)
-        GetUsrPref(sal_False);
+        GetUsrPref(false);
     pUsrPref->SetFldUpdateFlags(eFldFlags);
 }
 
 void SwModule::ApplyLinkMode(sal_Int32 nNewLinkMode)
 {
     if(!pUsrPref)
-        GetUsrPref(sal_False);
+        GetUsrPref(false);
     pUsrPref->SetUpdateLinkMode(nNewLinkMode);
 }
 
@@ -629,10 +629,10 @@ void SwModule::CheckSpellChanges( bool bOnlineSpelling,
     }
 }
 
-void SwModule::ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode)
+void SwModule::ApplyDefaultPageMode(bool bIsSquaredPageMode)
 {
     if(!pUsrPref)
-        GetUsrPref(sal_False);
+        GetUsrPref(false);
     pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
 }
 
@@ -641,12 +641,12 @@ SvxCompareMode SwModule::GetCompareMode() const
     return pModuleConfig->GetCompareMode();
 }
 
-sal_Bool SwModule::IsUseRsid() const
+bool SwModule::IsUseRsid() const
 {
     return pModuleConfig->IsUseRsid();
 }
 
-sal_Bool SwModule::IsIgnorePieces() const
+bool SwModule::IsIgnorePieces() const
 {
     return pModuleConfig->IsIgnorePieces();
 }
diff --git a/sw/source/core/uibase/app/swmodule.cxx b/sw/source/core/uibase/app/swmodule.cxx
index db2ac605dcab..d7038062fcd5 100644
--- a/sw/source/core/uibase/app/swmodule.cxx
+++ b/sw/source/core/uibase/app/swmodule.cxx
@@ -170,8 +170,8 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
     pUserOptions(0),
     pAttrPool(0),
     pView(0),
-    bAuthorInitialised(sal_False),
-    bEmbeddedLoadSave( sal_False ),
+    bAuthorInitialised(false),
+    bEmbeddedLoadSave( false ),
     pDragDrop( 0 ),
     pXSelection( 0 )
 {
diff --git a/sw/source/core/uibase/cctrl/swlbox.cxx b/sw/source/core/uibase/cctrl/swlbox.cxx
index 384fca4f5fc0..bdd3f15869ad 100644
--- a/sw/source/core/uibase/cctrl/swlbox.cxx
+++ b/sw/source/core/uibase/cctrl/swlbox.cxx
@@ -24,15 +24,15 @@
 
 //     Description: ListboxElement
 SwBoxEntry::SwBoxEntry() :
-    bModified(sal_False),
-    bNew(sal_False),
+    bModified(false),
+    bNew(false),
     nId(COMBOBOX_APPEND)
 {
 }
 
 SwBoxEntry::SwBoxEntry(const OUString& aNam, sal_Int32 nIdx) :
-    bModified(sal_False),
-    bNew(sal_False),
+    bModified(false),
+    bNew(false),
     aName(aNam),
     nId(nIdx)
 {
diff --git a/sw/source/core/uibase/chrdlg/ccoll.cxx b/sw/source/core/uibase/chrdlg/ccoll.cxx
index 15863f53a5a5..5de9a98f40cc 100644
--- a/sw/source/core/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/core/uibase/chrdlg/ccoll.cxx
@@ -150,12 +150,12 @@ SfxPoolItem*   SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const
 bool SwCondCollItem::operator==( const SfxPoolItem& rItem) const
 {
     OSL_ENSURE( SfxPoolItem::operator==(rItem), "different types" );
-    sal_Bool bReturn = sal_True;
+    bool bReturn = true;
     for(sal_uInt16 i = 0; i < COND_COMMAND_COUNT; i++)
         if (m_sStyles[i] !=
                 static_cast<SwCondCollItem const&>(rItem).m_sStyles[i])
         {
-            bReturn = sal_False;
+            bReturn = false;
             break;
         }
 
diff --git a/sw/source/core/uibase/config/caption.cxx b/sw/source/core/uibase/config/caption.cxx
index 76e1a0907b2f..bdc771779f88 100644
--- a/sw/source/core/uibase/config/caption.cxx
+++ b/sw/source/core/uibase/config/caption.cxx
@@ -23,7 +23,7 @@
 #include "caption.hxx"
 
 InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) :
-    bUseCaption(sal_False),
+    bUseCaption(false),
     eObjType(eType),
     nNumType(SVX_NUM_ARABIC),
     sNumberSeparator((". ")),
@@ -31,7 +31,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI
     nLevel(0),
     sSeparator( OUString(": ") ),
     bIgnoreSeqOpts(false),
-    bCopyAttributes(sal_False)
+    bCopyAttributes(false)
 {
     if (pOleId)
         aOleId = *pOleId;
diff --git a/sw/source/core/uibase/config/cfgitems.cxx b/sw/source/core/uibase/config/cfgitems.cxx
index 7272f6c7000f..a834edb50a38 100644
--- a/sw/source/core/uibase/config/cfgitems.cxx
+++ b/sw/source/core/uibase/config/cfgitems.cxx
@@ -46,7 +46,7 @@ SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
     bFldHiddenText      =
     bCharHiddenText     =
     bManualBreak        =
-    bShowHiddenPara     = sal_False;
+    bShowHiddenPara     = false;
 
 };
 
@@ -62,14 +62,14 @@ SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ):
 SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich ) :
             SfxPoolItem( _nWhich )
 {
-    bParagraphEnd       = rVOpt.IsParagraph(sal_True);
-    bTab                = rVOpt.IsTab(sal_True);
-    bSpace              = rVOpt.IsBlank(sal_True);
+    bParagraphEnd       = rVOpt.IsParagraph(true);
+    bTab                = rVOpt.IsTab(true);
+    bSpace              = rVOpt.IsBlank(true);
     bNonbreakingSpace   = rVOpt.IsHardBlank();
     bSoftHyphen         = rVOpt.IsSoftHyph();
-    bCharHiddenText     = rVOpt.IsShowHiddenChar(sal_True);
+    bCharHiddenText     = rVOpt.IsShowHiddenChar(true);
     bFldHiddenText      = rVOpt.IsShowHiddenField();
-    bManualBreak        = rVOpt.IsLineBreak(sal_True);
+    bManualBreak        = rVOpt.IsLineBreak(true);
     bShowHiddenPara     = rVOpt.IsShowHiddenPara();
 }
 
@@ -151,8 +151,8 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich) :
     bHorzScrollbar  = rVOpt.IsViewHScrollBar();
     bVertScrollbar  = rVOpt.IsViewVScrollBar();
     bAnyRuler       = rVOpt.IsViewAnyRuler();
-    bHorzRuler      = rVOpt.IsViewHRuler(sal_True);
-    bVertRuler      = rVOpt.IsViewVRuler(sal_True);
+    bHorzRuler      = rVOpt.IsViewHRuler(true);
+    bVertRuler      = rVOpt.IsViewVRuler(true);
     bVertRulerRight = rVOpt.IsVRulerRight();
     bCrosshair      = rVOpt.IsCrossHair();
     bSmoothScroll   = rVOpt.IsSmoothScroll();
@@ -271,7 +271,7 @@ bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const
 SwShadowCursorItem::SwShadowCursorItem( sal_uInt16 _nWhich )
     : SfxPoolItem( _nWhich ),
     eMode( FILL_TAB )
-    ,bOn( sal_False )
+    ,bOn( false )
 {
 }
 
diff --git a/sw/source/core/uibase/config/modcfg.cxx b/sw/source/core/uibase/config/modcfg.cxx
index a242b944dd0b..3795cbd0b32e 100644
--- a/sw/source/core/uibase/config/modcfg.cxx
+++ b/sw/source/core/uibase/config/modcfg.cxx
@@ -64,7 +64,7 @@ void InsCaptionOptArr::Insert(InsCaptionOpt* pObj)
 }
 
 const InsCaptionOpt* SwModuleOptions::GetCapOption(
-    sal_Bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId)
+    bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId)
 {
     if(bHTML)
     {
@@ -85,9 +85,9 @@ const InsCaptionOpt* SwModuleOptions::GetCapOption(
     }
 }
 
-sal_Bool SwModuleOptions::SetCapOption(sal_Bool bHTML, const InsCaptionOpt* pOpt)
+bool SwModuleOptions::SetCapOption(bool bHTML, const InsCaptionOpt* pOpt)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if(bHTML)
     {
@@ -120,22 +120,22 @@ sal_Bool SwModuleOptions::SetCapOption(sal_Bool bHTML, const InsCaptionOpt* pOpt
             rArr.Insert(new InsCaptionOpt(*pOpt));
 
         aInsertConfig.SetModified();
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
 }
 
 SwModuleOptions::SwModuleOptions() :
-    aInsertConfig(sal_False),
-    aWebInsertConfig(sal_True),
-    aTableConfig(sal_False),
-    aWebTableConfig(sal_True),
-    bHideFieldTips(sal_False)
+    aInsertConfig(false),
+    aWebInsertConfig(true),
+    aTableConfig(false),
+    aWebTableConfig(true),
+    bHideFieldTips(false)
 {
 }
 
-OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, sal_Bool bFromUI)
+OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, bool bFromUI)
 {
     OUString sReturn;
     const sal_Int32 nDelimLen = rDelim.getLength();
@@ -587,13 +587,13 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
     return bIsWeb ? aWebNames : aNames;
 }
 
-SwInsertConfig::SwInsertConfig(sal_Bool bWeb) :
+SwInsertConfig::SwInsertConfig(bool bWeb) :
     ConfigItem(bWeb ? OUString("Office.WriterWeb/Insert") : OUString("Office.Writer/Insert"),
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE),
     pCapOptions(0),
     pOLEMiscOpt(0),
-    bInsWithCaption( sal_False ),
-    bCaptionOrderNumberingFirst( sal_False ),
+    bInsWithCaption( false ),
+    bCaptionOrderNumberingFirst( false ),
     aInsTblOpts(0,0),
     bIsWeb(bWeb)
 {
@@ -916,7 +916,7 @@ void SwInsertConfig::Load()
         {
             if(pValues[nProp].hasValue())
             {
-                sal_Bool bBool = nProp < INS_PROP_CAP_OBJECT_TABLE_ENABLE ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
+                bool bBool = nProp < INS_PROP_CAP_OBJECT_TABLE_ENABLE ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
                 switch(nProp)
                 {
                     case INS_PROP_TABLE_HEADER:
@@ -1133,7 +1133,7 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames()
     return aNames;
 }
 
-SwTableConfig::SwTableConfig(sal_Bool bWeb) :
+SwTableConfig::SwTableConfig(bool bWeb) :
     ConfigItem(bWeb ? OUString("Office.WriterWeb/Table") : OUString("Office.Writer/Table"),
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE)
 {
@@ -1202,13 +1202,13 @@ void SwTableConfig::Load()
 SwMiscConfig::SwMiscConfig() :
     ConfigItem("Office.Writer",
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE),
-    bDefaultFontsInCurrDocOnly(sal_False),
-    bShowIndexPreview(sal_False),
-    bGrfToGalleryAsLnk(sal_True),
-    bNumAlignSize(sal_True),
-    bSinglePrintJob(sal_False),
-    bIsNameFromColumn(sal_True),
-    bAskForMailMergeInPrint(sal_True),
+    bDefaultFontsInCurrDocOnly(false),
+    bShowIndexPreview(false),
+    bGrfToGalleryAsLnk(true),
+    bNumAlignSize(true),
+    bSinglePrintJob(false),
+    bIsNameFromColumn(true),
+    bAskForMailMergeInPrint(true),
     nMailingFormats(0)
 {
     Load();
@@ -1262,7 +1262,7 @@ void SwMiscConfig::Commit()
         {
             case 0 :
                 pValues[nProp] <<=
-                    SwModuleOptions::ConvertWordDelimiter(sWordDelimiter, sal_False);
+                    SwModuleOptions::ConvertWordDelimiter(sWordDelimiter, false);
             break;
             case 1 : pValues[nProp].setValue(&bDefaultFontsInCurrDocOnly, rType); break;
             case 2 : pValues[nProp].setValue(&bShowIndexPreview, rType) ;        break;
@@ -1296,7 +1296,7 @@ void SwMiscConfig::Load()
                 switch(nProp)
                 {
                     case 0 : pValues[nProp] >>= sTmp;
-                        sWordDelimiter = SwModuleOptions::ConvertWordDelimiter(sTmp, sal_True);
+                        sWordDelimiter = SwModuleOptions::ConvertWordDelimiter(sTmp, true);
                     break;
                     case 1 : bDefaultFontsInCurrDocOnly = *(sal_Bool*)pValues[nProp].getValue(); break;
                     case 2 : bShowIndexPreview = *(sal_Bool*)pValues[nProp].getValue(); break;
@@ -1341,8 +1341,8 @@ SwCompareConfig::SwCompareConfig() :
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE)
 {
     eCmpMode = SVX_CMP_AUTO;
-    bUseRsid = 0;
-    bIgnorePieces = 0;
+    bUseRsid = false;
+    bIgnorePieces = false;
     nPieceLen = 1;
 
     Load();
diff --git a/sw/source/core/uibase/config/prtopt.cxx b/sw/source/core/uibase/config/prtopt.cxx
index ac3251b0d145..eb969bd7dabb 100644
--- a/sw/source/core/uibase/config/prtopt.cxx
+++ b/sw/source/core/uibase/config/prtopt.cxx
@@ -65,16 +65,16 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames()
     return aNames;
 }
 
-SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
+SwPrintOptions::SwPrintOptions(bool bWeb) :
     ConfigItem(bWeb ? OUString("Office.WriterWeb/Print") : OUString("Office.Writer/Print"),
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE),
     bIsWeb(bWeb)
 {
     bPrintPageBackground = !bWeb;
     bPrintBlackFont = bWeb;
-    bPrintTextPlaceholder = bPrintHiddenText = sal_False;
+    bPrintTextPlaceholder = bPrintHiddenText = false;
     if (bWeb)
-        bPrintEmptyPages = sal_False;
+        bPrintEmptyPages = false;
 
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sw/source/core/uibase/config/uinums.cxx b/sw/source/core/uibase/config/uinums.cxx
index c2157f672c68..ba78c55e17af 100644
--- a/sw/source/core/uibase/config/uinums.cxx
+++ b/sw/source/core/uibase/config/uinums.cxx
@@ -60,7 +60,7 @@ SwBaseNumRules::SwBaseNumRules( const OUString& rFileName )
     :
     sFileName( rFileName ),
     nVersion(0),
-    bModified( sal_False )
+    bModified( false )
 {
     Init();
 }
@@ -106,7 +106,7 @@ void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, sal_uInt16 n
 }
 
 // PROTECTED METHODS ----------------------------------------------------
-sal_Bool SwBaseNumRules::Store(SvStream &rStream)
+bool SwBaseNumRules::Store(SvStream &rStream)
 {
     rStream.WriteUInt16( ACT_NUM_VERSION );
         // Write, what positions are occupied by a rule
@@ -121,7 +121,7 @@ sal_Bool SwBaseNumRules::Store(SvStream &rStream)
         else
             rStream.WriteUChar( (unsigned char) sal_False );
     }
-    return sal_True;
+    return true;
 }
 
 int SwBaseNumRules::Load(SvStream &rStream)
@@ -166,7 +166,7 @@ SwChapterNumRules::SwChapterNumRules() :
 
 void SwChapterNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, sal_uInt16 nIdx)
 {
-    bModified = sal_True;
+    bModified = true;
     SwBaseNumRules::ApplyNumRules(rCopy, nIdx);
 }
 
@@ -243,7 +243,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const
 {
     // #i89178#
     rChg = SwNumRule( maName, numfunc::GetDefaultPositionAndSpaceMode() );
-    rChg.SetAutoRule( sal_False );
+    rChg.SetAutoRule( false );
     _SwNumFmtGlobal* pFmt;
     for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
         if( 0 != ( pFmt = aFmts[ n ] ) )
@@ -318,20 +318,20 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
         sal_uInt16 nUS;
         short nShort;
         sal_Char cChar;
-        sal_Bool bFlag;
+        bool bFlag;
         OUString sStr;
 
-        rStream.ReadUInt16( nUS );             aFmt.SetNumberingType((sal_Int16)nUS );
+        rStream.ReadUInt16( nUS );           aFmt.SetNumberingType((sal_Int16)nUS );
         if( VERSION_53A > nVersion )
         {
             rStream.ReadChar( cChar );       aFmt.SetBulletChar( cChar );
         }
         else
         {
-            rStream.ReadUInt16( nUS );         aFmt.SetBulletChar( nUS );
+            rStream.ReadUInt16( nUS );       aFmt.SetBulletChar( nUS );
         }
 
-        rStream.ReadUChar( bFlag );           aFmt.SetIncludeUpperLevels( bFlag );
+        rStream.ReadCharAsBool( bFlag );     aFmt.SetIncludeUpperLevels( bFlag );
 
         if( VERSION_30B == nVersion )
         {
@@ -342,7 +342,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
             aFmt.SetPrefix( sStr );
             sStr = rStream.ReadUniOrByteString(eEncoding);
             aFmt.SetSuffix( sStr );
-            rStream.ReadUInt16( nUS );         aFmt.SetNumAdjust( SvxAdjust( nUS ) );
+            rStream.ReadUInt16( nUS );        aFmt.SetNumAdjust( SvxAdjust( nUS ) );
             rStream.ReadInt32( nL );          aFmt.SetLSpace( lNumIndent );
             rStream.ReadInt32( nL );          aFmt.SetFirstLineOffset( (short)nL );
         }
@@ -355,10 +355,10 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
             aFmt.SetSuffix( sStr );
             rStream.ReadUInt16( nUS );         aFmt.SetNumAdjust( SvxAdjust( nUS ) );
             rStream.ReadUInt16( nUS );         aFmt.SetAbsLSpace( nUS );
-            rStream.ReadInt16( nShort );      aFmt.SetFirstLineOffset( nShort );
+            rStream.ReadInt16( nShort );       aFmt.SetFirstLineOffset( nShort );
             rStream.ReadUInt16( nUS );         aFmt.SetCharTextDistance( nUS );
-            rStream.ReadInt16( nShort );      aFmt.SetLSpace( nShort );
-            rStream.ReadUChar( bFlag );
+            rStream.ReadInt16( nShort );       aFmt.SetLSpace( nShort );
+            rStream.ReadCharAsBool( bFlag );
         }
 
         sal_uInt16  nFamily;
@@ -467,7 +467,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
 
         rStream.WriteUInt16( sal_uInt16(aFmt.GetNumberingType()) )
                .WriteUInt16( aFmt.GetBulletChar() )
-               .WriteUChar( static_cast<sal_Bool>(aFmt.GetIncludeUpperLevels() > 0) )
+               .WriteUChar( aFmt.GetIncludeUpperLevels() > 0 )
                .WriteUInt16( aFmt.GetStart() );
         rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding );
         rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding );
diff --git a/sw/source/core/uibase/config/usrpref.cxx b/sw/source/core/uibase/config/usrpref.cxx
index 6e0f70d6086d..c8efb7af92e6 100644
--- a/sw/source/core/uibase/config/usrpref.cxx
+++ b/sw/source/core/uibase/config/usrpref.cxx
@@ -42,11 +42,11 @@ void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
     *((SwViewOption*)this) = rCopy;
 }
 
-SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
+SwMasterUsrPref::SwMasterUsrPref(bool bWeb) :
     eFldUpdateFlags(AUTOUPD_OFF),
     nLinkUpdateMode(0),
-    bIsHScrollMetricSet(sal_False),
-    bIsVScrollMetricSet(sal_False),
+    bIsHScrollMetricSet(false),
+    bIsVScrollMetricSet(false),
     nDefTab( MM50 * 4 ),
     bIsSquaredPageMode(false),
     bIsAlignMathObjectsToBaseline(false),
@@ -55,7 +55,7 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
     aGridConfig(bWeb, *this),
     aCursorConfig(*this),
     pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
-    bApplyCharUnit(sal_False)
+    bApplyCharUnit(false)
 {
     MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
     eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
@@ -109,7 +109,7 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames()
     return aNames;
 }
 
-SwContentViewConfig::SwContentViewConfig(sal_Bool bIsWeb, SwMasterUsrPref& rPar) :
+SwContentViewConfig::SwContentViewConfig(bool bIsWeb, SwMasterUsrPref& rPar) :
     ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Content") :  OUString("Office.Writer/Content")),
     rParent(rPar),
     bWeb(bIsWeb)
@@ -146,15 +146,15 @@ void SwContentViewConfig::Commit()
             case  4: bVal = rParent.IsPostIts();    break;// "Display/Note",
             case  5: bVal = rParent.IsShowContentTips(); break; // "Display/ShowContentTips"
             case  6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
-            case  7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd",
+            case  7: bVal = rParent.IsParagraph(true); break;// "NonprintingCharacter/ParagraphEnd",
             case  8: bVal = rParent.IsSoftHyph(); break;// "NonprintingCharacter/OptionalHyphen",
-            case  9: bVal = rParent.IsBlank(sal_True);  break;// "NonprintingCharacter/Space",
-            case 10: bVal = rParent.IsLineBreak(sal_True);break;// "NonprintingCharacter/Break",
+            case  9: bVal = rParent.IsBlank(true);  break;// "NonprintingCharacter/Space",
+            case 10: bVal = rParent.IsLineBreak(true);break;// "NonprintingCharacter/Break",
             case 11: bVal = rParent.IsHardBlank(); break;// "NonprintingCharacter/ProtectedSpace",
-            case 12: bVal = rParent.IsTab(sal_True);        break;// "NonprintingCharacter/Tab",
+            case 12: bVal = rParent.IsTab(true);        break;// "NonprintingCharacter/Tab",
             case 13: bVal = rParent.IsShowHiddenField(); break;// "NonprintingCharacter/Fields: HiddenText",
             case 14: bVal = rParent.IsShowHiddenPara(); break;// "NonprintingCharacter/Fields: HiddenParagraph",
-            case 15: bVal = rParent.IsShowHiddenChar(sal_True);    break;// "NonprintingCharacter/HiddenCharacter",
+            case 15: bVal = rParent.IsShowHiddenChar(true);    break;// "NonprintingCharacter/HiddenCharacter",
             case 16: pValues[nProp] <<= rParent.GetUpdateLinkMode();    break;// "Update/Link",
             case 17: bVal = rParent.IsUpdateFields(); break;// "Update/Field",
             case 18: bVal = rParent.IsUpdateCharts(); break;// "Update/Chart"
@@ -177,7 +177,7 @@ void SwContentViewConfig::Load()
         {
             if(pValues[nProp].hasValue())
             {
-                sal_Bool bSet = nProp != 16 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
+                bool bSet = nProp != 16 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
                 switch(nProp)
                 {
                     case  0: rParent.SetGraphic(bSet);  break;// "Display/GraphicObject",
@@ -200,11 +200,11 @@ void SwContentViewConfig::Load()
                     {
                         sal_Int32 nSet = 0;
                         pValues[nProp] >>= nSet;
-                        rParent.SetUpdateLinkMode(nSet, sal_True);
+                        rParent.SetUpdateLinkMode(nSet, true);
                     }
                     break;// "Update/Link",
-                    case 17: rParent.SetUpdateFields(bSet, sal_True); break;// "Update/Field",
-                    case 18: rParent.SetUpdateCharts(bSet, sal_True); break;// "Update/Chart"
+                    case 17: rParent.SetUpdateFields(bSet, true); break;// "Update/Field",
+                    case 18: rParent.SetUpdateCharts(bSet, true); break;// "Update/Chart"
                 }
             }
         }
@@ -247,7 +247,7 @@ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames()
     return aNames;
 }
 
-SwLayoutViewConfig::SwLayoutViewConfig(sal_Bool bIsWeb, SwMasterUsrPref& rPar) :
+SwLayoutViewConfig::SwLayoutViewConfig(bool bIsWeb, SwMasterUsrPref& rPar) :
     ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Layout") :  OUString("Office.Writer/Layout"),
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE),
     rParent(rPar),
@@ -271,14 +271,14 @@ void SwLayoutViewConfig::Commit()
         Any &rVal = pValues[nProp];
         switch(nProp)
         {
-            case  0: rVal <<= (sal_Bool) rParent.IsCrossHair(); break;              // "Line/Guide",
-            case  1: rVal <<= (sal_Bool) rParent.IsViewHScrollBar(); break;         // "Window/HorizontalScroll",
-            case  2: rVal <<= (sal_Bool) rParent.IsViewVScrollBar(); break;         // "Window/VerticalScroll",
-            case  3: rVal <<= (sal_Bool) rParent.IsViewAnyRuler(); break;           // "Window/ShowRulers"
+            case  0: rVal <<= rParent.IsCrossHair(); break;              // "Line/Guide",
+            case  1: rVal <<= rParent.IsViewHScrollBar(); break;         // "Window/HorizontalScroll",
+            case  2: rVal <<= rParent.IsViewVScrollBar(); break;         // "Window/VerticalScroll",
+            case  3: rVal <<= rParent.IsViewAnyRuler(); break;           // "Window/ShowRulers"
             // #i14593# use IsView*Ruler(sal_True) instead of IsView*Ruler()
             // this preserves the single ruler states even if "Window/ShowRulers" is off
-            case  4: rVal <<= (sal_Bool) rParent.IsViewHRuler(sal_True); break;         // "Window/HorizontalRuler",
-            case  5: rVal <<= (sal_Bool) rParent.IsViewVRuler(sal_True); break;         // "Window/VerticalRuler",
+            case  4: rVal <<= rParent.IsViewHRuler(true); break;         // "Window/HorizontalRuler",
+            case  5: rVal <<= rParent.IsViewVRuler(true); break;         // "Window/VerticalRuler",
             case  6:
                 if(rParent.bIsHScrollMetricSet)
                     rVal <<= (sal_Int32)rParent.eHScrollMetric;                     // "Window/HorizontalRulerUnit"
@@ -287,18 +287,18 @@ void SwLayoutViewConfig::Commit()
                 if(rParent.bIsVScrollMetricSet)
                     rVal <<= (sal_Int32)rParent.eVScrollMetric;                     // "Window/VerticalRulerUnit"
             break;
-            case  8: rVal <<= (sal_Bool) rParent.IsSmoothScroll(); break;           // "Window/SmoothScroll",
+            case  8: rVal <<= rParent.IsSmoothScroll(); break;                      // "Window/SmoothScroll",
             case  9: rVal <<= (sal_Int32)rParent.GetZoom(); break;                  // "Zoom/Value",
             case 10: rVal <<= (sal_Int32)rParent.GetZoomType(); break;              // "Zoom/Type",
-            case 11: rVal <<= (sal_Bool) rParent.IsAlignMathObjectsToBaseline(); break;      // "Other/IsAlignMathObjectsToBaseline"
+            case 11: rVal <<= rParent.IsAlignMathObjectsToBaseline(); break;        // "Other/IsAlignMathObjectsToBaseline"
             case 12: rVal <<= (sal_Int32)rParent.GetMetric(); break;                // "Other/MeasureUnit",
             case 13: rVal <<= static_cast<sal_Int32>(convertTwipToMm100(rParent.GetDefTab())); break;// "Other/TabStop",
-            case 14: rVal <<= (sal_Bool) rParent.IsVRulerRight(); break;            // "Window/IsVerticalRulerRight",
+            case 14: rVal <<= rParent.IsVRulerRight(); break;                       // "Window/IsVerticalRulerRight",
             case 15: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break;     // "ViewLayout/Columns",
-            case 16: rVal <<= (sal_Bool) rParent.IsViewLayoutBookMode(); break;     // "ViewLayout/BookMode",
-            case 17: rVal <<= (sal_Bool) rParent.IsSquaredPageMode(); break;        // "Other/IsSquaredPageMode",
-            case 18: rVal <<= (sal_Bool) rParent.IsApplyCharUnit(); break;        // "Other/ApplyCharUnit",
-            case 19: rVal <<= (sal_Bool) rParent.IsShowScrollBarTips(); break;      // "Window/ShowScrollBarTips",
+            case 16: rVal <<= rParent.IsViewLayoutBookMode(); break;                // "ViewLayout/BookMode",
+            case 17: rVal <<= rParent.IsSquaredPageMode(); break;                   // "Other/IsSquaredPageMode",
+            case 18: rVal <<= rParent.IsApplyCharUnit(); break;                     // "Other/ApplyCharUnit",
+            case 19: rVal <<= rParent.IsShowScrollBarTips(); break;                 // "Window/ShowScrollBarTips",
         }
     }
     PutProperties(aNames, aValues);
@@ -317,7 +317,7 @@ void SwLayoutViewConfig::Load()
             if(pValues[nProp].hasValue())
             {
                 sal_Int32   nInt32Val   = 0;
-                sal_Bool    bSet        = sal_False;
+                bool    bSet        = false;
                 pValues[nProp] >>= nInt32Val;
                 pValues[nProp] >>= bSet;
 
@@ -331,13 +331,13 @@ void SwLayoutViewConfig::Load()
                     case  5: rParent.SetViewVRuler(bSet); break;// "Window/VerticalRuler",
                     case  6:
                     {
-                        rParent.bIsHScrollMetricSet = sal_True;
+                        rParent.bIsHScrollMetricSet = true;
                         rParent.eHScrollMetric = ((FieldUnit)nInt32Val);  // "Window/HorizontalRulerUnit"
                     }
                     break;
                     case  7:
                     {
-                        rParent.bIsVScrollMetricSet = sal_True;
+                        rParent.bIsVScrollMetricSet = true;
                         rParent.eVScrollMetric = ((FieldUnit)nInt32Val); // "Window/VerticalRulerUnit"
                     }
                     break;
@@ -345,12 +345,12 @@ void SwLayoutViewConfig::Load()
                     case  9: rParent.SetZoom( static_cast< sal_uInt16 >(nInt32Val) ); break;// "Zoom/Value",
                     case 10: rParent.SetZoomType( static_cast< SvxZoomType >(nInt32Val) ); break;// "Zoom/Type",
                     case 11: rParent.SetAlignMathObjectsToBaseline(bSet); break;// "Other/IsAlignMathObjectsToBaseline"
-                    case 12: rParent.SetMetric((FieldUnit)nInt32Val, sal_True); break;// "Other/MeasureUnit",
-                    case 13: rParent.SetDefTab(convertMm100ToTwip(nInt32Val), sal_True); break;// "Other/TabStop",
+                    case 12: rParent.SetMetric((FieldUnit)nInt32Val, true); break;// "Other/MeasureUnit",
+                    case 13: rParent.SetDefTab(convertMm100ToTwip(nInt32Val), true); break;// "Other/TabStop",
                     case 14: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
                     case 15: rParent.SetViewLayoutColumns( static_cast<sal_uInt16>(nInt32Val) ); break;// "ViewLayout/Columns",
                     case 16: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
-                    case 17: rParent.SetDefaultPageMode(bSet,sal_True); break;// "Other/IsSquaredPageMode",
+                    case 17: rParent.SetDefaultPageMode(bSet,true); break;// "Other/IsSquaredPageMode",
                     case 18: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
                     case 19: rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips",
                 }
@@ -383,7 +383,7 @@ Sequence<OUString> SwGridConfig::GetPropertyNames()
     return aNames;
 }
 
-SwGridConfig::SwGridConfig(sal_Bool bIsWeb, SwMasterUsrPref& rPar) :
+SwGridConfig::SwGridConfig(bool bIsWeb, SwMasterUsrPref& rPar) :
     ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Grid") :  OUString("Office.Writer/Grid"),
         CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE),
     rParent(rPar)
@@ -433,7 +433,7 @@ void SwGridConfig::Load()
         {
             if(pValues[nProp].hasValue())
             {
-                sal_Bool bSet = nProp < 3 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
+                bool bSet = nProp < 3 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
                 sal_Int32 nSet = 0;
                 if(nProp >= 3)
                     pValues[nProp] >>= nSet;
@@ -517,7 +517,7 @@ void SwCursorConfig::Load()
         {
             if(pValues[nProp].hasValue())
             {
-                sal_Bool bSet = sal_False;
+                bool bSet = false;
                 sal_Int32 nSet = 0;
                 if(nProp != 1 )
                     bSet = *(sal_Bool*)pValues[nProp].getValue();
diff --git a/sw/source/core/uibase/config/viewopt.cxx b/sw/source/core/uibase/config/viewopt.cxx
index 688e99829e64..0b4cec5417ec 100644
--- a/sw/source/core/uibase/config/viewopt.cxx
+++ b/sw/source/core/uibase/config/viewopt.cxx
@@ -131,7 +131,7 @@ sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const
     return sal_uInt16(pOut->GetTextWidth( OUString(aPostItStr )));
 }
 
-void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const
+void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ) const
 {
     if( pOut && bIsScript )
     {
@@ -156,15 +156,15 @@ SwViewOption::SwViewOption() :
     nPagePrevRow( 1 ),
     nPagePrevCol( 2 ),
     nShdwCrsrFillMode( FILL_TAB ),
-    bReadonly(sal_False),
-    bStarOneSetting(sal_False),
-    bIsPagePreview(sal_False),
-    bSelectionInReadonly(sal_False),
-    mbFormView(sal_False),
-    mbBrowseMode(sal_False),
-    mbBookView(sal_False),
-    mbViewLayoutBookMode(sal_False),
-    bShowPlaceHolderFields( sal_True ),
+    bReadonly(false),
+    bStarOneSetting(false),
+    bIsPagePreview(false),
+    bSelectionInReadonly(false),
+    mbFormView(false),
+    mbBrowseMode(false),
+    mbBookView(false),
+    mbViewLayoutBookMode(false),
+    bShowPlaceHolderFields( true ),
     nZoom( 100 ),
     eZoom( SVX_ZOOM_PERCENT ),
     nTblDest(TBL_DEST_CELL)
@@ -210,8 +210,8 @@ SwViewOption::SwViewOption() :
 
 SwViewOption::SwViewOption(const SwViewOption& rVOpt)
 {
-    bReadonly = sal_False;
-    bSelectionInReadonly = sal_False;
+    bReadonly = false;
+    bSelectionInReadonly = false;
     // #114856# Formular view
     mbFormView       = rVOpt.mbFormView;
     nZoom           = rVOpt.nZoom       ;
@@ -303,7 +303,7 @@ void SwViewOption::Init( Window *pWin )
     }
 }
 
-sal_Bool SwViewOption::IsAutoCompleteWords() const
+bool SwViewOption::IsAutoCompleteWords() const
 {
     const SvxSwAutoFmtFlags& rFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
     return rFlags.bAutoCmpltCollectWords;
@@ -500,7 +500,7 @@ void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig )
     aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
 }
 
-void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, sal_Bool bSet, sal_Bool bSaveInConfig )
+void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInConfig )
 {
     if(bSet)
         nAppearanceFlags |= nFlag;
@@ -542,7 +542,7 @@ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, sal_Bool bSet, sal_Bool bS
     }
 }
 
-sal_Bool SwViewOption::IsAppearanceFlag(sal_Int32 nFlag)
+bool SwViewOption::IsAppearanceFlag(sal_Int32 nFlag)
 {
     return 0 != (nAppearanceFlags & nFlag);
 }
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
index fdb5e6c1186c..0d65d5c66319 100644
--- a/sw/source/core/uibase/dbui/dbmgr.cxx
+++ b/sw/source/core/uibase/dbui/dbmgr.cxx
@@ -167,7 +167,7 @@ bool lcl_getCountFromResultSet( sal_Int32& rCount, const uno::Reference<XResultS
     {
         try
         {
-            sal_Bool bFinal = sal_False;
+            bool bFinal = false;
             Any aFinal = xPrSet->getPropertyValue("IsRowCountFinal");
             aFinal >>= bFinal;
             if(!bFinal)
@@ -255,9 +255,9 @@ static void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSourc
     }
 }
 
-static sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
+static bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         if(pParam->bScrollable)
@@ -275,7 +275,7 @@ static sal_Bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
     return bRet;
 }
 
-static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam,
+static bool lcl_GetColumnCnt(SwDSParam* pParam,
     const OUString& rColumnName, long nLanguage, OUString& rResult, double* pNumber)
 {
     uno::Reference< XColumnsSupplier > xColsSupp( pParam->xResultSet, UNO_QUERY );
@@ -288,7 +288,7 @@ static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam,
     {
     }
     if(!xCols.is() || !xCols->hasByName(rColumnName))
-        return sal_False;
+        return false;
     Any aCol = xCols->getByName(rColumnName);
     uno::Reference< XPropertySet > xColumnProps;
     aCol >>= xColumnProps;
@@ -306,13 +306,13 @@ static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam,
     aFormatData.aLocale = LanguageTag( (LanguageType)nLanguage ).getLocale();
 
     rResult = SwDBMgr::GetDBField( xColumnProps, aFormatData, pNumber);
-    return sal_True;
+    return true;
 };
 
 /*--------------------------------------------------------------------
     Description: import data
  --------------------------------------------------------------------*/
-sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
+bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
 {
     OSL_ENSURE(!bInMerge && !pImpl->pMergeData, "merge already activated!");
 
@@ -335,11 +335,11 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
 
     if(aData.sDataSource.isEmpty() || aData.sCommand.isEmpty() || !xResSet.is())
     {
-        return sal_False;
+        return false;
     }
 
     pImpl->pMergeData = new SwDSParam(aData, xResSet, aSelection);
-    SwDSParam*  pTemp = FindDSData(aData, sal_False);
+    SwDSParam*  pTemp = FindDSData(aData, false);
     if(pTemp)
         *pTemp = *pImpl->pMergeData;
     else
@@ -349,7 +349,7 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
         //DSData and set the correct CommandType
         SwDBData aTempData(aData);
         aData.nCommandType = -1;
-        pTemp = FindDSData(aData, sal_False);
+        pTemp = FindDSData(aData, false);
         if(pTemp)
             *pTemp = *pImpl->pMergeData;
         else
@@ -380,7 +380,7 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
             pImpl->pMergeData->bEndOfDB = !pImpl->pMergeData->xResultSet->absolute( nPos );
             pImpl->pMergeData->CheckEndOfDB();
             if(pImpl->pMergeData->nSelectionIndex >= pImpl->pMergeData->aSelection.getLength())
-                pImpl->pMergeData->bEndOfDB = sal_True;
+                pImpl->pMergeData->bEndOfDB = true;
         }
         else
         {
@@ -390,7 +390,7 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
     }
     catch(const Exception&)
     {
-        pImpl->pMergeData->bEndOfDB = sal_True;
+        pImpl->pMergeData->bEndOfDB = true;
         pImpl->pMergeData->CheckEndOfDB();
         OSL_FAIL("exception in MergeNew()");
     }
@@ -400,7 +400,7 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
     lcl_InitNumberFormatter(*pImpl->pMergeData, xSource);
 
     rMergeDesc.rSh.ChgDBData(aData);
-    bInMerge = sal_True;
+    bInMerge = true;
 
     if (IsInitDBFields())
     {
@@ -414,10 +414,10 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
         sDBName += OUString(DB_DELIM);
         sDBName += OUString::number(aInsertData.nCommandType);
         rMergeDesc.rSh.ChangeDBFields( aDBNames, sDBName);
-        SetInitDBFields(sal_False);
+        SetInitDBFields(false);
     }
 
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     switch(rMergeDesc.nMergeType)
     {
         case DBMGR_MERGE:
@@ -447,16 +447,16 @@ sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
 /*--------------------------------------------------------------------
     Description: import data
  --------------------------------------------------------------------*/
-sal_Bool SwDBMgr::Merge(SwWrtShell* pSh)
+bool SwDBMgr::Merge(SwWrtShell* pSh)
 {
     pSh->StartAllAction();
 
-    pSh->SwViewShell::UpdateFlds(sal_True);
+    pSh->SwViewShell::UpdateFlds(true);
     pSh->SetModified();
 
     pSh->EndAllAction();
 
-    return sal_True;
+    return true;
 }
 
 void SwDBMgr::ImportFromConnection(  SwWrtShell* pSh )
@@ -466,8 +466,8 @@ void SwDBMgr::ImportFromConnection(  SwWrtShell* pSh )
         {
             pSh->StartAllAction();
             pSh->StartUndo(UNDO_EMPTY);
-            sal_Bool bGroupUndo(pSh->DoesGroupUndo());
-            pSh->DoGroupUndo(sal_False);
+            bool bGroupUndo(pSh->DoesGroupUndo());
+            pSh->DoGroupUndo(false);
 
             if( pSh->HasSelection() )
                 pSh->DelRight();
@@ -595,12 +595,12 @@ void SwDBMgr::ImportDBEntry(SwWrtShell* pSh)
 /*--------------------------------------------------------------------
     Description: fill Listbox with tablelist
  --------------------------------------------------------------------*/
-sal_Bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
+bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     OUString sOldTableName(pListBox->GetSelectEntry());
     pListBox->Clear();
-    SwDSParam* pParam = FindDSConnection(rDBName, sal_False);
+    SwDSParam* pParam = FindDSConnection(rDBName, false);
     uno::Reference< XConnection> xConnection;
     if(pParam && pParam->xConnection.is())
         xConnection = pParam->xConnection;
@@ -638,7 +638,7 @@ sal_Bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
         }
         if (!sOldTableName.isEmpty())
             pListBox->SelectEntry(sOldTableName);
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
@@ -646,8 +646,8 @@ sal_Bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
 /*--------------------------------------------------------------------
     Description: fill Listbox with column names of a database
  --------------------------------------------------------------------*/
-sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
-            const OUString& rDBName, const OUString& rTableName, sal_Bool bAppend)
+void SwDBMgr::GetColumnNames(ListBox* pListBox,
+                             const OUString& rDBName, const OUString& rTableName, bool bAppend)
 {
     if (!bAppend)
         pListBox->Clear();
@@ -655,7 +655,7 @@ sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
     aData.sDataSource = rDBName;
     aData.sCommand = rTableName;
     aData.nCommandType = -1;
-    SwDSParam* pParam = FindDSData(aData, sal_False);
+    SwDSParam* pParam = FindDSData(aData, false);
     uno::Reference< XConnection> xConnection;
     if(pParam && pParam->xConnection.is())
         xConnection = pParam->xConnection;
@@ -676,12 +676,11 @@ sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
         }
         ::comphelper::disposeComponent( xColsSupp );
     }
-    return(sal_True);
 }
 
-sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
+void SwDBMgr::GetColumnNames(ListBox* pListBox,
         uno::Reference< XConnection> xConnection,
-        const OUString& rTableName, sal_Bool bAppend)
+        const OUString& rTableName, bool bAppend)
 {
     if (!bAppend)
         pListBox->Clear();
@@ -697,7 +696,6 @@ sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
         }
         ::comphelper::disposeComponent( xColsSupp );
     }
-    return(sal_True);
 }
 
 /*--------------------------------------------------------------------
@@ -818,15 +816,15 @@ static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell )
             rWorkShell.UpdateSection( nSection, aSectionData );
         }
     }
-    rWorkShell.SetLabelDoc( sal_False );
+    rWorkShell.SetLabelDoc( false );
 }
 
-sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
+bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
         const SwMergeDescriptor& rMergeDescriptor)
 {
     //check if the doc is synchronized and contains at least one linked section
     bool bSynchronizedDoc = pSourceShell->IsLabelDoc() && pSourceShell->GetSectionFmtCount() > 1;
-    sal_Bool bNoError = sal_True;
+    bool bNoError = true;
     bool bEMail = rMergeDescriptor.nMergeType == DBMGR_MERGE_MAILING;
     const bool bAsSingleFile = rMergeDescriptor.nMergeType == DBMGR_MERGE_SINGLE_FILE;
 
@@ -859,7 +857,7 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
             uno::Reference< XColumnsSupplier > xColsSupp( pImpl->pMergeData->xResultSet, UNO_QUERY );
             uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
             if(!xCols->hasByName(sEMailAddrFld))
-                return sal_False;
+                return false;
             Any aCol = xCols->getByName(sEMailAddrFld);
             aCol >>= xColumnProp;
         }
@@ -892,7 +890,7 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                         pStoreToFilterOptions = &rMergeDescriptor.sSaveToFilterOptions;
                 }
             }
-            bCancel = sal_False;
+            bCancel = false;
 
             // in case of creating a single resulting file this has to be created here
             SwWrtShell* pTargetShell = 0;
@@ -920,9 +918,9 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                 pTargetView->AttrChangedNotify( &pTargetView->GetWrtShell() );
                 pTargetShell = pTargetView->GetWrtShellPtr();
                 //copy the styles from the source to the target document
-                pTargetView->GetDocShell()->_LoadStyles( *pSourceDocSh, sal_True );
+                pTargetView->GetDocShell()->_LoadStyles( *pSourceDocSh, true );
                 //determine the page style and number used at the start of the source document
-                pSourceShell->SttEndDoc(sal_True);
+                pSourceShell->SttEndDoc(true);
                 nStartingPageNo = pSourceShell->GetVirtPageNum();
                 sStartingPageDesc = sModifiedStartingPageDesc = pSourceShell->GetPageDesc(
                                             pSourceShell->GetCurPageDesc()).GetName();
@@ -1001,8 +999,8 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                     if( !aTempFile->IsValid() )
                     {
                         ErrorHandler::HandleError( ERRCODE_IO_NOTSUPPORTED );
-                        bNoError = sal_False;
-                        bCancel = sal_True;
+                        bNoError = false;
+                        bCancel = true;
                     }
                     else
                     {
@@ -1067,13 +1065,13 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                 }
 
                                 // insert the document into the target document
-                                rWorkShell.SttEndDoc(sal_False);
-                                rWorkShell.SttEndDoc(sal_True);
+                                rWorkShell.SttEndDoc(false);
+                                rWorkShell.SttEndDoc(true);
                                 rWorkShell.SelAll();
-                                pTargetShell->SwCrsrShell::SttEndDoc( sal_False );
+                                pTargetShell->SwCrsrShell::SttEndDoc( false );
                                 //#i72517# the headers and footers are still those from the source - update in case of fields inside header/footer
                                 if( !nDocNo && bPageStylesWithHeaderFooter )
-                                    pTargetShell->GetView().GetDocShell()->_LoadStyles( *rWorkShell.GetView().GetDocShell(), sal_True );
+                                    pTargetShell->GetView().GetDocShell()->_LoadStyles( *rWorkShell.GetView().GetDocShell(), true );
                                 //#i72517# put the styles to the target document
                                 //if the source uses headers or footers each new copy need to copy a new page styles
                                 if(bPageStylesWithHeaderFooter)
@@ -1110,7 +1108,7 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                         pWorkDoc->AppendTxtNode( aTestPos );
                                     }
                                 }
-                                pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+                                pTargetShell->Paste( rWorkShell.GetDoc(), true );
 
                                 //convert fields in page styles (header/footer - has to be done after the first document has been pasted
                                 if(1 == nDocNo)
@@ -1144,8 +1142,8 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                 {
                                     // error message ??
                                     ErrorHandler::HandleError( xWorkDocSh->GetError() );
-                                    bCancel = sal_True;
-                                    bNoError = sal_False;
+                                    bCancel = true;
+                                    bNoError = false;
                                 }
                                 if( bEMail )
                                 {
@@ -1188,7 +1186,7 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                                 {
                                                     pInStream->SetStreamCharSet( eEncoding );
                                                     OString sLine;
-                                                    sal_Bool bDone = pInStream->ReadLine( sLine );
+                                                    bool bDone = pInStream->ReadLine( sLine );
                                                     while ( bDone )
                                                     {
                                                         sBody += OStringToOUString(sLine, eEncoding);
@@ -1282,14 +1280,14 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                     {
                         // error message ??
                         ErrorHandler::HandleError( xTargetDocShell->GetError() );
-                        bNoError = sal_False;
+                        bNoError = false;
                     }
                 }
                 else if( pTargetView ) // must be available!
                 {
                     //print the target document
         #if OSL_DEBUG_LEVEL > 1
-                    sal_Bool  _bVal;
+                    bool  _bVal;
                     sal_Int16 _nVal;
                     OUString  _sVal;
                     const beans::PropertyValue* pDbgPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray();
@@ -1358,7 +1356,7 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
 
 void SwDBMgr::MergeCancel()
 {
-    bCancel = sal_True;
+    bCancel = true;
 }
 
 IMPL_LINK_INLINE_START( SwDBMgr, PrtCancelHdl, Button *, pButton )
@@ -1401,7 +1399,7 @@ sal_uLong SwDBMgr::GetColumnFmt( const OUString& rDBName,
             aData.sDataSource = rDBName;
             aData.sCommand = rTableName;
             aData.nCommandType = -1;
-            SwDSParam* pParam = FindDSData(aData, sal_False);
+            SwDSParam* pParam = FindDSData(aData, false);
             if(pParam && pParam->xConnection.is())
             {
                 xConnection = pParam->xConnection;
@@ -1544,7 +1542,7 @@ sal_Int32 SwDBMgr::GetColumnType( const OUString& rDBName,
     aData.sDataSource = rDBName;
     aData.sCommand = rTableName;
     aData.nCommandType = -1;
-    SwDSParam* pParam = FindDSData(aData, sal_False);
+    SwDSParam* pParam = FindDSData(aData, false);
     uno::Reference< XConnection> xConnection;
     uno::Reference< XColumnsSupplier > xColsSupp;
     bool bDispose = false;
@@ -1725,14 +1723,14 @@ OUString SwDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
 void    SwDBMgr::EndMerge()
 {
     OSL_ENSURE(bInMerge, "merge is not active");
-    bInMerge = sal_False;
+    bInMerge = false;
     delete pImpl->pMergeData;
     pImpl->pMergeData = 0;
 }
 
 // checks if a desired data source table or query is open
-sal_Bool    SwDBMgr::IsDataSourceOpen(const OUString& rDataSource,
-                                         const OUString& rTableOrQuery, sal_Bool bMergeOnly)
+bool    SwDBMgr::IsDataSourceOpen(const OUString& rDataSource,
+                                  const OUString& rTableOrQuery, bool bMergeOnly)
 {
     if(pImpl->pMergeData)
     {
@@ -1749,19 +1747,19 @@ sal_Bool    SwDBMgr::IsDataSourceOpen(const OUString& rDataSource,
         aData.sDataSource = rDataSource;
         aData.sCommand = rTableOrQuery;
         aData.nCommandType = -1;
-        SwDSParam* pFound = FindDSData(aData, sal_False);
+        SwDSParam* pFound = FindDSData(aData, false);
         return (pFound && pFound->xResultSet.is());
     }
-    return sal_False;
+    return false;
 }
 
 // read column data at a specified position
-sal_Bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
-                            const OUString& rColumnName, sal_uInt32 nAbsRecordId,
-                            long nLanguage,
-                            OUString& rResult, double* pNumber)
+bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
+                           const OUString& rColumnName, sal_uInt32 nAbsRecordId,
+                           long nLanguage,
+                           OUString& rResult, double* pNumber)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwDSParam* pFound = 0;
     //check if it's the merge data source
     if(pImpl->pMergeData &&
@@ -1776,10 +1774,10 @@ sal_Bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTab
         aData.sDataSource = rSourceName;
         aData.sCommand = rTableName;
         aData.nCommandType = -1;
-        pFound = FindDSData(aData, sal_False);
+        pFound = FindDSData(aData, false);
     }
     if (!pFound)
-        return sal_False;
+        return false;
     //check validity of supplied record Id
     if(pFound->aSelection.getLength())
     {
@@ -1794,7 +1792,7 @@ sal_Bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTab
                 bFound = true;
         }
         if(!bFound)
-            return sal_False;
+            return false;
     }
     if(pFound->xResultSet.is() && !pFound->bAfterSelection)
     {
@@ -1805,10 +1803,10 @@ sal_Bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTab
         }
         catch(const Exception&)
         {
-            return sal_False;
+            return false;
         }
         //position to the desired index
-        sal_Bool bMove = sal_True;
+        bool bMove = true;
         if ( nOldRow != static_cast<sal_Int32>(nAbsRecordId) )
             bMove = lcl_MoveAbsolute(pFound, nAbsRecordId);
         if(bMove)
@@ -1822,26 +1820,26 @@ sal_Bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTab
 }
 
 // reads the column data at the current position
-sal_Bool    SwDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
-                                OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
+bool    SwDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
+                                   OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
 {
     if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection )
     {
         rResult = "";
-        return sal_False;
+        return false;
     }
 
-    sal_Bool bRet = lcl_GetColumnCnt(pImpl->pMergeData, rColumnName, nLanguage, rResult, pNumber);
+    bool bRet = lcl_GetColumnCnt(pImpl->pMergeData, rColumnName, nLanguage, rResult, pNumber);
     return bRet;
 }
 
-sal_Bool SwDBMgr::ToNextMergeRecord()
+bool SwDBMgr::ToNextMergeRecord()
 {
     OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
     return ToNextRecord(pImpl->pMergeData);
 }
 
-sal_Bool SwDBMgr::ToNextRecord(
+bool SwDBMgr::ToNextRecord(
     const OUString& rDataSource, const OUString& rCommand, sal_Int32 /*nCommandType*/)
 {
     SwDSParam* pFound = 0;
@@ -1855,20 +1853,20 @@ sal_Bool SwDBMgr::ToNextRecord(
         aData.sDataSource = rDataSource;
         aData.sCommand = rCommand;
         aData.nCommandType = -1;
-        pFound = FindDSData(aData, sal_False);
+        pFound = FindDSData(aData, false);
     }
     return ToNextRecord(pFound);
 }
 
-sal_Bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
+bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     if(!pParam || !pParam->xResultSet.is() || pParam->bEndOfDB ||
             (pParam->aSelection.getLength() && pParam->aSelection.getLength() <= pParam->nSelectionIndex))
     {
         if(pParam)
             pParam->CheckEndOfDB();
-        return sal_False;
+        return false;
     }
     try
     {
@@ -1880,7 +1878,7 @@ sal_Bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
             pParam->CheckEndOfDB();
             bRet = !pParam->bEndOfDB;
             if(pParam->nSelectionIndex >= pParam->aSelection.getLength())
-                pParam->bEndOfDB = sal_True;
+                pParam->bEndOfDB = true;
         }
         else
         {
@@ -1889,7 +1887,7 @@ sal_Bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
             if( !pParam->bEndOfDB && nBefore == pParam->xResultSet->getRow())
             {
                 //next returned true but it didn't move
-                pParam->bEndOfDB = sal_True;
+                pParam->bEndOfDB = true;
             }
 
             pParam->CheckEndOfDB();
@@ -1908,7 +1906,7 @@ sal_Bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
     to assure that the next page can be created in mail merge
     the cursor position must be validated
  ---------------------------------------------------------------------------*/
-sal_Bool SwDBMgr::ExistsNextRecord() const
+bool SwDBMgr::ExistsNextRecord() const
 {
     return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB;
 }
@@ -1929,12 +1927,12 @@ sal_uInt32  SwDBMgr::GetSelectedRecordId()
     return nRet;
 }
 
-sal_Bool SwDBMgr::ToRecordId(sal_Int32 nSet)
+bool SwDBMgr::ToRecordId(sal_Int32 nSet)
 {
     OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
     if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()|| nSet < 0)
-        return sal_False;
-    sal_Bool bRet = sal_False;
+        return false;
+    bool bRet = false;
     sal_Int32 nAbsPos = nSet;
 
     if(nAbsPos >= 0)
@@ -1946,7 +1944,7 @@ sal_Bool SwDBMgr::ToRecordId(sal_Int32 nSet)
     return bRet;
 }
 
-sal_Bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery,
+bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery,
             sal_Int32 nCommandType, bool bCreate)
 {
     SwDBData aData;
@@ -1954,11 +1952,11 @@ sal_Bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rT
     aData.sCommand = rTableOrQuery;
     aData.nCommandType = nCommandType;
 
-    SwDSParam* pFound = FindDSData(aData, sal_True);
+    SwDSParam* pFound = FindDSData(aData, true);
     uno::Reference< XDataSource> xSource;
     if(pFound->xResultSet.is())
-        return sal_True;
-    SwDSParam* pParam = FindDSConnection(rDataSource, sal_False);
+        return true;
+    SwDSParam* pParam = FindDSConnection(rDataSource, false);
     uno::Reference< XConnection> xConnection;
     if(pParam && pParam->xConnection.is())
         pFound->xConnection = pParam->xConnection;
@@ -1980,7 +1978,7 @@ sal_Bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rT
             catch(const Exception&)
             {
                 // DB driver may not be ODBC 3.0 compliant
-                pFound->bScrollable = sal_True;
+                pFound->bScrollable = true;
             }
             pFound->xStatement = pFound->xConnection->createStatement();
             OUString aQuoteChar = xMetaData->getIdentifierQuoteString();
@@ -1993,7 +1991,7 @@ sal_Bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rT
 
             //after executeQuery the cursor must be positioned
             pFound->bEndOfDB = !pFound->xResultSet->next();
-            pFound->bAfterSelection = sal_False;
+            pFound->bAfterSelection = false;
             pFound->CheckEndOfDB();
             ++pFound->nSelectionIndex;
         }
@@ -2009,7 +2007,7 @@ sal_Bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rT
 
 uno::Reference< XConnection> SwDBMgr::RegisterConnection(OUString& rDataSource)
 {
-    SwDSParam* pFound = SwDBMgr::FindDSConnection(rDataSource, sal_True);
+    SwDSParam* pFound = SwDBMgr::FindDSConnection(rDataSource, true);
     uno::Reference< XDataSource> xSource;
     if(!pFound->xConnection.is())
     {
@@ -2043,7 +2041,7 @@ sal_uInt32      SwDBMgr::GetSelectedRecordId(
         aData.sDataSource = rDataSource;
         aData.sCommand = rTableOrQuery;
         aData.nCommandType = nCommandType;
-        SwDSParam* pFound = FindDSData(aData, sal_False);
+        SwDSParam* pFound = FindDSData(aData, false);
         if(pFound && pFound->xResultSet.is())
         {
             try
@@ -2068,7 +2066,7 @@ sal_uInt32      SwDBMgr::GetSelectedRecordId(
 }
 
 // close all data sources - after fields were updated
-void    SwDBMgr::CloseAll(sal_Bool bIncludingMerge)
+void    SwDBMgr::CloseAll(bool bIncludingMerge)
 {
     //the only thing done here is to reset the selection index
     //all connections stay open
@@ -2078,8 +2076,8 @@ void    SwDBMgr::CloseAll(sal_Bool bIncludingMerge)
         if(bIncludingMerge || pParam != pImpl->pMergeData)
         {
             pParam->nSelectionIndex = 0;
-            pParam->bAfterSelection = sal_False;
-            pParam->bEndOfDB = sal_False;
+            pParam->bAfterSelection = false;
+            pParam->bEndOfDB = false;
             try
             {
                 if(!bInMerge && pParam->xResultSet.is())
@@ -2091,7 +2089,7 @@ void    SwDBMgr::CloseAll(sal_Bool bIncludingMerge)
     }
 }
 
-SwDSParam* SwDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate)
+SwDSParam* SwDBMgr::FindDSData(const SwDBData& rData, bool bCreate)
 {
     //prefer merge data if available
     if(pImpl->pMergeData && rData.sDataSource == pImpl->pMergeData->sDataSource &&
@@ -2140,7 +2138,7 @@ SwDSParam* SwDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate)
     return pFound;
 }
 
-SwDSParam*  SwDBMgr::FindDSConnection(const OUString& rDataSource, sal_Bool bCreate)
+SwDSParam*  SwDBMgr::FindDSConnection(const OUString& rDataSource, bool bCreate)
 {
     //prefer merge data if available
     if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource )
@@ -2375,7 +2373,7 @@ OUString SwDBMgr::LoadAndRegisterDataSource()
 
 void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
                         const Sequence<PropertyValue>& rProperties,
-                        sal_Bool bWithDataSourceBrowser)
+                        bool bWithDataSourceBrowser)
 {
     //prevent second call
     if(pImpl->pMergeDialog)
@@ -2407,7 +2405,7 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
     if(!xConnection.is())
     {
         xConnection = SwDBMgr::RegisterConnection(sDataSource);
-        pFound = FindDSConnection(sDataSource, sal_True);
+        pFound = FindDSConnection(sDataSource, true);
     }
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -2681,7 +2679,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
     uno::Reference< XResultSet> xResultSet = rMMConfig.GetResultSet();
     if(!xResultSet.is())
         return 0;
-    bInMerge = sal_True;
+    bInMerge = true;
     sal_Int32 nRet  = 0;
     pImpl->pMergeData = new SwDSParam(
                 rMMConfig.GetCurrentDBData(), xResultSet, rMMConfig.GetSelection());
@@ -2695,7 +2693,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
             pImpl->pMergeData->bEndOfDB = !pImpl->pMergeData->xResultSet->absolute( nPos );
             pImpl->pMergeData->CheckEndOfDB();
             if(pImpl->pMergeData->nSelectionIndex >= pImpl->pMergeData->aSelection.getLength())
-                pImpl->pMergeData->bEndOfDB = sal_True;
+                pImpl->pMergeData->bEndOfDB = true;
         }
         else
         {
@@ -2705,13 +2703,13 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
     }
     catch(const Exception&)
     {
-        pImpl->pMergeData->bEndOfDB = sal_True;
+        pImpl->pMergeData->bEndOfDB = true;
         pImpl->pMergeData->CheckEndOfDB();
         OSL_FAIL("exception in MergeNew()");
     }
 
     //bCancel is set from the PrintMonitor
-    bCancel = sal_False;
+    bCancel = false;
 
     CreateMonitor aMonitorDlg(&rSourceView.GetEditWin());
     aMonitorDlg.SetCancelHdl(LINK(this, SwDBMgr, PrtCancelHdl));
@@ -2728,7 +2726,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
     SwWrtShell& rSourceShell = rSourceView.GetWrtShell();
     bool bSynchronizedDoc = rSourceShell.IsLabelDoc() && rSourceShell.GetSectionFmtCount() > 1;
     //save the settings of the first
-    rSourceShell.SttEndDoc(sal_True);
+    rSourceShell.SttEndDoc(true);
     sal_uInt16 nStartingPageNo = rSourceShell.GetVirtPageNum();
     OUString sModifiedStartingPageDesc;
     OUString sStartingPageDesc = sModifiedStartingPageDesc = rSourceShell.GetPageDesc(
@@ -2832,10 +2830,10 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
             }
 
             // insert the document into the target document
-            rWorkShell.SttEndDoc(sal_False);
-            rWorkShell.SttEndDoc(sal_True);
+            rWorkShell.SttEndDoc(false);
+            rWorkShell.SttEndDoc(true);
             rWorkShell.SelAll();
-            pTargetShell->SttEndDoc(sal_False);
+            pTargetShell->SttEndDoc(false);
 
             //#i63806# put the styles to the target document
             //if the source uses headers or footers each new copy need to copy a new page styles
@@ -2859,7 +2857,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
             }
             if(nDocNo == 1 || bPageStylesWithHeaderFooter)
             {
-                pTargetView->GetDocShell()->_LoadStyles( *rSourceView.GetDocShell(), sal_True );
+                pTargetView->GetDocShell()->_LoadStyles( *rSourceView.GetDocShell(), true );
             }
             if(nDocNo > 1)
             {
@@ -2882,7 +2880,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                     pWorkDoc->AppendTxtNode( aTestPos );
                 }
             }
-            pTargetShell->Paste( rWorkShell.GetDoc(), sal_True );
+            pTargetShell->Paste( rWorkShell.GetDoc(), true );
             //convert fields in page styles (header/footer - has to be done after the first document has been pasted
             if(1 == nDocNo)
             {
@@ -2930,7 +2928,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
         OSL_FAIL("exception caught in SwDBMgr::MergeDocuments");
     }
     DELETEZ(pImpl->pMergeData);
-    bInMerge = sal_False;
+    bInMerge = false;
     return nRet;
 }
 
diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx
index 9ea865412366..71cd80da13ee 100644
--- a/sw/source/core/uibase/dbui/dbtree.cxx
+++ b/sw/source/core/uibase/dbui/dbtree.cxx
@@ -86,7 +86,7 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
     virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
 
-    sal_Bool                        HasContext();
+    bool                        HasContext();
     SwWrtShell*                 GetWrtShell() { return pWrtSh;}
     void                        SetWrtShell(SwWrtShell& rSh) { pWrtSh = &rSh;}
     Reference<XDatabaseContext>    GetContext() const {return xDBContext;}
@@ -137,7 +137,7 @@ void SwDBTreeList_Impl::elementReplaced( const ContainerEvent& rEvent ) throw (R
     elementRemoved(rEvent);
 }
 
-sal_Bool SwDBTreeList_Impl::HasContext()
+bool SwDBTreeList_Impl::HasContext()
 {
     if(!xDBContext.is())
     {
@@ -239,7 +239,7 @@ void    SwDBTreeList::AddDataSource(const OUString& rSource)
     SvTreeListBox::Select(pEntry);
 }
 
-void SwDBTreeList::ShowColumns(sal_Bool bShowCol)
+void SwDBTreeList::ShowColumns(bool bShowCol)
 {
     if (bShowCol != bShowColumns)
     {
diff --git a/sw/source/core/uibase/dbui/mailmergehelper.cxx b/sw/source/core/uibase/dbui/mailmergehelper.cxx
index f620e9f47258..29534423fae2 100644
--- a/sw/source/core/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/core/uibase/dbui/mailmergehelper.cxx
@@ -474,7 +474,7 @@ OUString SwAddressPreview::FillData(
     OUString sAddress(rAddress);
     OUString sNotAssigned = "<" + OUString(SW_RES(STR_NOTASSIGNED)) + ">";
 
-    sal_Bool bIncludeCountry = rConfigItem.IsIncludeCountry();
+    bool bIncludeCountry = rConfigItem.IsIncludeCountry();
     const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
     bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty());
     OUString sCountryColumn;
diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
index fadd827d28a9..3168c2be4b78 100644
--- a/sw/source/core/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx
@@ -93,15 +93,15 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
     ::std::vector<DBAddressDataAssignment>  aAddressDataAssignments;
     ::std::vector< OUString>         aAddressBlocks;
     sal_Int32                               nCurrentAddressBlock;
-    sal_Bool                                bIsAddressBlock;
-    sal_Bool                                bIsHideEmptyParagraphs;
+    bool                                bIsAddressBlock;
+    bool                                bIsHideEmptyParagraphs;
 
-    sal_Bool                                bIsOutputToLetter;
-    sal_Bool                                bIncludeCountry;
+    bool                                bIsOutputToLetter;
+    bool                                bIncludeCountry;
     OUString                         sExcludeCountry;
 
-    sal_Bool                                bIsGreetingLine;
-    sal_Bool                                bIsIndividualGreetingLine;
+    bool                                bIsGreetingLine;
+    bool                                bIsIndividualGreetingLine;
     ::std::vector< OUString>         aFemaleGreetingLines;
     sal_Int32                               nCurrentFemaleGreeting;
     ::std::vector< OUString>         aMaleGreetingLines;
@@ -111,8 +111,8 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
     OUString                         sFemaleGenderValue;
     uno::Sequence< OUString>         aSavedDocuments;
 
-    sal_Bool                                bIsGreetingLineInMail;
-    sal_Bool                                bIsIndividualGreetingLineInMail;
+    bool                                bIsGreetingLineInMail;
+    bool                                bIsIndividualGreetingLineInMail;
 
     //mail settings
     OUString                         sMailDisplayName;
@@ -122,20 +122,20 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
     OUString                         sMailUserName;
     OUString                         sMailPassword;
 
-    sal_Bool                                bIsSMPTAfterPOP;
+    bool                                bIsSMPTAfterPOP;
     OUString                         sInServerName;
     sal_Int16                               nInServerPort;
-    sal_Bool                                bInServerPOP;
+    bool                                bInServerPOP;
     OUString                         sInServerUserName;
     OUString                         sInServerPassword;
 
     sal_Int16                               nMailPort;
-    sal_Bool                                bIsMailReplyTo;
-    sal_Bool                                bIsDefaultPort;
-    sal_Bool                                bIsSecureConnection;
-    sal_Bool                                bIsAuthentication;
+    bool                                bIsMailReplyTo;
+    bool                                bIsDefaultPort;
+    bool                                bIsSecureConnection;
+    bool                                bIsAuthentication;
 
-    sal_Bool                                bIsEMailSupported;
+    bool                                bIsEMailSupported;
 
     ResStringArray                          m_AddressHeaderSA;
 
@@ -144,10 +144,10 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
 
     //we do overwrite the usersettings in a special case
     //than we do remind the usersettings here
-    sal_Bool                                bUserSettingWereOverwritten;
-    sal_Bool                                bIsAddressBlock_LastUserSetting;
-    sal_Bool                                bIsGreetingLineInMail_LastUserSetting;
-    sal_Bool                                bIsGreetingLine_LastUserSetting;
+    bool                                bUserSettingWereOverwritten;
+    bool                                bIsAddressBlock_LastUserSetting;
+    bool                                bIsGreetingLineInMail_LastUserSetting;
+    bool                                bIsGreetingLine_LastUserSetting;
 
     const Sequence< OUString>&       GetPropertyNames();
 
@@ -158,16 +158,16 @@ public:
     virtual void Commit() SAL_OVERRIDE;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
     const           Sequence< OUString>
-                        GetAddressBlocks(sal_Bool bConvertToConfig = sal_False) const;
+                        GetAddressBlocks(bool bConvertToConfig = false) const;
     void                SetAddressBlocks(
                                 const Sequence< OUString>& rBlocks,
-                                sal_Bool bConvertFromConfig = sal_False);
+                                bool bConvertFromConfig = false);
     const uno::Sequence< OUString>
                         GetGreetings(SwMailMergeConfigItem::Gender eType,
-                                        sal_Bool bConvertToConfig = sal_False) const;
+                                        bool bConvertToConfig = false) const;
     void                SetGreetings(SwMailMergeConfigItem::Gender eType,
                                     const uno::Sequence< OUString>& rBlocks,
-                                    sal_Bool bConvertFromConfig = sal_False);
+                                    bool bConvertFromConfig = false);
 
     void                SetCurrentAddressBlockIndex( sal_Int32 nSet );
     sal_Int32           GetCurrentAddressBlockIndex() const
@@ -181,30 +181,30 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
     ConfigItem("Office.Writer/MailMergeWizard", 0),
         nResultSetCursorPos(-1),
         nCurrentAddressBlock(0),
-        bIsAddressBlock(sal_True),
-        bIsHideEmptyParagraphs(sal_False),
-        bIsOutputToLetter(sal_True),
-        bIncludeCountry(sal_False),
-        bIsGreetingLine(sal_True),
+        bIsAddressBlock(true),
+        bIsHideEmptyParagraphs(false),
+        bIsOutputToLetter(true),
+        bIncludeCountry(false),
+        bIsGreetingLine(true),
         nCurrentFemaleGreeting(0),
         nCurrentMaleGreeting(0),
         nCurrentNeutralGreeting(0),
 
-        bIsSMPTAfterPOP(sal_False),
+        bIsSMPTAfterPOP(false),
         nInServerPort( POP_PORT ),
-        bInServerPOP( sal_True ),
+        bInServerPOP( true ),
         nMailPort(0),
-        bIsMailReplyTo(sal_False),
-        bIsDefaultPort(sal_False),
-        bIsSecureConnection(sal_False),
-        bIsAuthentication(sal_False),
+        bIsMailReplyTo(false),
+        bIsDefaultPort(false),
+        bIsSecureConnection(false),
+        bIsAuthentication(false),
 
-        bIsEMailSupported(sal_False),
+        bIsEMailSupported(false),
         m_AddressHeaderSA( SW_RES( SA_ADDRESS_HEADER )),
-        bUserSettingWereOverwritten(sal_False),
-        bIsAddressBlock_LastUserSetting(sal_False),
-        bIsGreetingLineInMail_LastUserSetting(sal_False),
-        bIsGreetingLine_LastUserSetting(sal_False)
+        bUserSettingWereOverwritten(false),
+        bIsAddressBlock_LastUserSetting(false),
+        bIsGreetingLineInMail_LastUserSetting(false),
+        bIsGreetingLine_LastUserSetting(false)
 {
     const Sequence<OUString>& rNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(rNames);
@@ -223,7 +223,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
                 {
                     Sequence< OUString> aBlocks;
                     pValues[nProp] >>= aBlocks;
-                    SetAddressBlocks(aBlocks, sal_True);
+                    SetAddressBlocks(aBlocks, true);
                 }
                 break;
                 case 4: pValues[nProp] >>= bIsAddressBlock; break;
@@ -236,7 +236,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
                     Sequence< OUString> aGreetings;
                     pValues[nProp] >>= aGreetings;
                     SetGreetings(SwMailMergeConfigItem::Gender(
-                            SwMailMergeConfigItem::FEMALE + nProp - 7), aGreetings, sal_True);
+                            SwMailMergeConfigItem::FEMALE + nProp - 7), aGreetings, true);
                 }
                 break;
 
@@ -505,10 +505,10 @@ void  SwMailMergeConfigItem_Impl::Commit()
             case 0: pValues[nProp] <<= bIsOutputToLetter; break;
             case 1: pValues[nProp] <<= bIncludeCountry; break;
             case 2: pValues[nProp] <<= sExcludeCountry; break;
-            case 3: pValues[nProp] <<= GetAddressBlocks(sal_True); break;
+            case 3: pValues[nProp] <<= GetAddressBlocks(true); break;
             case 4:
                 {
-                    if( bUserSettingWereOverwritten == sal_True )
+                    if( bUserSettingWereOverwritten)
                         pValues[nProp] <<= bIsAddressBlock_LastUserSetting;
                     else
                         pValues[nProp] <<= bIsAddressBlock;
@@ -516,7 +516,7 @@ void  SwMailMergeConfigItem_Impl::Commit()
                 }
             case 5:
                 {
-                    if( bUserSettingWereOverwritten == sal_True )
+                    if( bUserSettingWereOverwritten)
                         pValues[nProp] <<= bIsGreetingLine_LastUserSetting;
                     else
                         pValues[nProp] <<= bIsGreetingLine;
@@ -528,7 +528,7 @@ void  SwMailMergeConfigItem_Impl::Commit()
             case 9:
                 pValues[nProp] <<= GetGreetings(
                         SwMailMergeConfigItem::Gender(
-                            SwMailMergeConfigItem::FEMALE + nProp - 7), sal_True);
+                            SwMailMergeConfigItem::FEMALE + nProp - 7), true);
             break;
             case 10: pValues[nProp] <<= nCurrentFemaleGreeting;     break;
             case 11: pValues[nProp] <<= nCurrentMaleGreeting;       break;
@@ -554,7 +554,7 @@ void  SwMailMergeConfigItem_Impl::Commit()
             case 29: pValues[nProp] <<= bIsEMailSupported; break;
             case 30:
                 {
-                    if( bUserSettingWereOverwritten == sal_True )
+                    if( bUserSettingWereOverwritten)
                         pValues[nProp] <<= bIsGreetingLineInMail_LastUserSetting;
                     else
                         pValues[nProp] <<= bIsGreetingLineInMail;
@@ -612,11 +612,11 @@ void  SwMailMergeConfigItem_Impl::Commit()
         }
     }
 
-    bUserSettingWereOverwritten = sal_False;
+    bUserSettingWereOverwritten = false;
 }
 
 const Sequence< OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
-        sal_Bool bConvertToConfig) const
+        bool bConvertToConfig) const
 {
     Sequence< OUString> aRet(aAddressBlocks.size());
     OUString* pRet = aRet.getArray();
@@ -631,7 +631,7 @@ const Sequence< OUString> SwMailMergeConfigItem_Impl::GetAddressBlocks(
 
 void SwMailMergeConfigItem_Impl::SetAddressBlocks(
         const Sequence< OUString>& rBlocks,
-        sal_Bool bConvertFromConfig)
+        bool bConvertFromConfig)
 {
     aAddressBlocks.clear();
     for(sal_Int32 nBlock = 0; nBlock < rBlocks.getLength(); nBlock++)
@@ -646,7 +646,7 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks(
 }
 
 const Sequence< OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
-        SwMailMergeConfigItem::Gender eType, sal_Bool bConvertToConfig) const
+        SwMailMergeConfigItem::Gender eType, bool bConvertToConfig) const
 {
     const ::std::vector< OUString>& rGreetings =
             eType == SwMailMergeConfigItem::FEMALE ? aFemaleGreetingLines :
@@ -666,7 +666,7 @@ const Sequence< OUString>   SwMailMergeConfigItem_Impl::GetGreetings(
 void  SwMailMergeConfigItem_Impl::SetGreetings(
         SwMailMergeConfigItem::Gender eType,
         const Sequence< OUString>& rSetGreetings,
-        sal_Bool bConvertFromConfig)
+        bool bConvertFromConfig)
 {
     ::std::vector< OUString>& rGreetings =
             eType == SwMailMergeConfigItem::FEMALE ? aFemaleGreetingLines :
@@ -782,9 +782,9 @@ bool SwMailMergeConfigItem::IsAddressBlock()const
     return m_pImpl->bIsAddressBlock && IsOutputToLetter();
 }
 
-void     SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
+void     SwMailMergeConfigItem::SetAddressBlock(bool bSet)
 {
-    m_pImpl->bUserSettingWereOverwritten = sal_False;
+    m_pImpl->bUserSettingWereOverwritten = false;
     if(m_pImpl->bIsAddressBlock != bSet)
     {
         m_pImpl->bIsAddressBlock = bSet;
@@ -792,12 +792,12 @@ void     SwMailMergeConfigItem::SetAddressBlock(sal_Bool bSet)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsHideEmptyParagraphs() const
+bool SwMailMergeConfigItem::IsHideEmptyParagraphs() const
 {
     return m_pImpl->bIsHideEmptyParagraphs;
 }
 
-void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
+void SwMailMergeConfigItem::SetHideEmptyParagraphs(bool bSet)
 {
     if(m_pImpl->bIsHideEmptyParagraphs != bSet)
     {
@@ -806,7 +806,7 @@ void SwMailMergeConfigItem::SetHideEmptyParagraphs(sal_Bool bSet)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsIncludeCountry() const
+bool SwMailMergeConfigItem::IsIncludeCountry() const
 {
     return m_pImpl->bIncludeCountry;
 }
@@ -816,7 +816,7 @@ OUString& SwMailMergeConfigItem::GetExcludeCountry() const
     return m_pImpl->sExcludeCountry;
 }
 
-void SwMailMergeConfigItem::SetCountrySettings(sal_Bool bSet, const OUString& rCountry)
+void SwMailMergeConfigItem::SetCountrySettings(bool bSet, const OUString& rCountry)
 {
     if(m_pImpl->sExcludeCountry != rCountry ||
         m_pImpl->bIncludeCountry != bSet)
@@ -976,7 +976,7 @@ sal_Int32 SwMailMergeConfigItem::MoveResultSet(sal_Int32 nTarget)
             {
                 if(nTarget > 0)
                 {
-                    sal_Bool bMoved = m_pImpl->xResultSet->absolute(nTarget);
+                    bool bMoved = m_pImpl->xResultSet->absolute(nTarget);
                     if(!bMoved)
                     {
                         if(nTarget > 1)
@@ -1116,12 +1116,12 @@ void SwMailMergeConfigItem::AddSavedDocument(const OUString& rName)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsOutputToLetter()const
+bool SwMailMergeConfigItem::IsOutputToLetter()const
 {
     return m_pImpl->bIsOutputToLetter || !IsMailAvailable();
 }
 
-void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
+void SwMailMergeConfigItem::SetOutputToLetter(bool bSet)
 {
     if(m_pImpl->bIsOutputToLetter != bSet)
     {
@@ -1130,7 +1130,7 @@ void SwMailMergeConfigItem::SetOutputToLetter(sal_Bool bSet)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsIndividualGreeting(sal_Bool bInEMail) const
+bool SwMailMergeConfigItem::IsIndividualGreeting(bool bInEMail) const
 {
     return bInEMail ?
             m_pImpl->bIsIndividualGreetingLineInMail :
@@ -1138,7 +1138,7 @@ sal_Bool SwMailMergeConfigItem::IsIndividualGreeting(sal_Bool bInEMail) const
 }
 
 void     SwMailMergeConfigItem::SetIndividualGreeting(
-                                        sal_Bool bSet, sal_Bool bInEMail)
+                                        bool bSet, bool bInEMail)
 {
     if(bInEMail)
     {
@@ -1158,14 +1158,14 @@ void     SwMailMergeConfigItem::SetIndividualGreeting(
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsGreetingLine(sal_Bool bInEMail) const
+bool SwMailMergeConfigItem::IsGreetingLine(bool bInEMail) const
 {
     return bInEMail ? m_pImpl->bIsGreetingLineInMail : m_pImpl->bIsGreetingLine;
 }
 
-void     SwMailMergeConfigItem::SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail)
+void     SwMailMergeConfigItem::SetGreetingLine(bool bSet, bool bInEMail)
 {
-    m_pImpl->bUserSettingWereOverwritten = sal_False;
+    m_pImpl->bUserSettingWereOverwritten = false;
     if(bInEMail)
     {
         if(m_pImpl->bIsGreetingLineInMail != bSet)
@@ -1330,7 +1330,7 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
 {
     bool bResult = true;
 
-    if(!IsIndividualGreeting(sal_False))
+    if(!IsIndividualGreeting(false))
         return true;
 
     Reference< XResultSet> xResultSet = GetResultSet();
@@ -1413,12 +1413,12 @@ void SwMailMergeConfigItem::SetMailAddress(const OUString& rAddress)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsMailReplyTo() const
+bool SwMailMergeConfigItem::IsMailReplyTo() const
 {
     return m_pImpl->bIsMailReplyTo;
 }
 
-void  SwMailMergeConfigItem::SetMailReplyTo(sal_Bool bSet)
+void  SwMailMergeConfigItem::SetMailReplyTo(bool bSet)
 {
     if(m_pImpl->bIsMailReplyTo != bSet)
     {
@@ -1467,17 +1467,17 @@ void     SwMailMergeConfigItem::SetMailPort(sal_Int16 nSet)
     if(m_pImpl->nMailPort != nSet || m_pImpl->bIsDefaultPort)
     {
         m_pImpl->nMailPort = nSet;
-        m_pImpl->bIsDefaultPort = sal_False;
+        m_pImpl->bIsDefaultPort = false;
         m_pImpl->SetModified();
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsSecureConnection() const
+bool SwMailMergeConfigItem::IsSecureConnection() const
 {
     return m_pImpl->bIsSecureConnection;
 }
 
-void     SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
+void     SwMailMergeConfigItem::SetSecureConnection(bool bSet)
 {
     if(m_pImpl->bIsSecureConnection != bSet)
     {
@@ -1486,12 +1486,12 @@ void     SwMailMergeConfigItem::SetSecureConnection(sal_Bool bSet)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsAuthentication() const
+bool SwMailMergeConfigItem::IsAuthentication() const
 {
     return m_pImpl->bIsAuthentication;
 }
 
-void SwMailMergeConfigItem::SetAuthentication(sal_Bool bSet)
+void SwMailMergeConfigItem::SetAuthentication(bool bSet)
 {
     if(m_pImpl->bIsAuthentication != bSet)
     {
@@ -1528,12 +1528,12 @@ void SwMailMergeConfigItem::SetMailPassword(const OUString& rPassword)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsSMTPAfterPOP() const
+bool SwMailMergeConfigItem::IsSMTPAfterPOP() const
 {
     return m_pImpl->bIsSMPTAfterPOP;
 }
 
-void SwMailMergeConfigItem::SetSMTPAfterPOP(sal_Bool bSet)
+void SwMailMergeConfigItem::SetSMTPAfterPOP(bool bSet)
 {
     if( m_pImpl->bIsSMPTAfterPOP != bSet)
     {
@@ -1570,12 +1570,12 @@ void SwMailMergeConfigItem::SetInServerPort(sal_Int16 nSet)
     }
 }
 
-sal_Bool SwMailMergeConfigItem::IsInServerPOP() const
+bool SwMailMergeConfigItem::IsInServerPOP() const
 {
     return m_pImpl->bInServerPOP;
 }
 
-void SwMailMergeConfigItem::SetInServerPOP(sal_Bool bSet)
+void SwMailMergeConfigItem::SetInServerPOP(bool bSet)
 {
     if( m_pImpl->bInServerPOP != bSet)
     {
@@ -1695,20 +1695,20 @@ void SwMailMergeConfigItem::SetSourceView(SwView* pView)
             // if fields are available there is usually no need of an addressblock and greeting
             if(!m_pImpl->bUserSettingWereOverwritten)
             {
-                if( m_pImpl->bIsAddressBlock == sal_True
-                    || m_pImpl->bIsGreetingLineInMail == sal_True
-                    || m_pImpl->bIsGreetingLine == sal_True )
+                if( m_pImpl->bIsAddressBlock
+                    || m_pImpl->bIsGreetingLineInMail
+                    || m_pImpl->bIsGreetingLine )
                 {
                     //store user settings
-                    m_pImpl->bUserSettingWereOverwritten = sal_True;
+                    m_pImpl->bUserSettingWereOverwritten = true;
                     m_pImpl->bIsAddressBlock_LastUserSetting = m_pImpl->bIsAddressBlock;
                     m_pImpl->bIsGreetingLineInMail_LastUserSetting = m_pImpl->bIsGreetingLineInMail;
                     m_pImpl->bIsGreetingLine_LastUserSetting = m_pImpl->bIsGreetingLine;
 
                     //set all to false
-                    m_pImpl->bIsAddressBlock = sal_False;
-                    m_pImpl->bIsGreetingLineInMail = sal_False;
-                    m_pImpl->bIsGreetingLine = sal_False;
+                    m_pImpl->bIsAddressBlock = false;
+                    m_pImpl->bIsGreetingLineInMail = false;
+                    m_pImpl->bIsGreetingLine = false;
 
                     m_pImpl->SetModified();
                 }
@@ -1721,7 +1721,7 @@ void SwMailMergeConfigItem::SetSourceView(SwView* pView)
             m_pImpl->bIsGreetingLineInMail = m_pImpl->bIsGreetingLineInMail_LastUserSetting;
             m_pImpl->bIsGreetingLine = m_pImpl->bIsGreetingLine_LastUserSetting;
 
-            m_pImpl->bUserSettingWereOverwritten = sal_False;
+            m_pImpl->bUserSettingWereOverwritten = false;
         }
     }
 }
diff --git a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
index 176e8504549e..3a2ae61ea5e8 100644
--- a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -223,7 +223,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
                     m_pSpellState->m_bStartedInSelection = true;
                 }
                 // determine if the selection is outside of the body text
-                bOtherText = !(pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY);
+                bOtherText = !(pWrtShell->GetFrmType(0,true) & FRMTYPE_BODY);
                 m_pSpellState->m_SpellStartPosition = bOtherText ? SPELL_START_OTHER : SPELL_START_BODY;
                 if(bOtherText)
                 {
@@ -320,7 +320,7 @@ The code below would only be part of the solution.
                 if (!m_pSpellState->m_bStartedInSelection)
                 {
                     // find out which text has been spelled body or other
-                    bOtherText = !(pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY);
+                    bOtherText = !(pWrtShell->GetFrmType(0,true) & FRMTYPE_BODY);
                     if(bOtherText && m_pSpellState->m_bStartedInOther && m_pSpellState->pOtherCursor)
                     {
                         m_pSpellState->m_bStartedInOther = false;
diff --git a/sw/source/core/uibase/dialog/regionsw.cxx b/sw/source/core/uibase/dialog/regionsw.cxx
index 4085c67717f9..299c26c23f56 100644
--- a/sw/source/core/uibase/dialog/regionsw.cxx
+++ b/sw/source/core/uibase/dialog/regionsw.cxx
@@ -127,16 +127,13 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
             aSet.Put(*pItem);
         }
 
-        const sal_Bool bHidden = SFX_ITEM_SET ==
-            pSet->GetItemState(FN_PARAM_REGION_HIDDEN, true, &pItem)?
-            (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False;
-        const sal_Bool bProtect = SFX_ITEM_SET ==
-            pSet->GetItemState(FN_PARAM_REGION_PROTECT, true, &pItem)?
-            (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False;
+        const bool bHidden = SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_REGION_HIDDEN, true, &pItem) &&
+                             ((const SfxBoolItem *)pItem)->GetValue();
+        const bool bProtect = SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_REGION_PROTECT, true, &pItem) &&
+                              ((const SfxBoolItem *)pItem)->GetValue();
         // #114856# edit in readonly sections
-        const sal_Bool bEditInReadonly = SFX_ITEM_SET ==
-            pSet->GetItemState(FN_PARAM_REGION_EDIT_IN_READONLY, true, &pItem)?
-            (sal_Bool)((const SfxBoolItem *)pItem)->GetValue():sal_False;
+        const bool bEditInReadonly = SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_REGION_EDIT_IN_READONLY, true, &pItem) &&
+                                     ((const SfxBoolItem *)pItem)->GetValue();
 
         aSection.SetProtectFlag(bProtect);
         aSection.SetHidden(bHidden);
diff --git a/sw/source/core/uibase/dochdl/gloshdl.cxx b/sw/source/core/uibase/dochdl/gloshdl.cxx
index 172a24f8dcb4..9fd489b95d28 100644
--- a/sw/source/core/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/core/uibase/dochdl/gloshdl.cxx
@@ -100,7 +100,7 @@ void SwGlossaryHdl::GlossaryDlg()
 
 // set the default group; if called from the dialog
 // the group is created temporarily for faster access
-void SwGlossaryHdl::SetCurGroup(const OUString &rGrp, sal_Bool bApi, sal_Bool bAlwaysCreateNew )
+void SwGlossaryHdl::SetCurGroup(const OUString &rGrp, bool bApi, bool bAlwaysCreateNew )
 {
     OUString sGroup(rGrp);
     if (sGroup.indexOf(GLOS_DELIM)<0 && !FindGroupName(sGroup))
@@ -145,7 +145,7 @@ void SwGlossaryHdl::SetCurGroup(const OUString &rGrp, sal_Bool bApi, sal_Bool bA
             rStatGlossaries.PutGroupDoc(pCurGrp);
             pCurGrp = 0;
         }
-        pCurGrp = rStatGlossaries.GetGroupDoc(aCurGrp, sal_True);
+        pCurGrp = rStatGlossaries.GetGroupDoc(aCurGrp, true);
     }
 }
 
@@ -159,7 +159,7 @@ OUString SwGlossaryHdl::GetGroupName( sal_uInt16 nId, OUString* pTitle )
     OUString sRet = rStatGlossaries.GetGroupName(nId);
     if(pTitle)
     {
-        SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet, sal_False);
+        SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet, false);
         if(pGroup && !pGroup->GetError())
         {
             *pTitle = pGroup->GetName();
@@ -176,27 +176,27 @@ OUString SwGlossaryHdl::GetGroupName( sal_uInt16 nId, OUString* pTitle )
     return sRet;
 }
 
-sal_Bool SwGlossaryHdl::NewGroup(OUString &rGrpName, const OUString& rTitle)
+bool SwGlossaryHdl::NewGroup(OUString &rGrpName, const OUString& rTitle)
 {
     if (rGrpName.indexOf(GLOS_DELIM)<0)
         FindGroupName(rGrpName);
     return rStatGlossaries.NewGroupDoc(rGrpName, rTitle);
 }
 
-sal_Bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle)
+bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     OUString sOldGroup(rOld);
     if (rOld.indexOf(GLOS_DELIM)<0)
         FindGroupName(sOldGroup);
     if(rOld == rNew)
     {
-        SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sOldGroup, sal_False);
+        SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sOldGroup, false);
         if(pGroup)
         {
             pGroup->SetName(rNewTitle);
             rStatGlossaries.PutGroupDoc( pGroup );
-            bRet = sal_True;
+            bRet = true;
         }
     }
     else
@@ -212,14 +212,14 @@ sal_Bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const
     return bRet;
 }
 
-sal_Bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName,
-                        const OUString& rDestGroupName, const OUString& rLongName, sal_Bool bMove )
+bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName,
+                                const OUString& rDestGroupName, const OUString& rLongName, bool bMove )
 {
-    SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName, sal_False);
+    SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName, false);
 
-    SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, sal_False);
+    SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, false);
     if(pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) )
-        return sal_False;
+        return false;
 
     //The index must be determined here because rSourceShortName maybe changed in CopyBlock
     sal_uInt16 nDeleteIdx = pSourceGroup->GetIndex( rSourceShortName );
@@ -236,7 +236,7 @@ sal_Bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString&
 }
 
 // delete a autotext-file-group
-sal_Bool SwGlossaryHdl::DelGroup(const OUString &rGrpName)
+bool SwGlossaryHdl::DelGroup(const OUString &rGrpName)
 {
     OUString sGroup(rGrpName);
     if (sGroup.indexOf(GLOS_DELIM)<0)
@@ -248,9 +248,9 @@ sal_Bool SwGlossaryHdl::DelGroup(const OUString &rGrpName)
             if (pCurGrp->GetName() == sGroup)
                 DELETEZ(pCurGrp);
         }
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // ask for number of autotexts
@@ -276,7 +276,7 @@ OUString SwGlossaryHdl::GetGlossaryShortName(const OUString &rName)
 {
     OUString sReturn;
     SwTextBlocks *pTmp =
-        pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp, sal_False );
+        pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp, false );
     if(pTmp)
     {
         sal_uInt16 nIdx = pTmp->GetLongIndex( rName );
@@ -289,39 +289,39 @@ OUString SwGlossaryHdl::GetGlossaryShortName(const OUString &rName)
 }
 
 // short name for autotext already used?
-sal_Bool SwGlossaryHdl::HasShortName(const OUString& rShortName) const
+bool SwGlossaryHdl::HasShortName(const OUString& rShortName) const
 {
     SwTextBlocks *pBlock = pCurGrp ? pCurGrp
                                    : rStatGlossaries.GetGroupDoc( aCurGrp );
-    sal_Bool bRet = pBlock->GetIndex( rShortName ) != (sal_uInt16) -1;
+    bool bRet = pBlock->GetIndex( rShortName ) != (sal_uInt16) -1;
     if( !pCurGrp )
         rStatGlossaries.PutGroupDoc( pBlock );
     return bRet;
 }
 
-sal_Bool    SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
+bool SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
 {
-    return sal_True;
+    return true;
 }
 
 // Create autotext
-sal_Bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortName,
-                                sal_Bool bCreateGroup, sal_Bool bNoAttr)
+bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortName,
+                                bool bCreateGroup, bool bNoAttr)
 {
     SwTextBlocks *pTmp =
         pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp, bCreateGroup );
     //pTmp == 0 if the AutoText path setting is wrong
     if(!pTmp)
-        return sal_False;
+        return false;
     if(!ConvertToNew(*pTmp))
-        return sal_False;
+        return false;
 
     OUString sOnlyTxt;
     OUString* pOnlyTxt = 0;
     if( bNoAttr )
     {
         if( !pWrtShell->GetSelectedText( sOnlyTxt, GETSELTXT_PARABRK_TO_ONLYCR ))
-            return sal_False;
+            return false;
         pOnlyTxt = &sOnlyTxt;
     }
 
@@ -335,28 +335,28 @@ sal_Bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShor
     }
     if( !pCurGrp )
         rStatGlossaries.PutGroupDoc( pTmp );
-    return sal_Bool( nSuccess != (sal_uInt16) -1 );
+    return nSuccess != (sal_uInt16) -1;
 }
 
 // Delete a autotext
-sal_Bool SwGlossaryHdl::DelGlossary(const OUString &rShortName)
+bool SwGlossaryHdl::DelGlossary(const OUString &rShortName)
 {
     SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
                                     : rStatGlossaries.GetGroupDoc(aCurGrp);
     //pTmp == 0 if the AutoText path setting is wrong
     if(!pGlossary || !ConvertToNew(*pGlossary))
-        return sal_False;
+        return false;
 
     sal_uInt16 nIdx = pGlossary->GetIndex( rShortName );
     if( nIdx != (sal_uInt16) -1 )
         pGlossary->Delete( nIdx );
     if( !pCurGrp )
         rStatGlossaries.PutGroupDoc( pGlossary );
-    return sal_True;
+    return true;
 }
 
 // expand short name
-sal_Bool SwGlossaryHdl::ExpandGlossary()
+bool SwGlossaryHdl::ExpandGlossary()
 {
     OSL_ENSURE(pWrtShell->CanInsert(), "illegal");
     SwTextBlocks *pGlossary;
@@ -393,13 +393,13 @@ sal_Bool SwGlossaryHdl::ExpandGlossary()
     return pGlossary ? Expand( aShortName, &rStatGlossaries, pGlossary ) : sal_False;
 }
 
-sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
+bool SwGlossaryHdl::Expand( const OUString& rShortName,
                             SwGlossaries *pGlossaries,
                             SwTextBlocks *pGlossary  )
 {
     TextBlockInfoArr aFoundArr;
     OUString aShortName( rShortName );
-    sal_Bool bCancel = sal_False;
+    bool bCancel = false;
     // search for text block
     // - don't prefer current group depending on configuration setting
     const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
@@ -470,7 +470,7 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
                 else
                 {
                     nFound = (sal_uInt16) -1;
-                    bCancel = sal_True;
+                    bCancel = true;
                 }
             }
         }
@@ -493,7 +493,7 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
             InfoBox( pWrtShell->GetView().GetWindow(), aTmp ).Execute();
         }
 
-        return sal_False;
+        return false;
     }
     else
     {
@@ -513,7 +513,7 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
         pWrtShell->StartAllAction();
 
         // cache all InputFields
-        SwInputFieldList aFldLst( pWrtShell, sal_True );
+        SwInputFieldList aFldLst( pWrtShell, true );
 
         pWrtShell->InsertGlossary(*pGlossary, aShortName);
         pWrtShell->EndAllAction();
@@ -528,7 +528,7 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
             pWrtShell->UpdateInputFlds( &aFldLst );
     }
     pGlossaries->PutGroupDoc(pGlossary);
-    return sal_True;
+    return true;
 }
 
 // add autotext
@@ -557,7 +557,7 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName)
     pWrtShell->StartAllAction();
 
     // cache all InputFields
-    SwInputFieldList aFldLst( pWrtShell, sal_True );
+    SwInputFieldList aFldLst( pWrtShell, true );
 
     pWrtShell->InsertGlossary(*pGlos, rName);
     pWrtShell->EndAllAction();
@@ -642,16 +642,16 @@ SwGlossaryHdl::~SwGlossaryHdl()
 }
 
 // rename an autotext
-sal_Bool SwGlossaryHdl::Rename(const OUString& rOldShort, const OUString& rNewShortName,
-                               const OUString& rNewName )
+bool SwGlossaryHdl::Rename(const OUString& rOldShort, const OUString& rNewShortName,
+                           const OUString& rNewName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
                                     : rStatGlossaries.GetGroupDoc(aCurGrp);
     if(pGlossary)
     {
         if(!ConvertToNew(*pGlossary))
-            return sal_False;
+            return false;
 
         sal_uInt16 nIdx = pGlossary->GetIndex( rOldShort );
         sal_uInt16 nOldLongIdx = pGlossary->GetLongIndex( rNewName );
@@ -670,7 +670,7 @@ sal_Bool SwGlossaryHdl::Rename(const OUString& rOldShort, const OUString& rNewSh
     return bRet;
 }
 
-sal_Bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const
+bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const
 {
     SwTextBlocks *pGlossary = 0;
 
@@ -681,29 +681,29 @@ sal_Bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const
     else
         pGlossary = rStatGlossaries.GetGroupDoc(aCurGrp);
 
-    sal_Bool bRet = pGlossary ? pGlossary->IsReadOnly() : sal_True;
+    bool bRet = pGlossary ? pGlossary->IsReadOnly() : sal_True;
     if( pGrpNm || !pCurGrp )
         delete pGlossary;
     return bRet;
 }
 
-sal_Bool SwGlossaryHdl::IsOld() const
+bool SwGlossaryHdl::IsOld() const
 {
     SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
                                       : rStatGlossaries.GetGroupDoc(aCurGrp);
-    sal_Bool bRet = pGlossary ? pGlossary->IsOld() : sal_False;
+    bool bRet = pGlossary ? pGlossary->IsOld() : sal_False;
     if( !pCurGrp )
         delete pGlossary;
     return bRet;
 }
 
 // find group without path index
-sal_Bool SwGlossaryHdl::FindGroupName(OUString& rGroup)
+bool SwGlossaryHdl::FindGroupName(OUString& rGroup)
 {
     return rStatGlossaries.FindGroupName(rGroup);
 }
 
-sal_Bool SwGlossaryHdl::CopyToClipboard(SwWrtShell& rSh, const OUString& rShortName)
+bool SwGlossaryHdl::CopyToClipboard(SwWrtShell& rSh, const OUString& rShortName)
 {
     SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
                                     : rStatGlossaries.GetGroupDoc(aCurGrp);
@@ -718,9 +718,9 @@ sal_Bool SwGlossaryHdl::CopyToClipboard(SwWrtShell& rSh, const OUString& rShortN
     return 0 != nRet;
 }
 
-sal_Bool SwGlossaryHdl::ImportGlossaries( const OUString& rName )
+bool SwGlossaryHdl::ImportGlossaries( const OUString& rName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !rName.isEmpty() )
     {
         const SfxFilter* pFilter = 0;
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index 0a99bc249f94..447dbfdb86fc 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -151,10 +151,10 @@ class SwTrnsfrDdeLink : public ::sfx2::SvBaseLink
     SwTransferable& rTrnsfr;
     SwDocShell* pDocShell;
     sal_uLong nOldTimeOut;
-    sal_Bool bDelBookmrk : 1;
-    sal_Bool bInDisconnect : 1;
+    bool bDelBookmrk : 1;
+    bool bInDisconnect : 1;
 
-    sal_Bool FindDocShell();
+    bool FindDocShell();
 
     using sfx2::SvBaseLink::Disconnect;
 
@@ -168,9 +168,9 @@ public:
         const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
     virtual void Closed() SAL_OVERRIDE;
 
-    sal_Bool WriteData( SvStream& rStrm );
+    bool WriteData( SvStream& rStrm );
 
-    void Disconnect( sal_Bool bRemoveDataAdvise );
+    void Disconnect( bool bRemoveDataAdvise );
 };
 
 // helper class for Action and Undo enclosing
@@ -181,7 +181,7 @@ class SwTrnsfrActionAndUndo
 public:
     SwTrnsfrActionAndUndo( SwWrtShell *pS, SwUndoId nId,
                            const SwRewriter * pRewriter = 0,
-                           sal_Bool bDelSel = sal_False)
+                           bool bDelSel = false)
         : pSh( pS ), eUndoId( nId )
     {
         pSh->StartUndo( eUndoId, pRewriter );
@@ -233,7 +233,7 @@ SwTransferable::~SwTransferable()
     // the DDELink still needs the WrtShell!
     if( refDdeLink.Is() )
     {
-        ((SwTrnsfrDdeLink*)&refDdeLink)->Disconnect( sal_True );
+        ((SwTrnsfrDdeLink*)&refDdeLink)->Disconnect( true );
         refDdeLink.Clear();
     }
 
@@ -450,7 +450,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor )
 
             Point aPos( SwEditWin::GetDDStartPosX(), SwEditWin::GetDDStartPosY());
 
-            sal_Bool bSelect = bExecuteDrag &&
+            bool bSelect = bExecuteDrag &&
                             pWrtShell->GetView().GetDocShell() &&
                             !pWrtShell->GetView().GetDocShell()->IsReadOnly();
             if( pWrtShell->GetContentAtPos( aPos, aCntntAtPos, bSelect ) )
@@ -477,7 +477,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor )
         }
     }
 
-    sal_Bool    bOK = sal_False;
+    bool    bOK = false;
     if( TRNSFR_OLE == eBufferType )
     {
         //TODO/MBA: testing - is this the "single OLE object" case?!
@@ -721,7 +721,7 @@ bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
             xWrt->SetAsciiOptions( aAOpt );
 
             // no start char for clipboard
-            xWrt->bUCS2_WithStartChar = sal_False;
+            xWrt->bUCS2_WithStartChar = false;
         }
         break;
     }
@@ -729,9 +729,9 @@ bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
     if( xWrt.Is() )
     {
         SwDoc* pDoc = (SwDoc*)pObject;
-        xWrt->bWriteClipboardDoc = sal_True;
+        xWrt->bWriteClipboardDoc = true;
         xWrt->bWriteOnlyFirstTable = 0 != (TRNSFR_TABELLE & eBufferType);
-        xWrt->SetShowProgress( sal_False );
+        xWrt->SetShowProgress( false );
 
 #if defined(DEBUGPASTE)
         SvFileStream aPasteDebug(OUString(
@@ -754,7 +754,7 @@ bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
 
 int SwTransferable::Cut()
 {
-    int nRet = Copy( sal_True );
+    int nRet = Copy( true );
     if( nRet )
         DeleteSelection();
     return nRet;
@@ -773,7 +773,7 @@ void SwTransferable::DeleteSelection()
     pWrtShell->EndUndo( UNDO_DELETE );
 }
 
-int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
+int SwTransferable::PrepareForCopy( bool bIsCut )
 {
     int nRet = 1;
     if(!pWrtShell)
@@ -881,11 +881,11 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
         else
         {
             eBufferType = TRNSFR_DOCUMENT;
-            if (pWrtShell->IntelligentCut(nSelection, sal_False) != SwWrtShell::NO_WORD)
+            if (pWrtShell->IntelligentCut(nSelection, false) != SwWrtShell::NO_WORD)
                 eBufferType = (TransferBufferType)(TRNSFR_DOCUMENT_WORD | eBufferType);
         }
 
-        int bDDELink = pWrtShell->IsSelection();
+        bool bDDELink = pWrtShell->IsSelection();
         if( nSelection & nsSelectionType::SEL_TBL_CELLS )
         {
             eBufferType = (TransferBufferType)(TRNSFR_TABELLE | eBufferType);
@@ -983,7 +983,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
     return nRet;
 }
 
-int SwTransferable::Copy( sal_Bool bIsCut )
+int SwTransferable::Copy( bool bIsCut )
 {
     int nRet = PrepareForCopy( bIsCut );
     if ( nRet )
@@ -1065,7 +1065,7 @@ static inline uno::Reference < XTransferable > * lcl_getTransferPointer ( uno::R
     return &xRef;
 }
 
-sal_Bool SwTransferable::IsPaste( const SwWrtShell& rSh,
+bool SwTransferable::IsPaste( const SwWrtShell& rSh,
                               const TransferableDataHelper& rData )
 {
     // Check the common case first: We can always paste our own data!
@@ -1147,15 +1147,15 @@ bool SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
 
     return EXCHG_INOUT_ACTION_NONE != nAction &&
             SwTransferable::PasteData( rData, rSh, nAction, nFormat,
-                                        nDestination, sal_False, sal_False );
+                                        nDestination, false, false );
 }
 
 bool SwTransferable::PasteData( TransferableDataHelper& rData,
                             SwWrtShell& rSh, sal_uInt16 nAction, sal_uLong nFormat,
-                            sal_uInt16 nDestination, sal_Bool bIsPasteFmt,
-                            sal_Bool bIsDefault,
+                            sal_uInt16 nDestination, bool bIsPasteFmt,
+                            bool bIsDefault,
                             const Point* pPt, sal_Int8 nDropAction,
-                            sal_Bool bPasteSelection )
+                            bool bPasteSelection )
 {
     SwWait aWait( *rSh.GetView().GetDocShell(), false );
     boost::scoped_ptr<SwTrnsfrActionAndUndo> pAction;
@@ -1180,11 +1180,11 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
             case EXCHG_DEST_DOC_URLBUTTON:
             case EXCHG_DEST_DOC_GROUPOBJ:
                 // select frames/objects
-                SwTransferable::SetSelInShell( rSh, sal_True, pPt );
+                SwTransferable::SetSelInShell( rSh, true, pPt );
                 break;
 
             default:
-                SwTransferable::SetSelInShell( rSh, sal_False, pPt );
+                SwTransferable::SetSelInShell( rSh, false, pPt );
                 break;
             }
         }
@@ -1199,21 +1199,21 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
         // - at ReRead of a graphic/DDEData
         // - at D&D, for the right selection was taken care of
         //      in Drop-Handler
-        sal_Bool bDelSel = sal_False;
+        bool bDelSel = false;
         switch( nDestination )
         {
         case EXCHG_DEST_DOC_TEXTFRAME:
         case EXCHG_DEST_SWDOC_FREE_AREA:
         case EXCHG_DEST_DOC_TEXTFRAME_WEB:
         case EXCHG_DEST_SWDOC_FREE_AREA_WEB:
-            bDelSel = sal_True;
+            bDelSel = true;
             break;
         }
 
         if( bDelSel )
             // #i34830#
             pAction.reset(new SwTrnsfrActionAndUndo( &rSh, UNDO_PASTE_CLIPBOARD, NULL,
-                                                     sal_True ));
+                                                     true ));
     }
 
     SwTransferable *pTrans=0, *pTunneledTrans=GetSwTransferable( rData );
@@ -1262,7 +1262,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
         }
 
         // in Drag&Drop MessageBoxes must not be showed
-        sal_Bool bMsg = 0 == pPt;
+        bool bMsg = 0 == pPt;
         sal_uInt8 nActionFlags = static_cast< sal_uInt8 >(( nAction >> 8 ) & 0xFF);
 
         sal_uInt16 nClearedAction = ( nAction & EXCHG_ACTION_MASK );
@@ -1385,7 +1385,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
             case SOT_FORMATSTR_ID_NETSCAPE_IMAGE:
                 nRet = SwTransferable::_PasteTargetURL( rData, rSh,
                                                         SW_PASTESDR_INSERT,
-                                                        pPt, sal_True );
+                                                        pPt, true );
                 break;
 
             default:
@@ -1412,7 +1412,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
 
         case EXCHG_OUT_ACTION_INSERT_DDE:
             {
-                sal_Bool bReRead = 0 != CNT_HasGrf( rSh.GetCntType() );
+                bool bReRead = 0 != CNT_HasGrf( rSh.GetCntType() );
                 nRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg );
             }
             break;
@@ -1545,7 +1545,7 @@ sal_uInt16 SwTransferable::GetSotDestination( const SwWrtShell& rSh,
     {
     case OBJCNT_GRF:
         {
-            sal_Bool bIMap, bLink;
+            bool bIMap, bLink;
             if( pPt )
             {
                 bIMap = 0 != rSh.GetFmtFromObj( *pPt )->GetURL().GetMap();
@@ -1598,7 +1598,7 @@ sal_uInt16 SwTransferable::GetSotDestination( const SwWrtShell& rSh,
 }
 
 bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_uLong nFmt, sal_Bool bMsg )
+                                    SwWrtShell& rSh, sal_uLong nFmt, bool bMsg )
 {
     sal_uInt16 nResId = MSG_CLPBRD_FORMAT_ERROR;
     bool nRet = false;
@@ -1641,9 +1641,9 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
             {
                 pStream = aMSE40ClpObj.IsValid( *xStrm );
                 pRead = ReadHTML;
-                pRead->SetReadUTF8( sal_True );
+                pRead->SetReadUTF8( true );
 
-                sal_Bool bNoComments =
+                bool bNoComments =
                     ( nFmt == SOT_FORMATSTR_ID_HTML_NO_COMMENT );
                 pRead->SetIgnoreHTMLComments( bNoComments );
             }
@@ -1655,7 +1655,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
                 else if( !pRead )
                 {
                     pRead = ReadHTML;
-                    pRead->SetReadUTF8( sal_True );
+                    pRead->SetReadUTF8( true );
                 }
             }
         }
@@ -1694,7 +1694,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                sal_uLong nFmt, sal_uInt8 nActionFlags, sal_Bool bMsg )
+                                sal_uLong nFmt, sal_uInt8 nActionFlags, bool bMsg )
 {
     bool nRet = false;
     TransferableObjectDescriptor aObjDesc;
@@ -1900,7 +1900,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
 
             if( nRet && ( nActionFlags &
                 ( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ))
-                SwTransferable::_PasteTargetURL( rData, rSh, 0, 0, sal_False );
+                SwTransferable::_PasteTargetURL( rData, rSh, 0, 0, false );
 
             // let the object be unloaded if possible
             SwOLEObj::UnloadObject( xObj, rSh.GetDoc(), embed::Aspects::MSOLE_CONTENT );
@@ -1911,7 +1911,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
 
 bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, sal_uInt16 nAction,
-                                    const Point* pPt, sal_Bool bInsertGRF )
+                                    const Point* pPt, bool bInsertGRF )
 {
     bool nRet = false;
     INetImage aINetImg;
@@ -1938,7 +1938,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
                 switch( nAction )
                 {
                 case SW_PASTESDR_INSERT:
-                    SwTransferable::SetSelInShell( rSh, sal_False, pPt );
+                    SwTransferable::SetSelInShell( rSh, false, pPt );
                     rSh.Insert( sURL, aEmptyOUStr, aGraphic );
                     break;
 
@@ -1947,7 +1947,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
                     {
                         rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic );
                         Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() );
-                        SwTransferable::SetSelInShell( rSh, sal_True, &aPt );
+                        SwTransferable::SetSelInShell( rSh, true, &aPt );
                     }
                     else
                         rSh.ReRead( sURL, aEmptyOUStr, &aGraphic );
@@ -1960,7 +1960,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
                         rSh.ReRead( sURL, aEmptyOUStr, &aGraphic );
                     else
                     {
-                        SwTransferable::SetSelInShell( rSh, sal_False, pPt );
+                        SwTransferable::SetSelInShell( rSh, false, pPt );
                         rSh.Insert( sURL, aEmptyOUStr, aGraphic );
                     }
                     break;
@@ -1991,7 +1991,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
     return nRet;
 }
 
-void SwTransferable::SetSelInShell( SwWrtShell& rSh, sal_Bool bSelectFrm,
+void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrm,
                                         const Point* pPt )
 {
     if( bSelectFrm )
@@ -2022,13 +2022,13 @@ void SwTransferable::SetSelInShell( SwWrtShell& rSh, sal_Bool bSelectFrm,
 
         rSh.EnterStdMode();
         if( pPt )
-            rSh.SwCrsrShell::SetCrsr( *pPt, sal_True );
+            rSh.SwCrsrShell::SetCrsr( *pPt, true );
     }
 }
 
 bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
-                                SwWrtShell& rWrtShell, sal_Bool bReReadGrf,
-                                sal_Bool bMsg )
+                                SwWrtShell& rWrtShell, bool bReReadGrf,
+                                bool bMsg )
 {
     // data from Clipboardformat
     OUString aApp, aTopic, aItem;
@@ -2074,7 +2074,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     SwFieldType* pTyp = 0;
     sal_uInt16 i = 1,j;
     OUString aName;
-    sal_Bool bAlreadyThere = sal_False, bDoublePaste = sal_False;
+    bool bAlreadyThere = false, bDoublePaste = false;
     sal_uInt16 nSize = rWrtShell.GetFldTypeCount();
     const ::utl::TransliterationWrapper& rColl = ::GetAppCmpStrIgnore();
 
@@ -2091,7 +2091,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
                     sfx2::LINKUPDATE_ALWAYS == ((SwDDEFieldType*)pTyp)->GetType() )
                 {
                     aName = pTyp->GetName();
-                    bDoublePaste = sal_True;
+                    bDoublePaste = true;
                     break;
                 }
                 else if( rColl.isEqual( aName, pTyp->GetName() ) )
@@ -2099,10 +2099,10 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
             }
         }
         if( j == nSize )
-            bAlreadyThere = sal_False;
+            bAlreadyThere = false;
         else
         {
-            bAlreadyThere = sal_True;
+            bAlreadyThere = true;
             i++;
         }
     }
@@ -2201,7 +2201,7 @@ bool SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
         {
             // if this is an internal drag, need to set the target right (select it), else
             // still the source will be selected
-            SwTransferable::SetSelInShell( rSh, sal_True, pPt );
+            SwTransferable::SetSelInShell( rSh, true, pPt );
         }
 
         rSh.Paste( *xStrm, nAction, pPt );
@@ -2209,7 +2209,7 @@ bool SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
 
         if( nRet && ( nActionFlags &
             ( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ))
-            SwTransferable::_PasteTargetURL( rData, rSh, 0, 0, sal_False );
+            SwTransferable::_PasteTargetURL( rData, rSh, 0, 0, false );
     }
     return nRet;
 }
@@ -2222,7 +2222,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
     Graphic aGraphic;
     INetBookmark aBkmk;
-    sal_Bool bCheckForGrf = sal_False, bCheckForImageMap = sal_False;
+    bool bCheckForGrf = false, bCheckForImageMap = false;
 
     switch( nFmt )
     {
@@ -2253,7 +2253,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
             if( SW_PASTESDR_SETATTR == nAction )
                 nFmt = SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK;
             else
-                bCheckForGrf = sal_True;
+                bCheckForGrf = true;
         }
         break;
 
@@ -2268,7 +2268,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
                 aBkmk = INetBookmark(
                         URIHelper::SmartRel2Abs(INetURLObject(), sTxt, Link(), false ),
                         sDesc );
-                bCheckForGrf = sal_True;
+                bCheckForGrf = true;
                 bCheckForImageMap = SW_PASTESDR_REPLACE == nAction;
             }
         }
@@ -2303,7 +2303,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         // this is necessary to get the correct source data which is also
         // dependent from selection. After receiving the drag data it is
         // now tiime to select the correct target object
-        SwTransferable::SetSelInShell( rSh, sal_True, pPt );
+        SwTransferable::SetSelInShell( rSh, true, pPt );
     }
 
     if( nRet )
@@ -2323,7 +2323,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         {
             case SW_PASTESDR_INSERT:
             {
-                SwTransferable::SetSelInShell( rSh, sal_False, pPt );
+                SwTransferable::SetSelInShell( rSh, false, pPt );
                 rSh.Insert( sURL, aEmptyOUStr, aGraphic );
                 break;
             }
@@ -2377,7 +2377,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
                 }
                 else
                 {
-                    SwTransferable::SetSelInShell( rSh, sal_False, pPt );
+                    SwTransferable::SetSelInShell( rSh, false, pPt );
                     rSh.Insert( aBkmk.GetURL(), aEmptyOUStr, aGraphic );
                 }
                 break;
@@ -2400,7 +2400,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
         if( nActionFlags &
             ( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) )
-            SwTransferable::_PasteTargetURL( rData, rSh, 0, 0, sal_False );
+            SwTransferable::_PasteTargetURL( rData, rSh, 0, 0, false );
     }
     else if( bCheckForImageMap )
     {
@@ -2500,7 +2500,7 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
 bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, sal_uLong nFmt,
                                     sal_uInt16 nAction, const Point* pPt,
-                    sal_uInt8 nActionFlags, sal_Bool /* bMsg */,
+                    sal_uInt8 nActionFlags, bool /* bMsg */,
                     bool * graphicInserted)
 {
     bool nRet = SwTransferable::_PasteGrf( rData, rSh, nFmt, nAction,
@@ -2533,7 +2533,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
 #endif
             else
             {
-                sal_Bool bIsURLFile = SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc );
+                bool bIsURLFile = SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc );
 
                 //Own FileFormat? --> insert, not for StarWriter/Web
                 OUString sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link(), false );
@@ -2596,8 +2596,8 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_uLong nFmt, sal_Bool bLink,
-                                    const Point* pDragPt, sal_Bool bMsg )
+                                    SwWrtShell& rSh, sal_uLong nFmt, bool bLink,
+                                    const Point* pDragPt, bool bMsg )
 {
     bool nRet = false;
     OUString sTxt;
@@ -2613,7 +2613,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
                                     ? 0
                                     : FN_QRY_INSERT_FIELD );
         DataFlavorExVector& rVector = rData.GetDataFlavorExVector();
-        sal_Bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE);
+        bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE);
         if ( SOT_FORMATSTR_ID_XFORMS == nFmt )
         {
             SdrObject* pObj;
@@ -2638,14 +2638,14 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
             SfxUsrAnyItem* pColumnNameItem  = 0;
             SfxUsrAnyItem* pSelectionItem   = 0;
 
-            sal_Bool bDataAvailable = sal_True;
+            bool bDataAvailable = true;
             ODataAccessDescriptor aDesc;
             if(bHaveColumnDescriptor)
                 aDesc = OColumnTransferable::extractColumnDescriptor(rData);
             else if(ODataAccessObjectTransferable::canExtractObjectDescriptor(rVector) )
                 aDesc = ODataAccessObjectTransferable::extractObjectDescriptor(rData);
             else
-                bDataAvailable = sal_False;
+                bDataAvailable = false;
 
             if ( bDataAvailable )
             {
@@ -2699,8 +2699,8 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_Bool bLink,
-                                    const Point* pPt, sal_Bool bMsg )
+                                    SwWrtShell& rSh, bool bLink,
+                                    const Point* pPt, bool bMsg )
 {
     bool nRet = false;
     FileList aFileList;
@@ -2722,7 +2722,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
                 if( bLink )
                 {
                     sFlyNm = rSh.GetFlyName();
-                    SwTransferable::SetSelInShell( rSh, sal_False, pPt );
+                    SwTransferable::SetSelInShell( rSh, false, pPt );
                 }
                 nRet = true;
             }
@@ -2737,17 +2737,17 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
     return nRet;
 }
 
-sal_Bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
+bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
                                         OUString& rFileName, OUString* pTitle )
 {
-    sal_Bool bIsURLFile = sal_False;
+    bool bIsURLFile = false;
     INetBookmark aBkmk;
     if( rData.GetINetBookmark( SOT_FORMATSTR_ID_SOLK, aBkmk ) )
     {
         rFileName = aBkmk.GetURL();
         if( pTitle )
             *pTitle = aBkmk.GetDescription();
-        bIsURLFile = sal_True;
+        bIsURLFile = true;
     }
     else
     {
@@ -2764,7 +2764,7 @@ sal_Bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
     return bIsURLFile;
 }
 
-sal_Bool SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell,
+bool SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell,
                                      const TransferableDataHelper& rData )
 {
     // we can paste-special if there's an entry in the paste-special-format list
@@ -2810,7 +2810,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
 
         if( EXCHG_INOUT_ACTION_NONE != nAction )
             nRet = SwTransferable::PasteData( rData, rSh, nAction, nFormat,
-                                                nDestination, sal_True, sal_False );
+                                                nDestination, true, false );
     }
     return nRet;
 }
@@ -3019,7 +3019,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
         {
             eBufferType = TRNSFR_DOCUMENT;
             if( SwWrtShell::NO_WORD !=
-                pWrtShell->IntelligentCut( nSelection, sal_False ))
+                pWrtShell->IntelligentCut( nSelection, false ))
                 eBufferType = TransferBufferType( TRNSFR_DOCUMENT_WORD
                                                     | eBufferType);
         }
@@ -3124,9 +3124,9 @@ void SwTransferable::StartDrag( Window* pWin, const Point& rPos )
     if(!pWrtShell)
         return;
     bOldIdle = pWrtShell->GetViewOptions()->IsIdle();
-    bCleanUp = sal_True;
+    bCleanUp = true;
 
-    ((SwViewOption *)pWrtShell->GetViewOptions())->SetIdle( sal_False );
+    ((SwViewOption *)pWrtShell->GetViewOptions())->SetIdle( false );
 
     if( pWrtShell->IsSelFrmMode() )
         pWrtShell->ShowCrsr();
@@ -3161,7 +3161,7 @@ void SwTransferable::DragFinished( sal_Int8 nAction )
             {
                 if ( !(pWrtShell->IsSelFrmMode() || pWrtShell->IsObjSelected()) )
                     //SmartCut, take one of the blanks along
-                    pWrtShell->IntelligentCut( pWrtShell->GetSelectionType(), sal_True );
+                    pWrtShell->IntelligentCut( pWrtShell->GetSelectionType(), true );
                 pWrtShell->DelRight();
             }
             pWrtShell->EndUndo( UNDO_UI_DRAG_AND_MOVE );
@@ -3193,7 +3193,7 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
     // (otherwise it's not pasted into a TableSelection!!!)
     OSL_ENSURE( !rShell.ActionPend(), "Paste must never have an ActionPend" );
     if ( !pClpDocFac )
-        return false; // the return value of the SwFEShell::Paste also is sal_Bool!
+        return false; // the return value of the SwFEShell::Paste also is bool!
 
     const int nSelection = rShell.GetSelectionType();
 
@@ -3217,12 +3217,12 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
         {
             // position the cursor again
             Point aPt( rShell.GetCharRect().Pos() );
-            rShell.SwCrsrShell::SetCrsr( aPt, sal_True );
+            rShell.SwCrsrShell::SetCrsr( aPt, true );
         }
         rShell.SetRetainSelection( false );
     }
 
-    sal_Bool bInWrd = sal_False, bEndWrd = sal_False, bSttWrd = sal_False,
+    bool bInWrd = false, bEndWrd = false, bSttWrd = false,
          bSmart = 0 != (TRNSFR_DOCUMENT_WORD & eBufferType);
     if( bSmart )
     {
@@ -3253,15 +3253,15 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
 }
 
 bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
-                                sal_Bool bMove, sal_Bool bIsXSelection )
+                                bool bMove, bool bIsXSelection )
 {
     int cWord    = 0;
-    sal_Bool bInWrd  = sal_False;
-    sal_Bool bEndWrd = sal_False;
-    sal_Bool bSttWrd = sal_False;
+    bool bInWrd  = false;
+    bool bEndWrd = false;
+    bool bSttWrd = false;
     bool bSttPara = false;
-    sal_Bool bTblSel = sal_False;
-    sal_Bool bFrmSel = sal_False;
+    bool bTblSel = false;
+    bool bFrmSel = false;
 
     SwWrtShell& rSrcSh = *GetShell();
 
@@ -3324,14 +3324,14 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         return false;
 
     if( rSrcSh.IsTableMode() )
-        bTblSel = sal_True;
+        bTblSel = true;
     else if( rSrcSh.IsSelFrmMode() || rSrcSh.IsObjSelected() )
     {
         // don't move position-protected objects!
         if( bMove && rSrcSh.IsSelObjProtected( FLYPROTECT_POS ) )
             return false;
 
-        bFrmSel = sal_True;
+        bFrmSel = true;
     }
 
     const int nSel = rSrcSh.GetSelectionType();
@@ -3352,8 +3352,8 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
     if( &rSrcSh != &rSh )
     {
         rSh.EnterStdMode();
-        rSh.SwCrsrShell::SetCrsr( rDragPt, sal_True );
-        cWord = rSrcSh.IntelligentCut( nSel, sal_False );
+        rSh.SwCrsrShell::SetCrsr( rDragPt, true );
+        cWord = rSrcSh.IntelligentCut( nSel, false );
     }
     else if( !bTblSel && !bFrmSel )
     {
@@ -3368,9 +3368,9 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
 
             rSh.SwCrsrShell::CreateCrsr();
         }
-        rSh.SwCrsrShell::SetCrsr( rDragPt, sal_True, false );
+        rSh.SwCrsrShell::SetCrsr( rDragPt, true, false );
         rSh.GoPrevCrsr();
-        cWord = rSh.IntelligentCut( rSh.GetSelectionType(), sal_False );
+        cWord = rSh.IntelligentCut( rSh.GetSelectionType(), false );
         rSh.GoNextCrsr();
     }
 
@@ -3387,7 +3387,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         if( &rSrcSh == &rSh )
         {
             rSh.GoPrevCrsr();
-            rSh.SwCrsrShell::SetCrsr( aSttPt, sal_True );
+            rSh.SwCrsrShell::SetCrsr( aSttPt, true );
             rSh.SelectTxtAttr( RES_TXTATR_INETFMT );
             if( rSh.ChgCurrPam( rDragPt ) )
             {
@@ -3402,7 +3402,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         }
         else
         {
-            rSrcSh.SwCrsrShell::SetCrsr( aSttPt, sal_True );
+            rSrcSh.SwCrsrShell::SetCrsr( aSttPt, true );
             rSrcSh.SelectTxtAttr( RES_TXTATR_INETFMT );
         }
 
@@ -3418,7 +3418,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
         aSttPt -= aSttPt - rSrcSh.GetObjRect().Pos();
     }
 
-    sal_Bool bRet = rSrcSh.SwFEShell::Copy( &rSh, aSttPt, rDragPt, bMove,
+    bool bRet = rSrcSh.SwFEShell::Copy( &rSh, aSttPt, rDragPt, bMove,
                                             !bIsXSelection );
 
     if( !bIsXSelection )
@@ -3436,14 +3436,14 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
                 //SmartCut, take one of the blanks along.
                 rSh.SwCrsrShell::DestroyCrsr();
                 if ( cWord == SwWrtShell::WORD_SPACE_BEFORE )
-                    rSh.ExtendSelection( sal_False );
+                    rSh.ExtendSelection( false );
                 else if ( cWord == SwWrtShell::WORD_SPACE_AFTER )
                     rSh.ExtendSelection();
                 rSrcSh.DelRight();
             }
         }
         rSrcSh.KillPams();
-        rSrcSh.Pop( sal_False );
+        rSrcSh.Pop( false );
 
         /* after dragging a table selection inside one shell
             set cursor to the drop position. */
@@ -3595,9 +3595,9 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
     else
     {
         // creating a temp. bookmark without undo
-        sal_Bool bUndo = rSh.DoesUndo();
-        rSh.DoUndo( sal_False );
-        sal_Bool bIsModified = rSh.IsModified();
+        bool bUndo = rSh.DoesUndo();
+        rSh.DoUndo( false );
+        bool bIsModified = rSh.IsModified();
 
         ::sw::mark::IMark* pMark = rSh.SetBookmark(
             KeyCode(),
@@ -3607,7 +3607,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
         if(pMark)
         {
             sName = pMark->GetName();
-            bDelBookmrk = sal_True;
+            bDelBookmrk = true;
             if( !bIsModified )
                 rSh.ResetModified();
         }
@@ -3636,7 +3636,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
 SwTrnsfrDdeLink::~SwTrnsfrDdeLink()
 {
     if( refObj.Is() )
-        Disconnect( sal_True );
+        Disconnect( true );
 }
 
 ::sfx2::SvBaseLink::UpdateResult SwTrnsfrDdeLink::DataChanged( const OUString& ,
@@ -3647,15 +3647,15 @@ SwTrnsfrDdeLink::~SwTrnsfrDdeLink()
     {
         if( FindDocShell() && pDocShell->GetView() )
             rTrnsfr.RemoveDDELinkFormat( pDocShell->GetView()->GetEditWin() );
-        Disconnect( sal_False );
+        Disconnect( false );
     }
     return SUCCESS;
 }
 
-sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
+bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
 {
     if( !refObj.Is() || !FindDocShell() )
-        return sal_False;
+        return false;
 
     rtl_TextEncoding eEncoding = DDE_TXT_ENCODING;
     const OString aAppNm(OUStringToOString(
@@ -3717,12 +3717,12 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
     return true;
 }
 
-void SwTrnsfrDdeLink::Disconnect( sal_Bool bRemoveDataAdvise )
+void SwTrnsfrDdeLink::Disconnect( bool bRemoveDataAdvise )
 {
     //  don't accept DataChanged anymore, when already in Disconnect!
     //  (DTOR from Bookmark sends a DataChanged!)
-    sal_Bool bOldDisconnect = bInDisconnect;
-    bInDisconnect = sal_True;
+    bool bOldDisconnect = bInDisconnect;
+    bInDisconnect = true;
 
     // destroy the unused bookmark again (without Undo!)?
     if( bDelBookmrk && refObj.Is() && FindDocShell() )
@@ -3734,7 +3734,7 @@ void SwTrnsfrDdeLink::Disconnect( sal_Bool bRemoveDataAdvise )
         Link aSavedOle2Link( pDoc->GetOle2Link() );
         pDoc->SetOle2Link( Link() );
 
-        sal_Bool bIsModified = pDoc->IsModified();
+        bool bIsModified = pDoc->IsModified();
 
         IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
         pMarkAccess->deleteMark(pMarkAccess->findMark(sName));
@@ -3744,7 +3744,7 @@ void SwTrnsfrDdeLink::Disconnect( sal_Bool bRemoveDataAdvise )
         // #i58448#
         pDoc->SetOle2Link( aSavedOle2Link );
 
-        bDelBookmrk = sal_False;
+        bDelBookmrk = false;
     }
 
     if( refObj.Is() )
@@ -3762,7 +3762,7 @@ void SwTrnsfrDdeLink::Disconnect( sal_Bool bRemoveDataAdvise )
     bInDisconnect = bOldDisconnect;
 }
 
-sal_Bool SwTrnsfrDdeLink::FindDocShell()
+bool SwTrnsfrDdeLink::FindDocShell()
 {
     TypeId aType( TYPE( SwDocShell ) );
     SfxObjectShell* pTmpSh = SfxObjectShell::GetFirst( &aType );
@@ -3771,14 +3771,14 @@ sal_Bool SwTrnsfrDdeLink::FindDocShell()
         if( pTmpSh == pDocShell )       // that's what we want to have
         {
             if( pDocShell->GetDoc() )
-                return sal_True;
+                return true;
             break;      // the Doc is not there anymore, so leave!
         }
         pTmpSh = SfxObjectShell::GetNext( *pTmpSh, &aType );
     }
 
     pDocShell = 0;
-    return sal_False;
+    return false;
 }
 
 void SwTrnsfrDdeLink::Closed()
diff --git a/sw/source/core/uibase/docvw/PageBreakWin.cxx b/sw/source/core/uibase/docvw/PageBreakWin.cxx
index b6a6c5ce2419..876961aab601 100644
--- a/sw/source/core/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/core/uibase/docvw/PageBreakWin.cxx
@@ -222,8 +222,8 @@ void SwPageBreakWin::Select( )
                 if ( pBodyFrm )
                 {
                     SwWrtShell& rSh = pEditWin->GetView().GetWrtShell();
-                    sal_Bool bOldLock = rSh.IsViewLocked();
-                    rSh.LockView( sal_True );
+                    bool bOldLock = rSh.IsViewLocked();
+                    rSh.LockView( true );
 
                     if ( pBodyFrm->Lower()->IsTabFrm() )
                     {
@@ -238,7 +238,7 @@ void SwPageBreakWin::Select( )
                         pEditWin->GetView().GetViewFrame()->GetDispatcher()->Execute(
                                 FN_FORMAT_TABLE_DLG, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aItem, NULL );
 
-                        rSh.Pop( sal_False );
+                        rSh.Pop( false );
                     }
                     else
                     {
diff --git a/sw/source/core/uibase/docvw/PostItMgr.cxx b/sw/source/core/uibase/docvw/PostItMgr.cxx
index a755d8ee662e..77358d500b5f 100644
--- a/sw/source/core/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/core/uibase/docvw/PostItMgr.cxx
@@ -1889,8 +1889,8 @@ void SwPostItMgr::AssureStdModeAtShell()
           SdrView* pSdrView = mpWrtShell->GetDrawView();
         if ( pSdrView && pSdrView->IsTextEdit() )
         {
-            sal_Bool bLockView = mpWrtShell->IsViewLocked();
-            mpWrtShell->LockView( sal_True );
+            bool bLockView = mpWrtShell->IsViewLocked();
+            mpWrtShell->LockView( true );
             mpWrtShell->EndTextEdit();
             mpWrtShell->LockView( bLockView );
         }
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx b/sw/source/core/uibase/docvw/SidebarWin.cxx
index 3c77d9888a93..30905a0d79d5 100644
--- a/sw/source/core/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
@@ -892,7 +892,7 @@ void SwSidebarWin::SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSideb
     meSidebarPosition = eSidebarPosition;
 }
 
-void SwSidebarWin::SetReadonly(sal_Bool bSet)
+void SwSidebarWin::SetReadonly(bool bSet)
 {
     mbReadonly = bSet;
     GetOutlinerView()->SetReadOnly(bSet);
@@ -1129,8 +1129,8 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent )
         else if ( pWinEvent->GetId() == VCLEVENT_WINDOW_ACTIVATE &&
                   pWinEvent->GetWindow() == mpSidebarTxtControl )
         {
-            const sal_Bool bLockView = mrView.GetWrtShell().IsViewLocked();
-            mrView.GetWrtShell().LockView( sal_True );
+            const bool bLockView = mrView.GetWrtShell().IsViewLocked();
+            mrView.GetWrtShell().LockView( true );
 
             if ( !IsPreview() )
             {
@@ -1331,7 +1331,7 @@ void SwSidebarWin::SwitchToFieldPos()
     GotoPos();
     sal_uInt32 aCount = MoveCaret();
     if (aCount)
-        mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0, sal_False);
+        mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0, false);
     GrabFocusToDocument();
 }
 
diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
index c9201556017b..57850b9b3af6 100644
--- a/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
@@ -63,7 +63,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
             if ( mpAnchorFrm &&
                  mrViewShell.GetAccessibleMap() )
             {
-                xAccParent = mrViewShell.GetAccessibleMap()->GetContext( mpAnchorFrm, sal_False );
+                xAccParent = mrViewShell.GetAccessibleMap()->GetContext( mpAnchorFrm, false );
             }
 
             return xAccParent;
diff --git a/sw/source/core/uibase/docvw/edtdd.cxx b/sw/source/core/uibase/docvw/edtdd.cxx
index 005af17dad00..c43fb80eb81e 100644
--- a/sw/source/core/uibase/docvw/edtdd.cxx
+++ b/sw/source/core/uibase/docvw/edtdd.cxx
@@ -81,26 +81,26 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
 
     if ( !m_pApplyTempl && !rSh.IsDrawCreate() && !IsDrawAction())
     {
-        sal_Bool bStart = sal_False, bDelSelect = sal_False;
+        bool bStart = false, bDelSelect = false;
         SdrObject *pObj = NULL;
         Point aDocPos( PixelToLogic( rPosPixel ) );
-        if ( !rSh.IsInSelect() && rSh.ChgCurrPam( aDocPos, sal_True, sal_True))
+        if ( !rSh.IsInSelect() && rSh.ChgCurrPam( aDocPos, true, true))
             //We are not selecting and aren't at a selection
-            bStart = sal_True;
+            bStart = true;
         else if ( !bFrmDrag && rSh.IsSelFrmMode() &&
                     rSh.IsInsideSelectedObj( aDocPos ) )
         {
             //We are not dragging internally and are not at an
             //object (frame, draw object)
 
-            bStart = sal_True;
+            bStart = true;
         }
         else if( !bFrmDrag && m_rView.GetDocShell()->IsReadOnly() &&
                 OBJCNT_NONE != rSh.GetObjCntType( aDocPos, pObj ))
         {
             rSh.LockPaint();
             if( rSh.SelectObj( aDocPos, 0, pObj ))
-                bStart = bDelSelect = sal_True;
+                bStart = bDelSelect = true;
             else
                 rSh.UnlockPaint();
         }
@@ -109,12 +109,12 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
             SwContentAtPos aSwContentAtPos( SwContentAtPos::SW_INETATTR );
             bStart = rSh.GetContentAtPos( aDocPos,
                         aSwContentAtPos,
-                        sal_False );
+                        false );
         }
 
         if ( bStart && !m_bIsInDrag )
         {
-            m_bMBPressed = sal_False;
+            m_bMBPressed = false;
             ReleaseMouse();
             bFrmDrag = false;
             bExecuteDrag = true;
@@ -136,7 +136,7 @@ void SwEditWin::StartExecuteDrag()
     if( !bExecuteDrag || m_bIsInDrag )
         return;
 
-    m_bIsInDrag = sal_True;
+    m_bIsInDrag = true;
 
     SwTransferable* pTransfer = new SwTransferable( m_rView.GetWrtShell() );
     uno::Reference<
@@ -149,7 +149,7 @@ void SwEditWin::DragFinished()
 {
     DropCleanup();
     m_aTimer.SetTimeoutHdl( LINK(this,SwEditWin, TimerHandler) );
-    m_bIsInDrag = sal_False;
+    m_bIsInDrag = false;
 }
 
 void SwEditWin::DropCleanup()
@@ -161,7 +161,7 @@ void SwEditWin::DropCleanup()
     if ( m_bOldIdleSet )
     {
         ((SwViewOption*)rSh.GetViewOptions())->SetIdle( m_bOldIdle );
-        m_bOldIdleSet = sal_False;
+        m_bOldIdleSet = false;
     }
     if ( m_pUserMarker )
         CleanupDropUserMarker();
@@ -233,11 +233,11 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
     TransferableDataHelper aData( rEvt.maDropEvent.Transferable );
     nRet = rEvt.mnAction;
     if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, m_nDropFormat,
-                                m_nDropDestination, sal_False, rEvt.mbDefault, &aDocPt, nRet))
+                                m_nDropDestination, false, rEvt.mbDefault, &aDocPt, nRet))
         nRet = DND_ACTION_NONE;
     else if ( SW_MOD()->pDragDrop )
         //Don't clean up anymore at internal D&D!
-        SW_MOD()->pDragDrop->SetCleanUp( sal_False );
+        SW_MOD()->pDragDrop->SetCleanUp( false );
 
     return nRet;
 }
@@ -278,7 +278,7 @@ sal_uInt16 SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppO
         {
         case OBJCNT_GRF:
             {
-                sal_Bool bLink,
+                bool bLink,
                     bIMap = 0 != rSh.GetFmtFromObj( aDocPt )->GetURL().GetMap();
                 OUString aDummy;
                 rSh.GetGrfAtPos( aDocPt, aDummy, bLink );
@@ -350,8 +350,8 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
             last_tick = current_tick;
             if(!m_bOldIdleSet) {
                 m_bOldIdle = rSh.GetViewOptions()->IsIdle();
-                ((SwViewOption *)rSh.GetViewOptions())->SetIdle(sal_False);
-                m_bOldIdleSet = sal_True;
+                ((SwViewOption *)rSh.GetViewOptions())->SetIdle(false);
+                m_bOldIdleSet = true;
             }
             CleanupDropUserMarker();
             if(aPixPt.X() > aWin.Right()) aPixPt.X() += nMargin;
@@ -366,7 +366,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
 
     if(m_bOldIdleSet) {
         ((SwViewOption *)rSh.GetViewOptions())->SetIdle( m_bOldIdle );
-        m_bOldIdleSet = sal_False;
+        m_bOldIdleSet = false;
     }
 
     SdrObject *pObj = NULL;
@@ -392,21 +392,21 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
         SwModule *pMod = SW_MOD();
         if( pMod->pDragDrop )
         {
-            sal_Bool bCleanup = sal_False;
+            bool bCleanup = false;
             //Drawing objects in Headers/Footers are not allowed
 
             SwWrtShell *pSrcSh = pMod->pDragDrop->GetShell();
             if( (pSrcSh->GetSelFrmType() == FRMTYPE_DRAWOBJ) &&
                 pSrcSh->IsSelContainsControl() &&
-                 (rSh.GetFrmType( &aDocPt, sal_False ) & (FRMTYPE_HEADER|FRMTYPE_FOOTER)) )
+                 (rSh.GetFrmType( &aDocPt, false ) & (FRMTYPE_HEADER|FRMTYPE_FOOTER)) )
             {
-                bCleanup = sal_True;
+                bCleanup = true;
             }
             // don't more position protected objects!
             else if( DND_ACTION_MOVE == rEvt.mnAction &&
                      pSrcSh->IsSelObjProtected( FLYPROTECT_POS ) )
             {
-                bCleanup = sal_True;
+                bCleanup = true;
             }
             else if( rEvt.mbDefault )
             {
@@ -480,7 +480,7 @@ IMPL_LINK_NOARG(SwEditWin, DDHandler)
     bDDTimerStarted = false;
     m_aTimer.Stop();
     m_aTimer.SetTimeout(240);
-    m_bMBPressed = sal_False;
+    m_bMBPressed = false;
     ReleaseMouse();
     bFrmDrag = false;
 
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index bda06cfec446..f391ca1009b8 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -400,14 +400,14 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
         return;
     }
 
-    sal_Bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
+    bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
     if ( !bExecHyperlinks )
     {
         SvtSecurityOptions aSecOpts;
-        const sal_Bool bSecureOption = aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+        const bool bSecureOption = aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
         if ( (  bSecureOption && nModifier == KEY_MOD1 ) ||
              ( !bSecureOption && nModifier != KEY_MOD1 ) )
-            bExecHyperlinks = sal_True;
+            bExecHyperlinks = true;
     }
 
     const bool bExecSmarttags  = nModifier == KEY_MOD1;
@@ -658,12 +658,12 @@ inline void SwEditWin::EnterArea()
  */
 void SwEditWin::InsFrm(sal_uInt16 nCols)
 {
-    StdDrawMode( OBJ_NONE, sal_False );
-    m_bInsFrm = sal_True;
+    StdDrawMode( OBJ_NONE, false );
+    m_bInsFrm = true;
     m_nInsFrmColCount = nCols;
 }
 
-void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect )
+void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect )
 {
     SetSdrDrawMode( eSdrObjectKind );
 
@@ -678,7 +678,7 @@ void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect )
         m_rView.GetDrawFuncPtr()->Activate( SID_OBJECT_SELECT );
     else
         m_rView.GetDrawFuncPtr()->Activate( sal::static_int_cast< sal_uInt16 >(eSdrObjectKind) );
-    m_bInsFrm = sal_False;
+    m_bInsFrm = false;
     m_nInsFrmColCount = 1;
 }
 
@@ -690,19 +690,19 @@ void SwEditWin::StopInsFrm()
         m_rView.SetDrawFuncPtr(NULL);
     }
     m_rView.LeaveDrawCreate();    // leave construction mode
-    m_bInsFrm = sal_False;
+    m_bInsFrm = false;
     m_nInsFrmColCount = 1;
 }
 
-sal_Bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const
+bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const
 {
     const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
     if ( !rCTLOptions.IsCTLFontEnabled() ||
          !rCTLOptions.IsCTLSequenceChecking() )
-         return sal_False;
+         return false;
 
     if ( 0 == rCrsr.Start()->nContent.GetIndex() ) /* first char needs not to be checked */
-        return sal_False;
+        return false;
 
     SwBreakIt *pBreakIter = SwBreakIt::Get();
     uno::Reference < i18n::XBreakIterator > xBI = pBreakIter->GetBreakIter();
@@ -900,7 +900,7 @@ void SwEditWin::FlushInBuffer()
 
             // at this point now we will insert the buffer text 'normally' some lines below...
 
-            rSh.Pop( sal_False );  // pop old cursor from stack
+            rSh.Pop( false );  // pop old cursor from stack
 
             if (m_aInBuffer.isEmpty())
                 return;
@@ -962,7 +962,7 @@ void SwEditWin::FlushInBuffer()
 #define MOVE_RIGHT_HUGE     10
 #define MOVE_DOWN_HUGE      11
 
-void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
+void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
 {
     SwWrtShell &rSh = m_rView.GetWrtShell();
     SwRect aTmp = rSh.GetFlyRect();
@@ -1230,8 +1230,8 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
             if(0 == (nProtect&FLYPROTECT_POS))
             {
                 // Check if object is anchored as character and move direction
-                sal_Bool bDummy1, bDummy2;
-                const bool bVertAnchor = rSh.IsFrmVertical( sal_True, bDummy1, bDummy2 );
+                bool bDummy1, bDummy2;
+                const bool bVertAnchor = rSh.IsFrmVertical( true, bDummy1, bDummy2 );
                 bool bHoriMove = !bVertAnchor == !( nDir % 2 );
                 bool bMoveAllowed =
                     !bHoriMove || (rSh.GetAnchorId() != FLY_AS_CHAR);
@@ -1267,8 +1267,8 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
 
                     if(pSdrView->IsDragObj())
                     {
-                        sal_Bool bWasNoSnap = static_cast< sal_Bool >(rDragStat.IsNoSnap());
-                        sal_Bool bWasSnapEnabled = pSdrView->IsSnapEnabled();
+                        bool bWasNoSnap = rDragStat.IsNoSnap();
+                        bool bWasSnapEnabled = pSdrView->IsSnapEnabled();
 
                         // switch snapping off
                         if(!bWasNoSnap)
@@ -1312,7 +1312,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
     else if ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE &&
             rSh.IsHeaderFooterEdit( ) )
     {
-        bool bHeader = FRMTYPE_HEADER & rSh.GetFrmType(0,sal_False);
+        bool bHeader = FRMTYPE_HEADER & rSh.GetFrmType(0,false);
         if ( bHeader )
             rSh.SttPg();
         else
@@ -1593,12 +1593,12 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                     else
                         rSh.SttSelect();
                     rSh.MoveSection( fnSectionCurr, fnSectionEnd );
-                    rSh.Pop( sal_True );
+                    rSh.Pop( true );
                     rSh.EndSelect();
                     sFmlEntry = "=";
                 }
                 else
-                    rSh.Pop( sal_False );
+                    rSh.Pop( false );
             }
             else
             {
@@ -1818,8 +1818,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     if( !rSh.IsTableMode() && rSh.GetTableFmt() )
                     {
                         eKeyState = KS_End;
-                        m_bTblInsDelMode = sal_True;
-                        m_bTblIsInsMode = sal_False;
+                        m_bTblInsDelMode = true;
+                        m_bTblIsInsMode = false;
                         m_aKeyInputTimer.Start();
                         bStopKeyInputTimer = false;
                     }
@@ -1828,8 +1828,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     if( !rSh.IsTableMode() && rSh.GetTableFmt() )
                     {
                         eKeyState = KS_End;
-                        m_bTblInsDelMode = sal_True;
-                        m_bTblIsInsMode = sal_True;
+                        m_bTblInsDelMode = true;
+                        m_bTblIsInsMode = true;
                         m_aKeyInputTimer.Start();
                         bStopKeyInputTimer = false;
                     }
@@ -1990,7 +1990,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 case KEY_TAB:
                 {
 
-                    if (rSh.IsFormProtected() || rSh.GetCurrentFieldmark() || rSh.GetChar(sal_False)==CH_TXT_ATR_FORMELEMENT)
+                    if (rSh.IsFormProtected() || rSh.GetCurrentFieldmark() || rSh.GetChar(false)==CH_TXT_ATR_FORMELEMENT)
                     {
                         eKeyState=KS_GotoNextFieldMark;
                     }
@@ -2042,7 +2042,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 break;
                 case KEY_TAB | KEY_SHIFT:
                 {
-                    if (rSh.IsFormProtected() || rSh.GetCurrentFieldmark()|| rSh.GetChar(sal_False)==CH_TXT_ATR_FORMELEMENT)
+                    if (rSh.IsFormProtected() || rSh.GetCurrentFieldmark()|| rSh.GetChar(false)==CH_TXT_ATR_FORMELEMENT)
                     {
                         eKeyState=KS_GotoPrevFieldMark;
                     }
@@ -2206,12 +2206,12 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 switch ( rKeyCode.GetModifier() | rKeyCode.GetCode() )
                 {
                     case KEY_RIGHT | KEY_MOD2:
-                        rSh.Right( CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+                        rSh.Right( CRSR_SKIP_CHARS, false, 1, false );
                         eKeyState = KS_End;
                         FlushInBuffer();
                         break;
                     case KEY_LEFT | KEY_MOD2:
-                        rSh.Left( CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+                        rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
                         eKeyState = KS_End;
                         FlushInBuffer();
                         break;
@@ -2309,7 +2309,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
         case KS_EnterDrawHandleMode:
         {
             const SdrHdlList& rHdlList = rSh.GetDrawView()->GetHdlList();
-            sal_Bool bForward(!aKeyEvent.GetKeyCode().IsShift());
+            bool bForward(!aKeyEvent.GetKeyCode().IsShift());
 
             ((SdrHdlList&)rHdlList).TravelFocusHdl(bForward);
             eKeyState = KS_End;
@@ -2326,7 +2326,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
             aCh = '\t';
             // no break!
         case KS_InsChar:
-            if (rSh.GetChar(sal_False)==CH_TXT_ATR_FORMELEMENT)
+            if (rSh.GetChar(false)==CH_TXT_ATR_FORMELEMENT)
             {
                 ::sw::mark::ICheckboxFieldmark* pFieldmark =
                     dynamic_cast< ::sw::mark::ICheckboxFieldmark* >
@@ -2348,7 +2348,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
             else if ( !rSh.HasReadonlySel()
                       || rSh.CrsrInsideInputFld() )
             {
-                const sal_Bool bIsNormalChar =
+                const bool bIsNormalChar =
                     GetAppCharClass().isLetterNumeric( OUString( aCh ), 0 );
                 if( bAppendSpace && bIsNormalChar &&
                     (!m_aInBuffer.isEmpty() || !rSh.IsSttPara() || !rSh.IsEndPara() ))
@@ -2358,7 +2358,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     m_aInBuffer += " ";
                 }
 
-                const sal_Bool bIsAutoCorrectChar =  SvxAutoCorrect::IsAutoCorrectChar( aCh );
+                const bool bIsAutoCorrectChar =  SvxAutoCorrect::IsAutoCorrectChar( aCh );
                 const bool bRunNext = pACorr != NULL && pACorr->HasRunNext();
                 if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) &&
                         pACfg->IsAutoFmtByInput() &&
@@ -2492,7 +2492,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 nSlotId = FN_GOTO_PREV_CELL;
                 break;
             case KS_AutoFmtByInput:
-                rSh.SplitNode( sal_True );
+                rSh.SplitNode( true );
                 break;
 
             case KS_NextObject:
@@ -2525,9 +2525,9 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     if(pList->GetShortName( sFnd, sShrtNm, sGroup))
                     {
                         rSh.SttSelect();
-                        rSh.ExtendSelection( sal_False, aTmpQHD.nLen );
+                        rSh.ExtendSelection( false, aTmpQHD.nLen );
                         SwGlossaryHdl* pGlosHdl = GetView().GetGlosHdl();
-                        pGlosHdl->SetCurGroup(sGroup, sal_True);
+                        pGlosHdl->SetCurGroup(sGroup, true);
                         pGlosHdl->InsertGlossary( sShrtNm);
                         m_pQuickHlpData->m_bAppendSpace = true;
                     }
@@ -2625,7 +2625,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
     if( bStopKeyInputTimer )
     {
         m_aKeyInputTimer.Stop();
-        m_bTblInsDelMode = sal_False;
+        m_bTblInsDelMode = false;
     }
 
     // in case the buffered characters are inserted
@@ -2664,7 +2664,7 @@ void SwEditWin::RstMBDownFlags()
     // of the modal dialog (like on WINDOWS).
     // So reset the statuses here and release the mouse
     // for the dialog.
-    m_bMBPressed = sal_False;
+    m_bMBPressed = false;
     bNoInterrupt = false;
     EnterArea();
     ReleaseMouse();
@@ -2808,7 +2808,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     bool bPageAnchored = false;
     bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, eControl, bOverFly, bPageAnchored );
 
-    sal_Bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
+    bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
     if (bOverHeaderFooterFly && (!bIsDocReadOnly && rSh.GetCurFld()))
         // We have a field here, that should have priority over header/footer fly.
         bOverHeaderFooterFly = false;
@@ -2897,7 +2897,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 
     if ( IsChainMode() )
     {
-        SetChainMode( sal_False );
+        SetChainMode( false );
         SwRect aDummy;
         SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)rSh.GetFlyFrmFmt();
         if ( !rSh.Chainable( aDummy, *pFmt, aDocPos ) )
@@ -2931,7 +2931,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         }
     }
 
-    m_bIsInMove = sal_False;
+    m_bIsInMove = false;
     m_aStartPos = rMEvt.GetPosPixel();
     m_aRszMvHdlPt.X() = 0, m_aRszMvHdlPt.Y() = 0;
 
@@ -2953,7 +2953,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                 m_bIsRowDrag = SW_TABROWSEL_HORI == nMouseTabCol||
                             SW_TABROWSEL_HORI_RTL == nMouseTabCol ||
                             SW_TABCOLSEL_VERT == nMouseTabCol;
-                m_bMBPressed = sal_True;
+                m_bMBPressed = true;
                 CaptureMouse();
             }
             return;
@@ -2963,9 +2963,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         {
             // comes from table columns out of the document.
             if(SW_TABCOL_VERT == nMouseTabCol || SW_TABCOL_HORI == nMouseTabCol)
-                m_rView.SetTabColFromDoc( sal_True );
+                m_rView.SetTabColFromDoc( true );
             else
-                m_rView.SetTabRowFromDoc( sal_True );
+                m_rView.SetTabRowFromDoc( true );
 
             m_rView.SetTabColFromDocPos( aDocPos );
             m_rView.InvalidateRulerPos();
@@ -2974,8 +2974,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
             if ( RulerColumnDrag( rMEvt,
                     (SW_TABCOL_VERT == nMouseTabCol || SW_TABROW_HORI == nMouseTabCol)) )
             {
-                m_rView.SetTabColFromDoc( sal_False );
-                m_rView.SetTabRowFromDoc( sal_False );
+                m_rView.SetTabColFromDoc( false );
+                m_rView.SetTabRowFromDoc( false );
                 m_rView.InvalidateRulerPos();
                 rBind.Update();
                 bCallBase = false;
@@ -3019,8 +3019,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     // click releases the selection.
     if ( MOUSE_LEFT == rMEvt.GetButtons() )
     {
-        sal_Bool bOnlyText = sal_False;
-        m_bMBPressed = sal_True;
+        bool bOnlyText = false;
+        m_bMBPressed = true;
         bNoInterrupt = true;
         m_nKS_NUMDOWN_Count = 0;
 
@@ -3092,14 +3092,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                 }
         }
 
-        sal_Bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
+        bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
         if ( !bExecHyperlinks )
         {
             SvtSecurityOptions aSecOpts;
-            const sal_Bool bSecureOption = aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+            const bool bSecureOption = aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
             if ( (  bSecureOption && rMEvt.GetModifier() == KEY_MOD1 ) ||
                  ( !bSecureOption && rMEvt.GetModifier() != KEY_MOD1 ) )
-                bExecHyperlinks = sal_True;
+                bExecHyperlinks = true;
         }
 
         // Enhanced selection
@@ -3127,7 +3127,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         !bExecDrawTextLink)
                     {
                         // Test if there is a draw object at that position and if it should be selected.
-                        sal_Bool bShould = rSh.ShouldObjectBeSelected(aDocPos);
+                        bool bShould = rSh.ShouldObjectBeSelected(aDocPos);
 
                         if(bShould)
                         {
@@ -3135,11 +3135,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                             rSh.HideCrsr();
 
                             bool bUnLockView = !rSh.IsViewLocked();
-                            rSh.LockView( sal_True );
-                            sal_Bool bSelObj = rSh.SelectObj( aDocPos,
+                            rSh.LockView( true );
+                            bool bSelObj = rSh.SelectObj( aDocPos,
                                            rMEvt.IsMod1() ? SW_ENTER_GROUP : 0);
                             if( bUnLockView )
-                                rSh.LockView( sal_False );
+                                rSh.LockView( false );
 
                             if( bSelObj )
                             {
@@ -3164,7 +3164,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                 return;
                             }
                             else
-                                bOnlyText = static_cast< sal_Bool >(rSh.IsObjSelectable( aDocPos ));
+                                bOnlyText = rSh.IsObjSelectable( aDocPos );
 
                             if (!m_rView.GetDrawFuncPtr())
                                 rSh.ShowCrsr();
@@ -3190,7 +3190,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         else
                         {
                             bool bUnLockView = !rSh.IsViewLocked();
-                            rSh.LockView( sal_True );
+                            rSh.LockView( true );
                             sal_uInt8 nFlag = rMEvt.IsShift() ? SW_ADD_SELECT :0;
                             if( rMEvt.IsMod1() )
                                 nFlag = nFlag | SW_ENTER_GROUP;
@@ -3202,9 +3202,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                 m_rView.AttrChangedNotify(&rSh);
                             }
 
-                            sal_Bool bSelObj = rSh.SelectObj( aDocPos, nFlag );
+                            bool bSelObj = rSh.SelectObj( aDocPos, nFlag );
                             if( bUnLockView )
-                                rSh.LockView( sal_False );
+                                rSh.LockView( false );
 
                             if( !bSelObj )
                             {
@@ -3305,11 +3305,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                             return;
 
                         SwField *pFld;
-                        sal_Bool bFtn = sal_False;
+                        bool bFtn = false;
 
                         if( !bIsDocReadOnly &&
                             ( 0 != ( pFld = rSh.GetCurFld() ) ||
-                              0 != ( bFtn = rSh.GetCurFtn() )) )
+                              ( bFtn = rSh.GetCurFtn() )        ) )
                         {
                             RstMBDownFlags();
                             if( bFtn )
@@ -3398,7 +3398,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
             case MOUSE_LEFT + KEY_SHIFT:
             case MOUSE_LEFT + KEY_SHIFT + KEY_MOD1:
             {
-                sal_Bool bLockView = m_bWasShdwCrsr;
+                bool bLockView = m_bWasShdwCrsr;
 
                 switch ( rMEvt.GetModifier() )
                 {
@@ -3465,10 +3465,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                 bModePushed = true;
 
                                 bool bUnLockView = !rSh.IsViewLocked();
-                                rSh.LockView( sal_True );
+                                rSh.LockView( true );
                                 rSh.EnterAddMode();
                                 if( bUnLockView )
-                                    rSh.LockView( sal_False );
+                                    rSh.LockView( false );
                             }
                             bCallBase = false;
                         }
@@ -3481,10 +3481,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                             rSh.PushMode();
                             bModePushed = true;
                             bool bUnLockView = !rSh.IsViewLocked();
-                            rSh.LockView( sal_True );
+                            rSh.LockView( true );
                             rSh.EnterBlockMode();
                             if( bUnLockView )
-                                rSh.LockView( sal_False );
+                                rSh.LockView( false );
                         }
                         bCallBase = false;
                     }
@@ -3557,7 +3557,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                                             if( !rSh.IsViewLocked() &&
                                                 !rSh.IsReadOnlyAvailable() &&
                                                 aCntntAtPos.IsInProtectSect() )
-                                                    bLockView = sal_True;
+                                                    bLockView = true;
 
                                             bSttSelect = false;
                                         }
@@ -3578,10 +3578,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         {
                             SwContentAtPos aCntntAtPos( SwContentAtPos::SW_CLICKFIELD |
                                                         SwContentAtPos::SW_INETATTR );
-                            if( rSh.GetContentAtPos( aDocPos, aCntntAtPos, sal_False ) &&
+                            if( rSh.GetContentAtPos( aDocPos, aCntntAtPos, false ) &&
                                 !rSh.IsReadOnlyAvailable() &&
                                 aCntntAtPos.IsInProtectSect() )
-                                bLockView = sal_True;
+                                bLockView = true;
                         }
                 }
 
@@ -3619,7 +3619,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                     }
                 }
 
-                sal_Bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf = sal_False;
+                bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf = false;
                 if( !bOverSelect )
                     bOverURLGrf = bOverSelect = 0 != rSh.IsURLGrfAtPos( aDocPos );
 
@@ -3629,9 +3629,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                     bNoInterrupt = false;
 
                     if( !rSh.IsViewLocked() && bLockView )
-                        rSh.LockView( sal_True );
+                        rSh.LockView( true );
                     else
-                        bLockView = sal_False;
+                        bLockView = false;
 
                     int nTmpSetCrsr = 0;
 
@@ -3645,10 +3645,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 
                     // notify the edit window that from now on we do not use the input language
                     if ( !(CRSR_POSOLD & nTmpSetCrsr) )
-                        SetUseInputLanguage( sal_False );
+                        SetUseInputLanguage( false );
 
                     if( bLockView )
-                        rSh.LockView( sal_False );
+                        rSh.LockView( false );
 
                     bNoInterrupt = bTmpNoInterrupt;
                 }
@@ -3704,7 +3704,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
     if( m_pShadCrsr && 0 != (rMEvt.GetModifier() + rMEvt.GetButtons() ) )
         delete m_pShadCrsr, m_pShadCrsr = 0;
 
-    sal_Bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
+    bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
 
     SET_CURR_SHELL( &rSh );
 
@@ -3731,7 +3731,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
     }
 
     const Point aOldPt( rSh.VisArea().Pos() );
-    const sal_Bool bInsWin = rSh.VisArea().IsInside( aDocPt );
+    const bool bInsWin = rSh.VisArea().IsInside( aDocPt );
 
     if( m_pShadCrsr && !bInsWin )
         delete m_pShadCrsr, m_pShadCrsr = 0;
@@ -3909,7 +3909,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                         pSdrView->SetOrtho(false);
                         m_rView.GetDrawFuncPtr()->MouseMove( rMEvt );
                     }
-                    m_bIsInMove = sal_True;
+                    m_bIsInMove = true;
                 }
                 return;
             }
@@ -4016,7 +4016,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                     }
 
                     rSh.Drag( &aDocPt, rMEvt.IsShift() );
-                    m_bIsInMove = sal_True;
+                    m_bIsInMove = true;
                 }
                 else if( bIsDocReadOnly )
                     break;
@@ -4075,7 +4075,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
             // TODO: do the same thing for redlines SW_REDLINE
             SwRect aFldRect;
             SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD);
-            if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_False, &aFldRect ) )
+            if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, false, &aFldRect ) )
             {
                 const SwField* pFld = aCntntAtPos.aFnd.pFld;
                 if (pFld->Which()== RES_POSTITFLD)
@@ -4176,7 +4176,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
     if( bDelShadCrsr && m_pShadCrsr )
         delete m_pShadCrsr, m_pShadCrsr = 0;
-    m_bWasShdwCrsr = sal_False;
+    m_bWasShdwCrsr = false;
 }
 
 /**
@@ -4186,8 +4186,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 {
     bool bCallBase = true;
 
-    sal_Bool bCallShadowCrsr = m_bWasShdwCrsr;
-    m_bWasShdwCrsr = sal_False;
+    bool bCallShadowCrsr = m_bWasShdwCrsr;
+    m_bWasShdwCrsr = false;
     if( m_pShadCrsr )
         delete m_pShadCrsr, m_pShadCrsr = 0;
 
@@ -4198,7 +4198,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     eSdrMoveHdl = HDL_USER;     // for MoveEvents - reset again
 
     // preventively reset
-    m_rView.SetTabColFromDoc( sal_False );
+    m_rView.SetTabColFromDoc( false );
     m_rView.SetNumRuleNodeFromDoc(NULL);
 
     SwWrtShell &rSh = m_rView.GetWrtShell();
@@ -4228,7 +4228,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     if ( bDDTimerStarted )
     {
         StopDDTimer( &rSh, aDocPt );
-        m_bMBPressed = sal_False;
+        m_bMBPressed = false;
         if ( rSh.IsSelFrmMode() )
         {
             rSh.EndDrag( &aDocPt, false );
@@ -4261,7 +4261,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
         Point aPnt( m_pAnchorMarker->GetLastPos() );
         DELETEZ( m_pAnchorMarker );
         if( aPnt.X() || aPnt.Y() )
-            rSh.FindAnchorPos( aPnt, sal_True );
+            rSh.FindAnchorPos( aPnt, true );
     }
     if ( m_bInsDraw && m_rView.GetDrawFuncPtr() )
     {
@@ -4284,7 +4284,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
             {
                 rSh.EnterSelFrmMode();
                 if (!m_rView.GetDrawFuncPtr())
-                    StdDrawMode( OBJ_NONE, sal_True );
+                    StdDrawMode( OBJ_NONE, true );
             }
             else if ( rSh.IsFrmSelected() )
             {
@@ -4313,7 +4313,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
         case MOUSE_LEFT:
             if ( m_bInsDraw && rSh.IsDrawCreate() )
             {
-                if ( m_rView.GetDrawFuncPtr() && m_rView.GetDrawFuncPtr()->MouseButtonUp(rMEvt) == sal_True )
+                if ( m_rView.GetDrawFuncPtr() && m_rView.GetDrawFuncPtr()->MouseButtonUp(rMEvt) )
                 {
                     m_rView.GetDrawFuncPtr()->Deactivate();
                     m_rView.AttrChangedNotify( &rSh );
@@ -4352,7 +4352,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                         if ( aSttPt != aEndPt )
                         {
                             rSh.StartUndo( UNDO_UI_DRAG_AND_COPY );
-                            rSh.Copy(&rSh, aSttPt, aEndPt, sal_False);
+                            rSh.Copy(&rSh, aSttPt, aEndPt, false);
                             rSh.EndUndo( UNDO_UI_DRAG_AND_COPY );
                         }
                     }
@@ -4449,7 +4449,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                 }
                 else
                 {
-                    sal_Bool bInSel = rSh.IsInSelect();
+                    bool bInSel = rSh.IsInSelect();
                     rSh.EndDrag( &aDocPt, false );
 
                     // Internetfield? --> call link (load doc!!)
@@ -4459,36 +4459,36 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                         if( KEY_MOD1 == rMEvt.GetModifier() )
                             nFilter |= URLLOAD_NEWVIEW;
 
-                        sal_Bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
+                        bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
                         if ( !bExecHyperlinks )
                         {
                             SvtSecurityOptions aSecOpts;
-                            const sal_Bool bSecureOption = aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+                            const bool bSecureOption = aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
                             if ( (  bSecureOption && rMEvt.GetModifier() == KEY_MOD1 ) ||
                                  ( !bSecureOption && rMEvt.GetModifier() != KEY_MOD1 ) )
-                                bExecHyperlinks = sal_True;
+                                bExecHyperlinks = true;
                         }
 
                         const bool bExecSmarttags = rMEvt.GetModifier() == KEY_MOD1;
 
                         if(m_pApplyTempl)
-                            bExecHyperlinks = sal_False;
+                            bExecHyperlinks = false;
 
                         SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
                                                     SwContentAtPos::SW_INETATTR |
                                                     SwContentAtPos::SW_SMARTTAG  | SwContentAtPos::SW_FORMCTRL);
 
-                        if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_False ) )
+                        if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, false ) )
                         {
                             // Do it again if we're not on a field/hyperlink to update the cursor accordingly
                             if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos
                                  && SwContentAtPos::SW_INETATTR != aCntntAtPos.eCntntAtPos )
-                                rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True );
+                                rSh.GetContentAtPos( aDocPt, aCntntAtPos, true );
 
-                            sal_Bool bViewLocked = rSh.IsViewLocked();
+                            bool bViewLocked = rSh.IsViewLocked();
                             if( !bViewLocked && !rSh.IsReadOnlyAvailable() &&
                                 aCntntAtPos.IsInProtectSect() )
-                                rSh.LockView( sal_True );
+                                rSh.LockView( true );
 
                             ReleaseMouse();
 
@@ -4558,12 +4558,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                             }
 
                             rSh.LockView( bViewLocked );
-                            bCallShadowCrsr = sal_False;
+                            bCallShadowCrsr = false;
                         }
                         else
                         {
                             aCntntAtPos = SwContentAtPos( SwContentAtPos::SW_FTN );
-                            if( !rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True ) && bExecHyperlinks )
+                            if( !rSh.GetContentAtPos( aDocPt, aCntntAtPos, true ) && bExecHyperlinks )
                             {
                                 SdrViewEvent aVEvt;
 
@@ -4580,14 +4580,14 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                         OUString sTarget(pField->GetTargetFrame());
                                         ::LoadURL(rSh, sURL, nFilter, sTarget);
                                     }
-                                    bCallShadowCrsr = sal_False;
+                                    bCallShadowCrsr = false;
                                 }
                                 else
                                 {
                                     // hit graphic
                                     ReleaseMouse();
                                     if( rSh.ClickToINetGrf( aDocPt, nFilter ))
-                                        bCallShadowCrsr = sal_False;
+                                        bCallShadowCrsr = false;
                                 }
                             }
                         }
@@ -4785,7 +4785,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     ReleaseMouse();
     // Only processed MouseEvents arrive here; only at these the moduses can
     // be resetted.
-    m_bMBPressed = sal_False;
+    m_bMBPressed = false;
 
     // Make this call just to be sure. Selecting has finished surely by now.
     // Otherwise the timeout's timer could give problems.
@@ -4801,7 +4801,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
  */
 void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
 {
-    static sal_Bool bIdle = sal_False;
+    static bool bIdle = false;
     DELETEZ(m_pApplyTempl);
     SwWrtShell &rSh = m_rView.GetWrtShell();
 
@@ -4811,7 +4811,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
               SetPointer( POINTER_FILL );//@todo #i20119# maybe better a new brush pointer here in future
               rSh.NoEdit( false );
               bIdle = rSh.GetViewOptions()->IsIdle();
-              ((SwViewOption *)rSh.GetViewOptions())->SetIdle( sal_False );
+              ((SwViewOption *)rSh.GetViewOptions())->SetIdle( false );
     }
     else if(rTempl.nColor)
     {
@@ -4819,7 +4819,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
         SetPointer( POINTER_FILL );
         rSh.NoEdit( false );
         bIdle = rSh.GetViewOptions()->IsIdle();
-        ((SwViewOption *)rSh.GetViewOptions())->SetIdle( sal_False );
+        ((SwViewOption *)rSh.GetViewOptions())->SetIdle( false );
     }
     else if( rTempl.eType )
     {
@@ -4827,7 +4827,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
         SetPointer( POINTER_FILL  );
         rSh.NoEdit( false );
         bIdle = rSh.GetViewOptions()->IsIdle();
-        ((SwViewOption *)rSh.GetViewOptions())->SetIdle( sal_False );
+        ((SwViewOption *)rSh.GetViewOptions())->SetIdle( false );
     }
     else
     {
@@ -4900,16 +4900,16 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
     SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS );
 
     m_bMBPressed = m_bInsDraw = m_bInsFrm =
-    m_bIsInDrag = m_bOldIdle = m_bOldIdleSet = m_bChainMode = m_bWasShdwCrsr = sal_False;
+    m_bIsInDrag = m_bOldIdle = m_bOldIdleSet = m_bChainMode = m_bWasShdwCrsr = false;
     // initially use the input language
-    m_bUseInputLanguage = sal_True;
+    m_bUseInputLanguage = true;
 
     SetMapMode(MapMode(MAP_TWIP));
 
     SetPointer( POINTER_TEXT );
     m_aTimer.SetTimeoutHdl(LINK(this, SwEditWin, TimerHandler));
 
-    m_bTblInsDelMode = sal_False;
+    m_bTblInsDelMode = false;
     m_aKeyInputTimer.SetTimeout( 3000 );
     m_aKeyInputTimer.SetTimeoutHdl(LINK(this, SwEditWin, KeyInputTimerHandler));
 
@@ -4951,7 +4951,7 @@ SwEditWin::~SwEditWin()
  */
 void SwEditWin::EnterDrawTextMode( const Point& aDocPos )
 {
-    if ( m_rView.EnterDrawTextMode(aDocPos) == sal_True )
+    if ( m_rView.EnterDrawTextMode(aDocPos) )
     {
         if (m_rView.GetDrawFuncPtr())
         {
@@ -4967,7 +4967,7 @@ void SwEditWin::EnterDrawTextMode( const Point& aDocPos )
 /**
  * Turn on DrawMode
  */
-sal_Bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
+bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
 {
     SwWrtShell &rSh = m_rView.GetWrtShell();
     SdrView *pSdrView = rSh.GetDrawView();
@@ -4975,9 +4975,9 @@ sal_Bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
     if ( m_rView.GetDrawFuncPtr() )
     {
         if (rSh.IsDrawCreate())
-            return sal_True;
+            return true;
 
-        sal_Bool bRet = m_rView.GetDrawFuncPtr()->MouseButtonDown( rMEvt );
+        bool bRet = m_rView.GetDrawFuncPtr()->MouseButtonDown( rMEvt );
         m_rView.AttrChangedNotify( &rSh );
         return bRet;
     }
@@ -4985,7 +4985,7 @@ sal_Bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
     if ( pSdrView && pSdrView->IsTextEdit() )
     {
         bool bUnLockView = !rSh.IsViewLocked();
-        rSh.LockView( sal_True );
+        rSh.LockView( true );
 
         rSh.EndTextEdit(); // clicked aside, end Edit
         rSh.SelectObj( aDocPos );
@@ -4998,14 +4998,14 @@ sal_Bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
             bFrmDrag = true;
         }
         if( bUnLockView )
-            rSh.LockView( sal_False );
+            rSh.LockView( false );
         m_rView.AttrChangedNotify( &rSh );
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwEditWin::IsDrawSelMode()
+bool SwEditWin::IsDrawSelMode()
 {
     return IsObjectSelect();
 }
@@ -5096,7 +5096,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
                     {
                         ReleaseMouse();
                         bNoInterrupt = false;
-                        m_bMBPressed = sal_False;
+                        m_bMBPressed = false;
                     }
                     if ( rCEvt.IsMouseEvent() )
                     {
@@ -5292,9 +5292,9 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
             {
                 const Point aDocPt( PixelToLogic( rCEvt.GetMousePosPixel() ) );
                 SwTransferable::PasteData( aDataHelper, rSh, nDropAction,
-                                    nDropFormat, nDropDestination, sal_False,
-                                    sal_False, &aDocPt, EXCHG_IN_ACTION_COPY,
-                                    sal_True );
+                                    nDropFormat, nDropDestination, false,
+                                    false, &aDocPt, EXCHG_IN_ACTION_COPY,
+                                    true );
             }
         }
         break;
@@ -5319,7 +5319,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
         case COMMAND_INPUTLANGUAGECHANGE :
             // i#42732 - update state of fontname if input language changes
             bInputLanguageSwitched = true;
-            SetUseInputLanguage( sal_True );
+            SetUseInputLanguage( true );
         break;
         case COMMAND_SELECTIONCHANGE:
         {
@@ -5329,7 +5329,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
             rSh.GetCrsr()->GetPoint()->nContent += sal::static_int_cast<sal_uInt16, sal_uLong>(pData->GetStart());
             rSh.SetMark();
             rSh.GetCrsr()->GetMark()->nContent += sal::static_int_cast<sal_uInt16, sal_uLong>(pData->GetEnd() - pData->GetStart());
-            rSh.EndCrsrMove( sal_True );
+            rSh.EndCrsrMove( true );
         }
         break;
         case COMMAND_PREPARERECONVERSION:
@@ -5387,13 +5387,13 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
                     rSh.GetCrsr()->GetCntntNode( false )->Len();
                 }
 
-                rSh.EndCrsrMove( sal_True );
+                rSh.EndCrsrMove( true );
             }
         }
         break;
         case COMMAND_QUERYCHARPOSITION:
         {
-            sal_Bool bVertical = rSh.IsInVerticalText();
+            bool bVertical = rSh.IsInVerticalText();
             const SwPosition& rPos = *rSh.GetCrsr()->GetPoint();
             SwDocShell* pDocSh = m_rView.GetDocShell();
             SwDoc *pDoc = pDocSh->GetDoc();
@@ -5445,9 +5445,9 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
 
 /*  i#18686 select the object/cursor at the mouse
     position of the context menu request */
-sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
+bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const Point aDocPos( PixelToLogic( rMousePos ) );
     const bool bIsInsideSelectedObj( rSh.IsInsideSelectedObj( aDocPos ) );
     //create a synthetic mouse event out of the coordinates
@@ -5477,7 +5477,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
             if(!aSelection.IsZero())
             {
                 SdrOutliner* pOutliner = pSdrView->GetTextEditOutliner();
-                sal_Bool bVertical = pOutliner->IsVertical();
+                bool bVertical = pOutliner->IsVertical();
                 const EditEngine& rEditEng = pOutliner->GetEditEngine();
                 Point aEEPos(aDocPos);
                 const Rectangle& rOutputArea = pOLV->GetOutputArea();
@@ -5499,7 +5499,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
                 aSelection.Adjust();
                 if(!aCompare.IsLess(aSelection)  && !aCompare.IsGreater(aSelection))
                 {
-                    return sal_False;
+                    return false;
                 }
             }
 
@@ -5509,14 +5509,14 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
         {
             pSdrView->MouseButtonUp( aMEvt, this );
             rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
-            return sal_True;
+            return true;
         }
     }
     rSh.ResetCursorStack();
 
     if ( EnterDrawMode( aMEvt, aDocPos ) )
     {
-        return sal_True;
+        return true;
     }
     if ( m_rView.GetDrawFuncPtr() && m_bInsFrm )
     {
@@ -5530,7 +5530,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
         !GetView().GetViewFrame()->GetDispatcher()->IsLocked() )
     {
         // Test if there is a draw object at that position and if it should be selected.
-        sal_Bool bShould = rSh.ShouldObjectBeSelected(aDocPos);
+        bool bShould = rSh.ShouldObjectBeSelected(aDocPos);
 
         if(bShould)
         {
@@ -5538,14 +5538,14 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
             rSh.HideCrsr();
 
             bool bUnLockView = !rSh.IsViewLocked();
-            rSh.LockView( sal_True );
-            sal_Bool bSelObj = rSh.SelectObj( aDocPos, 0);
+            rSh.LockView( true );
+            bool bSelObj = rSh.SelectObj( aDocPos, 0);
             if( bUnLockView )
-                rSh.LockView( sal_False );
+                rSh.LockView( false );
 
             if( bSelObj )
             {
-                bRet = sal_True;
+                bRet = true;
                 // in case the frame was deselected in the macro
                 // just the cursor has to be displayed again.
                 if( FRMTYPE_NONE == rSh.GetSelFrmType() )
@@ -5577,7 +5577,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
     {
         m_rView.NoRotate();
         bool bUnLockView = !rSh.IsViewLocked();
-        rSh.LockView( sal_True );
+        rSh.LockView( true );
         sal_uInt8 nFlag = 0;
 
         if ( rSh.IsSelFrmMode() )
@@ -5585,12 +5585,12 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
             rSh.UnSelectFrm();
             rSh.LeaveSelFrmMode();
             m_rView.AttrChangedNotify(&rSh);
-            bRet = sal_True;
+            bRet = true;
         }
 
-        sal_Bool bSelObj = rSh.SelectObj( aDocPos, nFlag );
+        bool bSelObj = rSh.SelectObj( aDocPos, nFlag );
         if( bUnLockView )
-            rSh.LockView( sal_False );
+            rSh.LockView( false );
 
         if( !bSelObj )
         {
@@ -5600,7 +5600,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
             rSh.LeaveSelFrmMode();
             m_rView.LeaveDrawCreate();
             m_rView.AttrChangedNotify( &rSh );
-            bRet = sal_True;
+            bRet = true;
         }
         else
         {
@@ -5618,13 +5618,13 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
                 m_rView.AttrChangedNotify( &rSh );
             }
             UpdatePointer( aDocPos, 0 );
-            bRet = sal_True;
+            bRet = true;
         }
     }
     else if ( rSh.IsSelFrmMode() && bIsInsideSelectedObj )
     {
         // Object at the mouse cursor is already selected - do nothing
-        return sal_False;
+        return false;
     }
 
     if ( rSh.IsGCAttr() )
@@ -5633,7 +5633,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
         rSh.ClearGCAttr();
     }
 
-    sal_Bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf = sal_False;
+    bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf = false;
     if( !bOverSelect )
         bOverURLGrf = bOverSelect = 0 != rSh.IsURLGrfAtPos( aDocPos );
 
@@ -5643,7 +5643,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
             // the query against the content form doesn't work!!!
             SwMvContext aMvContext( &rSh );
             rSh.SetCursor(&aDocPos, false);
-            bRet = sal_True;
+            bRet = true;
         }
     }
     if( !bOverURLGrf )
@@ -5656,7 +5656,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
             if( !rSh.IsFrmSelected() )
                 rSh.GotoNextFly();
             rSh.EnterSelFrmMode();
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
@@ -5684,7 +5684,7 @@ IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler)
 
 IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler)
 {
-    m_bTblInsDelMode = sal_False;
+    m_bTblInsDelMode = false;
     return 0;
 }
 
@@ -5711,7 +5711,7 @@ IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl)
     return 0;
 }
 
-void SwEditWin::SetChainMode( sal_Bool bOn )
+void SwEditWin::SetChainMode( bool bOn )
 {
     if ( !m_bChainMode )
         StopInsFrm();
@@ -5815,7 +5815,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen )
 void QuickHelpData::Stop( SwWrtShell& rSh )
 {
     if( !m_bIsTip )
-        rSh.DeleteExtTextInput( 0, sal_False );
+        rSh.DeleteExtTextInput( 0, false );
     else if( nTipId )
         Help::HideTip( nTipId );
     ClearCntnt();
@@ -6075,7 +6075,7 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& r
     return bRet;
 }
 
-void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
+void SwEditWin::SetUseInputLanguage( bool bNew )
 {
     if ( bNew || m_bUseInputLanguage )
     {
diff --git a/sw/source/core/uibase/docvw/edtwin2.cxx b/sw/source/core/uibase/docvw/edtwin2.cxx
index df9b70462882..bbcaaf1a6399 100644
--- a/sw/source/core/uibase/docvw/edtwin2.cxx
+++ b/sw/source/core/uibase/docvw/edtwin2.cxx
@@ -68,7 +68,7 @@
 #include <IDocumentMarkAccess.hxx>
 #include <ndtxt.hxx>
 
-static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, sal_Bool bBalloon )
+static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
 {
     sal_uInt16 nResId = 0;
     switch( rRedl.GetType() )
@@ -104,7 +104,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
     SET_CURR_SHELL(&rSh);
     OUString sTxt;
     Point aPos( PixelToLogic( ScreenToOutputPixel( rEvt.GetMousePosPixel() ) ));
-    sal_Bool bBalloon = static_cast< sal_Bool >(rEvt.GetMode() & HELPMODE_BALLOON);
+    bool bBalloon = static_cast< bool >(rEvt.GetMode() & HELPMODE_BALLOON);
 
     SdrView *pSdrView = rSh.GetDrawView();
 
@@ -134,7 +134,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 #endif
                                     SwContentAtPos::SW_TABLEBOXFML );
 
-        if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) )
+        if( rSh.GetContentAtPos( aPos, aCntntAtPos, false, &aFldRect ) )
         {
             sal_uInt16 nStyle = 0; // style of quick help
             switch( aCntntAtPos.eCntntAtPos )
@@ -209,7 +209,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     }
                 }
                 // #i80029#
-                sal_Bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
+                bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
                 if ( !bExecHyperlinks )
                 {
                     SvtSecurityOptions aSecOpts;
@@ -242,7 +242,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     pFtn->GetFtnText( sTmp );
                     sTxt = SW_RESSTR( pFtn->IsEndNote()
                                     ? STR_ENDNOTE : STR_FTNNOTE ) + sTmp;
-                    bBalloon = sal_True;
+                    bBalloon = true;
                     if( aCntntAtPos.IsInRTLText() )
                         nStyle |= QUICKHELP_BIDI_RTL;
                 }
@@ -298,7 +298,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                                 break;
                             }
                         case RES_INPUTFLD:  // BubbleHelp, because the suggestion could be quite long
-                            bBalloon = sal_True;
+                            bBalloon = true;
                             /* no break */
                         case RES_JUMPEDITFLD:
                             sTxt = pFld->GetPar2();
@@ -350,7 +350,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     if( sTxt.isEmpty() )
                     {
                         aCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
-                        if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) )
+                        if( rSh.GetContentAtPos( aPos, aCntntAtPos, false, &aFldRect ) )
                             sTxt = lcl_GetRedlineHelp(*aCntntAtPos.aFnd.pRedl, bBalloon);
                     }
                 }
diff --git a/sw/source/core/uibase/docvw/edtwin3.cxx b/sw/source/core/uibase/docvw/edtwin3.cxx
index edd956754679..c627b7772ef1 100644
--- a/sw/source/core/uibase/docvw/edtwin3.cxx
+++ b/sw/source/core/uibase/docvw/edtwin3.cxx
@@ -45,12 +45,12 @@ void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect,
 }
 
 // Docmdi - movable
-sal_Bool IsScrollMDI( SwViewShell* pVwSh, const SwRect &rRect )
+bool IsScrollMDI( SwViewShell* pVwSh, const SwRect &rRect )
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if (pSfxVwSh && pSfxVwSh->ISA(SwView))
         return (((SwView *)pSfxVwSh)->IsScroll(rRect.SVRect()));
-    return sal_False;
+    return false;
 }
 
 // Notify for size change
@@ -83,7 +83,7 @@ void FrameNotify( SwViewShell* pVwSh, FlyMode eMode )
 }
 
 // Notify for page number update
-sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode)
+bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, bool bVerticalMode)
 {
     SvxRuler& rRuler = bVerticalMode ?  m_rView.GetVRuler() : m_rView.GetHRuler();
     return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER ) &&
@@ -94,7 +94,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVertical
 // #i23726#
 // #i42921# - add 3rd parameter <bVerticalMode> in order
 // to consider vertical layout
-sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
+bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
                                  const bool bVerticalMode )
 {
     SvxRuler& rRuler = bVerticalMode ?  m_rView.GetVRuler() : m_rView.GetHRuler();
@@ -131,8 +131,8 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
     // the SwWrtShell
     if(!pSh)
         return;
-    sal_Bool bViewWasLocked = pSh->IsViewLocked(), bUnlockPaint = sal_False;
-    pSh->LockView( sal_True );
+    bool bViewWasLocked = pSh->IsViewLocked(), bUnlockPaint = false;
+    pSh->LockView( true );
     switch( rDCEvt.GetType() )
     {
     case DATACHANGED_SETTINGS:
@@ -143,7 +143,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
         if( rDCEvt.GetFlags() & SETTINGS_STYLE )
         {
             pSh->LockPaint();
-            bUnlockPaint = sal_True;
+            bUnlockPaint = true;
             SwViewShell::DeleteReplacementBitmaps();
             GetView().InvalidateBorder();               //Scrollbar work
         }
@@ -154,7 +154,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
     case DATACHANGED_FONTS:
     case DATACHANGED_FONTSUBSTITUTION:
         pSh->LockPaint();
-        bUnlockPaint = sal_True;
+        bUnlockPaint = true;
         GetView().GetDocShell()->UpdateFontList();  //e.g. printer change
         break;
     }
diff --git a/sw/source/core/uibase/docvw/romenu.cxx b/sw/source/core/uibase/docvw/romenu.cxx
index bbed8b0a7589..37e6c32ea4d2 100644
--- a/sw/source/core/uibase/docvw/romenu.cxx
+++ b/sw/source/core/uibase/docvw/romenu.cxx
@@ -93,7 +93,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     if ( sURL.isEmpty() )
     {
         SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR );
-        if( rSh.GetContentAtPos( rDocPos, aCntntAtPos, sal_False))
+        if( rSh.GetContentAtPos( rDocPos, aCntntAtPos, false))
         {
             SwFmtINetFmt &rIItem = *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr;
             sURL = rIItem.GetValue();
@@ -102,7 +102,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
         }
     }
 
-    sal_Bool bLink = sal_False;
+    bool bLink = false;
     const Graphic *pGrf;
     if ( 0 == (pGrf = rSh.GetGrfAtPos( rDocPos, sGrfName, bLink )) )
     {
@@ -115,7 +115,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
         const SwFrmFmt* pGrfFmt = rSh.GetFmtFromObj( rDocPos );
         const SfxPoolItem* pURLItem;
         if( pGrfFmt && SFX_ITEM_SET == pGrfFmt->GetItemState(
-            RES_URL, sal_True, &pURLItem ))
+            RES_URL, true, &pURLItem ))
         {
             const SwFmtURL& rURL = *(SwFmtURL*)pURLItem;
             if( rURL.GetMap() )
@@ -150,12 +150,12 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     SfxDispatcher &rDis = *pVFrame->GetDispatcher();
     const SwPageDesc &rDesc = rSh.GetPageDesc( rSh.GetCurPageDesc() );
     pItem = &rDesc.GetMaster().GetBackground();
-    sal_Bool bEnableBackGallery = sal_False,
-         bEnableBack = sal_False;
+    bool bEnableBackGallery = false,
+         bEnableBack = false;
 
     if ( GPOS_NONE != pItem->GetGraphicPos() )
     {
-        bEnableBack = sal_True;
+        bEnableBack = true;
         if ( !pItem->GetGraphicLink().isEmpty() )
         {
             if ( aThemeList.empty() )
@@ -166,7 +166,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
                 PopupMenu *pMenu = GetPopupMenu(MN_READONLY_BACKGROUNDTOGALLERY);
                 pMenu->CheckItem( MN_READONLY_TOGALLERYLINK,  bGrfToGalleryAsLnk );
                 pMenu->CheckItem( MN_READONLY_TOGALLERYCOPY, !bGrfToGalleryAsLnk );
-                bEnableBackGallery = sal_True;
+                bEnableBackGallery = true;
 
                 for ( sal_uInt16 i=0; i < aThemeList.size(); ++i )
                     pMenu->InsertItem( MN_READONLY_GRAPHICTOGALLERY+i + 3, aThemeList[ i ] );
@@ -181,7 +181,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     else
         EnableItem( MN_READONLY_LOADGRAPHIC, false );
 
-    sal_Bool bReloadFrame = 0 != rSh.GetView().GetViewFrame()->GetFrame().GetParentFrame();
+    bool bReloadFrame = 0 != rSh.GetView().GetViewFrame()->GetFrame().GetParentFrame();
     EnableItem( MN_READONLY_RELOAD_FRAME,
             bReloadFrame );
     EnableItem( MN_READONLY_RELOAD, !bReloadFrame);
@@ -309,9 +309,9 @@ void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId )
 
         case MN_READONLY_LOADGRAPHIC:
             {
-                sal_Bool bModified = rSh.IsModified();
+                bool bModified = rSh.IsModified();
                 SwViewOption aOpt( *rSh.GetViewOptions() );
-                aOpt.SetGraphic( sal_True );
+                aOpt.SetGraphic( true );
                 rSh.ApplyViewOptions( aOpt );
                 if(!bModified)
                     rSh.ResetModified();
@@ -322,10 +322,10 @@ void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId )
         case MN_READONLY_PLUGINOFF:         nExecId = SID_PLUGINS_ACTIVE; break;
 #endif
         case MN_READONLY_TOGALLERYLINK:
-            SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( sal_True );
+            SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( true );
             break;
         case MN_READONLY_TOGALLERYCOPY:
-            SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( sal_False );
+            SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( false );
             break;
 
         default: //forward the id to the SfxBindings
diff --git a/sw/source/core/uibase/docvw/romenu.hxx b/sw/source/core/uibase/docvw/romenu.hxx
index 900f51107ebb..eae84d594181 100644
--- a/sw/source/core/uibase/docvw/romenu.hxx
+++ b/sw/source/core/uibase/docvw/romenu.hxx
@@ -40,7 +40,7 @@ class SwReadOnlyPopup : public PopupMenu
                 sDescription;
     OUString    sGrfName;
     std::vector<OUString> aThemeList;
-    sal_Bool        bGrfToGalleryAsLnk;
+    bool        bGrfToGalleryAsLnk;
     ImageMap*   pImageMap;
     INetImage*  pTargetURL;
 
diff --git a/sw/source/core/uibase/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx
index 0f41bdc828b9..353780925449 100644
--- a/sw/source/core/uibase/docvw/srcedtw.cxx
+++ b/sw/source/core/uibase/docvw/srcedtw.cxx
@@ -246,8 +246,8 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
     nCurTextWidth(0),
     nStartLine(USHRT_MAX),
     eSourceEncoding(osl_getThreadTextEncoding()),
-    bDoSyntaxHighlight(sal_True),
-    bHighlighting(sal_False)
+    bDoSyntaxHighlight(true),
+    bHighlighting(false)
 {
     SetHelpId(HID_SOURCE_EDITWIN);
     CreateTextEngine();
@@ -437,7 +437,7 @@ void  TextViewOutWin::Command( const CommandEvent& rCEvt )
 
 void  TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
 {
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     SwSrcEditWindow* pSrcEditWin = (SwSrcEditWindow*)GetParent();
     bool bChange = !pSrcEditWin->IsReadonly() || !TextEngine::DoesKeyChangeText( rKEvt );
     if(bChange)
@@ -578,7 +578,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
     Time aSyntaxCheckStart( Time::SYSTEM );
     SAL_WARN_IF(pTextView == 0, "sw", "No View yet, but syntax highlighting?!");
 
-    bHighlighting = sal_True;
+    bHighlighting = true;
     sal_uInt16 nCount  = 0;
     // at first the region around the cursor is processed
     TextSelection aSel = pTextView->GetSelection();
@@ -627,7 +627,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
     nCurTextWidth = pTextEngine->CalcTextWidth() + 25;  // kleine Toleranz
     if ( nCurTextWidth != nPrevTextWidth )
         SetScrollBarRanges();
-    bHighlighting = sal_False;
+    bHighlighting = false;
 
     return 0;
 }
@@ -638,7 +638,7 @@ void SwSrcEditWindow::DoSyntaxHighlight( sal_uInt16 nPara )
     // that the line doesn't exist anymore!
     if ( nPara < pTextEngine->GetParagraphCount() )
     {
-        sal_Bool bTempModified = IsModified();
+        bool bTempModified = IsModified();
         pTextEngine->RemoveAttribs( nPara, true );
         OUString aSource( pTextEngine->GetText( nPara ) );
         pTextEngine->SetUpdateMode( false );
diff --git a/sw/source/core/uibase/envelp/envimg.cxx b/sw/source/core/uibase/envelp/envimg.cxx
index 66e3f0a5d28c..1b8082df1541 100644
--- a/sw/source/core/uibase/envelp/envimg.cxx
+++ b/sw/source/core/uibase/envelp/envimg.cxx
@@ -94,7 +94,7 @@ SwEnvItem::SwEnvItem() :
     SfxPoolItem(FN_ENVELOP)
 {
     aAddrText       = aEmptyOUStr;
-    bSend           = sal_True;
+    bSend           = true;
     aSendText       = MakeSender();
     lSendFromLeft   = 566; // 1 cm
     lSendFromTop    = 566; // 1 cm
@@ -102,7 +102,7 @@ SwEnvItem::SwEnvItem() :
     lWidth          = aEnvSz.Width();
     lHeight         = aEnvSz.Height();
     eAlign          = ENV_HOR_LEFT;
-    bPrintFromAbove = sal_True;
+    bPrintFromAbove = true;
     lShiftRight     = 0;
     lShiftDown      = 0;
 
diff --git a/sw/source/core/uibase/envelp/labelcfg.cxx b/sw/source/core/uibase/envelp/labelcfg.cxx
index b798098492c4..232faa918344 100644
--- a/sw/source/core/uibase/envelp/labelcfg.cxx
+++ b/sw/source/core/uibase/envelp/labelcfg.cxx
@@ -259,7 +259,7 @@ void    SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab
         rLabArr.push_back( lcl_CreateSwLabRec(it->first, it->second.m_aMeasure, rManufacturer) );
 }
 
-sal_Bool    SwLabelConfig::HasLabel(const OUString& rManufacturer, const OUString& rType)
+bool    SwLabelConfig::HasLabel(const OUString& rManufacturer, const OUString& rType)
 {
     return ( ( m_aLabels.find(rManufacturer) != m_aLabels.end() ) &&
              ( m_aLabels[rManufacturer].find(rType) != m_aLabels[rManufacturer].end() ) );
diff --git a/sw/source/core/uibase/envelp/labimg.cxx b/sw/source/core/uibase/envelp/labimg.cxx
index 3665206d0a24..7c096fce201e 100644
--- a/sw/source/core/uibase/envelp/labimg.cxx
+++ b/sw/source/core/uibase/envelp/labimg.cxx
@@ -44,8 +44,8 @@ SwLabItem::SwLabItem() :
 {
     bAddr     =
     bCont     =
-    bSynchron = sal_False;
-    bPage  = sal_True;
+    bSynchron = false;
+    bPage  = true;
     lHDist   =
     lVDist   =
     lWidth   =
@@ -264,7 +264,7 @@ Sequence<OUString> SwLabCfgItem::GetPropertyNames()
     return aNames;
 }
 
-SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
+SwLabCfgItem::SwLabCfgItem(bool bLabel) :
     ConfigItem(bLabel ? OUString("Office.Writer/Label") : OUString("Office.Writer/BusinessCard")),
     bIsLabel(bLabel)
 {
@@ -390,7 +390,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 = sal_True;
+        aItem.bSynchron = true;
         SetModified();
     }
 }
diff --git a/sw/source/core/uibase/envelp/labimp.hxx b/sw/source/core/uibase/envelp/labimp.hxx
index 94dccc832eff..0f123ea20c58 100644
--- a/sw/source/core/uibase/envelp/labimp.hxx
+++ b/sw/source/core/uibase/envelp/labimp.hxx
@@ -97,7 +97,7 @@ public:
     long            lPHeight;
     sal_Int32       nCols;
     sal_Int32       nRows;
-    sal_Bool        bCont;
+    bool        bCont;
 };
 
 class SwLabRecs : public std::vector<SwLabRec*> {
diff --git a/sw/source/core/uibase/fldui/fldmgr.cxx b/sw/source/core/uibase/fldui/fldmgr.cxx
index cb7b4649a753..a7b855c8dd2d 100644
--- a/sw/source/core/uibase/fldui/fldmgr.cxx
+++ b/sw/source/core/uibase/fldui/fldmgr.cxx
@@ -231,7 +231,7 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) :
     pModule(0),
     pMacroItem(0),
     pWrtShell(pSh),
-    bEvalExp(sal_True)
+    bEvalExp(true)
 {
     // determine current field if existing
     GetCurFld();
@@ -341,7 +341,7 @@ SwField* SwFldMgr::GetCurFld()
     Description: provide group range
  --------------------------------------------------------------------*/
 
-const SwFldGroupRgn& SwFldMgr::GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const
+const SwFldGroupRgn& SwFldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) const
 {
 static SwFldGroupRgn const aRanges[] =
 {
@@ -372,7 +372,7 @@ static SwFldGroupRgn const aWebRanges[] =
     Description: determine GroupId
  --------------------------------------------------------------------*/
 
-sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const
+sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const
 {
     if (nTypeId == TYP_SETINPFLD)
         nTypeId = TYP_SETFLD;
@@ -564,7 +564,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                   ACCESS over TYP_....
  --------------------------------------------------------------------*/
 
-sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode) const
+sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode) const
 {
     OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
 
@@ -762,11 +762,11 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
     Description: Traveling
  --------------------------------------------------------------------*/
 
-sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp )
+bool SwFldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp )
 {
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
     if(!pSh)
-        return sal_False;
+        return false;
 
     if( !pTyp && pCurFld )
     {
@@ -813,7 +813,7 @@ sal_uInt16 SwFldMgr::GetCurTypeId() const
     Description: Over string  insert field or update
  --------------------------------------------------------------------*/
 
-sal_Bool SwFldMgr::InsertFld(
+bool SwFldMgr::InsertFld(
     const SwInsertFld_Data& rData)
 {
     SwField* pFld   = 0;
@@ -828,7 +828,7 @@ sal_Bool SwFldMgr::InsertFld(
         pCurShell = pWrtShell ? pWrtShell : ::lcl_GetShell();
     OSL_ENSURE(pCurShell, "no SwWrtShell found");
     if(!pCurShell)
-        return sal_False;
+        return false;
 
     switch(rData.nTypeId)
     {   // ATTENTION this field is inserted by a separate dialog
@@ -850,7 +850,7 @@ sal_Bool SwFldMgr::InsertFld(
         {
             SwScriptFieldType* pType =
                 (SwScriptFieldType*)pCurShell->GetFldType(0, RES_SCRIPTFLD);
-            pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (sal_Bool)nFormatId);
+            pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (bool)nFormatId);
             break;
         }
 
@@ -974,7 +974,7 @@ sal_Bool SwFldMgr::InsertFld(
         {
             SwHiddenTxtFieldType* pTyp =
                 (SwHiddenTxtFieldType*)pCurShell->GetFldType(0, RES_HIDDENTXTFLD);
-            pFld = new SwHiddenTxtField(pTyp, sal_True, rData.sPar1, rData.sPar2, sal_False, rData.nTypeId);
+            pFld = new SwHiddenTxtField(pTyp, true, rData.sPar1, rData.sPar2, false, rData.nTypeId);
             bExp = true;
             break;
         }
@@ -993,9 +993,9 @@ sal_Bool SwFldMgr::InsertFld(
             if( !rData.sPar1.isEmpty() && CanInsertRefMark( rData.sPar1 ) )
             {
                 pCurShell->SetAttrItem( SwFmtRefMark( rData.sPar1 ) );
-                return sal_True;
+                return true;
             }
-            return sal_False;
+            return false;
         }
 
     case TYP_GETREFFLD:
@@ -1236,12 +1236,12 @@ sal_Bool SwFldMgr::InsertFld(
                     pExpFld->SetSubType(nOldSubType | (nSubType & 0xff00));
 
                     pExpFld->SetPromptText(rData.sPar2);
-                    pExpFld->SetInputFlag(sal_True) ;
+                    pExpFld->SetInputFlag(true) ;
                     bExp = true;
                     pFld = pExpFld;
                 }
                 else
-                    return sal_False;
+                    return false;
             }
             else
             {
@@ -1254,14 +1254,14 @@ sal_Bool SwFldMgr::InsertFld(
             }
 
             // start dialog
-            pCurShell->StartInputFldDlg(pFld, sal_False, rData.pParent);
+            pCurShell->StartInputFldDlg(pFld, false, rData.pParent);
             break;
         }
 
     case TYP_SETFLD:
         {
             if (rData.sPar2.isEmpty())   // empty variables are not allowed
-                return sal_False;
+                return false;
 
             SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType(
                 SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1) );
@@ -1308,13 +1308,13 @@ sal_Bool SwFldMgr::InsertFld(
                 bExp = true;
             }
             else
-                return sal_False;
+                return false;
             break;
         }
 
     case TYP_FORMELFLD:
         {
-            if(pCurShell->GetFrmType(0,sal_False) & FRMTYPE_TABLE)
+            if(pCurShell->GetFrmType(0,false) & FRMTYPE_TABLE)
             {
                 pCurShell->StartAllAction();
 
@@ -1342,7 +1342,7 @@ sal_Bool SwFldMgr::InsertFld(
                 pCurShell->UpdateTable();
 
                 pCurShell->EndAllAction();
-                return sal_True;
+                return true;
 
             }
             else
@@ -1381,7 +1381,7 @@ sal_Bool SwFldMgr::InsertFld(
         break;
         default:
         {   OSL_ENSURE(!this, "wrong field type");
-            return sal_False;
+            return false;
         }
     }
     OSL_ENSURE(pFld, "field not available");
@@ -1397,13 +1397,13 @@ sal_Bool SwFldMgr::InsertFld(
     pCurShell->Insert( *pFld );
 
     if(bExp && bEvalExp)
-        pCurShell->UpdateExpFlds(sal_True);
+        pCurShell->UpdateExpFlds(true);
 
     if(bTbl)
     {
-        pCurShell->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+        pCurShell->Left(CRSR_SKIP_CHARS, false, 1, false );
         pCurShell->UpdateFlds(*pFld);
-        pCurShell->Right(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+        pCurShell->Right(CRSR_SKIP_CHARS, false, 1, false );
     }
     else if( bPageVar )
         ((SwRefPageGetFieldType*)pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ))->UpdateFlds();
@@ -1414,7 +1414,7 @@ sal_Bool SwFldMgr::InsertFld(
     delete pFld;
 
     pCurShell->EndAllAction();
-    return sal_True;
+    return true;
 }
 
 /*--------------------------------------------------------------------
@@ -1483,7 +1483,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
         }
 
         case TYP_SCRIPTFLD:
-            ((SwScriptField*)pTmpFld)->SetCodeURL((sal_Bool)nFormat);
+            ((SwScriptField*)pTmpFld)->SetCodeURL((bool)nFormat);
             break;
 
         case TYP_NEXTPAGEFLD:
@@ -1608,7 +1608,7 @@ void SwFldMgr::EvalExpFlds(SwWrtShell* pSh)
     if(pSh)
     {
         pSh->StartAllAction();
-        pSh->UpdateExpFlds(sal_True);
+        pSh->UpdateExpFlds(true);
         pSh->EndAllAction();
     }
 }
@@ -1679,9 +1679,9 @@ void SwFieldType::_GetFldName()
     }
 }
 
-sal_Bool SwFldMgr::ChooseMacro(const OUString&)
+bool SwFldMgr::ChooseMacro(const OUString&)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // choose script dialog
     OUString aScriptURL = SfxApplication::ChooseScript();
@@ -1690,7 +1690,7 @@ sal_Bool SwFldMgr::ChooseMacro(const OUString&)
     if ( !aScriptURL.isEmpty() )
     {
         SetMacroPath( aScriptURL );
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
diff --git a/sw/source/core/uibase/fldui/fldwrap.cxx b/sw/source/core/uibase/fldui/fldwrap.cxx
index 18c09bb93a43..32c02b0f8365 100644
--- a/sw/source/core/uibase/fldui/fldwrap.cxx
+++ b/sw/source/core/uibase/fldui/fldwrap.cxx
@@ -56,14 +56,14 @@ IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl)
 /*--------------------------------------------------------------------
     Description: newly initialise dialog after Doc switch
  --------------------------------------------------------------------*/
-sal_Bool SwChildWinWrapper::ReInitDlg(SwDocShell *)
+bool SwChildWinWrapper::ReInitDlg(SwDocShell *)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if (m_pDocSh != GetOldDocShell())
     {
         m_aUpdateTimer.Stop();
-        bRet = sal_True;            // immediate Update
+        bRet = true;            // immediate Update
     }
     else
         m_aUpdateTimer.Start();
@@ -97,11 +97,11 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, sal_uInt16 nId,
 /*--------------------------------------------------------------------
     Description: newly initialise dialog after Doc switch
  --------------------------------------------------------------------*/
-sal_Bool SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
+bool SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
 {
-    sal_Bool bRet;
+    bool bRet;
 
-    if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True)  // update immediately, Doc switch
+    if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)))  // update immediately, Doc switch
     {
         pDlgInterface->ReInitDlg();
     }
@@ -147,10 +147,10 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, sal_uInt16 n
 /* --------------------------------------------------
  * re-init after doc activation
  * --------------------------------------------------*/
-sal_Bool SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
+bool SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
 {
-    sal_Bool bRet;
-    if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True)  // update immediately, Doc switch
+    bool bRet;
+    if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)))  // update immediately, Doc switch
     {
         pDlgInterface->ReInitDlg();
     }
diff --git a/sw/source/core/uibase/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx
index de855ca42b54..28b5cf3a7465 100644
--- a/sw/source/core/uibase/fldui/xfldui.cxx
+++ b/sw/source/core/uibase/fldui/xfldui.cxx
@@ -50,10 +50,10 @@ using namespace ::com::sun::star::beans;
      remark: in case of error sal_True is returned
  --------------------------------------------------------------------*/
 
-sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName,
-                            sal_Bool bIsTable, const OUString& rFldName)
+bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName,
+                            bool bIsTable, const OUString& rFldName)
 {
-    sal_Bool bNumeric = sal_True;
+    bool bNumeric = true;
 
     SwDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetDBMgr() :
                             ::GetActiveView()->GetWrtShell().GetDBMgr();
@@ -158,7 +158,7 @@ sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQry
                 case DataType::VARCHAR:
                 case DataType::LONGVARCHAR:
                 default:
-                    bNumeric = sal_False;
+                    bNumeric = false;
             }
         }
     }
diff --git a/sw/source/core/uibase/frmdlg/colex.cxx b/sw/source/core/uibase/frmdlg/colex.cxx
index 10864e64c934..7a6ea208107c 100644
--- a/sw/source/core/uibase/frmdlg/colex.cxx
+++ b/sw/source/core/uibase/frmdlg/colex.cxx
@@ -228,7 +228,7 @@ void SwColExample::DrawPage( const Point& rOrg,
             SetFillColor( GetColor() );
 
         // #97495# make sure that the automatic column width's are always equal
-        sal_Bool bAutoWidth = pColMgr->IsAutoWidth();
+        bool bAutoWidth = pColMgr->IsAutoWidth();
         sal_Int32 nAutoColWidth = 0;
         if(bAutoWidth)
         {
diff --git a/sw/source/core/uibase/frmdlg/frmmgr.cxx b/sw/source/core/uibase/frmdlg/frmmgr.cxx
index 3ade717509e6..e06aa49fbc94 100644
--- a/sw/source/core/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/core/uibase/frmdlg/frmmgr.cxx
@@ -58,13 +58,13 @@ static sal_uInt16 aFrmMgrRange[] = {
 /*--------------------------------------------------------------------
      Description: determine frame attributes via Shell
  --------------------------------------------------------------------*/
-SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType ) :
+SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType ) :
     m_aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ),
     m_pOwnSh( pSh ),
-    m_bAbsPos( sal_False ),
+    m_bAbsPos( false ),
     m_bNewFrm( bNew ),
-    m_bIsInVertical( sal_False ),
-    m_bIsInVerticalL2R( sal_False )
+    m_bIsInVertical( false ),
+    m_bIsInVerticalL2R( false )
 {
     if ( m_bNewFrm )
     {
@@ -84,24 +84,24 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nTyp
     else if ( nType == FRMMGR_TYPE_NONE )
     {
         m_pOwnSh->GetFlyFrmAttr( m_aSet );
-        sal_Bool bRightToLeft;
-        m_bIsInVertical = m_pOwnSh->IsFrmVertical(sal_True, bRightToLeft, m_bIsInVerticalL2R);
+        bool bRightToLeft;
+        m_bIsInVertical = m_pOwnSh->IsFrmVertical(true, bRightToLeft, m_bIsInVerticalL2R);
     }
     ::PrepareBoxInfo( m_aSet, *m_pOwnSh );
 }
 
-SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, const SfxItemSet &rSet ) :
+SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, const SfxItemSet &rSet ) :
     m_aSet( rSet ),
     m_pOwnSh( pSh ),
-    m_bAbsPos( sal_False ),
+    m_bAbsPos( false ),
     m_bNewFrm( bNew ),
-    m_bIsInVertical(sal_False),
-    m_bIsInVerticalL2R(sal_False)
+    m_bIsInVertical(false),
+    m_bIsInVerticalL2R(false)
 {
     if(!bNew)
     {
-        sal_Bool bRightToLeft;
-        m_bIsInVertical = pSh->IsFrmVertical(sal_True, bRightToLeft, m_bIsInVerticalL2R);
+        bool bRightToLeft;
+        m_bIsInVertical = pSh->IsFrmVertical(true, bRightToLeft, m_bIsInVerticalL2R);
     }
 }
 
@@ -127,7 +127,7 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm()
     if ( m_bAbsPos )
     {
         m_pOwnSh->SetFlyPos( m_aAbsPos );
-        m_bAbsPos = sal_False;
+        m_bAbsPos = false;
     }
 }
 
@@ -167,11 +167,11 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
 /*--------------------------------------------------------------------
      Description:   insert frame
  --------------------------------------------------------------------*/
-sal_Bool SwFlyFrmAttrMgr::InsertFlyFrm()
+bool SwFlyFrmAttrMgr::InsertFlyFrm()
 {
     m_pOwnSh->StartAllAction();
 
-    sal_Bool bRet = 0 != m_pOwnSh->NewFlyFrm( m_aSet );
+    bool bRet = 0 != m_pOwnSh->NewFlyFrm( m_aSet );
 
     // turn on the right mode at the shell, frame got selected automatically.
     if ( bRet )
@@ -192,7 +192,7 @@ sal_Bool SwFlyFrmAttrMgr::InsertFlyFrm()
 void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds    eAnchorType,
                                    const Point  &rPos,
                                    const Size   &rSize,
-                                   sal_Bool bAbs )
+                                   bool bAbs )
 {
     OSL_ENSURE( eAnchorType == FLY_AT_PAGE ||
             eAnchorType == FLY_AT_PARA ||
@@ -244,7 +244,7 @@ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
  --------------------------------------------------------------------*/
 void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
 {
-    m_bAbsPos = sal_True;
+    m_bAbsPos = true;
     m_aAbsPos = rPoint;
 
     SwFmtVertOrient aVertOrient( GetVertOrient() );
diff --git a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
index ef5beea519a4..bd3de9370f35 100644
--- a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
+++ b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
@@ -49,7 +49,7 @@ class DropDownFieldDialog : public SvxStandardDialog
     virtual void    Apply() SAL_OVERRIDE;
 public:
     DropDownFieldDialog(   Window *pParent, SwWrtShell &rSh,
-                                SwField* pField, sal_Bool bNextButton = sal_False );
+                                SwField* pField, bool bNextButton = false );
 };
 } //namespace sw
 
diff --git a/sw/source/core/uibase/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
index f1ae68ef6d18..1cca0960400d 100644
--- a/sw/source/core/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
@@ -44,7 +44,7 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper5<
         ::com::sun::star::io::XInputStream > xInputStream;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XComponent > xModel;
-    sal_Bool            bExport;
+    bool            bExport;
 
 public:
                             SwXFilterOptions();
diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
index abfd7fc2679b..32aee688f2cc 100644
--- a/sw/source/core/uibase/inc/annotsh.hxx
+++ b/sw/source/core/uibase/inc/annotsh.hxx
@@ -67,7 +67,7 @@ public:
 
     void        InsertSymbol(SfxRequest& rReq);
 
-    void        ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False);
+    void        ExecSearch(SfxRequest&, bool bNoMessage = false);
     void            StateSearch(SfxItemSet &);
 
     virtual ::svl::IUndoManager*
diff --git a/sw/source/core/uibase/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx
index c4d597f502bf..0d43eaa86b31 100644
--- a/sw/source/core/uibase/inc/bmpwin.hxx
+++ b/sw/source/core/uibase/inc/bmpwin.hxx
@@ -33,9 +33,9 @@ private:
     Graphic     aGraphic;
     BitmapEx    aBmp;
 
-    sal_Bool        bHorz : 1;
-    sal_Bool        bVert : 1;
-    sal_Bool        bGraphic : 1;
+    bool        bHorz : 1;
+    bool        bVert : 1;
+    bool        bGraphic : 1;
     bool        bLeftAlign : 1;
 
     virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
@@ -45,8 +45,8 @@ private:
 public:
     BmpWindow(Window* pPar, WinBits nStyle);
     virtual ~BmpWindow();
-    void MirrorVert(sal_Bool bMirror) { bVert = bMirror; Invalidate(); }
-    void MirrorHorz(sal_Bool bMirror) { bHorz = bMirror; Invalidate(); }
+    void MirrorVert(bool bMirror) { bVert = bMirror; Invalidate(); }
+    void MirrorHorz(bool bMirror) { bHorz = bMirror; Invalidate(); }
     void SetGraphic(const Graphic& rGrf);
     void SetBitmapEx(const BitmapEx& rGrf);
 };
diff --git a/sw/source/core/uibase/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx
index 80414f4864e3..089fe9eae43b 100644
--- a/sw/source/core/uibase/inc/break.hxx
+++ b/sw/source/core/uibase/inc/break.hxx
@@ -49,7 +49,7 @@ class SwBreakDlg: public SvxStandardDialog
     sal_uInt16      nKind;
     ::boost::optional<sal_uInt16>      oPgNum;
 
-    sal_Bool            bHtmlMode;
+    bool            bHtmlMode;
 
     DECL_LINK( ClickHdl, void * );
     DECL_LINK( PageNumHdl, CheckBox * );
diff --git a/sw/source/core/uibase/inc/caption.hxx b/sw/source/core/uibase/inc/caption.hxx
index 80301ccfe90e..dddaee32b456 100644
--- a/sw/source/core/uibase/inc/caption.hxx
+++ b/sw/source/core/uibase/inc/caption.hxx
@@ -27,7 +27,7 @@
 class SW_DLLPUBLIC InsCaptionOpt
 {
 private:
-    sal_Bool            bUseCaption;
+    bool            bUseCaption;
     SwCapObjType    eObjType;
     SvGlobalName    aOleId;
     OUString        sCategory;
@@ -40,15 +40,15 @@ private:
     OUString        sCharacterStyle;
 
     bool         bIgnoreSeqOpts;    // is not being saved
-    sal_Bool         bCopyAttributes;   //          -""-
+    bool         bCopyAttributes;   //          -""-
 
 public:
     InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = 0);
     InsCaptionOpt(const InsCaptionOpt&);
     ~InsCaptionOpt();
 
-    inline sal_Bool&            UseCaption()                    { return bUseCaption; }
-    inline sal_Bool             UseCaption() const              { return bUseCaption; }
+    inline bool&            UseCaption()                    { return bUseCaption; }
+    inline bool             UseCaption() const              { return bUseCaption; }
 
     inline SwCapObjType     GetObjType() const              { return eObjType; }
     inline void             SetObjType(const SwCapObjType eType) { eObjType = eType; }
@@ -84,8 +84,8 @@ public:
     inline bool&            IgnoreSeqOpts()                 { return bIgnoreSeqOpts; }
     inline bool             IgnoreSeqOpts() const           { return bIgnoreSeqOpts; }
 
-    inline sal_Bool&            CopyAttributes()                { return bCopyAttributes; }
-    inline sal_Bool             CopyAttributes() const          { return bCopyAttributes; }
+    inline bool&            CopyAttributes()                { return bCopyAttributes; }
+    inline bool             CopyAttributes() const          { return bCopyAttributes; }
 
     bool                    operator==( const InsCaptionOpt& rOpt ) const;
     InsCaptionOpt&          operator= ( const InsCaptionOpt& rOpt );
diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx
index 7cf968d7950c..5839fa19a6bb 100644
--- a/sw/source/core/uibase/inc/cfgitems.hxx
+++ b/sw/source/core/uibase/inc/cfgitems.hxx
@@ -48,15 +48,15 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
     friend class SwShdwCrsrOptionsTabPage;
     friend class SwModule;
 
-    sal_Bool bParagraphEnd      :1;
-    sal_Bool bTab               :1;
-    sal_Bool bSpace             :1;
-    sal_Bool bNonbreakingSpace  :1;
-    sal_Bool bSoftHyphen        :1;
-    sal_Bool bCharHiddenText    :1;
-    sal_Bool bFldHiddenText     :1;
-    sal_Bool bManualBreak       :1;
-    sal_Bool bShowHiddenPara    :1;
+    bool bParagraphEnd      :1;
+    bool bTab               :1;
+    bool bSpace             :1;
+    bool bNonbreakingSpace  :1;
+    bool bSoftHyphen        :1;
+    bool bCharHiddenText    :1;
+    bool bFldHiddenText     :1;
+    bool bManualBreak       :1;
+    bool bShowHiddenPara    :1;
 
     Color aIndexBackgrndCol;
 
@@ -134,26 +134,26 @@ public:
     const OUString &GetFax() const              { return sFaxName; }
     void          SetFax( const OUString& rFax) { sFaxName = rFax; }
 
-    sal_Bool   IsPrintProspect() const      { return bPrintProspect; }
-    sal_Bool   IsPrintProspectRTL() const      { return bPrintProspectRTL; }
-    void   SetPrintProspect(sal_Bool bFlag ){ bPrintProspect = bFlag; }
-    void   SetPrintProspectRTL(sal_Bool bFlag ){ bPrintProspectRTL = bFlag; }
-    sal_Bool IsPrintGraphic () const { return bPrintGraphic; }
-    sal_Bool IsPrintTable () const { return bPrintTable; }
-    sal_Bool IsPrintDraw () const { return bPrintDraw; }
-    sal_Bool IsPrintControl () const { return bPrintControl; }
-    sal_Bool IsPrintLeftPage () const { return bPrintLeftPages; }
-    sal_Bool IsPrintRightPage() const { return bPrintRightPages; }
-    sal_Bool IsPrintReverse  () const { return bPrintReverse; }
-    sal_Bool IsPaperFromSetup() const { return bPaperFromSetup; }
-    sal_Bool IsPrintEmptyPages() const { return bPrintEmptyPages; }
-    sal_Bool IsPrintPageBackground() const { return bPrintPageBackground; }
-    sal_Bool IsPrintBlackFont() const { return bPrintBlackFont; }
+    bool   IsPrintProspect() const      { return bPrintProspect; }
+    bool   IsPrintProspectRTL() const      { return bPrintProspectRTL; }
+    void   SetPrintProspect(bool bFlag ){ bPrintProspect = bFlag; }
+    void   SetPrintProspectRTL(bool bFlag ){ bPrintProspectRTL = bFlag; }
+    bool IsPrintGraphic () const { return bPrintGraphic; }
+    bool IsPrintTable () const { return bPrintTable; }
+    bool IsPrintDraw () const { return bPrintDraw; }
+    bool IsPrintControl () const { return bPrintControl; }
+    bool IsPrintLeftPage () const { return bPrintLeftPages; }
+    bool IsPrintRightPage() const { return bPrintRightPages; }
+    bool IsPrintReverse  () const { return bPrintReverse; }
+    bool IsPaperFromSetup() const { return bPaperFromSetup; }
+    bool IsPrintEmptyPages() const { return bPrintEmptyPages; }
+    bool IsPrintPageBackground() const { return bPrintPageBackground; }
+    bool IsPrintBlackFont() const { return bPrintBlackFont; }
     //#i81434# - printing of hidden text
-    sal_Bool IsPrintHiddenText() const { return bPrintHiddenText; }
-    sal_Bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; }
+    bool IsPrintHiddenText() const { return bPrintHiddenText; }
+    bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; }
 
-    sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs; }
+    bool IsPrintSingleJobs() const { return bPrintSingleJobs; }
     sal_uLong GetPrintPostIts () const { return nPrintPostIts; }
 
 };
@@ -164,7 +164,7 @@ Item for settings dialog, ShadowCursorPage
 class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem
 {
     sal_uInt8 eMode;
-    sal_Bool bOn;
+    bool bOn;
 public:
     TYPEINFO_OVERRIDE();
     SwShadowCursorItem( sal_uInt16 nWhich = FN_PARAM_SHADOWCURSOR );
@@ -178,10 +178,10 @@ public:
     void FillViewOptions( SwViewOption& rVOpt) const;
 
     sal_uInt8 GetMode() const               { return eMode; }
-    sal_Bool IsOn() const                   { return bOn; }
+    bool IsOn() const                   { return bOn; }
 
     void SetMode( sal_uInt8 eM )            { eMode = eM; }
-    void SetOn( sal_Bool bFlag )            { bOn = bFlag; }
+    void SetOn( bool bFlag )            { bOn = bFlag; }
 };
 
 #ifdef DBG_UTIL
diff --git a/sw/source/core/uibase/inc/chldwrap.hxx b/sw/source/core/uibase/inc/chldwrap.hxx
index 92484a44ec1d..26f20c2f64f9 100644
--- a/sw/source/core/uibase/inc/chldwrap.hxx
+++ b/sw/source/core/uibase/inc/chldwrap.hxx
@@ -36,7 +36,7 @@ protected:
     SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId);
 
 public:
-    virtual sal_Bool    ReInitDlg(SwDocShell *pDocSh);
+    virtual bool    ReInitDlg(SwDocShell *pDocSh);
 
     inline SwDocShell*  GetOldDocShell()                    { return m_pDocSh; }
     inline void         SetOldDocShell(SwDocShell *pDcSh)   { m_pDocSh = pDcSh; }
diff --git a/sw/source/core/uibase/inc/colmgr.hxx b/sw/source/core/uibase/inc/colmgr.hxx
index b746438fed11..a9c98164096f 100644
--- a/sw/source/core/uibase/inc/colmgr.hxx
+++ b/sw/source/core/uibase/inc/colmgr.hxx
@@ -39,8 +39,8 @@ public:
     sal_uInt16              GetColWidth(sal_uInt16 nIdx) const;
     void                SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWidth);
 
-    inline sal_Bool         IsAutoWidth() const;
-    void                SetAutoWidth(sal_Bool bOn = sal_True, sal_uInt16 lGutterWidth = 0);
+    inline bool         IsAutoWidth() const;
+    void                SetAutoWidth(bool bOn = true, sal_uInt16 lGutterWidth = 0);
 
     inline bool         HasLine() const;
     inline void         SetNoLine();
@@ -99,11 +99,11 @@ inline  void SwColMgr::SetAdjust(SwColLineAdj eAdj)
 {
     aFmtCol.SetLineAdj(eAdj);
 }
-inline sal_Bool SwColMgr::IsAutoWidth() const
+inline bool SwColMgr::IsAutoWidth() const
 {
     return aFmtCol.IsOrtho();
 }
-inline void SwColMgr::SetAutoWidth(sal_Bool bOn, sal_uInt16 nGutterWidth)
+inline void SwColMgr::SetAutoWidth(bool bOn, sal_uInt16 nGutterWidth)
 {
     aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth);
 }
diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index 991450dba17d..4026d940eba5 100644
--- a/sw/source/core/uibase/inc/column.hxx
+++ b/sw/source/core/uibase/inc/column.hxx
@@ -135,9 +135,9 @@ class SwColumnPage : public SfxTabPage
 
     std::map<MetricField*, PercentField*> m_aPercentFieldsMap;
 
-    sal_Bool            bFormat;
-    sal_Bool            bFrm;
-    sal_Bool            bHtmlMode;
+    bool            bFormat;
+    bool            bFrm;
+    bool            bHtmlMode;
     bool            bLockUpdate;
 
     // Handler
@@ -180,20 +180,20 @@ public:
     virtual bool    FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
     virtual void    Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
 
-    void SetFrmMode(sal_Bool bMod);
+    void SetFrmMode(bool bMod);
     void SetPageWidth(long nPageWidth);
 
-    void SetFormatUsed(sal_Bool bFmt)
+    void SetFormatUsed(bool bFmt)
     {
         bFormat = bFmt;
     }
 
-    void ShowBalance(sal_Bool bShow)
+    void ShowBalance(bool bShow)
     {
         m_pBalanceColsCB->Show(bShow);
     }
 
-    void SetInSection(sal_Bool bSet);
+    void SetInSection(bool bSet);
 
     void ActivateColumnControl()
     {
diff --git a/sw/source/core/uibase/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx
index e5c2784e15c7..3d05c3e596aa 100644
--- a/sw/source/core/uibase/inc/conarc.hxx
+++ b/sw/source/core/uibase/inc/conarc.hxx
@@ -31,8 +31,8 @@ public:
     ConstArc(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
 
                                        // Mouse- & Key-Events
-    virtual sal_Bool    MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual sal_Bool    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool    MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
     virtual void    Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
     virtual void    Deactivate() SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx
index 73cf559296df..5b4e8a47ec51 100644
--- a/sw/source/core/uibase/inc/concustomshape.hxx
+++ b/sw/source/core/uibase/inc/concustomshape.hxx
@@ -39,8 +39,8 @@ class ConstCustomShape : public SwDrawBase
     ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq );
 
                                        // Mouse- & Key-Events
-    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 
diff --git a/sw/source/core/uibase/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx
index 57541fd0b42a..d3ebbec3ba58 100644
--- a/sw/source/core/uibase/inc/conform.hxx
+++ b/sw/source/core/uibase/inc/conform.hxx
@@ -27,7 +27,7 @@ public:
     ConstFormControl(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
 
                                        // Mouse- & Key-Events
-    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
     virtual void CreateDefaultObject() SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx
index 98810894abbc..ea35377d413b 100644
--- a/sw/source/core/uibase/inc/conpoly.hxx
+++ b/sw/source/core/uibase/inc/conpoly.hxx
@@ -30,9 +30,9 @@ public:
     ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
 
     // Mouse- & Key-Events
-    virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 };
diff --git a/sw/source/core/uibase/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx
index 4e4ff22cd6f2..b5b8e3e7b074 100644
--- a/sw/source/core/uibase/inc/conrect.hxx
+++ b/sw/source/core/uibase/inc/conrect.hxx
@@ -35,8 +35,8 @@ class ConstRectangle : public SwDrawBase
     ConstRectangle(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
 
                                        // Mouse- & Key-Events
-    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
 
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 };
diff --git a/sw/source/core/uibase/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx
index d5959f2901c4..aaf2ff242ce5 100644
--- a/sw/source/core/uibase/inc/content.hxx
+++ b/sw/source/core/uibase/inc/content.hxx
@@ -96,7 +96,7 @@ public:
         : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr )
     {}
 
-    virtual sal_Bool    IsProtect() const SAL_OVERRIDE;
+    virtual bool        IsProtect() const SAL_OVERRIDE;
     const OUString&     GetURL()            { return sURL; }
     const SwTxtINetFmt* GetINetAttr()       { return pINetAttr; }
 };
@@ -128,7 +128,7 @@ public:
 
     const SwFmtFld* GetPostIt()     { return pFld; }
     SwRangeRedline* GetRedline() { return pRedline; }
-    virtual sal_Bool    IsProtect()     const SAL_OVERRIDE;
+    virtual bool    IsProtect()     const SAL_OVERRIDE;
     bool            IsPostIt()      {return mbPostIt; }
 };
 
@@ -181,11 +181,11 @@ public:
         SwContentType(SwWrtShell* pParent, sal_uInt16 nType, sal_uInt8 nLevel );
         virtual ~SwContentType();
 
-        void                Init(sal_Bool* pbInvalidateWindow = 0);
-        void                FillMemberList(sal_Bool* pbLevelChanged = NULL);
-        sal_uInt16              GetMemberCount() const
+        void                Init(bool* pbInvalidateWindow = 0);
+        void                FillMemberList(bool* pbLevelChanged = NULL);
+        sal_uInt16          GetMemberCount() const
                                 {return nMemberCount;};
-        sal_uInt16              GetType() const {return nContentType;}
+        sal_uInt16          GetType() const {return nContentType;}
         const SwContent*    GetMember(sal_uInt16 nIndex);
         const OUString&     GetName() {return sContentTypeName;}
         const OUString&     GetSingleName() const {return sSingleContentTypeName;}
diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
index 10e533d74280..17bed3c8e485 100644
--- a/sw/source/core/uibase/inc/conttree.hxx
+++ b/sw/source/core/uibase/inc/conttree.hxx
@@ -81,7 +81,7 @@ class SwContentTree : public SvTreeListBox
     bool                bIsInternalDrag     :1;
     bool                bIsRoot             :1;
     bool                bIsIdleClear        :1;
-    sal_Bool                bIsLastReadOnly     :1;
+    bool                bIsLastReadOnly     :1;
     bool                bIsOutlineMoveable  :1;
     bool                bViewHasChanged     :1;
     bool                bIsImageListInitialized : 1;
@@ -170,11 +170,11 @@ public:
     sal_uInt8           GetOutlineLevel()const {return nOutlineLevel;}
     void            SetOutlineLevel(sal_uInt8 nSet);
 
-    sal_Bool            Expand( SvTreeListEntry* pParent );
+    bool            Expand( SvTreeListEntry* pParent );
 
-    sal_Bool            Collapse( SvTreeListEntry* pParent );
+    bool            Collapse( SvTreeListEntry* pParent );
 
-    void            ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier);
+    void            ExecCommand(sal_uInt16 nCmd, bool bModifier);
 
     void            ShowTree();
     void            HideTree();
@@ -321,7 +321,7 @@ public:
 
     void                Display(bool bOnlyUpdateUserData = false);
 
-    sal_Bool                Update(sal_Bool bHard);
+    bool                Update(bool bHard);
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx
index 7b8848798c8e..a72afc1a9ee0 100644
--- a/sw/source/core/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/core/uibase/inc/dbinsdlg.hxx
@@ -61,8 +61,8 @@ struct SwInsDBColumn
     sal_uInt32 nUsrNumFmt;
     LanguageType eUsrNumFmtLng;
     sal_uInt16 nCol;
-    sal_Bool bHasFmt : 1;
-    sal_Bool bIsDBFmt : 1;
+    bool bHasFmt : 1;
+    bool bIsDBFmt : 1;
 
     SwInsDBColumn( const OUString& rStr, sal_uInt16 nColumn )
         : sColumn( rStr ),
@@ -70,8 +70,8 @@ struct SwInsDBColumn
         nUsrNumFmt( 0 ),
         eUsrNumFmtLng( LANGUAGE_SYSTEM ),
         nCol( nColumn ),
-        bHasFmt(sal_False),
-        bIsDBFmt(sal_True)
+        bHasFmt(false),
+        bIsDBFmt(true)
     {}
 
     bool operator==( const SwInsDBColumn& rCmp ) const
@@ -142,7 +142,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     DECL_LINK( DblClickHdl, ListBox* );
     DECL_LINK( HeaderHdl, Button* );
 
-    bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
+    bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, bool bInsField );
         using SfxModalDialog::Notify;
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
     virtual void            Commit() SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx
index e1504aa7263b..9b229e4f13dc 100644
--- a/sw/source/core/uibase/inc/dbtree.hxx
+++ b/sw/source/core/uibase/inc/dbtree.hxx
@@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
 
     OUString        sDefDBName;
     bool            bInitialized;
-    sal_Bool            bShowColumns;
+    bool            bShowColumns;
 
     SwDBTreeList_Impl* pImpl;
 
@@ -61,7 +61,7 @@ public:
     void    Select( const OUString& rDBName, const OUString& rTableName,
                     const OUString& rColumnName );
 
-    void    ShowColumns(sal_Bool bShowCol);
+    void    ShowColumns(bool bShowCol);
     void    SetWrtShell(SwWrtShell& rSh);
 
     void    AddDataSource(const OUString& rSource);
diff --git a/sw/source/core/uibase/inc/drawbase.hxx b/sw/source/core/uibase/inc/drawbase.hxx
index 198b8ec79d5c..0cec957aed02 100644
--- a/sw/source/core/uibase/inc/drawbase.hxx
+++ b/sw/source/core/uibase/inc/drawbase.hxx
@@ -51,10 +51,10 @@ public:
     inline bool  IsCreateObj() const { return m_bCreateObj; }
 
     // mouse- & key events; return value=sal_True: event was edited
-    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
-    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
-    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
-    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+    virtual bool KeyInput(const KeyEvent& rKEvt);
+    virtual bool MouseMove(const MouseEvent& rMEvt);
+    virtual bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual bool MouseButtonDown(const MouseEvent& rMEvt);
 
     void         BreakCreate();
     void         SetSlotId(sal_uInt16 nSlot) {m_nSlotId = nSlot;}
diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
index 1a41ce20a00b..71a42d5572fc 100644
--- a/sw/source/core/uibase/inc/drpcps.hxx
+++ b/sw/source/core/uibase/inc/drpcps.hxx
@@ -64,9 +64,9 @@ friend class SwDropCapsPict;
 
     SwDropCapsPict*  m_pPict;
 
-    sal_Bool          bModified;
-    sal_Bool          bFormat;
-    sal_Bool          bHtmlMode;
+    bool          bModified;
+    bool          bFormat;
+    bool          bHtmlMode;
 
     SwWrtShell &rSh;
 
@@ -92,9 +92,9 @@ public:
     virtual bool FillItemSet(      SfxItemSet &rSet) SAL_OVERRIDE;
     virtual void Reset      (const SfxItemSet &rSet) SAL_OVERRIDE;
 
-    void    SetFormat(sal_Bool bSet){bFormat = bSet;}
+    void    SetFormat(bool bSet){bFormat = bSet;}
 protected:
-    void aSwitchText(sal_Bool bChecked);
+    void aSwitchText(bool bChecked);
     //void SW_RES(int arg1);
 };
 
diff --git a/sw/source/core/uibase/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx
index 3d27ed62d703..16237b34691a 100644
--- a/sw/source/core/uibase/inc/drwbassh.hxx
+++ b/sw/source/core/uibase/inc/drwbassh.hxx
@@ -52,7 +52,7 @@ public:
     void        GetState(SfxItemSet &);
     void        GetDrawAttrStateForIFBX( SfxItemSet& rSet );
     void        DisableState(SfxItemSet &rSet)               { Disable(rSet);}
-    sal_Bool    Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
+    bool    Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
 
     void        StateStatusline(SfxItemSet &rSet);
 };
diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
index d8b6d007ca99..c32d3d2128a8 100644
--- a/sw/source/core/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/core/uibase/inc/drwtxtsh.hxx
@@ -36,7 +36,7 @@ class SwDrawTextShell: public SfxShell
 
     void        SetAttrToMarked(const SfxItemSet& rAttr);
     void        InsertSymbol(SfxRequest& rReq);
-    sal_Bool    IsTextEdit();
+    bool    IsTextEdit();
 
 public:
     SFX_DECL_INTERFACE(SW_DRWTXTSHELL)
diff --git a/sw/source/core/uibase/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx
index c5a2a0f12a48..85ef2c6d13a0 100644
--- a/sw/source/core/uibase/inc/dselect.hxx
+++ b/sw/source/core/uibase/inc/dselect.hxx
@@ -28,7 +28,7 @@ class DrawSelection : public SwDrawBase
     DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView);
 
                                        // mouse- & key events
-    virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
+    virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
 
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 };
diff --git a/sw/source/core/uibase/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx
index 032764743f07..97a1bdb4db6c 100644
--- a/sw/source/core/uibase/inc/edtwin.hxx
+++ b/sw/source/core/uibase/inc/edtwin.hxx
@@ -59,7 +59,7 @@ class SwEditWin: public Window,
 {
 friend void     ScrollMDI(SwViewShell* pVwSh, const SwRect&,
                           sal_uInt16 nRangeX, sal_uInt16 nRangeY);
-friend sal_Bool     IsScrollMDI(SwViewShell* pVwSh, const SwRect&);
+friend bool     IsScrollMDI(SwViewShell* pVwSh, const SwRect&);
 
 friend void     SizeNotify(SwViewShell* pVwSh, const Size &);
 
@@ -117,7 +117,7 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
     sal_uInt16      m_eBezierMode;
     sal_uInt16      m_nInsFrmColCount; // column number for interactive frame
     SdrObjKind      m_eDrawMode;
-    sal_Bool        m_bMBPressed      : 1,
+    bool        m_bMBPressed      : 1,
                     m_bInsDraw        : 1,
                     m_bInsFrm         : 1,
                     m_bIsInMove       : 1,
@@ -147,19 +147,19 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
 
     void            RstMBDownFlags();
 
-    void            ChangeFly( sal_uInt8 nDir, sal_Bool bWeb = sal_False );
+    void            ChangeFly( sal_uInt8 nDir, bool bWeb = false );
     void            ChangeDrawing( sal_uInt8 nDir );
 
-    sal_Bool            EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos);
-    sal_Bool            RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode);
+    bool            EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos);
+    bool            RulerColumnDrag( const MouseEvent& rMEvt, bool bVerticalMode);
 
     // helper function for D&D
     void            DropCleanup();
     void            CleanupDropUserMarker();
-    sal_uInt16          GetDropDestination( const Point& rPixPnt,
+    sal_uInt16      GetDropDestination( const Point& rPixPnt,
                                         SdrObject ** ppObj = 0 );
     //select the object/cursor at the mouse position of the context menu request
-    sal_Bool            SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos );
+    bool            SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos );
 
     /*
      * handler for scrolling on when the mousepointer
@@ -219,16 +219,16 @@ public:
 
     void            UpdatePointer(const Point &, sal_uInt16 nButtons = 0);
 
-    sal_Bool            IsDrawSelMode();
-    sal_Bool            IsDrawAction()                  { return (m_bInsDraw); }
-    void            SetDrawAction(sal_Bool bFlag)       { m_bInsDraw = bFlag; }
+    bool            IsDrawSelMode();
+    bool            IsDrawAction()                  { return (m_bInsDraw); }
+    void            SetDrawAction(bool bFlag)       { m_bInsDraw = bFlag; }
 
-    void            SetObjectSelect( sal_Bool bVal )    { m_bObjectSelect = bVal; }
-    sal_Bool            IsObjectSelect() const          { return m_bObjectSelect; }
+    void            SetObjectSelect( bool bVal )    { m_bObjectSelect = bVal; }
+    bool            IsObjectSelect() const          { return m_bObjectSelect; }
 
-    inline SdrObjKind   GetSdrDrawMode(/*sal_Bool bBuf = sal_False*/) const { return m_eDrawMode; }
-    inline void         SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( sal_False ); }
-    void                StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect );
+    inline SdrObjKind   GetSdrDrawMode() const { return m_eDrawMode; }
+    inline void         SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); }
+    void                StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect );
 
     bool            IsFrmAction() const             { return (m_bInsFrm); }
     sal_uInt16      GetBezierMode() const           { return m_eBezierMode; }
@@ -238,11 +238,11 @@ public:
     void            StopInsFrm();
     sal_uInt16      GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame
 
-    void            SetChainMode( sal_Bool bOn );
-    sal_Bool            IsChainMode() const             { return m_bChainMode; }
+    void            SetChainMode( bool bOn );
+    bool            IsChainMode() const             { return m_bChainMode; }
 
     void            FlushInBuffer();
-    sal_Bool            IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const;
+    bool            IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const;
 
     void             SetApplyTemplate(const SwApplyTemplate &);
     SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl; }
@@ -264,7 +264,7 @@ public:
                                     { m_bTransparentBackColor = bSet; }
     bool            IsTextBackColorTransparent()
                                     { return m_bTransparentBackColor; }
-    void            LockKeyInput(sal_Bool bSet){m_bLockInput = bSet;}
+    void            LockKeyInput(bool bSet){m_bLockInput = bSet;}
 
     const SwView &GetView() const { return m_rView; }
           SwView &GetView()       { return m_rView; }
@@ -281,14 +281,14 @@ public:
     void StopQuickHelp();
 
     // #i42921# - add parameter <bVerticalMode>
-    sal_Bool RulerMarginDrag( const MouseEvent& rMEvt,
+    bool RulerMarginDrag( const MouseEvent& rMEvt,
                                      const bool bVerticalMode );
 
     /** #i42732# display status of font size/name depending on either the input
         language or the selection position depending on what has changed lately
      */
-    void        SetUseInputLanguage( sal_Bool bNew );
-    sal_Bool    IsUseInputLanguage() const { return m_bUseInputLanguage; }
+    void    SetUseInputLanguage( bool bNew );
+    bool    IsUseInputLanguage() const { return m_bUseInputLanguage; }
 
     SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; }
 
diff --git a/sw/source/core/uibase/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx
index 2225fc451f20..e6bdf30efa85 100644
--- a/sw/source/core/uibase/inc/envimg.hxx
+++ b/sw/source/core/uibase/inc/envimg.hxx
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem
 public:
 
     OUString   aAddrText;       // text for receiver
-    sal_Bool        bSend;           // sender?
+    bool        bSend;           // sender?
     OUString   aSendText;       // text for sender
     sal_Int32       lAddrFromLeft;   // left gap for receiver (twips)
     sal_Int32       lAddrFromTop;    // upper gap for receiver (twips)
@@ -52,7 +52,7 @@ public:
     sal_Int32       lWidth;          // envelope's width (twips)
     sal_Int32       lHeight;         // envelope's height (twips)
     SwEnvAlign      eAlign;          // alignment at indent
-    sal_Bool        bPrintFromAbove; // print from above?
+    bool        bPrintFromAbove; // print from above?
     sal_Int32       lShiftRight;     // shift to right (twips)
     sal_Int32       lShiftDown;      // shift down (twips)
 
diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx
index 3bfe4c8eef05..0c3de3affd3b 100644
--- a/sw/source/core/uibase/inc/envlop.hxx
+++ b/sw/source/core/uibase/inc/envlop.hxx
@@ -73,7 +73,7 @@ friend class SwEnvPreview;
     virtual short   Ok() SAL_OVERRIDE;
 
 public:
-     SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert);
+     SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert);
     virtual ~SwEnvDlg();
 };
 
diff --git a/sw/source/core/uibase/inc/fldedt.hxx b/sw/source/core/uibase/inc/fldedt.hxx
index 254f9cf65324..fdaab1429584 100644
--- a/sw/source/core/uibase/inc/fldedt.hxx
+++ b/sw/source/core/uibase/inc/fldedt.hxx
@@ -46,7 +46,7 @@ public:
 
     virtual short   Execute() SAL_OVERRIDE;
 
-    void            EnableInsert(sal_Bool bEnable);
+    void            EnableInsert(bool bEnable);
     void            InsertHdl();
 };
 
diff --git a/sw/source/core/uibase/inc/fldmgr.hxx b/sw/source/core/uibase/inc/fldmgr.hxx
index 2749f3dfc723..60a8ce2597ee 100644
--- a/sw/source/core/uibase/inc/fldmgr.hxx
+++ b/sw/source/core/uibase/inc/fldmgr.hxx
@@ -75,14 +75,14 @@ struct SwInsertFld_Data
     sal_uLong nFormatId;
     SwWrtShell* pSh;
     sal_Unicode cSeparator;
-    sal_Bool bIsAutomaticLanguage;
+    bool bIsAutomaticLanguage;
     ::com::sun::star::uno::Any aDBDataSource;
     ::com::sun::star::uno::Any aDBConnection;
     ::com::sun::star::uno::Any aDBColumn;
     Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg()
 
     SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
-                    sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', sal_Bool bIsAutoLanguage = sal_True) :
+                    sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
         nTypeId(nType),
         nSubType(nSub),
         sPar1(rPar1),
@@ -96,7 +96,7 @@ struct SwInsertFld_Data
     SwInsertFld_Data() :
         pSh(0),
         cSeparator(' '),
-        bIsAutomaticLanguage(sal_True){}
+        bIsAutomaticLanguage(true){}
 
 };
 
@@ -115,7 +115,7 @@ private:
     OUString          sMacroName;
 
     sal_uLong           nCurFmt;
-    sal_Bool            bEvalExp;
+    bool            bEvalExp;
 
     SAL_DLLPRIVATE sal_uInt16            GetCurrLanguage() const;
 
@@ -131,7 +131,7 @@ public:
                         {   pWrtShell = pShell;     }
 
      // insert field using TypeID (TYP_ ...)
-    sal_Bool InsertFld( const SwInsertFld_Data& rData );
+    bool InsertFld( const SwInsertFld_Data& rData );
 
     // change the current field directly
     void            UpdateCurFld(sal_uLong nFormat,
@@ -148,21 +148,21 @@ public:
 
     void            InsertFldType(SwFieldType& rType);
 
-    sal_Bool            ChooseMacro(const OUString &rSelMacro = OUString());
+    bool            ChooseMacro(const OUString &rSelMacro = OUString());
     void            SetMacroPath(const OUString& rPath);
     inline OUString GetMacroPath() const         { return sMacroPath; }
     inline OUString GetMacroName() const         { return sMacroName; }
     inline void     SetMacroModule(SbModule* pMod)    { pModule = pMod; }
 
     // previous and next of the same type
-    sal_Bool GoNextPrev( sal_Bool bNext = sal_True, SwFieldType* pTyp = 0 );
-    sal_Bool GoNext( SwFieldType* pTyp = 0 )    { return GoNextPrev( sal_True, pTyp ); }
-    sal_Bool GoPrev( SwFieldType* pTyp = 0 )    { return GoNextPrev( sal_False, pTyp ); }
+    bool GoNextPrev( bool bNext = true, SwFieldType* pTyp = 0 );
+    bool GoNext( SwFieldType* pTyp = 0 )    { return GoNextPrev( true, pTyp ); }
+    bool GoPrev( SwFieldType* pTyp = 0 )    { return GoNextPrev( false, pTyp ); }
 
     // query values from database fields (BASIC )
 //  String          GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh);
-    sal_Bool            IsDBNumeric(const OUString& rDBName, const OUString& rTblQryName,
-                                    sal_Bool bIsTable, const OUString& rFldName);
+    bool            IsDBNumeric(const OUString& rDBName, const OUString& rTblQryName,
+                                    bool bIsTable, const OUString& rFldName);
 
     // organise RefMark with names
     bool            CanInsertRefMark( const OUString& rStr );
@@ -176,8 +176,8 @@ public:
 
     // access via TypeId from the dialog
     // Ids for a range of fields
-    const SwFldGroupRgn& GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const;
-    sal_uInt16          GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0) const;
+    const SwFldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) const;
+    sal_uInt16          GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0) const;
 
     // the current field's TypeId
     sal_uInt16          GetCurTypeId() const;
@@ -194,7 +194,7 @@ public:
     bool            GetSubTypes(sal_uInt16 nId, std::vector<OUString>& rToFill);
 
     // format to a type
-    sal_uInt16          GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode = sal_False) const;
+    sal_uInt16          GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode = false) const;
     OUString            GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
     sal_uInt16          GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
     sal_uLong           GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
@@ -202,11 +202,11 @@ public:
     // turn off evaluation of expression fields for insertation
     // of many expressino fields (see labels)
 
-    inline void     SetEvalExpFlds(sal_Bool bEval);
+    inline void     SetEvalExpFlds(bool bEval);
     void            EvalExpFlds(SwWrtShell* pSh = NULL);
 };
 
-inline void SwFldMgr::SetEvalExpFlds(sal_Bool bEval)
+inline void SwFldMgr::SetEvalExpFlds(bool bEval)
     { bEvalExp = bEval; }
 
 inline sal_uLong SwFldMgr::GetCurFldFmt() const
diff --git a/sw/source/core/uibase/inc/fldtdlg.hxx b/sw/source/core/uibase/inc/fldtdlg.hxx
index bac006bc237d..073da94b8fc6 100644
--- a/sw/source/core/uibase/inc/fldtdlg.hxx
+++ b/sw/source/core/uibase/inc/fldtdlg.hxx
@@ -29,8 +29,8 @@ class SwFldDlg: public SfxTabDialog
 {
     SwChildWinWrapper*  m_pChildWin;
     SfxBindings*        m_pBindings;
-    sal_Bool            m_bHtmlMode;
-    sal_Bool            m_bDataBaseMode;
+    bool            m_bHtmlMode;
+    bool            m_bDataBaseMode;
     sal_uInt16          m_nDokId;
     sal_uInt16          m_nVarId;
     sal_uInt16          m_nDokInf;
@@ -44,7 +44,7 @@ class SwFldDlg: public SfxTabDialog
     virtual void        PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE;
 
     void                ReInitTabPage( sal_uInt16 nPageId,
-                                        sal_Bool bOnlyActivate = sal_False );
+                                       bool bOnlyActivate = false );
 
 public:
     SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent);
@@ -55,7 +55,7 @@ public:
 
     void                Initialize(SfxChildWinInfo *pInfo);
     void                ReInitDlg();
-    void                EnableInsert(sal_Bool bEnable);
+    void                EnableInsert(bool bEnable);
     void                InsertHdl();
     void                ActivateDatabasePage();
     void                ShowReferencePage();
diff --git a/sw/source/core/uibase/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx
index 1b73be2f7702..06ea1a47aea8 100644
--- a/sw/source/core/uibase/inc/fldwrap.hxx
+++ b/sw/source/core/uibase/inc/fldwrap.hxx
@@ -31,7 +31,7 @@ public:
 
     SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper);
 
-    virtual sal_Bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
+    virtual bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
     void ShowReferencePage();
 };
 
@@ -48,7 +48,7 @@ public:
 
     SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper);
 
-    virtual sal_Bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
+    virtual bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx
index 7a2c9686eb05..cf4a228d23de 100644
--- a/sw/source/core/uibase/inc/formedt.hxx
+++ b/sw/source/core/uibase/inc/formedt.hxx
@@ -73,7 +73,7 @@ class SwIdxFormDlg : public SvxStandardDialog
     SwWrtShell     &rSh;
     SwForm         *pForm;
     sal_uInt16          nAktLevel;
-    sal_Bool            bLastLinkIsEnd;
+    bool            bLastLinkIsEnd;
 
 public:
     SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm );
diff --git a/sw/source/core/uibase/inc/frmmgr.hxx b/sw/source/core/uibase/inc/frmmgr.hxx
index 97c6f8f64157..548a68e5c23a 100644
--- a/sw/source/core/uibase/inc/frmmgr.hxx
+++ b/sw/source/core/uibase/inc/frmmgr.hxx
@@ -53,11 +53,11 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr
     Point       m_aAbsPos;
     SwWrtShell* m_pOwnSh;
 
-    sal_Bool    m_bAbsPos,
+    bool    m_bAbsPos,
                 m_bNewFrm;
-    sal_Bool    m_bIsInVertical;
+    bool    m_bIsInVertical;
     // --> OD 2009-09-01 #mongolianlayout#
-    sal_Bool    m_bIsInVerticalL2R;
+    bool    m_bIsInVerticalL2R;
 
     // internal calculation for borders
     SAL_DLLPRIVATE SwTwips           CalcTopSpace();
@@ -68,10 +68,10 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr
     SAL_DLLPRIVATE void _UpdateFlyFrm(); // post-treatment after insert or update
 
 public:
-    SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType );
+    SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType );
 
     //CopyCtor for dialogs to check the metrics
-    SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet );
+    SwFlyFrmAttrMgr( bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet );
 
     inline SwWrtShell*  GetShell() { return m_pOwnSh; }
 
@@ -109,11 +109,11 @@ public:
     void                UpdateFlyFrm();
 
     // create new frame
-    sal_Bool                InsertFlyFrm();
+    bool                InsertFlyFrm();
     void                InsertFlyFrm(RndStdIds      eAnchorType,
                                    const Point    &rPos,
                                    const Size     &rSize,
-                                   sal_Bool           bAbsPos = sal_False);
+                                   bool           bAbsPos = false);
 
     // check and change metrics
     void                ValidateMetrics(SvxSwFrameValidation& rVal,
diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx
index 01d535dd4e59..050c59468f9f 100644
--- a/sw/source/core/uibase/inc/frmpage.hxx
+++ b/sw/source/core/uibase/inc/frmpage.hxx
@@ -94,17 +94,17 @@ class SwFrmPage: public SfxTabPage
     //'string provider'
     SvxSwFramePosString aFramePosString;
 
-    sal_Bool            bAtHorzPosModified;
-    sal_Bool            bAtVertPosModified;
+    bool            bAtHorzPosModified;
+    bool            bAtVertPosModified;
 
-    sal_Bool            bFormat;
-    sal_Bool            bNew;
-    sal_Bool            bNoModifyHdl;
+    bool            bFormat;
+    bool            bNew;
+    bool            bNoModifyHdl;
     bool            bIsVerticalFrame;  //current frame is in vertical environment - strings are exchanged
     // --> OD 2009-08-31 #mongolianlayou#
-    sal_Bool            bIsVerticalL2R;
-    sal_Bool            bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
-    sal_Bool            bHtmlMode;
+    bool            bIsVerticalL2R;
+    bool            bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged
+    bool            bHtmlMode;
     sal_uInt16          nHtmlMode;
     OString         sDlgType;
     Size            aGrfSize;
@@ -152,7 +152,7 @@ class SwFrmPage: public SfxTabPage
     void            UpdateExample();
     DECL_LINK( ModifyHdl, Edit * );
 
-    void            Init(const SfxItemSet& rSet, sal_Bool bReset = sal_False);
+    void            Init(const SfxItemSet& rSet, bool bReset = false);
     // OD 12.11.2003 #i22341# - adjustment to handle maps, that are ambigous
     //                          in the alignment.
     sal_Int32       FillPosLB( const FrmMap* _pMap,
@@ -193,10 +193,10 @@ public:
     virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
 
-    void            SetNewFrame(sal_Bool bNewFrame) { bNew      = bNewFrame; }
-    void            SetFormatUsed(sal_Bool bFmt);
+    void            SetNewFrame(bool bNewFrame) { bNew      = bNewFrame; }
+    void            SetFormatUsed(bool bFmt);
     void            SetFrmType(const OString &rType) { sDlgType  = rType; }
-    inline sal_Bool     IsInGraficMode( void ) { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; }
+    inline bool     IsInGraficMode( void ) { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; }
     void            EnableVerticalPositioning( bool bEnable );
 };
 
@@ -219,7 +219,7 @@ class SwGrfExtPage: public SfxTabPage
 
     ::sfx2::FileDialogHelper*     pGrfDlg;
 
-    sal_Bool            bHtmlMode;
+    bool            bHtmlMode;
 
     // handler for mirroring
     DECL_LINK(MirrorHdl, void *);
@@ -298,9 +298,9 @@ class SwFrmAddPage : public SfxTabPage
     SwWrtShell*   pWrtSh;
 
     OString       sDlgType;
-    sal_Bool      bHtmlMode;
-    sal_Bool      bFormat;
-    sal_Bool      bNew;
+    bool      bHtmlMode;
+    bool      bFormat;
+    bool      bNew;
 
     DECL_LINK(EditModifyHdl, void *);
     DECL_LINK(ChainModifyHdl, ListBox*);
@@ -316,9 +316,9 @@ public:
     virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
 
-    void            SetFormatUsed(sal_Bool bFmt);
+    void            SetFormatUsed(bool bFmt);
     void            SetFrmType(const OString &rType) { sDlgType = rType; }
-    void            SetNewFrame(sal_Bool bNewFrame) { bNew  = bNewFrame; }
+    void            SetNewFrame(bool bNewFrame) { bNew  = bNewFrame; }
     void            SetShell(SwWrtShell* pSh) { pWrtSh  = pSh; }
 
 };
diff --git a/sw/source/core/uibase/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx
index 11cb06507aa3..1a154aa4e2b4 100644
--- a/sw/source/core/uibase/inc/glosbib.hxx
+++ b/sw/source/core/uibase/inc/glosbib.hxx
@@ -92,7 +92,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog
 
     OUString        sCreatedGroup;
 
-    sal_Bool            IsDeleteAllowed(const OUString &rGroup);
+    bool            IsDeleteAllowed(const OUString &rGroup);
 
 protected:
     virtual void Apply() SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx
index 64dbcf7cbb22..b7ad24d188e7 100644
--- a/sw/source/core/uibase/inc/glosdoc.hxx
+++ b/sw/source/core/uibase/inc/glosdoc.hxx
@@ -53,9 +53,9 @@ class SW_DLLPUBLIC SwGlossaries
     std::vector<OUString>   m_aInvalidPaths;
     std::vector<OUString>   m_PathArr;
     std::vector<OUString>   m_GlosArr;
-    sal_Bool                m_bError;
+    bool                m_bError;
 
-    SAL_DLLPRIVATE SwTextBlocks* GetGlosDoc(const OUString &rName, sal_Bool bCreate = sal_True) const;
+    SAL_DLLPRIVATE SwTextBlocks* GetGlosDoc(const OUString &rName, bool bCreate = true) const;
     SAL_DLLPRIVATE std::vector<OUString> & GetNameList();
 
     // implementation in unoatxt.cxx
@@ -108,10 +108,10 @@ public:
     OUString        GetGroupName(sal_uInt16 );
     OUString        GetGroupTitle( const OUString& rGroupName );
 
-    sal_Bool            FindGroupName(OUString& rGroup);
+    bool            FindGroupName(OUString& rGroup);
 
     SwTextBlocks*   GetGroupDoc(const OUString &rName,
-                                sal_Bool bCreate = sal_False);
+                                bool bCreate = false);
     SwTextBlocks*   GetDefGroupDoc() { return GetGroupDoc(GetDefName()); }
     void            PutGroupDoc(SwTextBlocks *pBlock);
     static OUString GetDefName();
@@ -119,14 +119,14 @@ public:
 
     OUString        GetCompleteGroupName( const OUString& GroupName );
 
-    sal_Bool            NewGroupDoc(OUString &rGroupName, const OUString& rTitle);
-    sal_Bool            RenameGroupDoc(const OUString& sOldGroup, OUString& sNewGroup, const OUString& rNewTitle);
-    sal_Bool        DelGroupDoc(const OUString &);
-    SwDocShellRef   EditGroupDoc(const OUString &rGrpName, const OUString& rShortName, sal_Bool bShow = sal_True );
+    bool            NewGroupDoc(OUString &rGroupName, const OUString& rTitle);
+    bool            RenameGroupDoc(const OUString& sOldGroup, OUString& sNewGroup, const OUString& rNewTitle);
+    bool            DelGroupDoc(const OUString &);
+    SwDocShellRef   EditGroupDoc(const OUString &rGrpName, const OUString& rShortName, bool bShow = true );
     void            SaveGroupDoc(const OUString &rGrpName, const OUString& rLongName );
-    void            UpdateGlosPath(sal_Bool bFull);
+    void            UpdateGlosPath(bool bFull);
     void            ShowError();
-    inline sal_uLong            IsGlosPathErr() { return m_bError; }
+    bool            IsGlosPathErr() { return m_bError; }
     std::vector<OUString> const& GetPathArray() const { return m_PathArr; }
 };
 
diff --git a/sw/source/core/uibase/inc/gloshdl.hxx b/sw/source/core/uibase/inc/gloshdl.hxx
index 56e4e0d231cd..ba9cfe109cd8 100644
--- a/sw/source/core/uibase/inc/gloshdl.hxx
+++ b/sw/source/core/uibase/inc/gloshdl.hxx
@@ -42,20 +42,20 @@ class SW_DLLPUBLIC SwGlossaryHdl
                        const SvxMacro *pStart,
                        const SvxMacro *pEnd);
 
-    SAL_DLLPRIVATE sal_Bool  Expand( const OUString& rShortName,
+    SAL_DLLPRIVATE bool  Expand( const OUString& rShortName,
                     SwGlossaries* pGlossaries,
                     SwTextBlocks *pGlossary );
 
 public:
-    sal_Bool    ConvertToNew(SwTextBlocks& rOld);
+    bool    ConvertToNew(SwTextBlocks& rOld);
     void    GlossaryDlg();
 
     sal_uInt16  GetGroupCnt() const;
     OUString    GetGroupName( sal_uInt16, OUString* pTitle = 0 );
-    sal_Bool    NewGroup(OUString & rGroupName, const OUString& rTitle);
-    sal_Bool    DelGroup(const OUString &);
-    sal_Bool    RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle);
-    void        SetCurGroup(const OUString &aGrp, sal_Bool bApi = sal_False, sal_Bool bAlwaysCreateNew = sal_False);
+    bool        NewGroup(OUString & rGroupName, const OUString& rTitle);
+    bool        DelGroup(const OUString &);
+    bool        RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle);
+    void        SetCurGroup(const OUString &aGrp, bool bApi = false, bool bAlwaysCreateNew = false);
 
     OUString GetCurGroup() const { return aCurGrp; }
 
@@ -64,19 +64,19 @@ public:
     OUString  GetGlossaryShortName(const OUString &rName);
     OUString  GetGlossaryShortName(sal_uInt16);
 
-    sal_Bool    Rename( const OUString& rOldShortName, const OUString& rNewShortName,
+    bool    Rename( const OUString& rOldShortName, const OUString& rNewShortName,
                         const OUString& rNewName);
-    sal_Bool    CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName,
-                        const OUString& rDestGroupName, const OUString& rLongName, sal_Bool bMove );
-    sal_Bool    HasShortName(const OUString &rShortName) const;
+    bool    CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName,
+                        const OUString& rDestGroupName, const OUString& rLongName, bool bMove );
+    bool    HasShortName(const OUString &rShortName) const;
     // when NewGlossary is called from Basic then the previously set group should
     // be newly created if applicable.
-    sal_Bool    NewGlossary(const OUString &rName, const OUString &rShortName,
-                sal_Bool bApiCall = sal_False, sal_Bool bNoAttr = sal_False );
-    sal_Bool    DelGlossary(const OUString&);
-    sal_Bool    CopyToClipboard(SwWrtShell& rSh, const OUString& rShortName);
+    bool    NewGlossary(const OUString &rName, const OUString &rShortName,
+                bool bApiCall = false, bool bNoAttr = false );
+    bool    DelGlossary(const OUString&);
+    bool    CopyToClipboard(SwWrtShell& rSh, const OUString& rShortName);
 
-    sal_Bool    ExpandGlossary();
+    bool    ExpandGlossary();
     bool    InsertGlossary(const OUString &rName);
 
     void    SetMacros(const OUString& rName,
@@ -88,12 +88,12 @@ public:
                       SvxMacro& rEnd,
                       SwTextBlocks* pGlossary = 0 );
 
-    sal_Bool    IsReadOnly( const OUString* = 0 ) const;
-    sal_Bool    IsOld() const;
+    bool    IsReadOnly( const OUString* = 0 ) const;
+    bool    IsOld() const;
 
-    sal_Bool    FindGroupName(OUString& rGroup); // find group without path index
+    bool    FindGroupName(OUString& rGroup); // find group without path index
 
-    sal_Bool    ImportGlossaries( const OUString& rName );
+    bool    ImportGlossaries( const OUString& rName );
 
             SwGlossaryHdl(SfxViewFrame* pViewFrame, SwWrtShell *);
             ~SwGlossaryHdl();
diff --git a/sw/source/core/uibase/inc/gloslst.hxx b/sw/source/core/uibase/inc/gloslst.hxx
index c3b0bfa66f74..735c27bdab23 100644
--- a/sw/source/core/uibase/inc/gloslst.hxx
+++ b/sw/source/core/uibase/inc/gloslst.hxx
@@ -58,9 +58,9 @@ public:
         SwGlossaryList();
         virtual ~SwGlossaryList();
 
-    bool HasLongName(const OUString& rBegin, std::vector<OUString> *pLongNames);
-    sal_Bool            GetShortName(const OUString& rLongName,
-                                        OUString& rShortName, OUString& rGroupName );
+    bool            HasLongName(const OUString& rBegin, std::vector<OUString> *pLongNames);
+    bool            GetShortName(const OUString& rLongName,
+                                       OUString& rShortName, OUString& rGroupName );
 
     sal_uInt16      GetGroupCount();
     OUString        GetGroupName(sal_uInt16 nPos, bool bNoPath = true);
diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
index c2dcdaa12546..2dd41d11d85b 100644
--- a/sw/source/core/uibase/inc/glossary.hxx
+++ b/sw/source/core/uibase/inc/glossary.hxx
@@ -111,16 +111,16 @@ class SwGlossaryDlg : public SvxStandardDialog
 
     OUString        sResumeGroup;
     OUString        sResumeShortName;
-    sal_Bool            bResume;
+    bool            bResume;
 
-    const sal_Bool      bSelection : 1;
-    sal_Bool            bReadOnly : 1;
-    sal_Bool            bIsOld : 1;
-    sal_Bool            bIsDocReadOnly:1;
+    const bool      bSelection : 1;
+    bool            bReadOnly : 1;
+    bool            bIsOld : 1;
+    bool            bIsDocReadOnly:1;
 
     SwWrtShell*     pSh;
 
-    void EnableShortName(sal_Bool bOn = sal_True);
+    void EnableShortName(bool bOn = true);
     void ShowPreview();
 
     DECL_LINK( NameModify, Edit * );
@@ -141,11 +141,11 @@ class SwGlossaryDlg : public SvxStandardDialog
     void            ShowAutoText(const OUString& rGroup, const OUString& rShortName);
     void            ResumeShowAutoText();
 
-    sal_Bool            GetResumeData(OUString& rGroup, OUString& rShortName)
+    bool            GetResumeData(OUString& rGroup, OUString& rShortName)
                         {rGroup = sResumeGroup; rShortName = sResumeShortName; return bResume;}
     void            SetResumeData(const OUString& rGroup, const OUString& rShortName)
-                        {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = sal_True;}
-    void            ResetResumeData() {bResume = sal_False;}
+                        {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = true;}
+    void            ResetResumeData() {bResume = false;}
 public:
     SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell);
     virtual ~SwGlossaryDlg();
diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
index 0d89f521c0e5..33a9a6faac4d 100644
--- a/sw/source/core/uibase/inc/glshell.hxx
+++ b/sw/source/core/uibase/inc/glshell.hxx
@@ -40,7 +40,7 @@ private:
     static void InitInterface_Impl();
 
 public:
-    SwGlosDocShell( sal_Bool bNewShow = sal_True);
+    SwGlosDocShell( bool bNewShow = true);
     virtual ~SwGlosDocShell();
 
     void            Execute( SfxRequest& );
diff --git a/sw/source/core/uibase/inc/hyp.hxx b/sw/source/core/uibase/inc/hyp.hxx
index 12d33e9ff2d7..ca7642a74c45 100644
--- a/sw/source/core/uibase/inc/hyp.hxx
+++ b/sw/source/core/uibase/inc/hyp.hxx
@@ -34,9 +34,9 @@ private:
     Link            aOldLnk;
     sal_uInt16          nPageCount;     // page count for progress view
     sal_uInt16          nPageStart;     // 1st checked page
-    sal_Bool            bInSelection : 1; // separating selected text
-    sal_Bool            bAutomatic : 1; // insert separators without further inquiry
-    sal_Bool            bInfoBox : 1;   // display info-box when ending
+    bool            bInSelection : 1; // separating selected text
+    bool            bAutomatic : 1; // insert separators without further inquiry
+    bool            bInfoBox : 1;   // display info-box when ending
 
 protected:
     virtual void SpellStart( SvxSpellArea eSpell ) SAL_OVERRIDE;
@@ -49,7 +49,7 @@ public:
     SwHyphWrapper( SwView* pVw,
                    ::com::sun::star::uno::Reference<
                         ::com::sun::star::linguistic2::XHyphenator >  &rxHyph,
-                   sal_Bool bStart, sal_Bool bOther, sal_Bool bSelect );
+                   bool bStart, bool bOther, bool bSelect );
     virtual ~SwHyphWrapper();
 };
 
diff --git a/sw/source/core/uibase/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx
index 0eaed5fd2e2c..80f204f645e4 100644
--- a/sw/source/core/uibase/inc/inpdlg.hxx
+++ b/sw/source/core/uibase/inc/inpdlg.hxx
@@ -55,7 +55,7 @@ class SwFldInputDlg: public SvxStandardDialog
     DECL_LINK(NextHdl, void *);
 public:
     SwFldInputDlg(  Window *pParent, SwWrtShell &rSh,
-                    SwField* pField, sal_Bool bNextButton = sal_False );
+                    SwField* pField, bool bNextButton = false );
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/inputwin.hxx b/sw/source/core/uibase/inc/inputwin.hxx
index dafacfb93c59..082274390172 100644
--- a/sw/source/core/uibase/inc/inputwin.hxx
+++ b/sw/source/core/uibase/inc/inputwin.hxx
@@ -56,10 +56,10 @@ friend class InputEdit;
     SfxBindings*    pBindings;
     OUString        aAktTableName, sOldFml;
 
-    sal_Bool        bFirst : 1;  // initialisations at first call
-    sal_Bool        bActive : 1; // for hide/show when switching documents
-    sal_Bool        bIsTable : 1;
-    sal_Bool        bDelSel : 1;
+    bool        bFirst : 1;  // initialisations at first call
+    bool        bActive : 1; // for hide/show when switching documents
+    bool        bIsTable : 1;
+    bool        bDelSel : 1;
     bool            m_bDoesUndo : 1;
     bool            m_bResetUndo : 1;
     bool            m_bCallUndo : 1;
@@ -89,11 +89,11 @@ public:
 
     void            ShowWin();
 
-    sal_Bool            IsActive(){ return bActive; };
+    bool            IsActive(){ return bActive; };
 
     DECL_LINK( SelTblCellsNotify, SwWrtShell * );
 
-    void            SetFormula( const OUString& rFormula, sal_Bool bDelSel = sal_True );
+    void            SetFormula( const OUString& rFormula, bool bDelSel = true );
     const SwView*   GetView() const{return pView;}
 };
 
@@ -107,7 +107,7 @@ public:
                         SfxChildWinInfo*  );
     virtual ~SwInputChild();
     SFX_DECL_CHILDWINDOW_WITHID( SwInputChild );
-    void            SetFormula( const OUString& rFormula, sal_Bool bDelSel = sal_True )
+    void            SetFormula( const OUString& rFormula, bool bDelSel = true )
                         { ((SwInputWindow*)pWindow)->SetFormula(
                                     rFormula, bDelSel ); }
     const SwView*   GetView() const{return ((SwInputWindow*)pWindow)->GetView();}
diff --git a/sw/source/core/uibase/inc/insfnote.hxx b/sw/source/core/uibase/inc/insfnote.hxx
index e72df2a03d75..79b158924f50 100644
--- a/sw/source/core/uibase/inc/insfnote.hxx
+++ b/sw/source/core/uibase/inc/insfnote.hxx
@@ -37,8 +37,8 @@ class SwInsFootNoteDlg: public SvxStandardDialog
     // everything for the character(s)
     OUString        m_aFontName;
     rtl_TextEncoding eCharSet;
-    sal_Bool        bExtCharAvailable;
-    sal_Bool        bEdit;
+    bool        bExtCharAvailable;
+    bool        bEdit;
 
     VclFrame*       m_pNumberFrame;
     RadioButton*    m_pNumberAutoBtn;
@@ -65,13 +65,13 @@ class SwInsFootNoteDlg: public SvxStandardDialog
     void            Init();
 
 public:
-    SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False);
+    SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, bool bEd = false);
     virtual ~SwInsFootNoteDlg();
 
     rtl_TextEncoding GetCharSet() { return eCharSet; }
-    sal_Bool        IsExtCharAvailable() { return bExtCharAvailable; }
+    bool        IsExtCharAvailable() { return bExtCharAvailable; }
     OUString        GetFontName() { return m_aFontName; }
-    sal_Bool        IsEndNote() { return m_pEndNoteBtn->IsChecked(); }
+    bool        IsEndNote() { return m_pEndNoteBtn->IsChecked(); }
     OUString        GetStr()
                     {
                         if ( m_pNumberCharBtn->IsChecked() )
diff --git a/sw/source/core/uibase/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx
index f6127b1aedb9..7fddb57a8852 100644
--- a/sw/source/core/uibase/inc/javaedit.hxx
+++ b/sw/source/core/uibase/inc/javaedit.hxx
@@ -49,8 +49,8 @@ private:
     OUString       aText;
     OUString       aType;
 
-    sal_Bool                bNew;
-    sal_Bool                bIsUrl;
+    bool                bNew;
+    bool                bIsUrl;
 
     SwScriptField*          pFld;
     SwFldMgr*               pMgr;
@@ -78,8 +78,8 @@ public:
 
     OUString GetScriptType() const { return aType; }
 
-    sal_Bool IsUrl() const { return bIsUrl; }
-    sal_Bool IsNew() const { return bNew; }
+    bool IsUrl() const { return bIsUrl; }
+    bool IsNew() const { return bNew; }
     bool IsUpdate() const;
 };
 
diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx
index 65931de23be7..8a1f8bee4c13 100644
--- a/sw/source/core/uibase/inc/label.hxx
+++ b/sw/source/core/uibase/inc/label.hxx
@@ -56,10 +56,10 @@ class SwLabDlg : public SfxTabDialog
 public:
 
      SwLabDlg( Window* pParent, const SfxItemSet& rSet,
-                 SwDBMgr* pDBMgr, sal_Bool bLabel);
+                 SwDBMgr* pDBMgr, bool bLabel);
     virtual ~SwLabDlg();
 
-    SwLabRec*   GetRecord(const OUString &rRecName, sal_Bool bCont);
+    SwLabRec*   GetRecord(const OUString &rRecName, bool bCont);
     void        GetLabItem(SwLabItem &rItem);
 
           SwLabRecs &Recs()           { return *pRecs;   }
diff --git a/sw/source/core/uibase/inc/labelcfg.hxx b/sw/source/core/uibase/inc/labelcfg.hxx
index a816a01c1c2c..9789d86537e7 100644
--- a/sw/source/core/uibase/inc/labelcfg.hxx
+++ b/sw/source/core/uibase/inc/labelcfg.hxx
@@ -49,7 +49,7 @@ public:
     void    FillLabels(const OUString& rManufacturer, SwLabRecs& rLabArr);
     const std::vector<OUString>& GetManufacturers() const {return m_aManufacturers;}
 
-    sal_Bool    HasLabel(const OUString& rManufacturer, const OUString& rType);
+    bool    HasLabel(const OUString& rManufacturer, const OUString& rType);
     bool        IsPredefinedLabel(const OUString& rManufacturer, const OUString& rType)
                   { return m_aLabels[rManufacturer][rType].m_bPredefined; };
     void        SaveLabel(const OUString& rManufacturer, const OUString& rType,
diff --git a/sw/source/core/uibase/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx
index ac11a2bfb211..bcdb5612c249 100644
--- a/sw/source/core/uibase/inc/labimg.hxx
+++ b/sw/source/core/uibase/inc/labimg.hxx
@@ -61,10 +61,10 @@ public:
     sal_Int32       nRow;    // row for single print
     sal_Int32       lPHeight; // paper height
     sal_Int32       lPWidth;  // paper width
-    sal_Bool        bAddr;// address as label?
-    sal_Bool        bCont;// continuous paper?
-    sal_Bool        bPage;// whole page or single labels?
-    sal_Bool        bSynchron;// synchronise all labels
+    bool        bAddr;// address as label?
+    bool        bCont;// continuous paper?
+    bool        bPage;// whole page or single labels?
+    bool        bSynchron;// synchronise all labels
 
     //parts of the business card
     OUString   aPrivFirstName;
@@ -108,11 +108,11 @@ public:
 class SwLabCfgItem : public utl::ConfigItem
 {
     SwLabItem   aItem;
-    sal_Bool    bIsLabel;
+    bool    bIsLabel;
 
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 public:
-    SwLabCfgItem(sal_Bool bLabel);
+    SwLabCfgItem(bool bLabel);
 
     SwLabItem&              GetItem() {return aItem;}
 
diff --git a/sw/source/core/uibase/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx
index ab18a558eab1..8154aac7964e 100644
--- a/sw/source/core/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/core/uibase/inc/mailmergewizard.hxx
@@ -84,7 +84,7 @@ public:
     sal_uInt16              GetRestartPage() const {return m_nRestartPage;}
     void                    SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;}
 
-    sal_Bool                skipUntil( sal_uInt16 nPage)
+    bool                skipUntil( sal_uInt16 nPage)
                                 {return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));}
 
     void                    updateRoadmapItemLabel( WizardState _nState );
diff --git a/sw/source/core/uibase/inc/mergetbl.hxx b/sw/source/core/uibase/inc/mergetbl.hxx
index 8048a0583767..da889f361c1a 100644
--- a/sw/source/core/uibase/inc/mergetbl.hxx
+++ b/sw/source/core/uibase/inc/mergetbl.hxx
@@ -28,12 +28,12 @@ class SwMergeTblDlg : public SvxStandardDialog
 {
     RadioButton* m_pMergePrevRB;
 
-    sal_Bool&    m_rMergePrev;
+    bool&        m_rMergePrev;
 protected:
     virtual void Apply() SAL_OVERRIDE;
 
 public:
-    SwMergeTblDlg( Window *pParent, sal_Bool& rWithPrev );
+    SwMergeTblDlg( Window *pParent, bool& rWithPrev );
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/mmconfigitem.hxx b/sw/source/core/uibase/inc/mmconfigitem.hxx
index 92bcee55d550..32a3b44dd0e2 100644
--- a/sw/source/core/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/core/uibase/inc/mmconfigitem.hxx
@@ -121,14 +121,14 @@ public:
                         GetSavedDocuments() const;
     void                AddSavedDocument(const OUString& rName);
 
-    sal_Bool            IsOutputToLetter()const;
-    void                SetOutputToLetter(sal_Bool bSet);
+    bool            IsOutputToLetter()const;
+    void                SetOutputToLetter(bool bSet);
 
     bool                IsAddressBlock()const;
-    void                SetAddressBlock(sal_Bool bSet);
+    void                SetAddressBlock(bool bSet);
 
-    sal_Bool            IsHideEmptyParagraphs() const;
-    void                SetHideEmptyParagraphs(sal_Bool bSet);
+    bool            IsHideEmptyParagraphs() const;
+    void                SetHideEmptyParagraphs(bool bSet);
 
     const com::sun::star::uno::Sequence< OUString>
                         GetAddressBlocks() const;
@@ -137,15 +137,15 @@ public:
     void                SetCurrentAddressBlockIndex( sal_Int32 nSet );
     sal_Int32           GetCurrentAddressBlockIndex() const;
 
-    sal_Bool            IsIncludeCountry() const;
+    bool            IsIncludeCountry() const;
     OUString&      GetExcludeCountry() const;
-    void                SetCountrySettings(sal_Bool bSet, const OUString& sCountry);
+    void                SetCountrySettings(bool bSet, const OUString& sCountry);
 
-    sal_Bool            IsIndividualGreeting(sal_Bool bInEMail) const;
-    void                SetIndividualGreeting(sal_Bool bSet, sal_Bool bInEMail);
+    bool            IsIndividualGreeting(bool bInEMail) const;
+    void                SetIndividualGreeting(bool bSet, bool bInEMail);
 
-    sal_Bool            IsGreetingLine(sal_Bool bInEMail) const;
-    void                SetGreetingLine(sal_Bool bSet, sal_Bool bInEMail);
+    bool            IsGreetingLine(bool bInEMail) const;
+    void                SetGreetingLine(bool bSet, bool bInEMail);
 
     const com::sun::star::uno::Sequence< OUString>
                         GetGreetings(Gender eType) const;
@@ -175,8 +175,8 @@ public:
     OUString     GetMailAddress() const;
     void                SetMailAddress(const OUString& rAddress);
 
-    sal_Bool            IsMailReplyTo() const;
-    void                SetMailReplyTo(sal_Bool bSet);
+    bool            IsMailReplyTo() const;
+    void                SetMailReplyTo(bool bSet);
 
     OUString     GetMailReplyTo() const;
     void                SetMailReplyTo(const OUString& rReplyTo);
@@ -187,11 +187,11 @@ public:
     sal_Int16           GetMailPort() const;
     void                SetMailPort(sal_Int16 nSet);
 
-    sal_Bool            IsSecureConnection() const;
-    void                SetSecureConnection(sal_Bool bSet);
+    bool            IsSecureConnection() const;
+    void                SetSecureConnection(bool bSet);
 
-    sal_Bool            IsAuthentication() const;
-    void                SetAuthentication(sal_Bool bSet);
+    bool            IsAuthentication() const;
+    void                SetAuthentication(bool bSet);
 
     OUString     GetMailUserName() const;
     void                SetMailUserName(const OUString& rName);
@@ -199,8 +199,8 @@ public:
     OUString     GetMailPassword() const;
     void                SetMailPassword(const OUString& rPassword);
 
-    sal_Bool            IsSMTPAfterPOP() const;
-    void                SetSMTPAfterPOP(sal_Bool bSet);
+    bool            IsSMTPAfterPOP() const;
+    void                SetSMTPAfterPOP(bool bSet);
 
     OUString     GetInServerName() const;
     void                SetInServerName(const OUString& rServer);
@@ -208,8 +208,8 @@ public:
     sal_Int16           GetInServerPort() const;
     void                SetInServerPort(sal_Int16 nSet);
 
-    sal_Bool            IsInServerPOP() const;
-    void                SetInServerPOP(sal_Bool bSet);
+    bool            IsInServerPOP() const;
+    void                SetInServerPOP(bool bSet);
 
     OUString     GetInServerUserName() const;
     void                SetInServerUserName(const OUString& rName);
diff --git a/sw/source/core/uibase/inc/navicfg.hxx b/sw/source/core/uibase/inc/navicfg.hxx
index 69b93c213ad6..9dac0c8caf3c 100644
--- a/sw/source/core/uibase/inc/navicfg.hxx
+++ b/sw/source/core/uibase/inc/navicfg.hxx
@@ -28,8 +28,8 @@ class SwNavigationConfig : public utl::ConfigItem
     sal_Int32   nOutlineLevel;  //OutlineLevel
     sal_Int32   nRegionMode;    //InsertMode
     sal_Int32   nActiveBlock;   //ActiveBlock//Expand/CollapsState
-    sal_Bool    bIsSmall;       //ShowListBox
-    sal_Bool    bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
+    bool    bIsSmall;       //ShowListBox
+    bool    bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
 
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
@@ -85,8 +85,8 @@ public:
                         }
                     }
 
-    sal_Bool    IsSmall() const {return bIsSmall;}
-    void        SetSmall(sal_Bool bSet){
+    bool    IsSmall() const {return bIsSmall;}
+    void        SetSmall(bool bSet){
                         if(bIsSmall != bSet)
                         {
                             SetModified();
@@ -94,8 +94,8 @@ public:
                         }
                     }
 
-    sal_Bool    IsGlobalActive() const {return bIsGlobalActive;}
-    void        SetGlobalActive(sal_Bool bSet){
+    bool    IsGlobalActive() const {return bIsGlobalActive;}
+    void        SetGlobalActive(bool bSet){
                         if(bIsGlobalActive != bSet)
                         {
                             SetModified();
diff --git a/sw/source/core/uibase/inc/navicont.hxx b/sw/source/core/uibase/inc/navicont.hxx
index 19a86d72eb1f..b1d168e598cc 100644
--- a/sw/source/core/uibase/inc/navicont.hxx
+++ b/sw/source/core/uibase/inc/navicont.hxx
@@ -46,7 +46,7 @@ public:
     const OUString& GetDescription() const      { return aDescr; }
     sal_uInt16      GetDefaultDragType() const  { return nDefDrag; }
     void            Copy( TransferDataContainer& rData ) const;
-    sal_Bool            Paste( TransferableDataHelper& rData );
+    bool            Paste( TransferableDataHelper& rData );
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx
index fa6ce3a54a2f..e74c5d99d52f 100644
--- a/sw/source/core/uibase/inc/navipi.hxx
+++ b/sw/source/core/uibase/inc/navipi.hxx
@@ -91,13 +91,13 @@ class SwNavigationPI : public Window,
     short   nZoomOutInit;
     short   nZoomOut;
 
-    sal_Bool    bSmallMode : 1;
-    sal_Bool    bIsZoomedIn : 1;
-    sal_Bool    bPageCtrlsVisible : 1;
-    sal_Bool    bGlobalMode : 1;
+    bool    bSmallMode : 1;
+    bool    bIsZoomedIn : 1;
+    bool    bPageCtrlsVisible : 1;
+    bool    bGlobalMode : 1;
 
     // --------- methods -----------------------------
-    sal_Bool _IsZoomedIn() const {return bIsZoomedIn;}
+    bool _IsZoomedIn() const {return bIsZoomedIn;}
     void _ZoomOut();
     void _ZoomIn();
 
@@ -129,7 +129,7 @@ class SwNavigationPI : public Window,
 
 protected:
 
-    virtual         sal_Bool Close();
+    virtual         bool Close();
     virtual         void Resize() SAL_OVERRIDE;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
@@ -137,8 +137,8 @@ protected:
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
     NumEditAction&  GetPageEdit();
-    sal_Bool            ToggleTree();
-    void            SetGlobalMode(sal_Bool bSet) {bGlobalMode = bSet;}
+    bool            ToggleTree();
+    void            SetGlobalMode(bool bSet) {bGlobalMode = bSet;}
 
 public:
 
@@ -163,8 +163,8 @@ public:
     sal_Int8        AcceptDrop( const AcceptDropEvent& rEvt );
     sal_Int8        ExecuteDrop( const ExecuteDropEvent& rEvt );
 
-    sal_Bool            IsGlobalDoc() const;
-    sal_Bool            IsGlobalMode() const {return    bGlobalMode;}
+    bool            IsGlobalDoc() const;
+    bool            IsGlobalMode() const {return    bGlobalMode;}
 
     SwView*         GetCreateView() const;
     void            CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, Window *pParent);
diff --git a/sw/source/core/uibase/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx
index 0e8ef3c93ce5..ba36e48f4d10 100644
--- a/sw/source/core/uibase/inc/num.hxx
+++ b/sw/source/core/uibase/inc/num.hxx
@@ -89,9 +89,9 @@ class SwNumPositionTabPage : public SfxTabPage
     SwOutlineTabDialog* pOutlineDlg;
     sal_uInt16              nActNumLvl;
 
-    sal_Bool                bModified           : 1;
-    sal_Bool                bPreset             : 1;
-    sal_Bool                bInInintControl     : 1;  // work around modify-error; should be resolved from 391 on
+    bool                bModified           : 1;
+    bool                bPreset             : 1;
+    bool                bInInintControl     : 1;  // work around modify-error; should be resolved from 391 on
     bool                bLabelAlignmentPosAndSpaceModeActive;
 
     void                InitControls();
@@ -130,7 +130,7 @@ public:
     void                SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
     void                SetWrtShell(SwWrtShell* pSh);
 #ifdef DBG_UTIL
-    void                SetModified(sal_Bool bRepaint = sal_True);
+    void                SetModified(bool bRepaint = true);
 #else
     void                SetModified(sal_Bool bRepaint = sal_True)
                             {   bModified = sal_True;
diff --git a/sw/source/core/uibase/inc/numberingtypelistbox.hxx b/sw/source/core/uibase/inc/numberingtypelistbox.hxx
index 5883148880db..bf9854434221 100644
--- a/sw/source/core/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/core/uibase/inc/numberingtypelistbox.hxx
@@ -43,7 +43,7 @@ public:
     void        Reload(sal_uInt16 nTypeFlags);
 
     sal_Int16   GetSelectedNumberingType();
-    sal_Bool    SelectNumberingType(sal_Int16 nType);
+    bool    SelectNumberingType(sal_Int16 nType);
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/numfmtlb.hxx b/sw/source/core/uibase/inc/numfmtlb.hxx
index 3838f57e284c..3080619e41c4 100644
--- a/sw/source/core/uibase/inc/numfmtlb.hxx
+++ b/sw/source/core/uibase/inc/numfmtlb.hxx
@@ -29,19 +29,19 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
 {
     short               nCurrFormatType;
     sal_uInt16              nStdEntry;
-    sal_Bool                bOneArea;
+    bool                bOneArea;
     sal_uLong               nDefFormat;
     SwView*             pVw;
     SvNumberFormatter*  pOwnFormatter;
     LanguageType        eCurLanguage;
-    sal_Bool                bShowLanguageControl; //determine whether the language control has
+    bool                bShowLanguageControl; //determine whether the language control has
                                               //to be shown in the number format dialog
-    sal_Bool                bUseAutomaticLanguage;//determine whether language is automatically assigned
+    bool                bUseAutomaticLanguage;//determine whether language is automatically assigned
 
     SAL_DLLPRIVATE DECL_LINK( SelectHdl, ListBox * );
 
     SAL_DLLPRIVATE double          GetDefValue(const short nFormatType) const;
-    SAL_DLLPRIVATE void            Init(short nFormatType, sal_Bool bUsrFmts);
+    SAL_DLLPRIVATE void            Init(short nFormatType, bool bUsrFmts);
     SAL_DLLPRIVATE SwView*           GetView();
 
 public:
@@ -51,7 +51,7 @@ public:
 
     void            Clear();
 
-    inline void     SetOneArea(sal_Bool bOnlyOne = sal_True) { bOneArea = bOnlyOne; }
+    inline void     SetOneArea(bool bOnlyOne = true) { bOneArea = bOnlyOne; }
 
     void            SetFormatType(const short nFormatType);
     inline short    GetFormatType() const { return nCurrFormatType; }
@@ -61,10 +61,10 @@ public:
     inline LanguageType GetCurLanguage() const { return eCurLanguage;}
     void                SetLanguage(LanguageType eSet)  { eCurLanguage = eSet;}
 
-    void            SetAutomaticLanguage(sal_Bool bSet){bUseAutomaticLanguage = bSet;}
-    sal_Bool            IsAutomaticLanguage()const {return bUseAutomaticLanguage;}
+    void            SetAutomaticLanguage(bool bSet){bUseAutomaticLanguage = bSet;}
+    bool            IsAutomaticLanguage()const {return bUseAutomaticLanguage;}
 
-    void            SetShowLanguageControl(sal_Bool bSet){bShowLanguageControl = bSet;}
+    void            SetShowLanguageControl(bool bSet){bShowLanguageControl = bSet;}
 
 };
 
diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx
index 6b2d0daf01a9..9a938e6579f8 100644
--- a/sw/source/core/uibase/inc/numpara.hxx
+++ b/sw/source/core/uibase/inc/numpara.hxx
@@ -53,8 +53,8 @@ class SwParagraphNumTabPage : public SfxTabPage
     // --> OD 2008-04-14 #outlinelevel#
     const OUString msOutlineNumbering;
 
-    sal_Bool                    bModified : 1;
-    sal_Bool                    bCurNumrule : 1;
+    bool                    bModified : 1;
+    bool                    bCurNumrule : 1;
 
     DECL_LINK(NewStartHdl_Impl, void *);
     DECL_LINK( StyleHdl_Impl, ListBox* );
diff --git a/sw/source/core/uibase/inc/numprevw.hxx b/sw/source/core/uibase/inc/numprevw.hxx
index d496bb387a3f..4c29324af9e1 100644
--- a/sw/source/core/uibase/inc/numprevw.hxx
+++ b/sw/source/core/uibase/inc/numprevw.hxx
@@ -31,7 +31,7 @@ class NumberingPreview : public Window
     Font                aStdFont;
     long                nPageWidth;
     const OUString*     pOutlineNames;
-    sal_Bool                bPosition;
+    bool                bPosition;
     sal_uInt16              nActLevel;
 
     protected:
@@ -41,14 +41,14 @@ class NumberingPreview : public Window
         NumberingPreview(Window* pParent, const ResId& rResId)
         : Window(pParent, rResId),
             pActNum(0),nPageWidth(0), pOutlineNames(0),
-            bPosition(sal_False), nActLevel(USHRT_MAX)
+            bPosition(false), nActLevel(USHRT_MAX)
         {
         }
 
         NumberingPreview(Window* pParent)
             : Window(pParent)
             , pActNum(0),nPageWidth(0), pOutlineNames(0),
-            bPosition(sal_False), nActLevel(USHRT_MAX)
+            bPosition(false), nActLevel(USHRT_MAX)
         {
         }
 
@@ -61,7 +61,7 @@ class NumberingPreview : public Window
         void    SetOutlineNames(const OUString* pNames)
                         {pOutlineNames = pNames;}
         void    SetPositionMode()
-                        { bPosition = sal_True;}
+                        { bPosition = true;}
         void    SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
 
 };
diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx
index 00d273e3a65a..ddf79b070474 100644
--- a/sw/source/core/uibase/inc/optpage.hxx
+++ b/sw/source/core/uibase/inc/optpage.hxx
@@ -112,8 +112,8 @@ class SwAddPrinterTabPage : public SfxTabPage
 
     OUString        sNone;
 
-    sal_Bool        bAttrModified;
-    sal_Bool        bPreview;
+    bool        bAttrModified;
+    bool        bPreview;
 
     void        Init();
                 DECL_LINK(AutoClickHdl, void *);
@@ -130,7 +130,7 @@ public:
     virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
     void                SetFax( const std::vector<OUString>& );
     void                SelectFax( const OUString& );
-    void                SetPreview(sal_Bool bPrev);
+    void                SetPreview(bool bPrev);
     virtual void        PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE;
 
 };
@@ -164,20 +164,20 @@ class SwStdFontTabPage : public SfxTabPage
     SwWrtShell*         pWrtShell;
     LanguageType        eLanguage;
     // only defaults were there? they were signed with the boxes
-    sal_Bool    bListDefault    :1;
-    sal_Bool    bSetListDefault :1;
-    sal_Bool    bLabelDefault   :1;
-    sal_Bool    bSetLabelDefault :1;
-    sal_Bool    bIdxDefault     :1;
-    sal_Bool    bSetIdxDefault  :1;
-    sal_Bool    bDeletePrinter :1;
-
-    sal_Bool    bListHeightDefault    :1;
-    sal_Bool    bSetListHeightDefault :1;
-    sal_Bool    bLabelHeightDefault   :1;
-    sal_Bool    bSetLabelHeightDefault :1;
-    sal_Bool    bIndexHeightDefault     :1;
-    sal_Bool    bSetIndexHeightDefault  :1;
+    bool    bListDefault    :1;
+    bool    bSetListDefault :1;
+    bool    bLabelDefault   :1;
+    bool    bSetLabelDefault :1;
+    bool    bIdxDefault     :1;
+    bool    bSetIdxDefault  :1;
+    bool    bDeletePrinter :1;
+
+    bool    bListHeightDefault    :1;
+    bool    bSetListHeightDefault :1;
+    bool    bLabelHeightDefault   :1;
+    bool    bSetLabelHeightDefault :1;
+    bool    bIndexHeightDefault     :1;
+    bool    bSetIndexHeightDefault  :1;
 
     sal_uInt8 nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL]
 
@@ -227,7 +227,7 @@ class SwTableOptionsTabPage : public SfxTabPage
     RadioButton* pVarRB;
 
     SwWrtShell* pWrtShell;
-    sal_Bool        bHTMLMode;
+    bool        bHTMLMode;
 
     DECL_LINK(CheckBoxHdl, void *);
 
@@ -404,7 +404,7 @@ private:
     CheckBox* m_pTest9CBox;
     CheckBox* m_pTest10CBox;
 
-    sal_Bool        bAttrModified;
+    bool        bAttrModified;
 
     void        Init();
     DECL_LINK(AutoClickHdl, void *);
diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx
index ef296383020b..f224a38206bd 100644
--- a/sw/source/core/uibase/inc/outline.hxx
+++ b/sw/source/core/uibase/inc/outline.hxx
@@ -56,7 +56,7 @@ class SwOutlineTabDialog : public SfxTabDialog
     SwNumRule*          pNumRule;
     SwChapterNumRules*  pChapterNumRules;
 
-    sal_Bool                bModified : 1;
+    bool                bModified : 1;
 
     protected:
     DECL_LINK(CancelHdl, void *);
diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx
index 3acb5aba3591..56529f895d7d 100644
--- a/sw/source/core/uibase/inc/pggrid.hxx
+++ b/sw/source/core/uibase/inc/pggrid.hxx
@@ -62,12 +62,12 @@ class SwTextGridPage: public SfxTabPage
     ColorListBox*    m_pColorLB;
 
     sal_Int32       m_nRubyUserValue;
-    sal_Bool        m_bRubyUserValue;
+    bool        m_bRubyUserValue;
     Size            m_aPageSize;
     bool            m_bVertical;
-    sal_Bool        m_bSquaredMode;
-    sal_Bool        m_bHRulerChanged;
-    sal_Bool        m_bVRulerChanged;
+    bool        m_bSquaredMode;
+    bool        m_bHRulerChanged;
+    bool        m_bVRulerChanged;
 
     SwTextGridPage(Window *pParent, const SfxItemSet &rSet);
     virtual ~SwTextGridPage();
diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx
index 182374102de0..389690fadf36 100644
--- a/sw/source/core/uibase/inc/pview.hxx
+++ b/sw/source/core/uibase/inc/pview.hxx
@@ -173,17 +173,17 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
     Window                  *pScrollFill;
 
     sal_uInt16                  mnPageCount;
-    sal_Bool                    bNormalPrint;
+    bool                    bNormalPrint;
 
     // New members to reset design mode at draw view for form shell on switching
     // back from writer page preview to normal view.
-    sal_Bool                mbResetFormDesignMode:1;
-    sal_Bool                mbFormDesignModeToReset:1;
+    bool                mbResetFormDesignMode:1;
+    bool                mbFormDesignModeToReset:1;
 
     SAL_DLLPRIVATE void            Init(const SwViewOption* = 0);
     SAL_DLLPRIVATE Point           AlignToPixel(const Point& rPt) const;
 
-    SAL_DLLPRIVATE int             _CreateScrollbar( sal_Bool bHori );
+    SAL_DLLPRIVATE int             _CreateScrollbar( bool bHori );
     SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
@@ -195,7 +195,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
     SAL_DLLPRIVATE virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent,
                                                 const SfxItemSet &rOptions ) SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
+    SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner );
 
     /** Helper method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
 
@@ -241,15 +241,15 @@ public:
 
     void            ScrollViewSzChg();
     void            ScrollDocSzChg();
-    void            ShowHScrollbar(sal_Bool bShow);
-    void            ShowVScrollbar(sal_Bool bShow);
+    void            ShowHScrollbar(bool bShow);
+    void            ShowVScrollbar(bool bShow);
     void            EnableHScrollbar(bool bEnable);
     void            EnableVScrollbar(bool bEnable);
 
     sal_uInt16      GetPageCount() const        { return mnPageCount; }
     sal_uInt16      GetSelectedPage() const {return pViewWin->SelectedPage();}
 
-    sal_Bool            HandleWheelCommands( const CommandEvent& );
+    bool            HandleWheelCommands( const CommandEvent& );
 
     OUString        GetPrevSwViewData() const       { return sSwViewData; }
     void            SetNewCrsrPos( const OUString& rStr ) { sNewCrsrPos = rStr; }
@@ -270,12 +270,12 @@ public:
 
     // Inline method to request values of new members
     // <mbResetFormDesignMode> and <mbFormDesignModeToReset>
-    inline sal_Bool ResetFormDesignMode() const
+    inline bool ResetFormDesignMode() const
     {
         return mbResetFormDesignMode;
     }
 
-    inline sal_Bool FormDesignModeToReset() const
+    inline bool FormDesignModeToReset() const
     {
         return mbFormDesignModeToReset;
     }
diff --git a/sw/source/core/uibase/inc/redlndlg.hxx b/sw/source/core/uibase/inc/redlndlg.hxx
index c93b05ef5add..bd0495b72dec 100644
--- a/sw/source/core/uibase/inc/redlndlg.hxx
+++ b/sw/source/core/uibase/inc/redlndlg.hxx
@@ -48,9 +48,9 @@ struct SwRedlineDataParent
     SvTreeListEntry*            pTLBParent; // corresponding TreeListBox entry
     OUString                    sComment;   // redline comment
 
-    inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const
+    inline bool operator==( const SwRedlineDataParent& rObj ) const
                         { return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); }
-    inline sal_Bool operator< ( const SwRedlineDataParent& rObj ) const
+    inline bool operator< ( const SwRedlineDataParent& rObj ) const
                         { return (pData && pData->GetSeqNo() <  rObj.pData->GetSeqNo()); }
 };
 
@@ -85,9 +85,9 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SvxRedlinTable*         pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
     Link                    aOldSelectHdl;
     Link                    aOldDeselectHdl;
-    sal_Bool                    bOnlyFormatedRedlines;
-    sal_Bool                    bHasReadonlySel;
-    sal_Bool                    bRedlnAutoFmt;
+    bool                    bOnlyFormatedRedlines;
+    bool                    bHasReadonlySel;
+    bool                    bRedlnAutoFmt;
 
     // prevent update dialog data during longer operations (cf #102657#)
     bool                    bInhibitActivate;
@@ -102,7 +102,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SAL_DLLPRIVATE DECL_LINK( GotoHdl,           void* );
     SAL_DLLPRIVATE DECL_LINK( CommandHdl,        void* );
 
-    SAL_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, sal_Bool bChild);
+    SAL_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, bool bChild);
     SAL_DLLPRIVATE void          InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt);
     SAL_DLLPRIVATE void          InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
     SAL_DLLPRIVATE void          RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
@@ -113,16 +113,16 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SAL_DLLPRIVATE sal_uInt16    GetRedlinePos( const SvTreeListEntry& rEntry) const;
 
 public:
-    SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False);
+    SwRedlineAcceptDlg(Dialog *pParent, bool bAutoFmt = false);
     virtual ~SwRedlineAcceptDlg();
 
     DECL_LINK( FilterChangedHdl, void *pDummy = 0 );
 
     inline SvxAcceptChgCtr* GetChgCtrl()        { return &aTabPagesCTRL; }
-    inline sal_Bool     HasRedlineAutoFmt() const   { return bRedlnAutoFmt; }
+    inline bool     HasRedlineAutoFmt() const   { return bRedlnAutoFmt; }
 
     void            Init(sal_uInt16 nStart = 0);
-    void            CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept );
+    void            CallAcceptReject( bool bSelect, bool bAccept );
 
     void            Initialize(const OUString &rExtraData);
     void            FillInfo(OUString &rExtraData) const;
@@ -154,7 +154,7 @@ public:
 
     SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild );
 
-    virtual sal_Bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
+    virtual bool    ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx
index 920040c4d0a1..8a721dd9b7ab 100644
--- a/sw/source/core/uibase/inc/regionsw.hxx
+++ b/sw/source/core/uibase/inc/regionsw.hxx
@@ -97,10 +97,10 @@ class SwEditRegionDlg : public SfxModalDialog
     sfx2::DocumentInserter* m_pDocInserter;
     Window*                 m_pOldDefDlgParent;
 
-    sal_Bool            bDontCheckPasswd :1;
-    sal_Bool            bWeb            :1;
+    bool            bDontCheckPasswd :1;
+    bool            bWeb            :1;
 
-    Image  BuildBitmap(sal_Bool bProtect,sal_Bool bHidden);
+    Image  BuildBitmap(bool bProtect, bool bHidden);
 
     void    RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry);
     sal_uInt16  FindArrPos(const SwSectionFmt* pFmt);
@@ -126,7 +126,7 @@ class SwEditRegionDlg : public SfxModalDialog
     DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* );
     DECL_LINK( SubRegionEventHdl, VclWindowEvent * );
 
-    sal_Bool CheckPasswd(CheckBox* pBox = 0);
+    bool CheckPasswd(CheckBox* pBox = 0);
 
 public:
     SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh );
@@ -223,7 +223,7 @@ class SwSectionFtnEndTabPage : public SfxTabPage
     Edit*            pEndSuffixED;
 
     DECL_LINK( FootEndHdl, CheckBox * );
-    void ResetState( sal_Bool bFtn, const SwFmtFtnEndAtTxtEnd& );
+    void ResetState( bool bFtn, const SwFmtFtnEndAtTxtEnd& );
 
 public:
     SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet );
diff --git a/sw/source/core/uibase/inc/scroll.hxx b/sw/source/core/uibase/inc/scroll.hxx
index 44c4408d897c..a0932310ce59 100644
--- a/sw/source/core/uibase/inc/scroll.hxx
+++ b/sw/source/core/uibase/inc/scroll.hxx
@@ -23,10 +23,10 @@
 class SwScrollbar: public ScrollBar
 {
     Size    aDocSz;
-    sal_Bool    bHori       :1;     // horizontal = salTrue, otherwise vertical
-    sal_Bool    bAuto       :1;     // for scrolling mode
-    sal_Bool    bVisible    :1;     // show/hide should only set this flag
-    sal_Bool    bSizeSet    :1;     // was the size already set?
+    bool    bHori       :1;     // horizontal = salTrue, otherwise vertical
+    bool    bAuto       :1;     // for scrolling mode
+    bool    bVisible    :1;     // show/hide should only set this flag
+    bool    bSizeSet    :1;     // was the size already set?
 
     void    AutoShow();
 
@@ -35,22 +35,22 @@ class SwScrollbar: public ScrollBar
 
 public:
 
-    void    ExtendedShow( sal_Bool bVisible = sal_True );
+    void    ExtendedShow( bool bVisible = true );
     void    Hide() { Show( false ); }
     void    SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE;
-    sal_Bool    IsVisible(sal_Bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; }
+    bool    IsVisible(bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; }
 
         // changing of document size
     void    DocSzChgd(const Size &rNewSize);
         // changing of visible region
     void    ViewPortChgd(const Rectangle &rRectangle);
         // what is it??
-    sal_Bool    IsHoriScroll() const { return bHori; }
+    bool    IsHoriScroll() const { return bHori; }
 
-    void    SetAuto(sal_Bool bSet);
-    sal_Bool    IsAuto() { return bAuto;}
+    void    SetAuto(bool bSet);
+    bool    IsAuto() { return bAuto;}
 
-    SwScrollbar(Window *pParent, sal_Bool bHori = sal_True );
+    SwScrollbar(Window *pParent, bool bHori = true );
     virtual ~SwScrollbar();
 };
 
diff --git a/sw/source/core/uibase/inc/srcedtw.hxx b/sw/source/core/uibase/inc/srcedtw.hxx
index f63e57e2c5a4..d3347d720490 100644
--- a/sw/source/core/uibase/inc/srcedtw.hxx
+++ b/sw/source/core/uibase/inc/srcedtw.hxx
@@ -82,9 +82,9 @@ private:
     long            nCurTextWidth;
     sal_uInt16          nStartLine;
     rtl_TextEncoding eSourceEncoding;
-    sal_Bool            bReadonly;
-    sal_Bool            bDoSyntaxHighlight;
-    sal_Bool            bHighlighting;
+    bool            bReadonly;
+    bool            bDoSyntaxHighlight;
+    bool            bHighlighting;
 
     Timer           aSyntaxIdleTimer;
     SyntaxLineSet   aSyntaxLineTable;
@@ -135,12 +135,12 @@ public:
 
     void            ClearModifyFlag()
                         { pTextEngine->SetModified(false); }
-    sal_Bool            IsModified() const
+    bool            IsModified() const
                         { return pTextEngine->IsModified();}
     void            CreateScrollbars();
 
-    void            SetReadonly(sal_Bool bSet){bReadonly = bSet;}
-    sal_Bool            IsReadonly(){return bReadonly;}
+    void            SetReadonly(bool bSet){bReadonly = bSet;}
+    bool            IsReadonly(){return bReadonly;}
 
     void            DoDelayedSyntaxHighlight( sal_uInt16 nPara );
 
diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx
index cc8b7319304a..0cb7ce12d48d 100644
--- a/sw/source/core/uibase/inc/srcview.hxx
+++ b/sw/source/core/uibase/inc/srcview.hxx
@@ -36,7 +36,7 @@ class SwSrcView: public SfxViewShell
 
     SvxSearchItem*      pSearchItem;
 
-    sal_Bool                bSourceSaved    :1;
+    bool                bSourceSaved    :1;
     rtl_TextEncoding    eLoadEncoding;
     void                Init();
 
@@ -45,9 +45,9 @@ class SwSrcView: public SfxViewShell
 
 protected:
     sal_uInt16              StartSearchAndReplace(const SvxSearchItem& rItem,
-                                                        sal_Bool bFromStart,
-                                                        sal_Bool bApi,
-                                                        sal_Bool bRecursive = sal_False);
+                                                  bool bFromStart,
+                                                  bool bApi,
+                                                  bool bRecursive = false);
 
 public:
     SFX_DECL_VIEWFACTORY(SwSrcView);
@@ -68,7 +68,7 @@ public:
     void                SaveContent(const OUString& rTmpFile);
     void                SaveContentTo(SfxMedium& rMed);
 
-    sal_Bool                IsModified() {return aEditWin.IsModified();}
+    bool                IsModified() {return aEditWin.IsModified();}
 
     void            Execute(SfxRequest&);
     void            GetState(SfxItemSet&);
@@ -83,8 +83,8 @@ public:
 
     sal_Int32       PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly );
 
-    void            SourceSaved() {bSourceSaved = sal_True;}
-    sal_Bool            HasSourceSaved() const {return bSourceSaved;}
+    void            SourceSaved() {bSourceSaved = true;}
+    bool            HasSourceSaved() const {return bSourceSaved;}
 
 };
 
diff --git a/sw/source/core/uibase/inc/swcont.hxx b/sw/source/core/uibase/inc/swcont.hxx
index 9110512420bd..ca796b9a54f8 100644
--- a/sw/source/core/uibase/inc/swcont.hxx
+++ b/sw/source/core/uibase/inc/swcont.hxx
@@ -68,11 +68,11 @@ class SwContent : public SwTypeNumber
     const SwContentType*    pParent;
     OUString                sContentName;
     long                    nYPosition;
-    sal_Bool                    bInvisible;
+    bool                    bInvisible;
 public:
         SwContent(const SwContentType* pCnt, const OUString& rName, long nYPos );
 
-    virtual sal_Bool            IsProtect() const;
+    virtual bool            IsProtect() const;
     const SwContentType*    GetParent() const {return pParent;}
     const OUString&         GetName()   const {return sContentName;}
     int                     operator==(const SwContent& /*rCont*/) const
@@ -90,8 +90,8 @@ public:
 
     long        GetYPos() const {return nYPosition;}
 
-    sal_Bool        IsInvisible() const {return bInvisible;}
-    void        SetInvisible(){ bInvisible = sal_True;}
+    bool        IsInvisible() const {return bInvisible;}
+    void        SetInvisible(){ bInvisible = true;}
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx
index 6294969c55c1..0eefb80ba2f0 100644
--- a/sw/source/core/uibase/inc/swdtflvr.hxx
+++ b/sw/source/core/uibase/inc/swdtflvr.hxx
@@ -72,8 +72,8 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
     TransferBufferType eBufferType;
 
-    sal_Bool bOldIdle   :1; //D&D Idle flag from the viewsettings
-    sal_Bool bCleanUp   :1; //D&D cleanup after Drop (not by internal Drop)
+    bool bOldIdle   :1; //D&D Idle flag from the viewsettings
+    bool bCleanUp   :1; //D&D cleanup after Drop (not by internal Drop)
 
     // helper methods for the copy
     css::uno::Reference < css::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const;
@@ -82,21 +82,21 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
     // helper methods for the paste
     static SwTransferable* GetSwTransferable( const TransferableDataHelper& rData );
-    static void SetSelInShell( SwWrtShell& , sal_Bool , const Point* );
-    static sal_Bool _CheckForURLOrLNKFile( TransferableDataHelper& rData,
+    static void SetSelInShell( SwWrtShell& , bool , const Point* );
+    static bool _CheckForURLOrLNKFile( TransferableDataHelper& rData,
                                 OUString& rFileName, OUString* pTitle = 0 );
     static bool _TestAllowedFormat( const TransferableDataHelper& rData,
                                         sal_uLong nFormat, sal_uInt16 nDestination );
 
     static bool _PasteFileContent( TransferableDataHelper&,
-                                    SwWrtShell& rSh, sal_uLong nFmt, sal_Bool bMsg );
+                                    SwWrtShell& rSh, sal_uLong nFmt, bool bMsg );
     static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
-                            sal_uLong nFmt, sal_uInt8 nActionFlags, sal_Bool bMsg );
+                            sal_uLong nFmt, sal_uInt8 nActionFlags, bool bMsg );
     static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh,
-                        sal_uInt16 nAction, const Point* pPt, sal_Bool bInsertGRF );
+                        sal_uInt16 nAction, const Point* pPt, bool bInsertGRF );
 
     static bool _PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell,
-                            sal_Bool bReReadGrf, sal_Bool bMsg );
+                            bool bReReadGrf, bool bMsg );
 
     static bool _PasteSdrFormat(  TransferableDataHelper& rData,
                                     SwWrtShell& rSh, sal_uInt16 nAction,
@@ -114,18 +114,18 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
     static bool _PasteFileName( TransferableDataHelper& rData,
                             SwWrtShell& rSh, sal_uLong nFmt, sal_uInt16 nAction,
-                            const Point* pPt, sal_uInt8 nActionFlags, sal_Bool bMsg, bool * graphicInserted );
+                            const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted );
 
     static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh,
-                            sal_uLong nFmt, sal_Bool bLink, const Point* pDragPt,
-                            sal_Bool bMsg );
+                            sal_uLong nFmt, bool bLink, const Point* pDragPt,
+                            bool bMsg );
 
     static bool _PasteFileList( TransferableDataHelper& rData,
-                                SwWrtShell& rSh, sal_Bool bLink,
-                                const Point* pPt, sal_Bool bMsg );
+                                SwWrtShell& rSh, bool bLink,
+                                const Point* pPt, bool bMsg );
 
-    bool PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, sal_Bool bMove,
-                        sal_Bool bIsXSelection );
+    bool PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, bool bMove,
+                        bool bIsXSelection );
     bool PrivatePaste( SwWrtShell& rShell );
 
     void SetDataForDragAndDrop( const Point& rSttPos );
@@ -159,8 +159,8 @@ public:
 
     // copy - methods and helper methods for the copy
     int  Cut();
-    int  Copy( sal_Bool bIsCut = sal_False );
-    int  PrepareForCopy( sal_Bool bIsCut = sal_False );
+    int  Copy( bool bIsCut = false );
+    int  PrepareForCopy( bool bIsCut = false );
     int  CalculateAndCopy();                // special for Calculator
     int  CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr );
 
@@ -168,16 +168,16 @@ public:
     void RemoveDDELinkFormat( const Window& rWin );
 
     // paste - methods and helper methods for the paste
-    static sal_Bool IsPaste( const SwWrtShell&, const TransferableDataHelper& );
+    static bool IsPaste( const SwWrtShell&, const TransferableDataHelper& );
     static bool Paste( SwWrtShell&, TransferableDataHelper& );
     static bool PasteData( TransferableDataHelper& rData,
                           SwWrtShell& rSh, sal_uInt16 nAction, sal_uLong nFormat,
-                          sal_uInt16 nDestination, sal_Bool bIsPasteFmt,
-                          sal_Bool bIsDefault,
+                          sal_uInt16 nDestination, bool bIsPasteFmt,
+                          bool bIsDefault,
                           const Point* pDDPos = 0, sal_Int8 nDropAction = 0,
-                          sal_Bool bPasteSelection = sal_False );
+                          bool bPasteSelection = false );
 
-    static sal_Bool IsPasteSpecial( const SwWrtShell& rWrtShell,
+    static bool IsPasteSpecial( const SwWrtShell& rWrtShell,
                                 const TransferableDataHelper& );
     static bool PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& );
     static bool PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, sal_uLong& rFormatUsed );
@@ -192,7 +192,7 @@ public:
     void StartDrag( Window* pWin, const Point& rPos );
 
     SwWrtShell* GetShell()              { return pWrtShell; }
-    void SetCleanUp( sal_Bool bFlag )       { bCleanUp = bFlag; }
+    void SetCleanUp( bool bFlag )       { bCleanUp = bFlag; }
 
     // Interfaces for Selection
     /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */
diff --git a/sw/source/core/uibase/inc/swlbox.hxx b/sw/source/core/uibase/inc/swlbox.hxx
index 4287dd903781..a71df6be4ef5 100644
--- a/sw/source/core/uibase/inc/swlbox.hxx
+++ b/sw/source/core/uibase/inc/swlbox.hxx
@@ -36,8 +36,8 @@ class SW_DLLPUBLIC SwBoxEntry
 {
     friend class SwComboBox;
 
-    sal_Bool    bModified : 1;
-    sal_Bool    bNew : 1;
+    bool    bModified : 1;
+    bool    bNew : 1;
 
     OUString    aName;
     sal_Int32   nId;
diff --git a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
index 782d14f2aba9..ef8ec69eb027 100644
--- a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
@@ -31,7 +31,7 @@ public:
     SwModalRedlineAcceptDlg(Window *pParent);
     virtual ~SwModalRedlineAcceptDlg();
 
-    void            AcceptAll( sal_Bool bAccept );
+    void            AcceptAll( bool bAccept );
     virtual void    Activate() SAL_OVERRIDE;
 };
 
diff --git a/sw/source/core/uibase/inc/swtablerep.hxx b/sw/source/core/uibase/inc/swtablerep.hxx
index bf351c976a9e..48358705a55c 100644
--- a/sw/source/core/uibase/inc/swtablerep.hxx
+++ b/sw/source/core/uibase/inc/swtablerep.hxx
@@ -37,15 +37,15 @@ class SW_DLLPUBLIC SwTableRep
     sal_uInt16      nColCount;
     sal_uInt16      nAllCols;
     sal_uInt16      nWidthPercent;
-    sal_Bool        bLineSelected : 1;
-    sal_Bool        bWidthChanged : 1;
-    sal_Bool        bColsChanged : 1;
+    bool        bLineSelected : 1;
+    bool        bWidthChanged : 1;
+    bool        bColsChanged : 1;
 
 public:
     SwTableRep( const SwTabCols& rTabCol );
     ~SwTableRep();
 
-    sal_Bool        FillTabCols( SwTabCols& rTabCol ) const;
+    bool        FillTabCols( SwTabCols& rTabCol ) const;
 
     SwTwips     GetLeftSpace() const            {return nLeftSpace;}
     void        SetLeftSpace(SwTwips nSet)      {nLeftSpace = nSet;}
@@ -65,14 +65,14 @@ public:
     sal_uInt16      GetColCount() const             {return nColCount;}
     sal_uInt16      GetAllColCount() const          {return nAllCols;}
 
-    sal_Bool        HasColsChanged() const          {return bColsChanged;}
-    void        SetColsChanged()                {bColsChanged = sal_True;}
+    bool        HasColsChanged() const          {return bColsChanged;}
+    void        SetColsChanged()                {bColsChanged = true;}
 
-    sal_Bool        HasWidthChanged() const         {return bWidthChanged;}
-    void        SetWidthChanged()               {bWidthChanged  = sal_True;}
+    bool        HasWidthChanged() const         {return bWidthChanged;}
+    void        SetWidthChanged()               {bWidthChanged  = true;}
 
-    sal_Bool        IsLineSelected() const          {return bLineSelected;}
-    void        SetLineSelected(sal_Bool bSet)      {bLineSelected = bSet;}
+    bool        IsLineSelected() const          {return bLineSelected;}
+    void        SetLineSelected(bool bSet)      {bLineSelected = bSet;}
 
     SwTwips     GetSpace() const                { return nSpace;}
     void        SetSpace(SwTwips nSet)          {nSpace = nSet;}
diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx
index 06f20041015f..965361e321dd 100644
--- a/sw/source/core/uibase/inc/swuiccoll.hxx
+++ b/sw/source/core/uibase/inc/swuiccoll.hxx
@@ -45,7 +45,7 @@ class SwCondCollPage : public SfxTabPage
     const CommandStruct*pCmds;
     SwFmt*              pFmt;
 
-    sal_Bool                bNewTemplate;
+    bool                bNewTemplate;
 
     SwCondCollPage(Window *pParent, const SfxItemSet &rSet);
     virtual ~SwCondCollPage();
@@ -67,7 +67,7 @@ public:
     virtual bool FillItemSet(      SfxItemSet &rSet) SAL_OVERRIDE;
     virtual void Reset      (const SfxItemSet &rSet) SAL_OVERRIDE;
 
-    void SetCollection( SwFmt* pFormat, sal_Bool bNew );
+    void SetCollection( SwFmt* pFormat, bool bNew );
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx
index 37ba536bb019..5443348a15b4 100644
--- a/sw/source/core/uibase/inc/swuicnttab.hxx
+++ b/sw/source/core/uibase/inc/swuicnttab.hxx
@@ -86,9 +86,9 @@ class SwMultiTOXTabDialog : public SfxTabDialog
     sal_uInt16              nTypeCount;
     sal_uInt16              nInitialTOXType;
 
-    sal_Bool                bEditTOX;
-    sal_Bool                bExampleCreated;
-    sal_Bool                bGlobalFlag;
+    bool                bEditTOX;
+    bool                bExampleCreated;
+    bool                bGlobalFlag;
 
     virtual short       Ok() SAL_OVERRIDE;
     SwTOXDescription*   CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX);
@@ -100,7 +100,7 @@ public:
     SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet,
                         SwWrtShell &rShell,
                         SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
-                        sal_Bool bGlobal = sal_False);
+                        bool bGlobal = false);
     virtual ~SwMultiTOXTabDialog();
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
@@ -114,7 +114,7 @@ public:
                                 }
 
     void                UpdateExample();
-    sal_Bool                IsTOXEditMode() const { return bEditTOX;}
+    bool                IsTOXEditMode() const { return bEditTOX;}
 
     SwWrtShell&         GetWrtShell() {return rSh;}
 
@@ -122,7 +122,7 @@ public:
     void                CreateOrUpdateExample(
                             TOXTypes nTOXIndex, sal_uInt16 nPage = 0, sal_uInt16 nCurLevel = USHRT_MAX);
 
-    static sal_Bool IsNoNum(SwWrtShell& rSh, const OUString& rName);
+    static bool IsNoNum(SwWrtShell& rSh, const OUString& rName);
 };
 
 class IndexEntryResource;
@@ -289,7 +289,7 @@ public:
     void        SetForm(SwForm& rForm, sal_uInt16 nLevel);
     sal_uInt16      GetLastLevel()const {return nLevel;};
 
-    sal_Bool        IsValid() const {return bValid;}
+    bool        IsValid() const {return bValid;}
 
     void        SetInvalid() {bValid = false;}
 
@@ -304,14 +304,14 @@ public:
                     { return pActiveCtrl;}
 
     void        InsertAtSelection(const OUString& rText, const SwFormToken& aToken);
-    void        RemoveControl(SwTOXButton* pDel, sal_Bool bInternalCall = sal_False);
+    void        RemoveControl(SwTOXButton* pDel, bool bInternalCall = false);
 
-    sal_Bool        Contains(FormTokenType) const;
+    bool        Contains(FormTokenType) const;
 
-    sal_Bool        DetermineLinkStart();
+    bool        DetermineLinkStart();
 
     //helper for pattern buttons and edits
-    sal_Bool        CreateQuickHelp(Control* pCtrl,
+    bool        CreateQuickHelp(Control* pCtrl,
                     const SwFormToken& rToken, const HelpEvent& );
 
     virtual void    GetFocus() SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx
index ce83df03d8d3..8bf8020a910d 100644
--- a/sw/source/core/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/core/uibase/inc/swuiidxmrk.hxx
@@ -88,15 +88,15 @@ class SwIndexMarkPane
     PushButton*     m_pNextBT;
 
     OUString        aOrgStr;
-    sal_Bool            bDel;
-    sal_Bool            bNewMark;
-    sal_Bool            bSelected;
+    bool            bDel;
+    bool            bNewMark;
+    bool            bSelected;
 
-    sal_Bool            bPhoneticED0_ChangedByUser;
-    sal_Bool            bPhoneticED1_ChangedByUser;
-    sal_Bool            bPhoneticED2_ChangedByUser;
+    bool            bPhoneticED0_ChangedByUser;
+    bool            bPhoneticED1_ChangedByUser;
+    bool            bPhoneticED2_ChangedByUser;
     LanguageType    nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
-    sal_Bool            bIsPhoneticReadingEnabled; //this value states whether phonetic reading is enabled in principle dependent of global cjk settings and language of current entry
+    bool            bIsPhoneticReadingEnabled; //this value states whether phonetic reading is enabled in principle dependent of global cjk settings and language of current entry
     com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier >
                     xExtendedIndexEntrySupplier;
 
@@ -137,7 +137,7 @@ class SwIndexMarkPane
 public:
 
     SwIndexMarkPane(Dialog &rDialog,
-                    sal_Bool bNewDlg,
+                    bool bNewDlg,
                     SwWrtShell& rWrtShell);
 
     Dialog &GetDialog() { return m_rDialog; }
@@ -145,7 +145,7 @@ public:
     ~SwIndexMarkPane();
 
     void    ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0);
-    sal_Bool    IsTOXType(const OUString& rName)
+    bool    IsTOXType(const OUString& rName)
                 {return LISTBOX_ENTRY_NOTFOUND != m_pTypeDCB->GetEntryPos(rName);}
 };
 
@@ -154,11 +154,11 @@ class SwIndexMarkFloatDlg : public SfxModelessDialog
     SwIndexMarkPane m_aContent;
     virtual void    Activate() SAL_OVERRIDE;
     public:
-        SwIndexMarkFloatDlg(    SfxBindings* pBindings,
+        SwIndexMarkFloatDlg(       SfxBindings* pBindings,
                                    SfxChildWindow* pChild,
                                    Window *pParent,
-                                SfxChildWinInfo* pInfo,
-                                   sal_Bool bNew=sal_True);
+                                   SfxChildWinInfo* pInfo,
+                                   bool bNew=true);
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
 
@@ -178,7 +178,7 @@ class SwAuthorMarkPane
 {
     Dialog& m_rDialog;
 
-    static sal_Bool     bIsFromComponent;
+    static bool     bIsFromComponent;
 
     friend class SwAuthMarkModalDlg;
     friend class SwAuthMarkFloatDlg;
@@ -195,8 +195,8 @@ class SwAuthorMarkPane
     PushButton*     m_pCreateEntryPB;
     PushButton*     m_pEditEntryPB;
 
-    sal_Bool        bNewEntry;
-    sal_Bool        bBibAccessInitialized;
+    bool        bNewEntry;
+    bool        bBibAccessInitialized;
 
     SwWrtShell*     pSh;
 
@@ -220,7 +220,7 @@ class SwAuthorMarkPane
 public:
 
     SwAuthorMarkPane( Dialog &rDialog,
-                       sal_Bool bNew=sal_True);
+                       bool bNew=true);
 
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
@@ -230,11 +230,11 @@ class SwAuthMarkFloatDlg : public SfxModelessDialog
     SwAuthorMarkPane m_aContent;
     virtual void    Activate() SAL_OVERRIDE;
     public:
-        SwAuthMarkFloatDlg(     SfxBindings* pBindings,
+        SwAuthMarkFloatDlg(        SfxBindings* pBindings,
                                    SfxChildWindow* pChild,
                                    Window *pParent,
-                                SfxChildWinInfo* pInfo,
-                                   sal_Bool bNew=sal_True);
+                                   SfxChildWinInfo* pInfo,
+                                   bool bNew=true);
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
 
diff --git a/sw/source/core/uibase/inc/swuipardlg.hxx b/sw/source/core/uibase/inc/swuipardlg.hxx
index e90b2aee8315..e4c778140339 100644
--- a/sw/source/core/uibase/inc/swuipardlg.hxx
+++ b/sw/source/core/uibase/inc/swuipardlg.hxx
@@ -25,7 +25,7 @@ class SwParaDlg: public SfxTabDialog
     SwView& rView;
     sal_uInt16 nHtmlMode;
     sal_uInt8 nDlgMode;
-    sal_Bool bDrawParaDlg;
+    bool bDrawParaDlg;
 
     sal_uInt16 m_nParaStd;
     sal_uInt16 m_nParaAlign;
@@ -43,7 +43,7 @@ public:
                 const SfxItemSet&,
                 sal_uInt8 nDialogMode,
                 const OUString *pCollName = 0,
-                sal_Bool bDraw = sal_False,
+                bool bDraw = false,
                 const OString& sDefPage = OString());
     virtual ~SwParaDlg();
 };
diff --git a/sw/source/core/uibase/inc/tablemgr.hxx b/sw/source/core/uibase/inc/tablemgr.hxx
index 73a117d94a15..623016af5297 100644
--- a/sw/source/core/uibase/inc/tablemgr.hxx
+++ b/sw/source/core/uibase/inc/tablemgr.hxx
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwTableFUNC
 {
     SwFrmFmt    *pFmt;
     SwWrtShell  *pSh;
-    sal_Bool        bCopy;
+    bool        bCopy;
     SwTabCols   aCols;
 
 private:
@@ -51,7 +51,7 @@ private:
 
 public:
     inline SwTableFUNC(SwFrmFmt &);
-           SwTableFUNC(SwWrtShell *pShell, sal_Bool bCopyFmt = sal_False);
+           SwTableFUNC(SwWrtShell *pShell, bool bCopyFmt = false);
            ~SwTableFUNC();
 
     void    InitTabCols();
@@ -62,7 +62,7 @@ public:
     sal_uInt16  GetColCount() const;
     sal_uInt16  GetCurColNum() const;
 
-    sal_Bool IsTableSelected() const { return pFmt != 0; }
+    bool IsTableSelected() const { return pFmt != 0; }
 
     const SwFrmFmt *GetTableFmt() const { return pFmt; }
 
@@ -73,13 +73,13 @@ public:
 
     /// @return the XModel of the newly inserted chart if successful
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
-        InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, sal_Bool bFillWithData, const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 );
+        InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 );
 };
 
 inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) :
     pFmt(&rFmt),
     pSh(0),
-    bCopy(sal_False)
+    bCopy(false)
 {
 }
 
diff --git a/sw/source/core/uibase/inc/tautofmt.hxx b/sw/source/core/uibase/inc/tautofmt.hxx
index a06264c637d2..3faec092eadc 100644
--- a/sw/source/core/uibase/inc/tautofmt.hxx
+++ b/sw/source/core/uibase/inc/tautofmt.hxx
@@ -64,11 +64,11 @@ class SwAutoFormatDlg : public SfxModalDialog
     SwTableAutoFmtTbl*      pTableTbl;
     sal_uInt8                   nIndex;
     sal_uInt8                   nDfltStylePos;
-    sal_Bool                    bCoreDataChanged : 1;
-    sal_Bool                    bSetAutoFmt : 1;
+    bool                    bCoreDataChanged : 1;
+    bool                    bSetAutoFmt : 1;
 
     void Init( const SwTableAutoFmt* pSelFmt );
-    void UpdateChecks( const SwTableAutoFmt&, sal_Bool bEnableBtn );
+    void UpdateChecks( const SwTableAutoFmt&, bool bEnableBtn );
 
     DECL_LINK( CheckHdl, Button * );
     DECL_LINK(OkHdl, void *);
@@ -79,7 +79,7 @@ class SwAutoFormatDlg : public SfxModalDialog
 
 public:
     SwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
-                        sal_Bool bSetAutoFmt = sal_True,
+                        bool bSetAutoFmt = true,
                         const SwTableAutoFmt* pSelFmt = 0 );
     virtual ~SwAutoFormatDlg();
 
diff --git a/sw/source/core/uibase/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx
index 52afff36dd21..e6ef9cdcf7ab 100644
--- a/sw/source/core/uibase/inc/tmpdlg.hxx
+++ b/sw/source/core/uibase/inc/tmpdlg.hxx
@@ -33,7 +33,7 @@ class SwTemplateDlg: public SfxStyleDialog
     sal_uInt16      nType;
     sal_uInt16      nHtmlMode;
     SwWrtShell*     pWrtShell;
-    sal_Bool        bNewStyle;
+    bool        bNewStyle;
 
     DECL_LINK( NumOptionsHdl, PushButton* );
 
diff --git a/sw/source/core/uibase/inc/toxmgr.hxx b/sw/source/core/uibase/inc/toxmgr.hxx
index aa247dadb80c..183e38435b0f 100644
--- a/sw/source/core/uibase/inc/toxmgr.hxx
+++ b/sw/source/core/uibase/inc/toxmgr.hxx
@@ -53,12 +53,12 @@ class SW_DLLPUBLIC SwTOXDescription
     SwTOXSortKey        eSortKey2;
     SwTOXSortKey        eSortKey3;
     sal_uInt8           nLevel;
-    sal_Bool                bFromObjectNames : 1;
-    sal_Bool                bFromChapter : 1;
-    sal_Bool                bReadonly: 1;
-    sal_Bool                bLevelFromChapter : 1;
-    sal_Bool                bIsAuthSequence :1;
-    sal_Bool                bSortByDocument :1;
+    bool                bFromObjectNames : 1;
+    bool                bFromChapter : 1;
+    bool                bReadonly: 1;
+    bool                bLevelFromChapter : 1;
+    bool                bIsAuthSequence :1;
+    bool                bSortByDocument :1;
 
     //TODO: TemplateNames
     //const String* pTemplateName = 0, ???
@@ -81,12 +81,12 @@ public:
         eLanguage((LanguageType)::GetAppLanguage()),
         eCaptionDisplay(CAPTION_COMPLETE),
         nLevel(MAXLEVEL),
-        bFromObjectNames(sal_False),
-        bFromChapter(sal_False),
-        bReadonly(sal_True),
-        bLevelFromChapter(sal_False),
-        bIsAuthSequence(sal_False),
-        bSortByDocument(sal_True)
+        bFromObjectNames(false),
+        bFromChapter(false),
+        bReadonly(true),
+        bLevelFromChapter(false),
+        bIsAuthSequence(false),
+        bSortByDocument(true)
         {}
     ~SwTOXDescription()
         {
@@ -127,8 +127,8 @@ public:
     void            SetLevel(sal_uInt8 nSet) {nLevel = nSet;}
     sal_uInt8           GetLevel()const  {return nLevel; }
 
-    void            SetCreateFromObjectNames(sal_Bool bSet) { bFromObjectNames = bSet;}
-    sal_Bool            IsCreateFromObjectNames() const {return bFromObjectNames;}
+    void            SetCreateFromObjectNames(bool bSet) { bFromObjectNames = bSet;}
+    bool            IsCreateFromObjectNames() const {return bFromObjectNames;}
 
     const OUString& GetSequenceName() const {return sSequenceName;}
     void            SetSequenceName(const OUString& rSet) {sSequenceName = rSet;}
@@ -136,26 +136,26 @@ public:
     SwCaptionDisplay    GetCaptionDisplay() const { return eCaptionDisplay;}
     void                SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
 
-    void            SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;}
-    sal_Bool            IsFromChapter() const {return bFromChapter;}
+    void            SetFromChapter(bool bSet) { bFromChapter = bSet;}
+    bool            IsFromChapter() const {return bFromChapter;}
 
-    void            SetReadonly(sal_Bool bSet){bReadonly = bSet;}
-    sal_Bool            IsReadonly() const {return bReadonly;}
+    void            SetReadonly(bool bSet){bReadonly = bSet;}
+    bool            IsReadonly() const {return bReadonly;}
 
     sal_uInt16          GetOLEOptions() const {return nOLEOptions;}
     void            SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;}
 
-    sal_Bool            IsLevelFromChapter() const {return bLevelFromChapter;}
-    void            SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;}
+    bool            IsLevelFromChapter() const {return bLevelFromChapter;}
+    void            SetLevelFromChapter(bool bSet) {bLevelFromChapter = bSet;}
 
     OUString        GetAuthBrackets() const {return sAuthBrackets;}
     void            SetAuthBrackets(const OUString& rSet) {sAuthBrackets = rSet;}
 
-    sal_Bool            IsAuthSequence() const {return bIsAuthSequence;}
-    void            SetAuthSequence(sal_Bool bSet){bIsAuthSequence = bSet;}
+    bool            IsAuthSequence() const {return bIsAuthSequence;}
+    void            SetAuthSequence(bool bSet){bIsAuthSequence = bSet;}
 
-    sal_Bool            IsSortByDocument()const {return bSortByDocument ;}
-    void            SetSortByDocument(sal_Bool bSet) {bSortByDocument = bSet;}
+    bool            IsSortByDocument()const {return bSortByDocument ;}
+    void            SetSortByDocument(bool bSet) {bSortByDocument = bSet;}
 
     void SetSortKeys(SwTOXSortKey eKey1,
                         SwTOXSortKey eKey2,
@@ -179,7 +179,7 @@ class SwTOXMarkDescription
 {
     TOXTypes    eTOXType;
     int         nLevel;
-    sal_Bool        bMainEntry;
+    bool        bMainEntry;
 
     OUString*   pPrimKey;
     OUString*   pSecKey;
@@ -200,7 +200,7 @@ public:
     explicit SwTOXMarkDescription(TOXTypes eType) :
         eTOXType(eType),
         nLevel(0),
-        bMainEntry(sal_False),
+        bMainEntry(false),
         pPrimKey(0),
         pSecKey(0),
         pAltStr(0),
@@ -226,8 +226,8 @@ public:
     void            SetLevel(int nSet) {nLevel = nSet;}
     int             GetLevel() const {return nLevel;}
 
-    void            SetMainEntry(sal_Bool bSet) {bMainEntry = bSet;}
-    sal_Bool            IsMainEntry() const {return bMainEntry;}
+    void            SetMainEntry(bool bSet) {bMainEntry = bSet;}
+    bool            IsMainEntry() const {return bMainEntry;}
 
     void            SetPrimKey(const OUString& rSet)
                                 {delete pPrimKey; pPrimKey = new OUString(rSet);}
@@ -277,8 +277,8 @@ public:
     void    UpdateTOXMark(const SwTOXMarkDescription& rDesc);
 
     void                DeleteTOXMark();
-    void                NextTOXMark(sal_Bool bSame=sal_False);
-    void                PrevTOXMark(sal_Bool bSame=sal_False);
+    void                NextTOXMark(bool bSame=false);
+    void                PrevTOXMark(bool bSame=false);
 
     // get current TOXmarks
     sal_uInt16              GetTOXMarks();
@@ -289,7 +289,7 @@ public:
 
     // methods for directories
 
-    sal_Bool    UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0);
+    bool    UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0);
 
     const SwTOXType*    GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const;
     const SwTOXBase*    GetCurTOX();
diff --git a/sw/source/core/uibase/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx
index 5fad0e8aff0e..55989fc52a48 100644
--- a/sw/source/core/uibase/inc/uinums.hxx
+++ b/sw/source/core/uibase/inc/uinums.hxx
@@ -82,10 +82,10 @@ protected:
     SwNumRulesWithName   *pNumRules[ MAX_NUM_RULES ];
     OUString              sFileName;
     sal_uInt16            nVersion;
-    sal_Bool              bModified;
+    bool              bModified;
 
     virtual int         Load(SvStream&);
-    virtual sal_Bool        Store(SvStream&);
+    virtual bool        Store(SvStream&);
 
     void                Init();
 
diff --git a/sw/source/core/uibase/inc/uitool.hxx b/sw/source/core/uibase/inc/uitool.hxx
index 597269fcd39c..19d07702465d 100644
--- a/sw/source/core/uibase/inc/uitool.hxx
+++ b/sw/source/core/uibase/inc/uitool.hxx
@@ -82,11 +82,11 @@ SW_DLLPUBLIC sal_uInt16     GetTabDist(const SvxTabStopItem& rTabs);
 void SwToSfxPageDescAttr( SfxItemSet& rSet );
 void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet );
 
-SW_DLLPUBLIC FieldUnit  GetDfltMetric(sal_Bool bWeb);
-void        SetDfltMetric(FieldUnit eMetric, sal_Bool bWeb);
+SW_DLLPUBLIC FieldUnit  GetDfltMetric(bool bWeb);
+void        SetDfltMetric(FieldUnit eMetric, bool bWeb);
 
-SW_DLLPUBLIC sal_Bool HasCharUnit( sal_Bool bWeb );
-void SetApplyCharUnit(sal_Bool bApplyChar, sal_Bool bWeb);
+SW_DLLPUBLIC bool HasCharUnit( bool bWeb );
+void SetApplyCharUnit(bool bApplyChar, bool bWeb);
 
 // ListBox mit allen Zeichenvorlagen fuellen - ausser Standard!
 SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false);
diff --git a/sw/source/core/uibase/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx
index 5c2cdb89e58a..07a0bb3de030 100644
--- a/sw/source/core/uibase/inc/uivwimp.hxx
+++ b/sw/source/core/uibase/inc/uivwimp.hxx
@@ -83,7 +83,7 @@ public:
 
     void ViewDestroyed() { pView = 0; }
 
-    void AddRemoveListener( sal_Bool bAdd );
+    void AddRemoveListener( bool bAdd );
 };
 
 class SwMailMergeConfigItem;
@@ -108,7 +108,7 @@ class SwView_Impl
 #if HAVE_FEATURE_DBCONNECTIVITY
     SwMailMergeConfigItem*      pConfigItem;
     sal_uInt16                  nMailMergeRestartPage;
-    sal_Bool                    bMailMergeSourceView;
+    bool                    bMailMergeSourceView;
 #endif
 
     sfx2::DocumentInserter*     m_pDocInserter;
@@ -142,14 +142,14 @@ public:
 
 #if HAVE_FEATURE_DBCONNECTIVITY
     void   SetMailMergeConfigItem(SwMailMergeConfigItem*  pItem,
-                                                sal_uInt16 nRestart, sal_Bool bIsSource)
+                                                sal_uInt16 nRestart, bool bIsSource)
                             {   pConfigItem = pItem;
                                 nMailMergeRestartPage = nRestart;
                                 bMailMergeSourceView = bIsSource;
                             }
     SwMailMergeConfigItem*  GetMailMergeConfigItem() {return pConfigItem;}
     sal_uInt16              GetMailMergeRestartPage() const {return nMailMergeRestartPage;}
-    sal_Bool                IsMailMergeSourceView() const { return bMailMergeSourceView;  }
+    bool                IsMailMergeSourceView() const { return bMailMergeSourceView;  }
 #endif
 
     //#i33307# restore editing position
diff --git a/sw/source/core/uibase/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx
index 18b29cd1c0cc..e78951bf6dc2 100644
--- a/sw/source/core/uibase/inc/unodispatch.hxx
+++ b/sw/source/core/uibase/inc/unodispatch.hxx
@@ -102,8 +102,8 @@ class SwXDispatch : public cppu::WeakImplHelper2
 {
     SwView*             m_pView;
     StatusListenerList  m_aListenerList;
-    sal_Bool            m_bOldEnable;
-    sal_Bool            m_bListenerAdded;
+    bool            m_bOldEnable;
+    bool            m_bListenerAdded;
 public:
     SwXDispatch(SwView& rView);
     virtual ~SwXDispatch();
diff --git a/sw/source/core/uibase/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx
index 2050ba8b0872..f5e86b973134 100644
--- a/sw/source/core/uibase/inc/unomailmerge.hxx
+++ b/sw/source/core/uibase/inc/unomailmerge.hxx
@@ -98,9 +98,9 @@ class SwXMailMerge :
     OUString   aFileNamePrefix;
     sal_Int32       nDataCommandType;
     sal_Int16       nOutputType;
-    sal_Bool        bEscapeProcessing;
-    sal_Bool        bSinglePrintJobs;
-    sal_Bool        bFileNameFromColumn;
+    bool        bEscapeProcessing;
+    bool        bSinglePrintJobs;
+    bool        bFileNameFromColumn;
 
     OUString                                         sInServerPassword;
     OUString                                         sOutServerPassword;
@@ -111,17 +111,17 @@ class SwXMailMerge :
     OUString                                         sAttachmentFilter;
     com::sun::star::uno::Sequence< OUString >        aCopiesTo;
     com::sun::star::uno::Sequence< OUString >        aBlindCopiesTo;
-    sal_Bool                                                bSendAsHTML;
-    sal_Bool                                                bSendAsAttachment;
+    bool                                                bSendAsHTML;
+    bool                                                bSendAsAttachment;
 
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintSettings;
 
-    sal_Bool                                                bSaveAsSingleFile;
+    bool                                                bSaveAsSingleFile;
     OUString                                         sSaveFilter;
     OUString                                         sSaveFilterOptions;
     com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveFilterData;
 
-    sal_Bool        bDisposing;
+    bool        bDisposing;
     SwDBMgr     *m_pMgr;
 
     void    launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
diff --git a/sw/source/core/uibase/inc/unomod.hxx b/sw/source/core/uibase/inc/unomod.hxx
index 3b2cc67e3495..41b59c487ffe 100644
--- a/sw/source/core/uibase/inc/unomod.hxx
+++ b/sw/source/core/uibase/inc/unomod.hxx
@@ -121,12 +121,12 @@ protected:
     SwView*                     pView;
     SwViewOption*       mpViewOption;
     const SwViewOption*         mpConstViewOption;
-    sal_Bool                    bObjectValid:1, bWeb:1, mbApplyZoom;
+    bool                    bObjectValid:1, bWeb:1, mbApplyZoom;
 
     sal_Int32   eHRulerUnit;
-    sal_Bool    mbApplyHRulerMetric;
+    bool    mbApplyHRulerMetric;
     sal_Int32   eVRulerUnit;
-    sal_Bool    mbApplyVRulerMetric;
+    bool    mbApplyVRulerMetric;
 
     virtual void _preSetValues ()
         throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
@@ -145,15 +145,15 @@ protected:
     virtual ~SwXViewSettings()
         throw();
 public:
-    SwXViewSettings(sal_Bool bWeb, SwView*  pView);
+    SwXViewSettings(bool bWeb, SwView*  pView);
 
     //XServiceInfo
     virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-    sal_Bool    IsValid() const {return bObjectValid;}
-    void    Invalidate() {bObjectValid = sal_False;}
+    bool    IsValid() const {return bObjectValid;}
+    void    Invalidate() {bObjectValid = false;}
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/unotools.hxx b/sw/source/core/uibase/inc/unotools.hxx
index 930006ebe720..c4350ee07b7c 100644
--- a/sw/source/core/uibase/inc/unotools.hxx
+++ b/sw/source/core/uibase/inc/unotools.hxx
@@ -83,8 +83,8 @@ class SW_DLLPUBLIC SwOneExampleFrame
 
     sal_uInt32          nStyleFlags;
 
-    sal_Bool            bIsInitialized;
-    sal_Bool            bServiceAvailable;
+    bool            bIsInitialized;
+    bool            bServiceAvailable;
 
     static  bool    bShowServiceNotAvailableMessage;
 
@@ -106,10 +106,10 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &  GetController() {return _xController;}
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > &   GetTextCursor() {return _xCursor;}
 
-    void ClearDocument( sal_Bool bStartTimer = sal_False );
+    void ClearDocument( bool bStartTimer = false );
 
-    sal_Bool IsInitialized() const {return bIsInitialized;}
-    sal_Bool IsServiceAvailable() const {return bServiceAvailable;}
+    bool IsInitialized() const {return bIsInitialized;}
+    bool IsServiceAvailable() const {return bServiceAvailable;}
 
     void CreatePopup(const Point& rPt);
 
diff --git a/sw/source/core/uibase/inc/unotxvw.hxx b/sw/source/core/uibase/inc/unotxvw.hxx
index fc42176cb8aa..1a8cb58e9560 100644
--- a/sw/source/core/uibase/inc/unotxvw.hxx
+++ b/sw/source/core/uibase/inc/unotxvw.hxx
@@ -175,7 +175,7 @@ public OTextCursorHelper
     SwView*                         m_pView;
     const SfxItemPropertySet*       m_pPropSet;
 protected:
-    sal_Bool    IsTextSelection( sal_Bool bAllowTables = sal_True ) const;
+    bool        IsTextSelection( bool bAllowTables = true ) const;
     virtual     ~SwXTextViewCursor();
 public:
     SwXTextViewCursor(SwView* pVw);
diff --git a/sw/source/core/uibase/inc/usrpref.hxx b/sw/source/core/uibase/inc/usrpref.hxx
index 5b1a0f574862..57370f892170 100644
--- a/sw/source/core/uibase/inc/usrpref.hxx
+++ b/sw/source/core/uibase/inc/usrpref.hxx
@@ -29,11 +29,11 @@ class SwMasterUsrPref;
 class SwContentViewConfig : public utl::ConfigItem
 {
     SwMasterUsrPref&        rParent;
-    sal_Bool                    bWeb;
+    bool                    bWeb;
 
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
     public:
-        SwContentViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
+        SwContentViewConfig(bool bWeb, SwMasterUsrPref& rParent);
         virtual ~SwContentViewConfig();
 
     // utl::ConfigItem
@@ -47,11 +47,11 @@ class SwContentViewConfig : public utl::ConfigItem
 class SwLayoutViewConfig : public utl::ConfigItem
 {
     SwMasterUsrPref&    rParent;
-    sal_Bool                bWeb;
+    bool                bWeb;
 
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
     public:
-        SwLayoutViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
+        SwLayoutViewConfig(bool bWeb, SwMasterUsrPref& rParent);
         virtual ~SwLayoutViewConfig();
 
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
@@ -66,7 +66,7 @@ class SwGridConfig : public utl::ConfigItem
 
     com::sun::star::uno::Sequence<OUString> GetPropertyNames();
     public:
-        SwGridConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
+        SwGridConfig(bool bWeb, SwMasterUsrPref& rParent);
         virtual ~SwGridConfig();
 
     virtual void Commit() SAL_OVERRIDE;
@@ -117,14 +117,14 @@ class SwMasterUsrPref : public SwViewOption
     sal_Int32   nLinkUpdateMode;
     FieldUnit   eUserMetric;
     FieldUnit   eHScrollMetric;
-    sal_Bool    bIsHScrollMetricSet;
+    bool    bIsHScrollMetricSet;
     FieldUnit   eVScrollMetric;
-    sal_Bool    bIsVScrollMetricSet;
+    bool    bIsVScrollMetricSet;
 
     sal_Int32   nDefTab;            //default tab stop distance
 
-    sal_Bool    bIsSquaredPageMode; //default page mode for text grid
-    sal_Bool    bIsAlignMathObjectsToBaseline;
+    bool    bIsSquaredPageMode; //default page mode for text grid
+    bool    bIsAlignMathObjectsToBaseline;
 
     SwContentViewConfig aContentConfig;
     SwLayoutViewConfig  aLayoutConfig;
@@ -132,9 +132,9 @@ class SwMasterUsrPref : public SwViewOption
     SwCursorConfig      aCursorConfig;
     SwWebColorConfig*   pWebColorConfig;
 
-    sal_Bool bApplyCharUnit; // apply_char_unit
+    bool bApplyCharUnit; // apply_char_unit
 public:
-    SwMasterUsrPref(sal_Bool bWeb);
+    SwMasterUsrPref(bool bWeb);
     ~SwMasterUsrPref();
 
     void SetUsrPref(const SwViewOption &rCopy);
@@ -158,7 +158,7 @@ public:
                 pWebColorConfig->SetModified();
         }
 
-    void SetUpdateLinkMode(sal_Int32 nSet, sal_Bool bNoModify = sal_False)
+    void SetUpdateLinkMode(sal_Int32 nSet, bool bNoModify = false)
         {
             nLinkUpdateMode = nSet;
             if(!bNoModify)
@@ -166,7 +166,7 @@ public:
         }
     sal_Int32 GetUpdateLinkMode() const {return nLinkUpdateMode; }
 
-    void SetUpdateFields(sal_Bool bSet, sal_Bool bNoModify = sal_False)
+    void SetUpdateFields(bool bSet, bool bNoModify = false)
         {
             if(bSet && eFldUpdateFlags == AUTOUPD_OFF)
             {
@@ -181,17 +181,17 @@ public:
                     aContentConfig.SetModified();
             }
         };
-    sal_Bool IsUpdateFields()const {return eFldUpdateFlags != AUTOUPD_OFF; }
+    bool IsUpdateFields()const {return eFldUpdateFlags != AUTOUPD_OFF; }
 
     SwFldUpdateFlags   GetFldUpdateFlags()const {return eFldUpdateFlags;}
-    void        SetFldUpdateFlags(SwFldUpdateFlags eSet, sal_Bool bNoModify = sal_False)
+    void        SetFldUpdateFlags(SwFldUpdateFlags eSet, bool bNoModify = false)
         {
             eFldUpdateFlags = eSet;
             if(!bNoModify)
                 aContentConfig.SetModified();
         }
 
-    void SetUpdateCharts(sal_Bool bSet, sal_Bool bNoModify = sal_False)
+    void SetUpdateCharts(bool bSet, bool bNoModify = false)
         {
             if(bSet)
             {
@@ -206,39 +206,39 @@ public:
                     aContentConfig.SetModified();
              }
         };
-    sal_Bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
+    bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; }
 
     FieldUnit   GetMetric() const { return eUserMetric;}
-    void        SetMetric(FieldUnit eSet, sal_Bool bNoModify = sal_False)
+    void        SetMetric(FieldUnit eSet, bool bNoModify = false)
                 {
                     eUserMetric = eSet;
                     if(!bNoModify)
                         aLayoutConfig.SetModified();
                 }
 
-    sal_Bool    IsHScrollMetric()const {return bIsHScrollMetricSet;}
+    bool    IsHScrollMetric()const {return bIsHScrollMetricSet;}
     FieldUnit   GetHScrollMetric() const { return bIsHScrollMetricSet ? eHScrollMetric : eUserMetric;}
-    void        SetHScrollMetric(FieldUnit eSet, sal_Bool bNoModify = sal_False)
+    void        SetHScrollMetric(FieldUnit eSet, bool bNoModify = false)
                 {
-                    eHScrollMetric = eSet; bIsHScrollMetricSet = sal_True;
+                    eHScrollMetric = eSet; bIsHScrollMetricSet = true;
                     if(!bNoModify)
                         aLayoutConfig.SetModified();
                 }
 
-    sal_Bool    IsVScrollMetric()const {return bIsVScrollMetricSet;}
+    bool    IsVScrollMetric()const {return bIsVScrollMetricSet;}
     FieldUnit   GetVScrollMetric() const { return bIsVScrollMetricSet ? eVScrollMetric : eUserMetric;}
-    void        SetVScrollMetric(FieldUnit eSet, sal_Bool bNoModify = sal_False)
+    void        SetVScrollMetric(FieldUnit eSet, bool bNoModify = false)
                 {
-                    eVScrollMetric = eSet; bIsVScrollMetricSet = sal_True;
+                    eVScrollMetric = eSet; bIsVScrollMetricSet = true;
                     if(!bNoModify)
                         aLayoutConfig.SetModified();
                 }
 
-    sal_Bool    IsApplyCharUnit() const
+    bool    IsApplyCharUnit() const
     {
         return bApplyCharUnit;
     }
-    void   SetApplyCharUnit(sal_Bool bSet, sal_Bool bNoModify = sal_False)
+    void   SetApplyCharUnit(bool bSet, bool bNoModify = false)
     {
         bApplyCharUnit = bSet;
         if(!bNoModify)
@@ -246,7 +246,7 @@ public:
     }
 
     sal_Int32   GetDefTab() const { return nDefTab;}
-    void        SetDefTab( sal_Int32  nSet, sal_Bool bNoModify = sal_False )
+    void        SetDefTab( sal_Int32  nSet, bool bNoModify = false )
                 {
                     nDefTab = nSet;
                     if(!bNoModify)
@@ -254,16 +254,16 @@ public:
                 }
 
     //default page mode for text grid
-    sal_Bool    IsSquaredPageMode() const {return bIsSquaredPageMode;}
-    void        SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify = sal_False )
+    bool    IsSquaredPageMode() const {return bIsSquaredPageMode;}
+    void        SetDefaultPageMode( bool bVal, bool bNoModify = false )
                 {
                     bIsSquaredPageMode = bVal;
                     if(!bNoModify)
                         aLayoutConfig.SetModified();
                 }
 
-    sal_Bool    IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; }
-    void        SetAlignMathObjectsToBaseline( sal_Bool bVal, sal_Bool bNoModify = sal_False )
+    bool    IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; }
+    void        SetAlignMathObjectsToBaseline( bool bVal, bool bNoModify = false )
                 {
                     bIsAlignMathObjectsToBaseline = bVal;
                     if(!bNoModify)
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 6d251529d1dd..74e18fc16394 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
@@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     static sal_Int32        m_nActMark; // current jump mark for unknown mark
 
     static bool             m_bExtra;
-    static sal_Bool             m_bFound;
+    static bool             m_bFound;
     static bool             m_bJustOpened;
 
     static SearchAttrItemList* m_pSrchList;
@@ -244,7 +244,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 
     bool m_bWheelScrollInProgress;
 
-    sal_Bool            m_bCenterCrsr : 1,
+    bool            m_bCenterCrsr : 1,
                     m_bTopCrsr : 1,
                     m_bAlwaysShowSel : 1,
                     m_bTabColFromDoc : 1,
@@ -271,8 +271,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 
     // methods for searching
     // set search context
-    SAL_DLLPRIVATE sal_Bool              SearchAndWrap(sal_Bool bApi = sal_False);
-    SAL_DLLPRIVATE sal_Bool          SearchAll(sal_uInt16* pFound = 0);
+    SAL_DLLPRIVATE bool              SearchAndWrap(bool bApi = false);
+    SAL_DLLPRIVATE bool          SearchAll(sal_uInt16* pFound = 0);
     SAL_DLLPRIVATE sal_uLong         FUNC_Search( const SwSearchOptions& rOptions );
     SAL_DLLPRIVATE void          Replace();
 
@@ -296,34 +296,34 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
                             sal_uInt16 nRangeX = USHRT_MAX,
                             sal_uInt16 nRangeY = USHRT_MAX);
 
-    SAL_DLLPRIVATE sal_Bool          GetPageScrollUpOffset(SwTwips& rOff) const;
-    SAL_DLLPRIVATE sal_Bool          GetPageScrollDownOffset(SwTwips& rOff) const;
+    SAL_DLLPRIVATE bool          GetPageScrollUpOffset(SwTwips& rOff) const;
+    SAL_DLLPRIVATE bool          GetPageScrollDownOffset(SwTwips& rOff) const;
 
     // scrollbar movements
     SAL_DLLPRIVATE long          PageUp();
     SAL_DLLPRIVATE long          PageDown();
-    SAL_DLLPRIVATE long          PageUpCrsr(sal_Bool bSelect);
-    SAL_DLLPRIVATE long          PageDownCrsr(sal_Bool bSelect);
+    SAL_DLLPRIVATE long          PageUpCrsr(bool bSelect);
+    SAL_DLLPRIVATE long          PageDownCrsr(bool bSelect);
     SAL_DLLPRIVATE long          PhyPageUp();
     SAL_DLLPRIVATE long          PhyPageDown();
 
-    SAL_DLLPRIVATE int               _CreateScrollbar( sal_Bool bHori );
+    SAL_DLLPRIVATE int               _CreateScrollbar( bool bHori );
     SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
-    SAL_DLLPRIVATE sal_Bool          UpdateScrollbars();
+    SAL_DLLPRIVATE bool          UpdateScrollbars();
     SAL_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
     SAL_DLLPRIVATE void          CalcVisArea( const Size &rPixelSz );
 
-    SAL_DLLPRIVATE void            CreatePageButtons(sal_Bool bShow);
+    SAL_DLLPRIVATE void            CreatePageButtons(bool bShow);
 
     // linguistics functions
     SAL_DLLPRIVATE void          HyphenateDocument();
-    SAL_DLLPRIVATE sal_Bool          IsDrawTextHyphenate();
+    SAL_DLLPRIVATE bool          IsDrawTextHyphenate();
     SAL_DLLPRIVATE void          HyphenateDrawText();
     SAL_DLLPRIVATE void          StartThesaurus();
 
     // text conversion
-    SAL_DLLPRIVATE void          StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
+    SAL_DLLPRIVATE void          StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
 
     // used for spell checking and text conversion
     SAL_DLLPRIVATE void          SpellStart( SvxSpellArea eSpell, bool bStartDone,
@@ -331,9 +331,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE void          SpellEnd( SwConversionArgs *pConvArgs = 0 );
 
     SAL_DLLPRIVATE void          HyphStart( SvxSpellArea eSpell );
-    SAL_DLLPRIVATE sal_Bool      CheckSpecialCntnt();
-    SAL_DLLPRIVATE void          SpellKontext(sal_Bool bOn = sal_True)
-                            { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; }
+    SAL_DLLPRIVATE bool          CheckSpecialCntnt();
+    SAL_DLLPRIVATE void          SpellKontext(bool bOn = true)
+                                 { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; }
 
     // methods for printing
     SAL_DLLPRIVATE virtual SfxPrinter*       GetPrinter( bool bCreate = false ) SAL_OVERRIDE;
@@ -351,8 +351,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE void          _SetZoom( const Size &rEditSz,
                               SvxZoomType eZoomType,
                               short nFactor = 100,
-                              sal_Bool bViewOnly = sal_False);
-    SAL_DLLPRIVATE void          CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool bInner );
+                              bool bViewOnly = false);
+    SAL_DLLPRIVATE void          CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner );
 
     SAL_DLLPRIVATE void          ShowAtResize();
 
@@ -361,7 +361,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE void          DocumentStatsChanged();
 
 public: // #i123922# Needs to be called from a 2nd place now as a helper method
-    SAL_DLLPRIVATE sal_Bool          InsertGraphicDlg( SfxRequest& );
+    SAL_DLLPRIVATE bool          InsertGraphicDlg( SfxRequest& );
 
 protected:
 
@@ -389,7 +389,7 @@ protected:
     void            SetLastTblFrmFmt(const SwFrmFmt* pSet) {m_pLastTableFormat = pSet;}
 
     // form letter execution
-    void    GenerateFormLetter(sal_Bool bUseCurrentDocument);
+    void    GenerateFormLetter(bool bUseCurrentDocument);
 
     using SfxShell::GetDispatcher;
 
@@ -448,7 +448,7 @@ public:
 
     inline const Rectangle& GetVisArea() const { return m_aVisArea; }
 
-    sal_Bool            IsScroll(const Rectangle& rRect) const;
+    bool            IsScroll(const Rectangle& rRect) const;
     void            Scroll( const Rectangle& rRect,
                             sal_uInt16 nRangeX = USHRT_MAX,
                             sal_uInt16 nRangeY = USHRT_MAX);
@@ -457,30 +457,30 @@ public:
     long        SetHScrollMax(long lMax);
 
     void SpellError(LanguageType eLang);
-    sal_Bool            ExecSpellPopup( const Point& rPt );
+    bool            ExecSpellPopup( const Point& rPt );
     void                ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
-    sal_Bool            ExecSmartTagPopup( const Point& rPt );
+    bool            ExecSmartTagPopup( const Point& rPt );
 
     DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*);
-    sal_Bool            ExecDrwTxtSpellPopup(const Point& rPt);
+    bool            ExecDrwTxtSpellPopup(const Point& rPt);
 
     void            SetTabColFromDocPos( const Point &rPt ) { m_aTabColFromDocPos = rPt; }
-    void            SetTabColFromDoc( sal_Bool b ) { m_bTabColFromDoc = b; }
-    sal_Bool            IsTabColFromDoc() const    { return m_bTabColFromDoc; }
-    void            SetTabRowFromDoc( sal_Bool b ) { m_bTabRowFromDoc = b; }
-    sal_Bool            IsTabRowFromDoc() const    { return m_bTabRowFromDoc; }
+    void            SetTabColFromDoc( bool b ) { m_bTabColFromDoc = b; }
+    bool            IsTabColFromDoc() const    { return m_bTabColFromDoc; }
+    void            SetTabRowFromDoc( bool b ) { m_bTabRowFromDoc = b; }
+    bool            IsTabRowFromDoc() const    { return m_bTabRowFromDoc; }
 
     // -> #i23726#
     void            SetNumRuleNodeFromDoc( SwTxtNode * pNumRuleNode )
                     { m_pNumRuleNodeFromDoc = pNumRuleNode; }
-    void            SetNumIndentFromDoc(sal_Bool b) { m_bNumIndentFromDoc = b; }
-    sal_Bool            IsNumIndentFromDoc() const { return NULL != m_pNumRuleNodeFromDoc; }
+    void            SetNumIndentFromDoc(bool b) { m_bNumIndentFromDoc = b; }
+    bool            IsNumIndentFromDoc() const { return NULL != m_pNumRuleNodeFromDoc; }
     // <- #i23726#
 
     void    DocSzChgd( const Size& rNewSize );
     const   Size&   GetDocSz() const { return m_aDocSz; }
-    virtual void    SetVisArea( const Rectangle&, sal_Bool bUpdateScrollbar = sal_True);
-            void    SetVisArea( const Point&, sal_Bool bUpdateScrollbar = sal_True);
+    virtual void    SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
+            void    SetVisArea( const Point&, bool bUpdateScrollbar = true);
             void    CheckVisArea();
 
     void RecheckBrowseMode();
@@ -491,21 +491,21 @@ public:
     DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416#
     static void     SetActMark(sal_Int32 nSet);
 
-    sal_Bool            HandleWheelCommands( const CommandEvent& );
+    bool            HandleWheelCommands( const CommandEvent& );
 
     // insert frames
     void            InsFrmMode(sal_uInt16 nCols);
 
-    void            SetZoom( SvxZoomType eZoomType, short nFactor = 100, sal_Bool bViewOnly = sal_False);
+    void            SetZoom( SvxZoomType eZoomType, short nFactor = 100, bool bViewOnly = false);
     virtual void    SetZoomFactor( const Fraction &rX, const Fraction & ) SAL_OVERRIDE;
 
-    void            SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewOnly = sal_False );
+    void            SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly = false );
 
-    void            ShowHScrollbar(sal_Bool bShow);
-    sal_Bool        IsHScrollbarVisible()const;
+    void            ShowHScrollbar(bool bShow);
+    bool        IsHScrollbarVisible()const;
 
-    void            ShowVScrollbar(sal_Bool bShow);
-    sal_Bool        IsVScrollbarVisible()const;
+    void            ShowVScrollbar(bool bShow);
+    bool        IsVScrollbarVisible()const;
 
     void            EnableHScrollbar(bool bEnable);
     void            EnableVScrollbar(bool bEnable);
@@ -541,7 +541,7 @@ public:
     void            ExecTabWin(SfxRequest&);
     void            ExecuteStatusLine(SfxRequest&);
     DECL_LINK( ExecRulerClick, Ruler * );
-    void            ExecSearch(SfxRequest&, sal_Bool bNoMessage = sal_False);
+    void            ExecSearch(SfxRequest&, bool bNoMessage = false);
     void            ExecViewOptions(SfxRequest &);
 
     void            StateViewOptions(SfxItemSet &);
@@ -551,24 +551,24 @@ public:
 
     // functions for drawing
     void            SetDrawFuncPtr(SwDrawBase* pFuncPtr);
-    inline SwDrawBase* GetDrawFuncPtr(/*sal_Bool bBuf = sal_False*/) const  { return m_pDrawActual; }
+    inline SwDrawBase* GetDrawFuncPtr() const  { return m_pDrawActual; }
     void            GetDrawState(SfxItemSet &rSet);
     void            ExitDraw();
-    inline sal_Bool     IsDrawRotate()      { return m_bDrawRotate; }
+    inline bool     IsDrawRotate()      { return m_bDrawRotate; }
     inline void     FlipDrawRotate()    { m_bDrawRotate = !m_bDrawRotate; }
-    inline sal_Bool     IsDrawSelMode()     { return m_bDrawSelMode; }
+    inline bool     IsDrawSelMode()     { return m_bDrawSelMode; }
     void            SetSelDrawSlot();
     inline void     FlipDrawSelMode()   { m_bDrawSelMode = !m_bDrawSelMode; }
     void            NoRotate();     // turn off rotate mode
-    sal_Bool            EnterDrawTextMode(const Point& aDocPos);
+    bool            EnterDrawTextMode(const Point& aDocPos);
     void            LeaveDrawCreate()   { m_nDrawSfxId = m_nFormSfxId = USHRT_MAX; m_sDrawCustom = "";}
-    sal_Bool            IsDrawMode()        { return (m_nDrawSfxId != USHRT_MAX || m_nFormSfxId != USHRT_MAX); }
+    bool            IsDrawMode()        { return (m_nDrawSfxId != USHRT_MAX || m_nFormSfxId != USHRT_MAX); }
     bool            IsFormMode() const;
     bool            IsBezierEditMode();
     bool            AreOnlyFormsSelected() const;
-    sal_Bool            HasDrwObj(SdrObject *pSdrObj) const;
-    sal_Bool            HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const;
-    sal_Bool            BeginTextEdit(  SdrObject* pObj, SdrPageView* pPV=NULL,
+    bool            HasDrwObj(SdrObject *pSdrObj) const;
+    bool            HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const;
+    bool            BeginTextEdit(  SdrObject* pObj, SdrPageView* pPV=NULL,
                                     Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false );
 
     void            StateTabWin(SfxItemSet&);
@@ -604,10 +604,10 @@ public:
     virtual void    ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) SAL_OVERRIDE;
     virtual void    WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) SAL_OVERRIDE;
 
-    void SetCrsrAtTop( sal_Bool bFlag, sal_Bool bCenter = sal_False )
+    void SetCrsrAtTop( bool bFlag, bool bCenter = false )
         { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; }
-    sal_Bool IsCrsrAtTop() const                    { return m_bTopCrsr; }
-    sal_Bool IsCrsrAtCenter() const                 { return m_bCenterCrsr; }
+    bool IsCrsrAtTop() const                    { return m_bTopCrsr; }
+    bool IsCrsrAtCenter() const                 { return m_bCenterCrsr; }
 
     bool JumpToSwMark( const OUString& rMark );
 
@@ -620,11 +620,11 @@ public:
 
     // status methods for clipboard.
     // Status changes now notified from the clipboard.
-    sal_Bool IsPasteAllowed();
-    sal_Bool IsPasteSpecialAllowed();
+    bool IsPasteAllowed();
+    bool IsPasteSpecialAllowed();
 
     // Enable mail merge - mail merge field dialog enabled
-    void EnableMailMerge(sal_Bool bEnable = sal_True);
+    void EnableMailMerge(bool bEnable = true);
     //apply Accessiblity options
     void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions);
 
@@ -639,19 +639,19 @@ public:
 
     // store MailMerge data while "Back to Mail Merge Wizard" FloatingWindow is active
     // or to support printing
-    void   SetMailMergeConfigItem(SwMailMergeConfigItem*  pConfigItem, sal_uInt16 nRestart, sal_Bool bIsSource);
+    void   SetMailMergeConfigItem(SwMailMergeConfigItem*  pConfigItem, sal_uInt16 nRestart, bool bIsSource);
     SwMailMergeConfigItem*  GetMailMergeConfigItem();
     sal_uInt16              GetMailMergeRestartPage() const;
-    sal_Bool                IsMailMergeSourceView() const;
+    bool                IsMailMergeSourceView() const;
 
     void ExecFormatPaintbrush(SfxRequest &);
     void StateFormatPaintbrush(SfxItemSet &);
 
     //public fuer D&D
     int     InsertGraphic( const OUString &rPath, const OUString &rFilter,
-                            sal_Bool bLink = sal_True, GraphicFilter *pFlt = 0,
+                            bool bLink = true, GraphicFilter *pFlt = 0,
                             Graphic* pPreviewGrf = 0,
-                            sal_Bool bRule = sal_False );
+                            bool bRule = false );
 
     void ExecuteScan( SfxRequest& rReq );
 
@@ -684,7 +684,7 @@ inline const SwDocShell *SwView::GetDocShell() const
 
 SfxTabPage* CreatePrintOptionsPage( Window *pParent,
                                     const SfxItemSet &rOptions,
-                                    sal_Bool bPreview);
+                                    bool bPreview);
 
 #endif
 
diff --git a/sw/source/core/uibase/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx
index d25a13c3b774..513d0efa0daf 100644
--- a/sw/source/core/uibase/inc/workctrl.hxx
+++ b/sw/source/core/uibase/inc/workctrl.hxx
@@ -147,7 +147,7 @@ public:
         SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window *pParent );
         virtual ~SwScrollNaviPopup();
 
-    static OUString         GetQuickHelpText(sal_Bool bNext);
+    static OUString         GetQuickHelpText(bool bNext);
 
     virtual SfxPopupWindow* Clone() const SAL_OVERRIDE;
     void                GrabFocus(){aToolBox.GrabFocus();}
@@ -157,9 +157,9 @@ public:
 
 class SwHlpImageButton : public ImageButton
 {
-    sal_Bool        bUp;
+    bool        bUp;
     public:
-        SwHlpImageButton(Window* pParent, const ResId& rResId, sal_Bool bUpBtn) :
+        SwHlpImageButton(Window* pParent, const ResId& rResId, bool bUpBtn) :
             ImageButton(pParent, rResId), bUp(bUpBtn){}
 
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx
index 6a58d8b36b70..1059b8d67bf5 100644
--- a/sw/source/core/uibase/inc/wrap.hxx
+++ b/sw/source/core/uibase/inc/wrap.hxx
@@ -76,11 +76,11 @@ class SwWrapTabPage: public SfxTabPage
     Size aFrmSize;
     SwWrtShell*         pWrtSh;
 
-    sal_Bool bFormat;
-    sal_Bool bNew;
-    sal_Bool bHtmlMode;
-    sal_Bool bDrawMode;
-    sal_Bool bContourImage;
+    bool bFormat;
+    bool bNew;
+    bool bHtmlMode;
+    bool bDrawMode;
+    bool bContourImage;
 
     SwWrapTabPage(Window *pParent, const SfxItemSet &rSet);
     virtual ~SwWrapTabPage();
@@ -106,8 +106,8 @@ public:
     virtual void    Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
 
     static const sal_uInt16*  GetRanges();
-    inline void     SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; }
-    inline void     SetFormatUsed(sal_Bool bFmt, sal_Bool bDrw) { bFormat = bFmt;
+    inline void     SetNewFrame(bool bNewFrame) { bNew = bNewFrame; }
+    inline void     SetFormatUsed(bool bFmt, bool bDrw) { bFormat = bFmt;
                                                             bDrawMode = bDrw; }
     inline void     SetShell(SwWrtShell* pSh) { pWrtSh = pSh; }
 };
diff --git a/sw/source/core/uibase/inc/wrtsh.hxx b/sw/source/core/uibase/inc/wrtsh.hxx
index a8216c351d3a..7f960048709f 100644
--- a/sw/source/core/uibase/inc/wrtsh.hxx
+++ b/sw/source/core/uibase/inc/wrtsh.hxx
@@ -92,7 +92,7 @@ private:
     using SwEditShell::AutoCorrect;
     using SwCrsrShell::GotoMark;
 
-    typedef long (SwWrtShell::*SELECTFUNC)(const Point *, sal_Bool bProp );
+    typedef long (SwWrtShell::*SELECTFUNC)(const Point *, bool bProp );
 
     SELECTFUNC  fnDrag;
     SELECTFUNC  fnSetCrsr;
@@ -109,7 +109,7 @@ public:
     long KillSelection(const Point* pPt, bool bProp) { return (this->*fnKillSel)(pPt, bProp); }
 
     // reset all selections
-    long ResetSelect( const Point *, sal_Bool );
+    long ResetSelect( const Point *, bool );
 
     // resets the cursorstack after movement with PageUp/-Down if a stack is built up
     inline void ResetCursorStack();
@@ -121,12 +121,12 @@ public:
 
     void    SttSelect();
     void    EndSelect();
-    sal_Bool    IsInSelect() const { return bInSelect; }
-    void    SetInSelect(sal_Bool bSel = sal_True) { bInSelect = bSel; }
+    bool    IsInSelect() const { return bInSelect; }
+    void    SetInSelect(bool bSel = true) { bInSelect = bSel; }
         // is there a text- or frameselection?
-    sal_Bool    HasSelection() const { return SwCrsrShell::HasSelection() ||
+    bool    HasSelection() const { return SwCrsrShell::HasSelection() ||
                                         IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); }
-    sal_Bool Pop( sal_Bool bOldCrsr = sal_True );
+    bool     Pop( bool bOldCrsr = true );
 
     void    EnterStdMode();
     bool    IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
@@ -134,33 +134,33 @@ public:
     void    EnterExtMode();
     void    LeaveExtMode();
     bool    ToggleExtMode();
-    sal_Bool    IsExtMode() const { return bExtMode; }
+    bool    IsExtMode() const { return bExtMode; }
 
     void    EnterAddMode();
     void    LeaveAddMode();
     bool    ToggleAddMode();
-    sal_Bool    IsAddMode() const { return bAddMode; }
+    bool    IsAddMode() const { return bAddMode; }
 
     void    EnterBlockMode();
     void    LeaveBlockMode();
     bool    ToggleBlockMode();
     bool    IsBlockMode() const { return bBlockMode; }
 
-    void    SetInsMode( sal_Bool bOn = sal_True );
+    void    SetInsMode( bool bOn = true );
     void    ToggleInsMode() { SetInsMode( !bIns ); }
-    sal_Bool    IsInsMode() const { return bIns; }
+    bool    IsInsMode() const { return bIns; }
     void    SetRedlineModeAndCheckInsMode( sal_uInt16 eMode );
 
     void    EnterSelFrmMode(const Point *pStartDrag = 0);
     void    LeaveSelFrmMode();
-    sal_Bool    IsSelFrmMode() const { return bLayoutMode; }
+    bool    IsSelFrmMode() const { return bLayoutMode; }
         // reset selection of frames
     void    UnSelectFrm();
 
     void    Invalidate();
 
     // select table cells for editing of formulas in the ribbonbar
-    inline void SelTblCells( const Link &rLink, sal_Bool bMark = sal_True );
+    inline void SelTblCells( const Link &rLink, bool bMark = true );
     inline void EndSelTblCells();
 
     // leave per word or per line selection mode. Is usually called in MB-Up.
@@ -171,82 +171,82 @@ public:
     inline bool Is_FnDragEQBeginDrag() const;
 
     // base requests
-    sal_Bool    IsInWrd()           { return IsInWord(); }
-    sal_Bool    IsSttWrd()          { return IsStartWord(); }
-    sal_Bool    IsEndWrd();
+    bool    IsInWrd()           { return IsInWord(); }
+    bool    IsSttWrd()          { return IsStartWord(); }
+    bool    IsEndWrd();
     bool    IsSttOfPara() const { return IsSttPara(); }
     bool    IsEndOfPara() const { return IsEndPara(); }
 
     // select word / sentense
-    sal_Bool    SelNearestWrd();
-    sal_Bool    SelWrd      (const Point * = 0, sal_Bool bProp=sal_False );
+    bool    SelNearestWrd();
+    bool    SelWrd      (const Point * = 0, bool bProp=false );
     // #i32329# Enhanced selection
-    void    SelSentence (const Point * = 0, sal_Bool bProp=sal_False );
-    void    SelPara     (const Point * = 0, sal_Bool bProp=sal_False );
+    void    SelSentence (const Point * = 0, bool bProp=false );
+    void    SelPara     (const Point * = 0, bool bProp=false );
     long    SelAll();
 
     // basecursortravelling
-typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
-    sal_Bool SimpleMove( FNSimpleMove, sal_Bool bSelect );
+typedef bool (SwWrtShell:: *FNSimpleMove)();
+    bool SimpleMove( FNSimpleMove, bool bSelect );
 
-    sal_Bool Left       ( sal_uInt16 nMode, sal_Bool bSelect,
-                            sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual = sal_False );
-    sal_Bool Right      ( sal_uInt16 nMode, sal_Bool bSelect,
-                            sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual = sal_False );
+    bool Left       ( sal_uInt16 nMode, bool bSelect,
+                            sal_uInt16 nCount, bool bBasicCall, bool bVisual = false );
+    bool Right      ( sal_uInt16 nMode, bool bSelect,
+                            sal_uInt16 nCount, bool bBasicCall, bool bVisual = false );
     bool Up         ( bool bSelect = false, sal_uInt16 nCount = 1, bool bBasicCall = false );
     bool Down       ( bool bSelect = false, sal_uInt16 nCount = 1, bool bBasicCall = false );
-    sal_Bool NxtWrd     ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); }
-    sal_Bool PrvWrd     ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); }
-
-    sal_Bool LeftMargin ( sal_Bool bSelect, sal_Bool bBasicCall );
-    sal_Bool RightMargin( sal_Bool bSelect, sal_Bool bBasicCall );
-
-    sal_Bool SttDoc     ( sal_Bool bSelect = sal_False );
-    sal_Bool EndDoc     ( sal_Bool bSelect = sal_False );
-
-    sal_Bool SttNxtPg   ( sal_Bool bSelect = sal_False );
-    sal_Bool SttPrvPg   ( sal_Bool bSelect = sal_False );
-    sal_Bool EndNxtPg   ( sal_Bool bSelect = sal_False );
-    sal_Bool EndPrvPg   ( sal_Bool bSelect = sal_False );
-    sal_Bool SttPg      ( sal_Bool bSelect = sal_False );
-    sal_Bool EndPg      ( sal_Bool bSelect = sal_False );
-    sal_Bool SttPara    ( sal_Bool bSelect = sal_False );
-    sal_Bool EndPara    ( sal_Bool bSelect = sal_False );
-    sal_Bool FwdPara    ( sal_Bool bSelect = sal_False )
+    bool NxtWrd     ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); }
+    bool PrvWrd     ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); }
+
+    bool LeftMargin ( bool bSelect, bool bBasicCall );
+    bool RightMargin( bool bSelect, bool bBasicCall );
+
+    bool SttDoc     ( bool bSelect = false );
+    bool EndDoc     ( bool bSelect = false );
+
+    bool SttNxtPg   ( bool bSelect = false );
+    bool SttPrvPg   ( bool bSelect = false );
+    bool EndNxtPg   ( bool bSelect = false );
+    bool EndPrvPg   ( bool bSelect = false );
+    bool SttPg      ( bool bSelect = false );
+    bool EndPg      ( bool bSelect = false );
+    bool SttPara    ( bool bSelect = false );
+    bool EndPara    ( bool bSelect = false );
+    bool FwdPara    ( bool bSelect = false )
                 { return SimpleMove( &SwWrtShell::_FwdPara, bSelect ); }
-    sal_Bool BwdPara    ( sal_Bool bSelect = sal_False )
+    bool BwdPara    ( bool bSelect = false )
                 { return SimpleMove( &SwWrtShell::_BwdPara, bSelect ); }
-    sal_Bool FwdSentence( sal_Bool bSelect = sal_False )
+    bool FwdSentence( bool bSelect = false )
                 { return SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); }
-    sal_Bool BwdSentence( sal_Bool bSelect = sal_False )
+    bool BwdSentence( bool bSelect = false )
                 { return SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); }
 
     // #i20126# Enhanced table selection
-    sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
-    sal_Bool SelectTableRow();
-    sal_Bool SelectTableCol();
-    sal_Bool SelectTableCell();
+    bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
+    bool SelectTableRow();
+    bool SelectTableCol();
+    bool SelectTableCell();
 
-    sal_Bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 );
+    bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 );
 
     // per column jumps
-    sal_Bool StartOfColumn      ( sal_Bool bSelect = sal_False );
-    sal_Bool EndOfColumn        ( sal_Bool bSelect = sal_False );
-    sal_Bool StartOfNextColumn  ( sal_Bool bSelect = sal_False );
-    sal_Bool EndOfNextColumn    ( sal_Bool bSelect = sal_False );
-    sal_Bool StartOfPrevColumn  ( sal_Bool bSelect = sal_False );
-    sal_Bool EndOfPrevColumn    ( sal_Bool bSelect = sal_False );
+    bool StartOfColumn      ( bool bSelect = false );
+    bool EndOfColumn        ( bool bSelect = false );
+    bool StartOfNextColumn  ( bool bSelect = false );
+    bool EndOfNextColumn    ( bool bSelect = false );
+    bool StartOfPrevColumn  ( bool bSelect = false );
+    bool EndOfPrevColumn    ( bool bSelect = false );
 
     // set the cursor to page "nPage" at the beginning
     // additionally to a identically named implementation in crsrsh.hxx
     // here all existing selections are being reset before setting the
     // cursor
-    sal_Bool    GotoPage( sal_uInt16 nPage, sal_Bool bRecord );
+    bool    GotoPage( sal_uInt16 nPage, bool bRecord );
 
     // setting the cursor; remember the old position for turning back
     DECL_LINK( ExecFlyMac, void * );
 
-    sal_Bool    PageCrsr(SwTwips lOffset, sal_Bool bSelect);
+    bool    PageCrsr(SwTwips lOffset, bool bSelect);
 
     // update fields
     void    UpdateInputFlds( SwInputFieldList* pLst = 0 );
@@ -254,8 +254,8 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
     void    NoEdit(bool bHideCrsr = true);
     void    Edit();
 
-    sal_Bool IsRetainSelection() const { return mbRetainSelection; }
-    void SetRetainSelection( sal_Bool bRet ) { mbRetainSelection = bRet; }
+    bool IsRetainSelection() const { return mbRetainSelection; }
+    void SetRetainSelection( bool bRet ) { mbRetainSelection = bRet; }
 
     // change current data base and notify
     void ChgDBData(const SwDBData& SwDBData);
@@ -285,7 +285,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
             WORD_SPACE_AFTER = 2,
             WORD_NO_SPACE = 3
         };
-    int     IntelligentCut(int nSelectionType, sal_Bool bCut = sal_True);
+    int     IntelligentCut(int nSelectionType, bool bCut = true);
 
     // edit
     void    Insert(SwField &);
@@ -293,19 +293,19 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
     // graphic
     void    Insert( const OUString &rPath, const OUString &rFilter,
                     const Graphic &, SwFlyFrmAttrMgr * = 0,
-                    sal_Bool bRule = sal_False );
+                    bool bRule = false );
 
     void    InsertByWord( const OUString & );
     void    InsertPageBreak(const OUString *pPageDesc = 0, ::boost::optional<sal_uInt16> pPgNum = boost::none );
     void    InsertLineBreak();
     void    InsertColumnBreak();
-    void    InsertFootnote(const OUString &, sal_Bool bEndNote = sal_False, sal_Bool bEdit = sal_True );
-    void    SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True );
+    void    InsertFootnote(const OUString &, bool bEndNote = false, bool bEdit = true );
+    void    SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true );
     bool    CanInsert();
 
     // indexes
     void    InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
-    sal_Bool    UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+    bool    UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
 
     // numbering and bullets
     /**
@@ -314,7 +314,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
        @param bNum    sal_True: turn on numbering
                       sal_False: turn on bullets
     */
-    void    NumOrBulletOn(sal_Bool bNum); // #i29560#
+    void    NumOrBulletOn(bool bNum); // #i29560#
     void    NumOrBulletOff(); // #i29560#
     void    NumOn();
     void    BulletOn();
@@ -323,10 +323,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
     void    InsertObject(     /*SvInPlaceObjectRef *pObj, */       // != 0 for clipboard
                           const svt::EmbeddedObjectRef&,
                           SvGlobalName *pName = 0,      // != 0 create object accordingly
-                          sal_Bool bActivate = sal_True,
+                          bool bActivate = true,
                           sal_uInt16 nSlotId = 0);       // SlotId for dialog
 
-    sal_Bool    InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
+    bool    InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
     void    LaunchOLEObj( long nVerb = 0 );             // start server
     virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE;
     virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
@@ -351,7 +351,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
 
     void            SetPageStyle(const OUString &rCollName);
 
-    OUString        GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const;
+    OUString        GetCurPageStyle( const bool bCalcFrm = true ) const;
 
     // change current style using the attributes in effect
     void    QuickUpdateStyle();
@@ -365,10 +365,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
 
     // search and replace
     sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt,
-                         sal_Bool bSearchInNotes,
+                         bool bSearchInNotes,
                          SwDocPositions eStart, SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
-                         int bReplace = sal_False );
+                         bool bReplace = false );
 
     sal_uLong SearchTempl  (const OUString &rTempl,
                          SwDocPositions eStart, SwDocPositions eEnde,
@@ -376,7 +376,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
                          const OUString* pReplTempl = 0 );
 
     sal_uLong SearchAttr   (const SfxItemSet& rFindSet,
-                         sal_Bool bNoColls,
+                         bool bNoColls,
                          SwDocPositions eStart,SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
                          const com::sun::star::util::SearchOptions* pSearchOpt = 0,
@@ -386,26 +386,26 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
 
     // action ahead of cursor movement
     // resets selection if applicable, triggers timer and GCAttr()
-    void    MoveCrsr( sal_Bool bWithSelect = sal_False );
+    void    MoveCrsr( bool bWithSelect = false );
 
     // update input fields
-    sal_Bool    StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0);
+    bool    StartInputFldDlg(SwField*, bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0);
     // update DropDown fields
-    sal_Bool    StartDropDownFldDlg(SwField*, sal_Bool bNextButton, OString* pWindowState = 0);
+    bool    StartDropDownFldDlg(SwField*, bool bNextButton, OString* pWindowState = 0);
 
     //"Handler" for changes at DrawView - for controls.
     virtual void DrawSelChanged( ) SAL_OVERRIDE;
 
     // jump to bookmark and set the "selctions-flags" correctly again
-    sal_Bool GotoMark( const ::sw::mark::IMark* const pMark );
-    sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart );
-    sal_Bool GotoMark( const OUString& rName );
-    sal_Bool GoNextBookmark(); // sal_True when there still was one
-    sal_Bool GoPrevBookmark();
+    bool GotoMark( const ::sw::mark::IMark* const pMark );
+    bool GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, bool bStart );
+    bool GotoMark( const OUString& rName );
+    bool GoNextBookmark(); // sal_True when there still was one
+    bool GoPrevBookmark();
 
     bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark);
 
-    sal_Bool GotoField( const SwFmtFld& rFld );
+    bool GotoField( const SwFmtFld& rFld );
 
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
@@ -436,7 +436,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
                          const sal_uInt16 nAction );
 
     virtual void ApplyViewOptions( const SwViewOption &rOpt ) SAL_OVERRIDE;
-    virtual void SetReadonlyOption( sal_Bool bSet ) SAL_OVERRIDE;
+    virtual void SetReadonlyOption( bool bSet ) SAL_OVERRIDE;
 
     // automatic update of styles
     void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet);
@@ -457,20 +457,20 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
 
     SwNavigationMgr& GetNavigationMgr();
     void addCurrentPosition();
-    sal_Bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL,
-         sal_Bool bSelFrame = sal_True );
+    bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL,
+         bool bSelFrame = true );
     bool GotoINetAttr( const SwTxtINetFmt& rAttr );
     void GotoOutline( sal_uInt16 nIdx );
     bool GotoOutline( const OUString& rName );
     bool GotoRegion( const OUString& rName );
-    sal_Bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
+    bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
         sal_uInt16 nSeqNo = 0 );
-    sal_Bool GotoNextTOXBase( const OUString* pName = 0);
+    bool GotoNextTOXBase( const OUString* pName = 0);
     bool GotoTable( const OUString& rName );
-    sal_Bool GotoFld( const SwFmtFld& rFld );
-    const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False);
+    bool GotoFld( const SwFmtFld& rFld );
+    const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false);
 
-    void ChangeHeaderOrFooter(const OUString& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning);
+    void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning);
     virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) SAL_OVERRIDE;
 
 private:
@@ -481,11 +481,11 @@ private:
     struct ModeStack
     {
         ModeStack   *pNext;
-        sal_Bool        bAdd,
+        bool        bAdd,
                     bBlock,
                     bExt,
                     bIns;
-        ModeStack(ModeStack *pNextMode, sal_Bool _bIns, sal_Bool _bExt, sal_Bool _bAdd, sal_Bool _bBlock):
+        ModeStack(ModeStack *pNextMode, bool _bIns, bool _bExt, bool _bAdd, bool _bBlock):
             pNext(pNextMode),
             bAdd(_bAdd),
             bBlock(_bBlock),
@@ -506,11 +506,11 @@ private:
     {
         Point aDocPos;
         CrsrStack *pNext;
-        sal_Bool bValidCurPos : 1;
-        sal_Bool bIsFrmSel : 1;
+        bool bValidCurPos : 1;
+        bool bIsFrmSel : 1;
         SwTwips lOffset;
 
-        CrsrStack( sal_Bool bValid, sal_Bool bFrmSel, const Point &rDocPos,
+        CrsrStack( bool bValid, bool bFrmSel, const Point &rDocPos,
                     SwTwips lOff, CrsrStack *pN )
             : aDocPos(rDocPos),
             pNext(pN),
@@ -529,35 +529,35 @@ private:
     Point   aDest;
     bool    bDestOnStack;
     bool    HasCrsrStack() const { return 0 != pCrsrStack; }
-    SAL_DLLPRIVATE sal_Bool  PushCrsr(SwTwips lOffset, sal_Bool bSelect);
-    SAL_DLLPRIVATE sal_Bool  PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False);
+    SAL_DLLPRIVATE bool  PushCrsr(SwTwips lOffset, bool bSelect);
+    SAL_DLLPRIVATE bool  PopCrsr(bool bUpdate, bool bSelect = false);
 
     // take END cursor along when PageUp / -Down
     SAL_DLLPRIVATE bool _SttWrd();
     SAL_DLLPRIVATE bool _EndWrd();
-    SAL_DLLPRIVATE sal_Bool _NxtWrd();
-    SAL_DLLPRIVATE sal_Bool _PrvWrd();
+    SAL_DLLPRIVATE bool _NxtWrd();
+    SAL_DLLPRIVATE bool _PrvWrd();
     // #i92468#
-    SAL_DLLPRIVATE sal_Bool _NxtWrdForDelete();
-    SAL_DLLPRIVATE sal_Bool _PrvWrdForDelete();
-    SAL_DLLPRIVATE sal_Bool _FwdSentence();
-    SAL_DLLPRIVATE sal_Bool _BwdSentence();
-    sal_Bool _FwdPara();
-    SAL_DLLPRIVATE sal_Bool _BwdPara();
+    SAL_DLLPRIVATE bool _NxtWrdForDelete();
+    SAL_DLLPRIVATE bool _PrvWrdForDelete();
+    SAL_DLLPRIVATE bool _FwdSentence();
+    SAL_DLLPRIVATE bool _BwdSentence();
+    bool _FwdPara();
+    SAL_DLLPRIVATE bool _BwdPara();
 
         // selections
-    sal_Bool    bIns            :1;
-    sal_Bool    bInSelect       :1;
-    sal_Bool    bExtMode        :1;
-    sal_Bool    bAddMode        :1;
-    sal_Bool    bBlockMode      :1;
-    sal_Bool    bLayoutMode     :1;
-    sal_Bool    bCopy           :1;
-    sal_Bool    bSelWrd         :1;
-    sal_Bool    bSelLn          :1;
+    bool    bIns            :1;
+    bool    bInSelect       :1;
+    bool    bExtMode        :1;
+    bool    bAddMode        :1;
+    bool    bBlockMode      :1;
+    bool    bLayoutMode     :1;
+    bool    bCopy           :1;
+    bool    bSelWrd         :1;
+    bool    bSelLn          :1;
     bool    bIsInClickToEdit:1;
-    sal_Bool    bClearMark      :1;     // don't delete selection for ChartAutoPilot
-    sal_Bool    mbRetainSelection :1; // Do not remove selections
+    bool    bClearMark      :1;     // don't delete selection for ChartAutoPilot
+    bool    mbRetainSelection :1; // Do not remove selections
 
     Point   aStart;
     Link    aSelTblLink;
@@ -568,35 +568,35 @@ private:
     SAL_DLLPRIVATE void  SttDragDrop(Timer *);
 
     using SwCrsrShell::SetCrsr;
-    SAL_DLLPRIVATE long  SetCrsr(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  SetCrsr(const Point *, bool bProp=false );
 
-    SAL_DLLPRIVATE long  SetCrsrKillSel(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  SetCrsrKillSel(const Point *, bool bProp=false );
 
-    SAL_DLLPRIVATE long  StdSelect(const Point *, sal_Bool bProp=sal_False );
-    SAL_DLLPRIVATE long  BeginDrag(const Point *, sal_Bool bProp=sal_False );
-    SAL_DLLPRIVATE long  Drag(const Point *, sal_Bool bProp=sal_False );
-    SAL_DLLPRIVATE long  EndDrag(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  StdSelect(const Point *, bool bProp=false );
+    SAL_DLLPRIVATE long  BeginDrag(const Point *, bool bProp=false );
+    SAL_DLLPRIVATE long  DefaultDrag(const Point *, bool bProp=false );
+    SAL_DLLPRIVATE long  DefaultEndDrag(const Point *, bool bProp=false );
 
-    SAL_DLLPRIVATE long  ExtSelWrd(const Point *, sal_Bool bProp=sal_False );
-    SAL_DLLPRIVATE long  ExtSelLn(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  ExtSelWrd(const Point *, bool bProp=false );
+    SAL_DLLPRIVATE long  ExtSelLn(const Point *, bool bProp=false );
 
     // move text from Drag and Drop; Point is destination for all selections.
-    SAL_DLLPRIVATE long  MoveText(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  MoveText(const Point *, bool bProp=false );
 
-    SAL_DLLPRIVATE long  BeginFrmDrag(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  BeginFrmDrag(const Point *, bool bProp=false );
 
     // after SSize/Move of a frame update; Point is destination.
-    SAL_DLLPRIVATE long  UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  UpdateLayoutFrm(const Point *, bool bProp=false );
 
-    SAL_DLLPRIVATE long  SttLeaveSelect(const Point *, sal_Bool bProp=sal_False );
-    SAL_DLLPRIVATE long  AddLeaveSelect(const Point *, sal_Bool bProp=sal_False );
-    SAL_DLLPRIVATE long  Ignore(const Point *, sal_Bool bProp=sal_False );
+    SAL_DLLPRIVATE long  SttLeaveSelect(const Point *, bool bProp=false );
+    SAL_DLLPRIVATE long  AddLeaveSelect(const Point *, bool bProp=false );
+    SAL_DLLPRIVATE long  Ignore(const Point *, bool bProp=false );
 
-    SAL_DLLPRIVATE void  LeaveExtSel() { bSelWrd = bSelLn = sal_False;}
+    SAL_DLLPRIVATE void  LeaveExtSel() { bSelWrd = bSelLn = false;}
 
-    SAL_DLLPRIVATE sal_Bool  GoStart(sal_Bool KeepArea = sal_False, sal_Bool * = 0,
-            sal_Bool bSelect = sal_False, sal_Bool bDontMoveRegion = sal_False);
-    SAL_DLLPRIVATE sal_Bool  GoEnd(sal_Bool KeepArea = sal_False, sal_Bool * = 0);
+    SAL_DLLPRIVATE bool  GoStart(bool KeepArea = false, bool * = 0,
+            bool bSelect = false, bool bDontMoveRegion = false);
+    SAL_DLLPRIVATE bool  GoEnd(bool KeepArea = false, bool * = 0);
 
     enum BookMarkMove
     {
@@ -606,7 +606,7 @@ private:
         BOOKMARK_LAST_LAST_ENTRY
     };
 
-    SAL_DLLPRIVATE sal_Bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
+    SAL_DLLPRIVATE bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
 };
 
 inline void SwWrtShell::ResetCursorStack()
@@ -615,16 +615,16 @@ inline void SwWrtShell::ResetCursorStack()
         _ResetCursorStack();
 }
 
-inline void SwWrtShell::SelTblCells(const Link &rLink, sal_Bool bMark )
+inline void SwWrtShell::SelTblCells(const Link &rLink, bool bMark )
 {
-    SetSelTblCells( sal_True );
+    SetSelTblCells( true );
     bClearMark = bMark;
     aSelTblLink = rLink;
 }
 inline void SwWrtShell::EndSelTblCells()
 {
-    SetSelTblCells( sal_False );
-    bClearMark = sal_True;
+    SetSelTblCells( false );
+    bClearMark = true;
 }
 
 inline bool SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
diff --git a/sw/source/core/uibase/index/toxmgr.cxx b/sw/source/core/uibase/index/toxmgr.cxx
index 67845e719b90..1b40394854a0 100644
--- a/sw/source/core/uibase/index/toxmgr.cxx
+++ b/sw/source/core/uibase/index/toxmgr.cxx
@@ -211,7 +211,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
     {
         // JP 26.08.96: Bug 30344 - either the text of a Doc or an alternative test,
         //                          not both!
-        sal_Bool bReplace = pCurTOXMark->IsAlternativeText();
+        bool bReplace = pCurTOXMark->IsAlternativeText();
         if( bReplace )
             pCurTOXMark->SetAlternativeText( *rDesc.GetAltStr() );
         else
@@ -229,7 +229,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
     // Bug 36207 pCurTOXMark points nowhere here!
     if(!pCurTOXMark)
     {
-        pSh->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+        pSh->Left(CRSR_SKIP_CHARS, false, 1, false );
         pSh->GetCurTOXMarks(aCurMarks);
         SetCurTOXMark(0);
     }
@@ -257,7 +257,7 @@ sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr)
     Description: traveling between TOXMarks
  --------------------------------------------------------------------*/
 
-void SwTOXMgr::NextTOXMark(sal_Bool bSame)
+void SwTOXMgr::NextTOXMark(bool bSame)
 {
     OSL_ENSURE(pCurTOXMark, "no current TOXMark");
     if( pCurTOXMark )
@@ -267,7 +267,7 @@ void SwTOXMgr::NextTOXMark(sal_Bool bSame)
     }
 }
 
-void SwTOXMgr::PrevTOXMark(sal_Bool bSame)
+void SwTOXMgr::PrevTOXMark(bool bSame)
 {
     OSL_ENSURE(pCurTOXMark, "no current TOXMark");
     if( pCurTOXMark )
@@ -295,12 +295,12 @@ void SwTOXMgr::SetCurTOXMark(sal_uInt16 nId)
     pCurTOXMark = (nId < aCurMarks.size()) ? aCurMarks[nId] : 0;
 }
 
-sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
+bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
                                     SwTOXBase** ppBase,
                                     const SfxItemSet* pSet)
 {
     SwWait aWait( *pSh->GetView().GetDocShell(), true );
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     const SwTOXBase* pCurTOX = ppBase && *ppBase ? *ppBase : GetCurTOX();
     SwTOXBase* pTOX = (SwTOXBase*)pCurTOX;
 
@@ -422,7 +422,7 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
 
     OSL_ENSURE(pNewTOX, "no TOXBase created!" );
     if(!pNewTOX)
-        return sal_False;
+        return false;
 
     pNewTOX->SetFromChapter(rDesc.IsFromChapter());
     pNewTOX->SetSequenceName(rDesc.GetSequenceName());
diff --git a/sw/source/core/uibase/lingu/hhcwrp.cxx b/sw/source/core/uibase/lingu/hhcwrp.cxx
index b5d1950f24f3..5560c52cd765 100644
--- a/sw/source/core/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/core/uibase/lingu/hhcwrp.cxx
@@ -184,11 +184,11 @@ void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd
     pCrsr->GetPoint()->nContent = m_nLastPos;
     pCrsr->DeleteMark();
 
-    m_rWrtShell.Right( CRSR_SKIP_CHARS, /*bExpand*/ sal_False,
-                  (sal_uInt16) (m_nUnitOffset + nUnitStart), sal_True );
+    m_rWrtShell.Right( CRSR_SKIP_CHARS, /*bExpand*/ false,
+                  (sal_uInt16) (m_nUnitOffset + nUnitStart), true );
     pCrsr->SetMark();
-    m_rWrtShell.Right( CRSR_SKIP_CHARS, /*bExpand*/ sal_True,
-                  (sal_uInt16) (nUnitEnd - nUnitStart), sal_True );
+    m_rWrtShell.Right( CRSR_SKIP_CHARS, /*bExpand*/ true,
+                  (sal_uInt16) (nUnitEnd - nUnitStart), true );
     // end selection now. Otherwise SHIFT+HOME (extending the selection)
     // won't work when the dialog is closed without any replacement.
     // (see #116346#)
@@ -452,7 +452,7 @@ void SwHHCWrapper::ReplaceUnit(
             // of the flag.
             m_rWrtShell.EndSelect();
 
-            m_rWrtShell.Left( 0, sal_True, aNewOrigText.getLength(), sal_True, sal_True );
+            m_rWrtShell.Left( 0, true, aNewOrigText.getLength(), true, true );
         }
 
         pRuby->SetPosition( static_cast<sal_uInt16>(bRubyBelow) );
diff --git a/sw/source/core/uibase/lingu/hyp.cxx b/sw/source/core/uibase/lingu/hyp.cxx
index 73de46c7aeb8..10cbec315e6b 100644
--- a/sw/source/core/uibase/lingu/hyp.cxx
+++ b/sw/source/core/uibase/lingu/hyp.cxx
@@ -47,14 +47,14 @@ using namespace ::com::sun::star;
 
 SwHyphWrapper::SwHyphWrapper( SwView* pVw,
             uno::Reference< linguistic2::XHyphenator >  &rxHyph,
-            sal_Bool bStart, sal_Bool bOther, sal_Bool bSelect ) :
+            bool bStart, bool bOther, bool bSelect ) :
     SvxSpellWrapper( &pVw->GetEditWin(), rxHyph, bStart, bOther ),
     pView( pVw ),
     xHyph( rxHyph ),
     nPageCount( 0 ),
     nPageStart( 0 ),
     bInSelection( bSelect ),
-    bInfoBox( sal_False )
+    bInfoBox( false )
 {
     uno::Reference< linguistic2::XLinguProperties >  xProp( GetLinguPropertySet() );
     bAutomatic = xProp.is() ? xProp->getIsHyphAuto() : sal_False;
@@ -106,7 +106,7 @@ void SwHyphWrapper::SpellEnd()
 bool SwHyphWrapper::SpellMore()
 {
     PSH->Push();
-    bInfoBox = sal_True;
+    bInfoBox = true;
     PSH->Combine();
     return false;
 }
diff --git a/sw/source/core/uibase/lingu/olmenu.cxx b/sw/source/core/uibase/lingu/olmenu.cxx
index 682df9aebb34..62bbf2deaad9 100644
--- a/sw/source/core/uibase/lingu/olmenu.cxx
+++ b/sw/source/core/uibase/lingu/olmenu.cxx
@@ -288,7 +288,7 @@ SwSpellPopup::SwSpellPopup(
 
     PopupMenu *pMenu = GetPopupMenu(MN_AUTOCORR);
     pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
-    sal_Bool bEnable = sal_False;
+    bool bEnable = false;
     if( nStringCount )
     {
         Image aImage;
@@ -305,7 +305,7 @@ SwSpellPopup::SwSpellPopup(
         }
 
         InsertSeparator(OString(), 0);
-        bEnable = sal_True;
+        bEnable = true;
         sal_uInt16 nAutoCorrItemId  = MN_AUTOCORR_START;
         sal_uInt16 nItemId          = MN_SUGGESTION_START;
         for (sal_uInt16 i = 0; i < nStringCount; ++i)
@@ -653,8 +653,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
         OSL_ENSURE( 0 <= nAltIdx && nAltIdx < m_aSuggestions.getLength(), "index out of range" );
         if (0 <= nAltIdx && nAltIdx < m_aSuggestions.getLength() && (m_bGrammarResults || m_xSpellAlt.is()))
         {
-            sal_Bool bOldIns = m_pSh->IsInsMode();
-            m_pSh->SetInsMode( sal_True );
+            bool bOldIns = m_pSh->IsInsMode();
+            m_pSh->SetInsMode( true );
 
             OUString aTmp( m_aSuggestions[ nAltIdx ] );
             OUString aOrig( m_bGrammarResults ? OUString() : m_xSpellAlt->getWord() );
@@ -714,7 +714,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
         {
             SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( sal_True ));
         }
-        m_pSh->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+        m_pSh->Left(CRSR_SKIP_CHARS, false, 1, false );
         {
             uno::Reference<linguistic2::XSearchableDictionaryList> xDictionaryList( SvxGetDictionaryList() );
             SvxDicListChgClamp aClamp( xDictionaryList );
@@ -853,7 +853,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             m_pSh->Push();        // save cursor
             SwLangHelper::SelectCurrentPara( *m_pSh );
             SwLangHelper::SetLanguage( *m_pSh, aNewLangTxt, true, aCoreSet );
-            m_pSh->Pop( sal_False );  // restore cursor
+            m_pSh->Pop( false );  // restore cursor
         }
         else if (nId == MN_SET_PARA_NONE)
         {
@@ -861,7 +861,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             m_pSh->Push();        // save cursor
             SwLangHelper::SelectCurrentPara( *m_pSh );
             SwLangHelper::SetLanguage_None( *m_pSh, true, aCoreSet );
-            m_pSh->Pop( sal_False );  // restore cursor
+            m_pSh->Pop( false );  // restore cursor
         }
         else if (nId == MN_SET_PARA_RESET)
         {
@@ -869,7 +869,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             m_pSh->Push();        // save cursor
             SwLangHelper::SelectCurrentPara( *m_pSh );
             SwLangHelper::ResetLanguages( *m_pSh, true );
-            m_pSh->Pop( sal_False );  // restore cursor
+            m_pSh->Pop( false );  // restore cursor
         }
         else if (nId == MN_SET_PARA_MORE)
         {
@@ -877,7 +877,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             SwLangHelper::SelectCurrentPara( *m_pSh );
             //Open Format/Character Dialog
             sw_CharDialog( *m_pSh, true, SID_ATTR_CHAR_FONT, 0, 0 );
-            m_pSh->Pop( sal_False );  // restore cursor
+            m_pSh->Pop( false );  // restore cursor
         }
     }
 
diff --git a/sw/source/core/uibase/misc/glosdoc.cxx b/sw/source/core/uibase/misc/glosdoc.cxx
index 66d019846420..fd78f33e0dd5 100644
--- a/sw/source/core/uibase/misc/glosdoc.cxx
+++ b/sw/source/core/uibase/misc/glosdoc.cxx
@@ -109,7 +109,7 @@ sal_uInt16 SwGlossaries::GetGroupCnt()
 /*------------------------------------------------------------------------
     Description: supplies the group's name
 ------------------------------------------------------------------------*/
-sal_Bool SwGlossaries::FindGroupName(OUString& rGroup)
+bool SwGlossaries::FindGroupName(OUString& rGroup)
 {
     // if the group name doesn't contain a path, a suitable group entry
     // can the searched for here;
@@ -121,7 +121,7 @@ sal_Bool SwGlossaries::FindGroupName(OUString& rGroup)
         if (rGroup==sTemp.getToken(0, GLOS_DELIM))
         {
             rGroup = sTemp;
-            return sal_True;
+            return true;
         }
     }
     // you can search two times because for more directories the case sensitive
@@ -136,10 +136,10 @@ sal_Bool SwGlossaries::FindGroupName(OUString& rGroup)
              && rSCmp.isEqual( rGroup, sTemp.getToken( 0, GLOS_DELIM) ) )
         {
             rGroup = sTemp;
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 OUString SwGlossaries::GetGroupName(sal_uInt16 nGroupId)
@@ -155,7 +155,7 @@ OUString SwGlossaries::GetGroupTitle( const OUString& rGroupName )
     OUString sGroup(rGroupName);
     if (sGroup.indexOf(GLOS_DELIM)<0)
         FindGroupName(sGroup);
-    SwTextBlocks* pGroup = GetGroupDoc(sGroup, sal_False);
+    SwTextBlocks* pGroup = GetGroupDoc(sGroup, false);
     if(pGroup)
     {
         sRet = pGroup->GetName();
@@ -168,7 +168,7 @@ OUString SwGlossaries::GetGroupTitle( const OUString& rGroupName )
     Description: supplies the group rName's text block document
 ------------------------------------------------------------------------*/
 SwTextBlocks* SwGlossaries::GetGroupDoc(const OUString &rName,
-                                        sal_Bool bCreate)
+                                        bool bCreate)
 {
     // insert to the list of text blocks if applicable
     if(bCreate && !m_GlosArr.empty())
@@ -199,12 +199,12 @@ void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) {
                    also created as file so that groups remain there later
                    (without access).
 ------------------------------------------------------------------------*/
-sal_Bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle)
+bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle)
 {
     const OUString sNewPath(rGroupName.getToken(1, GLOS_DELIM));
     sal_uInt16 nNewPath = (sal_uInt16)sNewPath.toInt32();
     if (static_cast<size_t>(nNewPath) >= m_PathArr.size())
-        return sal_False;
+        return false;
     const OUString sNewFilePath(m_PathArr[nNewPath]);
     const OUString sNewGroup = lcl_CheckFileName(sNewFilePath, rGroupName.getToken(0, GLOS_DELIM))
         + OUString(GLOS_DELIM) + sNewPath;
@@ -215,17 +215,17 @@ sal_Bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle)
         pBlock->SetName(rTitle);
         PutGroupDoc(pBlock);
         rGroupName = sNewGroup;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool    SwGlossaries::RenameGroupDoc(
+bool    SwGlossaries::RenameGroupDoc(
     const OUString& rOldGroup, OUString& rNewGroup, const OUString& rNewTitle )
 {
     sal_uInt16 nOldPath = (sal_uInt16)rOldGroup.getToken(1, GLOS_DELIM).toInt32();
     if (static_cast<size_t>(nOldPath) >= m_PathArr.size())
-        return sal_False;
+        return false;
 
     const OUString sOldFileURL =
         lcl_FullPathName(m_PathArr[nOldPath], rOldGroup.getToken(0, GLOS_DELIM));
@@ -233,12 +233,12 @@ sal_Bool    SwGlossaries::RenameGroupDoc(
     if (!FStatHelper::IsDocument( sOldFileURL ))
     {
         OSL_FAIL("group doesn't exist!");
-        return sal_False;
+        return false;
     }
 
     sal_uInt16 nNewPath = (sal_uInt16)rNewGroup.getToken(1, GLOS_DELIM).toInt32();
     if (static_cast<size_t>(nNewPath) >= m_PathArr.size())
-        return sal_False;
+        return false;
 
     const OUString sNewFileName = lcl_CheckFileName(m_PathArr[nNewPath],
                                                     rNewGroup.getToken(0, GLOS_DELIM));
@@ -247,11 +247,11 @@ sal_Bool    SwGlossaries::RenameGroupDoc(
     if (FStatHelper::IsDocument( sNewFileURL ))
     {
         OSL_FAIL("group already exists!");
-        return sal_False;
+        return false;
     }
 
-    if (!SWUnoHelper::UCB_CopyFile(sOldFileURL, sNewFileURL, sal_True ))
-        return sal_False;
+    if (!SWUnoHelper::UCB_CopyFile(sOldFileURL, sNewFileURL, true ))
+        return false;
 
     RemoveFileFromList( rOldGroup );
 
@@ -269,24 +269,24 @@ sal_Bool    SwGlossaries::RenameGroupDoc(
     pNewBlock->SetName(rNewTitle);
     delete pNewBlock;
 
-    return sal_True;
+    return true;
 }
 
 /*------------------------------------------------------------------------
     Description: Deletes a text block group
 ------------------------------------------------------------------------*/
-sal_Bool SwGlossaries::DelGroupDoc(const OUString &rName)
+bool SwGlossaries::DelGroupDoc(const OUString &rName)
 {
     sal_uInt16 nPath = (sal_uInt16)rName.getToken(1, GLOS_DELIM).toInt32();
     if (static_cast<size_t>(nPath) >= m_PathArr.size())
-        return sal_False;
+        return false;
     const OUString sBaseName(rName.getToken(0, GLOS_DELIM));
     const OUString sFileURL = lcl_FullPathName(m_PathArr[nPath], sBaseName);
     const OUString aName = sBaseName + OUString(GLOS_DELIM) + OUString::number(nPath);
     // Even if the file doesn't exist it has to be deleted from
     // the list of text block regions
     // no && because of CFfront
-    sal_Bool bRemoved = SWUnoHelper::UCB_DeleteFile( sFileURL );
+    bool bRemoved = SWUnoHelper::UCB_DeleteFile( sFileURL );
     OSL_ENSURE(bRemoved, "file has not been removed");
     RemoveFileFromList( aName );
     return bRemoved;
@@ -300,7 +300,7 @@ SwGlossaries::~SwGlossaries()
 /*------------------------------------------------------------------------
     Description: read a block document
 ------------------------------------------------------------------------*/
-SwTextBlocks* SwGlossaries::GetGlosDoc( const OUString &rName, sal_Bool bCreate ) const
+SwTextBlocks* SwGlossaries::GetGlosDoc( const OUString &rName, bool bCreate ) const
 {
     sal_uInt16 nPath = (sal_uInt16)rName.getToken(1, GLOS_DELIM).toInt32();
     SwTextBlocks *pTmp = 0;
@@ -309,7 +309,7 @@ SwTextBlocks* SwGlossaries::GetGlosDoc( const OUString &rName, sal_Bool bCreate
         const OUString sFileURL =
             lcl_FullPathName(m_PathArr[nPath], rName.getToken(0, GLOS_DELIM));
 
-        sal_Bool bExist = sal_False;
+        bool bExist = false;
         if(!bCreate)
             bExist = FStatHelper::IsDocument( sFileURL );
 
@@ -364,7 +364,7 @@ std::vector<OUString> & SwGlossaries::GetNameList()
 
 SwGlossaries::SwGlossaries()
 {
-    UpdateGlosPath(sal_True);
+    UpdateGlosPath(true);
 }
 
 /*------------------------------------------------------------------------
@@ -385,7 +385,7 @@ rtl::OUString lcl_makePath(const std::vector<rtl::OUString>& rPaths)
     return aPath.getStr();
 }
 
-void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
+void SwGlossaries::UpdateGlosPath(bool bFull)
 {
     SvtPathOptions aPathOpt;
     OUString aNewPath( aPathOpt.GetAutoTextPath() );
@@ -433,13 +433,13 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
                 ErrorHandler::HandleError( *new StringErrorInfo(
                                         ERR_AUTOPATH_ERROR, lcl_makePath(m_aInvalidPaths),
                                         ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR ));
-                m_bError = sal_True;
+                m_bError = true;
             }
             else
-                m_bError = sal_False;
+                m_bError = false;
         }
         else
-            m_bError = sal_False;
+            m_bError = false;
 
         if (!m_GlosArr.empty())
         {
@@ -639,7 +639,7 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry(
     bool _bCreate )
 {
     //standard must be created
-    sal_Bool bCreate = ( rCompleteGroupName == GetDefName() );
+    bool bCreate = ( rCompleteGroupName == GetDefName() );
     boost::scoped_ptr< SwTextBlocks > pGlosGroup( GetGroupDoc( rCompleteGroupName, bCreate ) );
 
     if ( pGlosGroup.get() && !pGlosGroup->GetError() )
diff --git a/sw/source/core/uibase/misc/glshell.cxx b/sw/source/core/uibase/misc/glshell.cxx
index 0f4d8693762d..21fce360171c 100644
--- a/sw/source/core/uibase/misc/glshell.cxx
+++ b/sw/source/core/uibase/misc/glshell.cxx
@@ -98,7 +98,7 @@ static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet )
     }
 }
 
-static sal_Bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
+static bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
                 const OUString& rShortNm, const OUString& rLongNm )
 {
     const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
@@ -129,7 +129,7 @@ static sal_Bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
     return nRet != USHRT_MAX;
 }
 
-SwGlosDocShell::SwGlosDocShell(sal_Bool bNewShow)
+SwGlosDocShell::SwGlosDocShell(bool bNewShow)
     : SwDocShell( (bNewShow)
             ? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL )
 {
@@ -198,7 +198,7 @@ bool SwWebGlosDocShell::Save()
     }
 }
 
-SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString& rShortName, sal_Bool bShow )
+SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString& rShortName, bool bShow )
 {
     SwDocShellRef xDocSh;
 
diff --git a/sw/source/core/uibase/misc/numberingtypelistbox.cxx b/sw/source/core/uibase/misc/numberingtypelistbox.cxx
index d319a131e3df..ab21d35764a4 100644
--- a/sw/source/core/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/core/uibase/misc/numberingtypelistbox.cxx
@@ -154,7 +154,7 @@ sal_Int16   SwNumberingTypeListBox::GetSelectedNumberingType()
     return nRet;
 }
 
-sal_Bool    SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType)
+bool    SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType)
 {
     sal_Int32 nPos = GetEntryPos((void*)(sal_uLong)nType);
     SelectEntryPos( nPos );
diff --git a/sw/source/core/uibase/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx
index 7497e3f2e56c..d3dc31f29427 100644
--- a/sw/source/core/uibase/misc/redlndlg.cxx
+++ b/sw/source/core/uibase/misc/redlndlg.cxx
@@ -58,7 +58,7 @@
 SFX_IMPL_MODELESSDIALOG_WITHID( SwRedlineAcceptChild, FN_REDLINE_ACCEPT )
 
 static sal_uInt16 nSortMode = 0xffff;
-static sal_Bool   bSortDir = sal_True;
+static bool       bSortDir = true;
 
 SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent,
                                             sal_uInt16 nId,
@@ -74,11 +74,11 @@ SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent,
 /*--------------------------------------------------------------------
     Description: newly initialise dialog after document switch
  --------------------------------------------------------------------*/
-sal_Bool SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh)
+bool SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh)
 {
-    sal_Bool bRet;
+    bool bRet;
 
-    if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True)  // update immediately, doc switch!
+    if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)))  // update immediately, doc switch!
         ((SwModelessRedlineAcceptDlg*)GetWindow())->Activate();
 
     return bRet;
@@ -109,7 +109,7 @@ void SwModelessRedlineAcceptDlg::Activate()
 
         pChildWin->SetOldDocShell(pDocSh);  // avoid recursion (using modified-Hdl)
 
-        sal_Bool bMod = pSh->IsModified();
+        bool bMod = pSh->IsModified();
         SfxBoolItem aShow(FN_REDLINE_SHOW, true);
         pSh->GetView().GetViewFrame()->GetDispatcher()->Execute(
             FN_REDLINE_SHOW, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aShow, 0L);
@@ -142,7 +142,7 @@ SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg()
     delete pImplDlg;
 }
 
-SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) :
+SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, bool bAutoFmt) :
     pParentDlg      (pParent),
     aTabPagesCTRL   (pParent->get_content_area()),
     aPopup          (SW_RES(MN_REDLINE_POPUP)),
@@ -152,8 +152,8 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) :
     sTableChgd      (SW_RES(STR_REDLINE_TABLECHG)),
     sFmtCollSet     (SW_RES(STR_REDLINE_FMTCOLLSET)),
     sAutoFormat     (SW_RES(STR_REDLINE_AUTOFMT)),
-    bOnlyFormatedRedlines( sal_False ),
-    bHasReadonlySel ( sal_False ),
+    bOnlyFormatedRedlines( false ),
+    bHasReadonlySel ( false ),
     bRedlnAutoFmt   (bAutoFmt),
     bInhibitActivate( false )
 {
@@ -257,8 +257,8 @@ void SwRedlineAcceptDlg::InitAuthors()
 
     sal_uInt16 nCount = pSh->GetRedlineCount();
 
-    bOnlyFormatedRedlines = sal_True;
-    bHasReadonlySel = sal_False;
+    bOnlyFormatedRedlines = true;
+    bHasReadonlySel = false;
     bool bIsNotFormated = false;
     sal_uInt16 i;
 
@@ -268,7 +268,7 @@ void SwRedlineAcceptDlg::InitAuthors()
         const SwRangeRedline& rRedln = pSh->GetRedline(i);
 
         if( bOnlyFormatedRedlines && nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType() )
-            bOnlyFormatedRedlines = sal_False;
+            bOnlyFormatedRedlines = false;
 
         aStrings.push_back(rRedln.GetAuthorString());
 
@@ -387,7 +387,7 @@ void SwRedlineAcceptDlg::Activate()
         if (&rRedln.GetRedlineData() != pParent->pData)
         {
             // Redline-Parents were inserted, changed or deleted
-            if ((i = CalcDiff(i, sal_False)) == USHRT_MAX)
+            if ((i = CalcDiff(i, false)) == USHRT_MAX)
                 return;
             continue;
         }
@@ -398,7 +398,7 @@ void SwRedlineAcceptDlg::Activate()
         if (!pRedlineData && pBackupData)
         {
             // Redline-Children were deleted
-            if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
+            if ((i = CalcDiff(i, true)) == USHRT_MAX)
                 return;
             continue;
         }
@@ -409,7 +409,7 @@ void SwRedlineAcceptDlg::Activate()
                 if (pRedlineData != pBackupData->pChild)
                 {
                     // Redline-Children were inserted, changed or deleted
-                    if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
+                    if ((i = CalcDiff(i, true)) == USHRT_MAX)
                         return;
                     continue;
                 }
@@ -447,7 +447,7 @@ void SwRedlineAcceptDlg::Activate()
     InitAuthors();
 }
 
-sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
+sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, bool bChild)
 {
     if (!nStart)
     {
@@ -534,7 +534,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
     bool bAutoFmt = (rRedln.GetRealType() & nAutoFmt) != 0;
 
     OUString sAction = GetActionText(rRedln);
-    sal_Bool bValidParent = sFilterAction.isEmpty() || sFilterAction == sAction;
+    bool bValidParent = sFilterAction.isEmpty() || sFilterAction == sAction;
     bValidParent = bValidParent && pTable->IsValidEntry(rRedln.GetAuthorString(), rRedln.GetTimeStamp(), rRedln.GetComment());
     if (nAutoFmt)
     {
@@ -557,7 +557,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
         }
         bValidParent = bValidParent && bAutoFmt;
     }
-    sal_Bool bValidTree = bValidParent;
+    bool bValidTree = bValidParent;
 
     for (sal_uInt16 nStack = 1; nStack < rRedln.GetStackCount(); nStack++)
     {
@@ -573,7 +573,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
             pParent->pNext = pRedlineChild;
 
         sAction = GetActionText(rRedln, nStack);
-        sal_Bool bValidChild = sFilterAction.isEmpty() || sFilterAction == sAction;
+        bool bValidChild = sFilterAction.isEmpty() || sFilterAction == sAction;
         bValidChild = bValidChild && pTable->IsValidEntry(rRedln.GetAuthorString(nStack), rRedln.GetTimeStamp(nStack), rRedln.GetComment());
         if (nAutoFmt)
             bValidChild = bValidChild && bAutoFmt;
@@ -709,7 +709,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
             pSh->SwCrsrShell::Push();
             if( 0 == (pCurrRedline = pSh->SelNextRedline()))
                 pCurrRedline = pSh->SelPrevRedline();
-            pSh->SwCrsrShell::Pop( sal_False );
+            pSh->SwCrsrShell::Pop( false );
         }
     }
     else
@@ -746,7 +746,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
     }
 }
 
-void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept )
+void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )
 {
     SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
     SvTreeListEntry* pEntry = bSelect ? pTable->FirstSelected() : pTable->First();
@@ -777,7 +777,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept )
         pEntry = bSelect ? pTable->NextSelected(pEntry) : pTable->Next(pEntry);
     }
 
-    sal_Bool (SwEditShell:: *FnAccRej)( sal_uInt16 ) = &SwEditShell::AcceptRedline;
+    bool (SwEditShell:: *FnAccRej)( sal_uInt16 ) = &SwEditShell::AcceptRedline;
     if( !bAccept )
         FnAccRej = &SwEditShell::RejectRedline;
 
@@ -854,25 +854,25 @@ sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry ) co
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptHdl)
 {
-    CallAcceptReject( sal_True, sal_True );
+    CallAcceptReject( true, true );
     return 0;
 }
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, AcceptAllHdl)
 {
-    CallAcceptReject( sal_False, sal_True );
+    CallAcceptReject( false, true );
     return 0;
 }
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectHdl)
 {
-    CallAcceptReject( sal_True, sal_False );
+    CallAcceptReject( true, false );
     return 0;
 }
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, RejectAllHdl)
 {
-    CallAcceptReject( sal_False, sal_False );
+    CallAcceptReject( false, false );
     return 0;
 }
 
@@ -965,7 +965,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl)
                 const SwRangeRedline& rRedln = pSh->GetRedline( nPos );
                 bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType();
 
-                if (pSh->GotoRedline(nPos, sal_True))
+                if (pSh->GotoRedline(nPos, true))
                 {
                     pSh->SetInSelect();
                     pSh->EnterAddMode();
@@ -1009,7 +1009,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
                 sal_uInt16 nPos = GetRedlinePos(*pTopEntry);
 
                 // disable commenting for protected areas
-                if (nPos != USHRT_MAX && (pRed = pSh->GotoRedline(nPos, sal_True)) != 0)
+                if (nPos != USHRT_MAX && (pRed = pSh->GotoRedline(nPos, true)) != 0)
                 {
                     if( pSh->IsCrsrPtAtEnd() )
                         pSh->SwapPam();
@@ -1129,7 +1129,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
             case MN_SORT_COMMENT:
             case MN_SORT_POSITION:
                 {
-                    bSortDir = sal_True;
+                    bSortDir = true;
                     if (nRet - MN_SORT_ACTION == 4 && pTable->GetSortedCol() == 0xffff)
                         break;  // we already have it
 
diff --git a/sw/source/core/uibase/ribbar/conarc.cxx b/sw/source/core/uibase/ribbar/conarc.cxx
index d3cf4d146d16..ad4be6f06465 100644
--- a/sw/source/core/uibase/ribbar/conarc.cxx
+++ b/sw/source/core/uibase/ribbar/conarc.cxx
@@ -30,11 +30,11 @@ ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView)
 {
 }
 
-sal_Bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt )
+bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    sal_Bool bReturn;
+    bool bReturn;
 
-    if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt)) == sal_True)
+    if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt)))
     {
         if (!nAnzButUp)
             aStartPnt = m_pWin->PixelToLogic(rMEvt.GetPosPixel());
@@ -42,9 +42,9 @@ sal_Bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt )
     return (bReturn);
 }
 
-sal_Bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
+bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     if ((m_pSh->IsDrawCreate() || m_pWin->IsDrawAction()) && rMEvt.IsLeft())
     {
@@ -52,7 +52,7 @@ sal_Bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
         if (!nAnzButUp && aPnt == aStartPnt)
         {
             SwDrawBase::MouseButtonUp(rMEvt);
-            bReturn = sal_True;
+            bReturn = true;
         }
         else
         {   nAnzButUp++;
@@ -61,7 +61,7 @@ sal_Bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
             {
                 SwDrawBase::MouseButtonUp(rMEvt);
                 nAnzButUp = 0;
-                bReturn = sal_True;
+                bReturn = true;
             }
             else
                 m_pSh->EndCreate(SDRCREATE_NEXTPOINT);
diff --git a/sw/source/core/uibase/ribbar/concustomshape.cxx b/sw/source/core/uibase/ribbar/concustomshape.cxx
index 1b623ee19197..9b3a5dfa7b89 100644
--- a/sw/source/core/uibase/ribbar/concustomshape.cxx
+++ b/sw/source/core/uibase/ribbar/concustomshape.cxx
@@ -68,9 +68,9 @@ OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq )
     return aRet;
 }
 
-sal_Bool ConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
+bool ConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn = SwDrawBase::MouseButtonDown(rMEvt);
+    bool bReturn = SwDrawBase::MouseButtonDown(rMEvt);
     if ( bReturn )
     {
         SdrView *pSdrView = m_pSh->GetDrawView();
@@ -94,7 +94,7 @@ sal_Bool ConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
     return bReturn;
 }
 
-sal_Bool ConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
+bool ConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
 {
     return SwDrawBase::MouseButtonUp(rMEvt);
 }
diff --git a/sw/source/core/uibase/ribbar/conform.cxx b/sw/source/core/uibase/ribbar/conform.cxx
index a3b5c3d2e7d1..4326a8040324 100644
--- a/sw/source/core/uibase/ribbar/conform.cxx
+++ b/sw/source/core/uibase/ribbar/conform.cxx
@@ -35,9 +35,9 @@ ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, S
     m_bInsForm = true;
 }
 
-sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
+bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     SdrView *pSdrView = m_pSh->GetDrawView();
 
@@ -71,7 +71,7 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
         bReturn = m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, m_aStartPos);
 
         if (bReturn)
-            m_pWin->SetDrawAction(sal_True);
+            m_pWin->SetDrawAction(true);
     }
     else
         bReturn = SwDrawBase::MouseButtonDown(rMEvt);
diff --git a/sw/source/core/uibase/ribbar/conpoly.cxx b/sw/source/core/uibase/ribbar/conpoly.cxx
index 5edde1056ac2..94110be16ec7 100644
--- a/sw/source/core/uibase/ribbar/conpoly.cxx
+++ b/sw/source/core/uibase/ribbar/conpoly.cxx
@@ -33,26 +33,26 @@ ConstPolygon::ConstPolygon(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* p
 {
 }
 
-sal_Bool ConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
+bool ConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn;
+    bool bReturn;
 
-    if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt)) == sal_True)
+    if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt)))
         aLastPos = rMEvt.GetPosPixel();
 
     return (bReturn);
 }
 
-sal_Bool ConstPolygon::MouseMove(const MouseEvent& rMEvt)
+bool ConstPolygon::MouseMove(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn = SwDrawBase::MouseMove(rMEvt);
+    bool bReturn = SwDrawBase::MouseMove(rMEvt);
 
     return bReturn;
 }
 
-sal_Bool ConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
+bool ConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     if (m_pSh->IsDrawCreate())
     {
@@ -63,7 +63,7 @@ sal_Bool ConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
             {
                 m_pSh->BreakCreate();
                 EnterSelectMode(rMEvt);
-                return sal_True;
+                return true;
             }
         }
         else
diff --git a/sw/source/core/uibase/ribbar/conrect.cxx b/sw/source/core/uibase/ribbar/conrect.cxx
index daa266a12b64..2b6d08caf53a 100644
--- a/sw/source/core/uibase/ribbar/conrect.cxx
+++ b/sw/source/core/uibase/ribbar/conrect.cxx
@@ -46,11 +46,11 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin,
 {
 }
 
-sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
+bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn;
+    bool bReturn;
 
-    if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt)) == sal_True
+    if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt))
                                     && m_pWin->GetSdrDrawMode() == OBJ_CAPTION)
     {
         m_pView->NoRotate();
@@ -63,9 +63,9 @@ sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
     return (bReturn);
 }
 
-sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
+bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
 {
-    sal_Bool bRet = SwDrawBase::MouseButtonUp(rMEvt);
+    bool bRet = SwDrawBase::MouseButtonUp(rMEvt);
     if( bRet )
     {
         SdrView *pSdrView = m_pSh->GetDrawView();
diff --git a/sw/source/core/uibase/ribbar/drawbase.cxx b/sw/source/core/uibase/ribbar/drawbase.cxx
index 927522a873a8..8aba0debcbc9 100644
--- a/sw/source/core/uibase/ribbar/drawbase.cxx
+++ b/sw/source/core/uibase/ribbar/drawbase.cxx
@@ -59,9 +59,9 @@ SwDrawBase::~SwDrawBase()
         m_pSh->GetDrawView()->SetEditMode(true);
 }
 
-sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
+bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     SdrView *pSdrView = m_pSh->GetDrawView();
 
@@ -98,7 +98,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
             SetDrawPointer();
 
             if ( bReturn )
-                m_pWin->SetDrawAction(sal_True);
+                m_pWin->SetDrawAction(true);
         }
         else if (!pSdrView->IsAction())
         {
@@ -112,14 +112,14 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                 // Drag handle
                 bNoInterrupt = true;
                 bReturn = pSdrView->BegDragObj(m_aStartPos, (OutputDevice*) NULL, aVEvt.pHdl);
-                m_pWin->SetDrawAction(sal_True);
+                m_pWin->SetDrawAction(true);
             }
             else if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
             {
                 // Insert gluepoint
                 bNoInterrupt = true;
                 bReturn = pSdrView->BegInsObjPoint(m_aStartPos, rMEvt.IsMod1());
-                m_pWin->SetDrawAction(sal_True);
+                m_pWin->SetDrawAction(true);
             }
             else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
             {
@@ -128,12 +128,12 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                     pSdrView->UnmarkAllPoints();
 
                 bReturn = pSdrView->BegMarkPoints(m_aStartPos);
-                m_pWin->SetDrawAction(sal_True);
+                m_pWin->SetDrawAction(true);
             }
             else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2())
             {
                 // Move objekt
-                return sal_False;
+                return false;
             }
             else if (eHit == SDRHIT_HANDLE)
             {
@@ -177,7 +177,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
 
                     bNoInterrupt = false;
                     // Use drag in edtwin
-                    return sal_False;
+                    return false;
                 }
 
                 bNoInterrupt = true;
@@ -189,10 +189,10 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                         if (!pSdrView->HasMarkablePoints())
                         {
                             bool bUnlockView = !m_pSh->IsViewLocked();
-                            m_pSh->LockView( sal_True ); //lock visible section
+                            m_pSh->LockView( true ); //lock visible section
                             m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // deselect all
                             if( bUnlockView )
-                                m_pSh->LockView( sal_False );
+                                m_pSh->LockView( false );
                         }
                         else
                             pSdrView->UnmarkAllPoints();
@@ -201,8 +201,8 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                 if (!m_pSh->IsSelFrmMode())
                     m_pSh->EnterSelFrmMode(NULL);
 
-                if( 0 != (bReturn = m_pSh->BeginMark(m_aStartPos)) )
-                    m_pWin->SetDrawAction(sal_True);
+                if( (bReturn = m_pSh->BeginMark(m_aStartPos)) )
+                    m_pWin->SetDrawAction(true);
 
                 SetDrawPointer();
             }
@@ -211,11 +211,11 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
     return bReturn;
 }
 
-sal_Bool SwDrawBase::MouseMove(const MouseEvent& rMEvt)
+bool SwDrawBase::MouseMove(const MouseEvent& rMEvt)
 {
     SdrView *pSdrView = m_pSh->GetDrawView();
     Point aPnt(m_pWin->PixelToLogic(rMEvt.GetPosPixel()));
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if (IsCreateObj() && !m_pWin->IsDrawSelMode() && pSdrView->IsCreateObj())
     {
@@ -224,20 +224,20 @@ sal_Bool SwDrawBase::MouseMove(const MouseEvent& rMEvt)
         pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
 
         m_pSh->MoveCreate(aPnt);
-        bRet = sal_True;
+        bRet = true;
     }
     else if (pSdrView->IsAction() || pSdrView->IsInsObjPoint() || pSdrView->IsMarkPoints())
     {
         m_pSh->MoveMark(aPnt);
-        bRet = sal_True;
+        bRet = true;
     }
 
     return (bRet);
 }
 
-sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
+bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
     bool bCheckShell = false;
     bool bAutoCap = false;
 
@@ -300,7 +300,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
             }
         }
 
-        bReturn = sal_True;
+        bReturn = true;
 
         EnterSelectMode(rMEvt);
     }
@@ -316,7 +316,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
             {
                 bReturn = m_pSh->EndMark();
 
-                m_pWin->SetDrawAction(sal_False);
+                m_pWin->SetDrawAction(false);
 
                 if (aPnt == m_aStartPos && m_pSh->IsObjSelectable(aPnt))
                 {
@@ -349,7 +349,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
                     }
                     m_pView->NoRotate();
 
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
             }
         }
@@ -365,9 +365,9 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
                 else
                 {
                     pSdrView->EndAction();
-                    bReturn = sal_True;
+                    bReturn = true;
                 }
-                m_pWin->SetDrawAction(sal_False);
+                m_pWin->SetDrawAction(false);
 
                 if (aPnt == m_aStartPos)
                 {
@@ -405,7 +405,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
                     m_pSh->LeaveSelFrmMode();
 
                 m_pView->NoRotate();
-                bReturn = sal_True;
+                bReturn = true;
             }
         }
     }
@@ -441,7 +441,7 @@ void SwDrawBase::Deactivate()
     if (m_pWin->IsDrawAction() && m_pSh->IsDrawCreate())
         m_pSh->BreakCreate();
 
-    m_pWin->SetDrawAction(sal_False);
+    m_pWin->SetDrawAction(false);
 
     m_pWin->ReleaseMouse();
     bNoInterrupt = false;
@@ -456,9 +456,9 @@ void SwDrawBase::Deactivate()
 // If a KeyEvent is processed then the return value is sal_True, otherwise
 // Sal_False.
 
-sal_Bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
+bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
     sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
 
     switch (nCode)
@@ -471,14 +471,14 @@ sal_Bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
                 m_pView->LeaveDrawCreate();
             }
 
-            bReturn = sal_True;
+            bReturn = true;
         }
         break;
 
         case KEY_DELETE:
         {
             m_pSh->DelSelectedObj();
-            bReturn = sal_True;
+            bReturn = true;
         }
         break;
 
@@ -527,7 +527,7 @@ sal_Bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
                     pSdrView->MoveAllMarked(Size(nX, nY));
                 }
 
-                bReturn = sal_True;
+                bReturn = true;
             }
         }
         break;
@@ -544,7 +544,7 @@ sal_Bool SwDrawBase::KeyInput(const KeyEvent& rKEvt)
 void SwDrawBase::BreakCreate()
 {
     m_pSh->BreakCreate();
-    m_pWin->SetDrawAction(sal_False);
+    m_pWin->SetDrawAction(false);
     m_pWin->ReleaseMouse();
 
     Deactivate();
@@ -564,7 +564,7 @@ void SwDrawBase::SetDrawPointer()
 
 void SwDrawBase::EnterSelectMode(const MouseEvent& rMEvt)
 {
-    m_pWin->SetDrawAction(sal_False);
+    m_pWin->SetDrawAction(false);
 
     if (!m_pSh->IsObjSelected() && !m_pWin->IsDrawAction())
     {
diff --git a/sw/source/core/uibase/ribbar/dselect.cxx b/sw/source/core/uibase/ribbar/dselect.cxx
index 91ad444ccf0b..60c1a06fec8e 100644
--- a/sw/source/core/uibase/ribbar/dselect.cxx
+++ b/sw/source/core/uibase/ribbar/dselect.cxx
@@ -36,9 +36,9 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView*
 // If a KeyEvent is processed then the return value is sal_True, otherwise
 // Sal_False.
 
-sal_Bool DrawSelection::KeyInput(const KeyEvent& rKEvt)
+bool DrawSelection::KeyInput(const KeyEvent& rKEvt)
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     switch (rKEvt.GetKeyCode().GetCode())
     {
@@ -49,7 +49,7 @@ sal_Bool DrawSelection::KeyInput(const KeyEvent& rKEvt)
                 m_pSh->BreakMark();
                 m_pWin->ReleaseMouse();
             }
-            bReturn = sal_True;
+            bReturn = true;
         }
         break;
     }
@@ -63,7 +63,7 @@ sal_Bool DrawSelection::KeyInput(const KeyEvent& rKEvt)
 void DrawSelection::Activate(const sal_uInt16 nSlotId)
 {
     m_pWin->SetSdrDrawMode(OBJ_NONE);
-    m_pWin->SetObjectSelect( sal_True );
+    m_pWin->SetObjectSelect( true );
     SwDrawBase::Activate(nSlotId);
 
     m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
diff --git a/sw/source/core/uibase/ribbar/inputwin.cxx b/sw/source/core/uibase/ribbar/inputwin.cxx
index 3052bc7ba3e6..c3caec60a7fe 100644
--- a/sw/source/core/uibase/ribbar/inputwin.cxx
+++ b/sw/source/core/uibase/ribbar/inputwin.cxx
@@ -70,8 +70,8 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
     , m_bResetUndo(false)
     , m_bCallUndo(false)
 {
-    bFirst = sal_True;
-    bActive = bIsTable = bDelSel = sal_False;
+    bFirst = true;
+    bActive = bIsTable = bDelSel = false;
 
     FreeResource();
 
@@ -189,7 +189,7 @@ void SwInputWindow::Resize()
 
 void SwInputWindow::ShowWin()
 {
-    bIsTable = sal_False;
+    bIsTable = false;
     // stop rulers
     if(pView)
     {
@@ -238,7 +238,7 @@ void SwInputWindow::ShowWin()
                 m_bDoesUndo = pWrtShell->DoesUndo();
                 if( !m_bDoesUndo )
                 {
-                    pWrtShell->DoUndo( sal_True );
+                    pWrtShell->DoUndo( true );
                 }
 
                 if( !pWrtShell->SwCrsrShell::HasSelection() )
@@ -271,7 +271,7 @@ void SwInputWindow::ShowWin()
             pWrtShell->EndSelect();
         }
 
-        bFirst = sal_False;
+        bFirst = false;
 
         aEdit.SetModifyHdl( LINK( this, SwInputWindow, ModifyHdl ));
 
@@ -284,7 +284,7 @@ void SwInputWindow::ShowWin()
         aEdit.GrabFocus();
         // For input cut the UserInterface
 
-        pView->GetEditWin().LockKeyInput(sal_True);
+        pView->GetEditWin().LockKeyInput(true);
         pView->GetViewFrame()->GetDispatcher()->Lock(true);
         pWrtShell->Push();
     }
@@ -371,9 +371,9 @@ void SwInputWindow::Click( )
 void  SwInputWindow::ApplyFormula()
 {
     pView->GetViewFrame()->GetDispatcher()->Lock(false);
-    pView->GetEditWin().LockKeyInput(sal_False);
+    pView->GetEditWin().LockKeyInput(false);
     CleanupUglyHackWithUndo();
-    pWrtShell->Pop( sal_False );
+    pWrtShell->Pop( false );
 
     // Formular should always begin with "=", so remove it here again
     OUString sEdit(comphelper::string::strip(aEdit.GetText(), ' '));
@@ -394,9 +394,9 @@ void  SwInputWindow::CancelFormula()
     if(pView)
     {
         pView->GetViewFrame()->GetDispatcher()->Lock( false );
-        pView->GetEditWin().LockKeyInput(sal_False);
+        pView->GetEditWin().LockKeyInput(false);
         CleanupUglyHackWithUndo();
-        pWrtShell->Pop( sal_False );
+        pWrtShell->Pop( false );
 
         if( bDelSel )
             pWrtShell->EnterStdMode();
@@ -453,7 +453,7 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
     return 0;
 }
 
-void SwInputWindow::SetFormula( const OUString& rFormula, sal_Bool bDelFlag )
+void SwInputWindow::SetFormula( const OUString& rFormula, bool bDelFlag )
 {
     OUString sEdit('=');
     if( !rFormula.isEmpty() )
@@ -492,7 +492,7 @@ void SwInputWindow::DelBoxCntnt()
     {
         pWrtShell->StartAllAction();
         pWrtShell->ClearMark();
-        pWrtShell->Pop( sal_False );
+        pWrtShell->Pop( false );
         pWrtShell->Push();
         pWrtShell->MoveSection( fnSectionCurr, fnSectionStart );
         pWrtShell->SetMark();
diff --git a/sw/source/core/uibase/ribbar/workctrl.cxx b/sw/source/core/uibase/ribbar/workctrl.cxx
index 7cd02e5bfcb8..31a8978e746c 100644
--- a/sw/source/core/uibase/ribbar/workctrl.cxx
+++ b/sw/source/core/uibase/ribbar/workctrl.cxx
@@ -258,7 +258,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
     ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc();
     if ( fnSetActGroup )
         (*fnSetActGroup)( sGroup );
-    pGlosHdl->SetCurGroup(sGroup, sal_True);
+    pGlosHdl->SetCurGroup(sGroup, true);
     pGlosHdl->InsertGlossary(sShortName);
 
     return 0;
@@ -585,13 +585,13 @@ void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 
 void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 {
-    SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(sal_True));
-    SetItemText(NID_PREV, SwScrollNaviPopup::GetQuickHelpText(sal_False));
+    SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(true));
+    SetItemText(NID_PREV, SwScrollNaviPopup::GetQuickHelpText(false));
     ToolBox::RequestHelp( rHEvt );
 
 }
 
-OUString SwScrollNaviPopup::GetQuickHelpText(sal_Bool bNext)
+OUString SwScrollNaviPopup::GetQuickHelpText(bool bNext)
 {
     sal_uInt16 nResId = STR_IMGBTN_START;
     nResId += SwView::GetMoveType() - NID_START;
diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx
index f03193098d89..f8524bed686f 100644
--- a/sw/source/core/uibase/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
@@ -535,7 +535,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-                SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, 0, sal_True );
+                SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, 0, true );
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
                 sal_uInt16 nRet = pDlg->Execute();
                 if(RET_OK == nRet)
@@ -793,7 +793,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
                         rSet.DisableItem( nWhich );
                     else
                     {
-                        sal_Bool bFlag = sal_False;
+                        bool bFlag = false;
                         switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() )
                         {
                             case FRMDIR_HORI_LEFT_TOP:
@@ -819,7 +819,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
             case SID_INSERT_ZWSP:
             {
                 SvtCTLOptions aCTLOptions;
-                sal_Bool bEnabled = aCTLOptions.IsCTLFontEnabled();
+                bool bEnabled = aCTLOptions.IsCTLFontEnabled();
                 rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, bEnabled );
                 if(!bEnabled)
                     rSet.DisableItem(nWhich);
@@ -850,7 +850,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
     }
 }
 
-void SwAnnotationShell::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
+void SwAnnotationShell::ExecSearch(SfxRequest& rReq, bool bNoMessage)
 {
     rView.ExecSearch(rReq,bNoMessage);
 }
@@ -1252,9 +1252,9 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
                             if( RET_OK == nDialogRet )
                             {
                                 //get some parameters from the dialog
-                                sal_Bool bToSimplified = sal_True;
-                                sal_Bool bUseVariants = sal_True;
-                                sal_Bool bCommonTerms = sal_True;
+                                bool bToSimplified = true;
+                                bool bUseVariants = true;
+                                bool bCommonTerms = true;
                                 Reference< beans::XPropertySet >  xProp( xDialog, UNO_QUERY );
                                 if( xProp.is() )
                                 {
diff --git a/sw/source/core/uibase/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx
index dfcc17498ef6..aa63b4fa1597 100644
--- a/sw/source/core/uibase/shells/basesh.cxx
+++ b/sw/source/core/uibase/shells/basesh.cxx
@@ -203,7 +203,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
             if( rSh.IsNoNum() )
             {
                 rSh.SttCrsrMove();
-                sal_Bool bLeft = rSh.Left( CRSR_SKIP_CHARS, sal_True, 1, sal_False  );
+                bool bLeft = rSh.Left( CRSR_SKIP_CHARS, true, 1, false  );
                 if( bLeft )
                 {
                     rSh.DelLeft();
@@ -229,7 +229,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
     rReq.Done();
 
     //#i42732# - notify the edit window that from now on we do not use the input language
-    rTmpEditWin.SetUseInputLanguage( sal_False );
+    rTmpEditWin.SetUseInputLanguage( false );
 }
 
 void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
@@ -254,8 +254,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                     pTransfer->Cut();
                 else
                 {
-                    const sal_Bool bLockedView = rSh.IsViewLocked();
-                    rSh.LockView( sal_True );    //lock visible section
+                    const bool bLockedView = rSh.IsViewLocked();
+                    rSh.LockView( true );    //lock visible section
                     pTransfer->Copy();
                     rSh.LockView( bLockedView );
                 }
@@ -397,7 +397,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
     SwWrtShell &rSh = GetShell();
     SfxWhichIter aIter(rSet);
 
-    const sal_Bool bCopy = rSh.HasSelection();
+    const bool bCopy = rSh.HasSelection();
 
     sal_uInt16 nWhich = aIter.FirstWhich();
 
@@ -591,12 +591,12 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             {
                 rSh.UpdateDocStat();
                 rSh.EndAllTblBoxEdit();
-                rSh.SwViewShell::UpdateFlds(sal_True);
+                rSh.SwViewShell::UpdateFlds(true);
 
                 if( rSh.IsCrsrInTbl() )
                 {
                     if( !rSh.IsTblComplexForChart() )
-                        SwTableFUNC( &rSh, sal_False).UpdateChart();
+                        SwTableFUNC( &rSh, false).UpdateChart();
                     rSh.ClearTblBoxCntnt();
                     rSh.SaveTblBoxCntnt();
                 }
@@ -660,7 +660,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     rSh.ClearMark();
                     rSh.EndSelect();
                 }
-                sal_Bool bRet = rSh.MoveFldType( pFldType, nSlot == FN_GOTO_NEXT_MARK );
+                bool bRet = rSh.MoveFldType( pFldType, nSlot == FN_GOTO_NEXT_MARK );
                 SwField* pCurField = bRet ? rSh.GetCurFld() : 0;
                 if (pCurField)
                     rSh.ClickToField(*pCurField);
@@ -679,14 +679,14 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             }
             rSh.EnterStdMode();
             nSlot == FN_START_DOC_DIRECT ?
-                rSh.SttEndDoc(sal_True) :
-                    rSh.SttEndDoc(sal_False);
+                rSh.SttEndDoc(true) :
+                    rSh.SttEndDoc(false);
         }
         break;
         case FN_GOTO_PREV_OBJ:
         case FN_GOTO_NEXT_OBJ:
         {
-                sal_Bool bSuccess = rSh.GotoObj(
+                bool bSuccess = rSh.GotoObj(
                             nSlot == FN_GOTO_NEXT_OBJ ? sal_True : sal_False);
                 rReq.SetReturnValue(SfxBoolItem(nSlot, bSuccess));
                 if (bSuccess && !rSh.IsSelFrmMode())
@@ -835,7 +835,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             {
                 //Shell change!
                 SwView& rSaveView = rView;
-                sal_Bool bInserted = sal_False;
+                bool bInserted = false;
                 //recording:
                 SfxViewFrame* pViewFrame = GetView().GetViewFrame();
                 if( SfxRequest::HasMacroRecorder(pViewFrame) )
@@ -885,8 +885,8 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 // oj #107754#
                 if ( SID_STYLE_WATERCAN == nSlot )
                 {
-                    const sal_Bool bLockedView = rSh.IsViewLocked();
-                    rSh.LockView( sal_True );    //lock visible section
+                    const bool bLockedView = rSh.IsViewLocked();
+                    rSh.LockView( true );    //lock visible section
 
                     GetView().GetDocShell()->ExecStyleSheet(rReq);
 
@@ -961,7 +961,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                     SwFmtSurround aSur( (SwFmtSurround&)aSet.Get( RES_SURROUND ) );
                     if ( !aSur.IsContour() )
                     {
-                        aSur.SetContour( sal_True );
+                        aSur.SetContour( true );
                         if ( aSur.GetSurround() == SURROUND_NONE )
                             aSur.SetSurround( SURROUND_PARALLEL );
                         aSet.Put( aSur );
@@ -1116,7 +1116,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 && pItem != NULL
                 && pItem->ISA( SfxBoolItem ) )
             {
-                sal_Bool bDesignMode =
+                bool bDesignMode =
                     static_cast<const SfxBoolItem*>( pItem )->GetValue();
 
                 // set form design mode
@@ -1162,7 +1162,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             else if ( rSh.IsFrmSelected() )
             {
                 // Set border attributes via Frame-Manager.
-                SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+                SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
                 aMgr.SetAttrSet( *pArgs );
                 aMgr.UpdateFlyFrm();
             }
@@ -1194,7 +1194,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             else if ( rSh.IsFrmSelected() )
             {
                 // Set border attributes via Frame-Manager.
-                SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+                SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
                 aMgr.SetAttrSet(*pArgs);
                 aMgr.UpdateFlyFrm();
             }
@@ -1229,8 +1229,8 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
         std::set<sal_uInt16>::iterator it;
         for( it = aGrfUpdateSlots.begin(); it != aGrfUpdateSlots.end(); ++it )
         {
-            sal_Bool bSetState = sal_False;
-            sal_Bool bState = sal_False;
+            bool bSetState = false;
+            bool bState = false;
             switch( nSlot = *it )
             {
             case SID_IMAP:
@@ -1247,7 +1247,7 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
                             lcl_UpdateIMapDlg( rSh );
 
                     if( !bProtect && SID_IMAP == nSlot )
-                        bSetState = sal_True, bState = 0 != pDlg;
+                        bSetState = true, bState = 0 != pDlg;
                 }
                 break;
 
@@ -1262,7 +1262,7 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
                                 rSh.GetIMapInventor() )
                         lcl_UpdateContourDlg( rSh, nsSelectionType::SEL_GRF );
 
-                    bSetState = sal_True;
+                    bSetState = true;
                     bState = 0 != pDlg;
                 }
                 break;
@@ -1273,7 +1273,7 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
                     SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND);
                     rSh.GetFlyFrmAttr(aSet);
                     const SwFmtSurround& rWrap = (const SwFmtSurround&)aSet.Get(RES_SURROUND);
-                    bSetState = sal_True;
+                    bSetState = true;
                     bState = rWrap.IsContour();
                 }
                 break;
@@ -1345,7 +1345,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 
             case FN_CONVERT_TABLE_TO_TEXT:
             {
-                sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_True);
+                sal_uInt16 eFrmType = rSh.GetFrmType(0,true);
                 if( (eFrmType & FRMTYPE_FOOTNOTE) ||
                     !rSh.GetTableFmt() )
                     rSet.DisableItem( nWhich );
@@ -1353,7 +1353,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             break;
             case FN_CONVERT_TEXT_TO_TABLE:
             {
-                sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_True);
+                sal_uInt16 eFrmType = rSh.GetFrmType(0,true);
                 if( (eFrmType & FRMTYPE_FOOTNOTE) ||
                     !rSh.IsTextToTableAvailable()  )
                     rSet.DisableItem( nWhich );
@@ -1361,7 +1361,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             break;
             case FN_CONVERT_TEXT_TABLE:
             {
-                sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_True);
+                sal_uInt16 eFrmType = rSh.GetFrmType(0,true);
                 if( (eFrmType & FRMTYPE_FOOTNOTE) ||
                     (!rSh.GetTableFmt() && !rSh.IsTextToTableAvailable() ) )
                     rSet.DisableItem( nWhich );
@@ -1376,11 +1376,11 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 if ( rSh.IsTableMode() )
                 {
                     SwFrmFmt *pFmt = rSh.GetTableFmt();
-                    aSet.Put(pFmt->GetFmtAttr( nWhich, sal_True ));
+                    aSet.Put(pFmt->GetFmtAttr( nWhich, true ));
                 }
                 else if( rSh.IsFrmSelected() )
                 {
-                    SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+                    SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
                     aSet.Put( aMgr.GetAttrSet() );
                 }
                 else
@@ -1403,8 +1403,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 else
                 {
                     const sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
-                    const sal_Bool bHas = pVFrame->HasChildWindow( nId );
-                    const sal_Bool bFrmSel = rSh.IsFrmSelected();
+                    const bool bHas = pVFrame->HasChildWindow( nId );
+                    const bool bFrmSel = rSh.IsFrmSelected();
                     const bool bIsGraphicSelection =
                                 rSh.GetSelectionType() == nsSelectionType::SEL_GRF;
 
@@ -1414,10 +1414,10 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                     // If the swapping of the graphic is finished, the status
                     // must be determined asynchronously, until this the slot
                     // will be disabled.
-                    if ( bHas && bIsGraphicSelection && rSh.IsGrfSwapOut( sal_True ) )
+                    if ( bHas && bIsGraphicSelection && rSh.IsGrfSwapOut( true ) )
                     {
                         if( AddGrfUpdateSlot( nWhich ))
-                            rSh.GetGraphic(sal_False);  // start the loading
+                            rSh.GetGraphic(false);  // start the loading
                     }
                     else
                     {
@@ -1441,17 +1441,17 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             break;
             case SID_IMAP_EXEC:
             {
-                sal_Bool bDisable = sal_False;
+                bool bDisable = false;
                 if( !rSh.IsFrmSelected())
-                    bDisable = sal_True;
+                    bDisable = true;
                 sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
                 if(!bDisable && pVFrame->HasChildWindow( nId ))
                 {
                     if(rSh.GetSelectionType() == nsSelectionType::SEL_GRF
-                                    && rSh.IsGrfSwapOut(sal_True))
+                                    && rSh.IsGrfSwapOut(true))
                     {
                         if( AddGrfUpdateSlot( nWhich ))
-                            rSh.GetGraphic(sal_False);  // start the loading
+                            rSh.GetGraphic(false);  // start the loading
                     }
                     else
                     {
@@ -1475,7 +1475,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 
             case SID_CONTOUR_DLG:
             {
-                sal_Bool bParentCntProt = 0 != rSh.IsSelObjProtected(FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
+                bool bParentCntProt = 0 != rSh.IsSelObjProtected(FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
 
                 if( bParentCntProt || 0 != (HTMLMODE_ON & ::GetHtmlMode(
                                             GetView().GetDocShell() )) )
@@ -1483,9 +1483,9 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 else
                 {
                     sal_uInt16 nId = SvxContourDlgChildWindow::GetChildWindowId();
-                    sal_Bool bHas = GetView().GetViewFrame()->HasChildWindow( nId );
+                    bool bHas = GetView().GetViewFrame()->HasChildWindow( nId );
                     int nSel = rSh.GetSelectionType();
-                    sal_Bool bOk = 0 != (nSel & (nsSelectionType::SEL_GRF|nsSelectionType::SEL_OLE));
+                    bool bOk = 0 != (nSel & (nsSelectionType::SEL_GRF|nsSelectionType::SEL_OLE));
 
                     bool bDisable = false;
                     if( !bHas && !bOk )
@@ -1497,10 +1497,10 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                     // must be determined asynchronously, until this the slot
                     // will be disabled.
                     else if ( bHas && (nSel & nsSelectionType::SEL_GRF) &&
-                              rSh.IsGrfSwapOut(sal_True) )
+                              rSh.IsGrfSwapOut(true) )
                     {
                         if( AddGrfUpdateSlot( nWhich ))
-                            rSh.GetGraphic(sal_False);  // start the loading
+                            rSh.GetGraphic(false);  // start the loading
                         // #i75481#
                         bDisable = true;
                     }
@@ -1525,16 +1525,16 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             break;
             case SID_CONTOUR_EXEC:
             {
-                sal_Bool bDisable = sal_False;
+                bool bDisable = false;
                 int nSel = rSh.GetSelectionType();
                 if( !(nSel & (nsSelectionType::SEL_GRF|nsSelectionType::SEL_OLE)) )
-                    bDisable = sal_True;
+                    bDisable = true;
                 sal_uInt16 nId = SvxContourDlgChildWindow::GetChildWindowId();
                 if( !bDisable && GetView().GetViewFrame()->HasChildWindow( nId ))
                 {
                     SvxContourDlg *pDlg = SWCONTOURDLG(GetView());
                     if( pDlg->GetEditingObject() != rSh.GetIMapInventor() )
-                        bDisable = sal_True;
+                        bDisable = true;
                 }
                 rSet.Put(SfxBoolItem(nWhich, bDisable));
             }
@@ -1547,8 +1547,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             case FN_TOOL_ANCHOR_AT_CHAR:
             case FN_TOOL_ANCHOR_FRAME:
             {
-                sal_Bool bObj = 0 != rSh.IsObjSelected();
-                sal_Bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
+                bool bObj = 0 != rSh.IsObjSelected();
+                bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
 
                 if( !bParentCntProt && (bObj || rSh.IsFrmSelected()))
                 {
@@ -1558,7 +1558,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                     else
                         rSh.GetFlyFrmAttr(aSet);
                     RndStdIds eSet = ((SwFmtAnchor&)aSet.Get(RES_ANCHOR)).GetAnchorId();
-                    const sal_Bool bSet =
+                    const bool bSet =
                            ((nWhich == FN_TOOL_ANCHOR_PAGE) &&
                             (eSet == FLY_AT_PAGE))
                         || ((nWhich == FN_TOOL_ANCHOR_PARAGRAPH) &&
@@ -1617,8 +1617,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             case FN_FRAME_WRAP_LEFT:
             case FN_FRAME_WRAP_RIGHT:
             {
-                sal_Bool bObj = 0 != rSh.IsObjSelected();
-                sal_Bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
+                bool bObj = 0 != rSh.IsObjSelected();
+                bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
 
                 if( !bParentCntProt && (bObj || rSh.IsFrmSelected()))
                 {
@@ -1637,9 +1637,9 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                     const SwFmtSurround& rWrap = (const SwFmtSurround&)aSet.Get(RES_SURROUND);
 
                     const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)aSet.Get(RES_OPAQUE);
-                    sal_Bool bOpaque = rOpaque.GetValue();
+                    bool bOpaque = rOpaque.GetValue();
                     SwSurround nSurround = rWrap.GetSurround();
-                    sal_Bool bSet = sal_False;
+                    bool bSet = false;
 
                     bool bDisable =
                         (nAnchorType == - 1) || (nAnchorType == FLY_AS_CHAR);
@@ -1689,10 +1689,10 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                             {
                                 int nSel = rSh.GetSelectionType();
                                 if( (nSel & nsSelectionType::SEL_GRF) &&
-                                            rSh.IsGrfSwapOut(sal_True))
+                                            rSh.IsGrfSwapOut(true))
                                 {
                                     if( AddGrfUpdateSlot( nWhich ))
-                                        rSh.GetGraphic(sal_False);  // start the loading
+                                        rSh.GetGraphic(false);  // start the loading
                                 }
                                 else if( rSh.IsFrmSelected() )
                                 {
@@ -1740,7 +1740,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                 if( rSh.GetDoc()->isXForms() )
                 {
                     // determine current state from view options
-                    sal_Bool bValue = ! rSh.GetViewOptions()->IsFormView();
+                    bool bValue = ! rSh.GetViewOptions()->IsFormView();
                     rSet.Put( SfxBoolItem( nWhich, bValue ) );
                 }
                 else
@@ -1812,7 +1812,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
             case FN_FRAME_NOWRAP:
                 nSurround = SURROUND_NONE;
                 if (aWrap.IsContour())
-                    aWrap.SetContour(sal_False);
+                    aWrap.SetContour(false);
                 break;
             case FN_FRAME_WRAP_IDEAL:
                 nSurround = SURROUND_IDEAL;
@@ -1833,7 +1833,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
                 break;
             case FN_FRAME_WRAPTHRU_TRANSP:
                 if (aWrap.IsContour())
-                    aWrap.SetContour(sal_False);
+                    aWrap.SetContour(false);
                 // No break!!!
             case FN_FRAME_WRAPTHRU:
                 nSurround = SURROUND_THROUGHT;
@@ -1858,7 +1858,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
             if (bObj && nOldSurround != nSurround &&
                 (nOldSurround == SURROUND_NONE || nOldSurround == SURROUND_THROUGHT))
             {
-                aWrap.SetContour(sal_True);
+                aWrap.SetContour(true);
             }
         }
 
@@ -2366,7 +2366,7 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet)
     SwWrtShell &rSh = GetShell();
     // Tabele cell(s) selected?
     bool bPrepare = true;
-    sal_Bool bTableMode = rSh.IsTableMode();
+    bool bTableMode = rSh.IsTableMode();
     if ( bTableMode )
     {
         SfxItemSet aCoreSet( GetPool(),
@@ -2379,7 +2379,7 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet)
     }
     else if ( rSh.IsFrmSelected() )
     {
-        SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+        SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
         rSet.Put( aMgr.GetAttrSet() );
         bPrepare = false;
     }
@@ -2473,7 +2473,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
             else if ( rSh.IsFrmSelected() )
             {
                 // Set border attributes via Frame-Manager
-                SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+                SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
                 aSet.Put( aMgr.GetAttrSet() );
 
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2601,10 +2601,10 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
     const SfxItemSet* pArgs = _rRequest.GetArgs();
     SwWrtShell& rSh = GetShell();
 
-    if ( !( rSh.GetFrmType( 0, sal_True ) & FRMTYPE_FOOTNOTE ) )
+    if ( !( rSh.GetFrmType( 0, true ) & FRMTYPE_FOOTNOTE ) )
     {
         SwView &rTempView = GetView(); // Because GetView() does not work after the shell exchange
-        sal_Bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())&HTMLMODE_ON);
+        bool bHTMLMode = 0 != (::GetHtmlMode(rTempView.GetDocShell())&HTMLMODE_ON);
         bool bCallEndUndo = false;
 
         if( !pArgs && rSh.IsSelection() && !rSh.IsInClickToEdit() &&
@@ -2616,7 +2616,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
             rSh.StartUndo(UNDO_INSTABLE);
             bCallEndUndo = true;
 
-            sal_Bool bInserted = rSh.TextToTable( aInsTblOpts, '\t', text::HoriOrientation::FULL );
+            bool bInserted = rSh.TextToTable( aInsTblOpts, '\t', text::HoriOrientation::FULL );
             rSh.EnterStdMode();
             if (bInserted)
                 rTempView.AutoCaption(TABLE_CAP);
@@ -2792,7 +2792,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet )
                     rLst.push_back( SW_RESSTR( STR_SWBG_OLE ) );
                     nOlePos = nPos++;
                 }
-                const sal_uInt16 nType = rSh.GetFrmType(0,sal_True);
+                const sal_uInt16 nType = rSh.GetFrmType(0,true);
                 if ( nType & FRMTYPE_HEADER )
                 {
                     rLst.push_back( SW_RESSTR( STR_SWBG_HEADER ) );
diff --git a/sw/source/core/uibase/shells/beziersh.cxx b/sw/source/core/uibase/shells/beziersh.cxx
index 3268ea5b36e6..04e2e13ac28a 100644
--- a/sw/source/core/uibase/shells/beziersh.cxx
+++ b/sw/source/core/uibase/shells/beziersh.cxx
@@ -73,7 +73,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
     SdrView*    pSdrView = pSh->GetDrawView();
     const SfxItemSet *pArgs = rReq.GetArgs();
     sal_uInt16      nSlotId = rReq.GetSlot();
-    sal_Bool        bChanged = pSdrView->GetModel()->IsChanged();
+    bool        bChanged = pSdrView->GetModel()->IsChanged();
     pSdrView->GetModel()->SetChanged(false);
     const SfxPoolItem* pItem;
     if(pArgs)
@@ -282,7 +282,7 @@ void SwBezierShell::GetState(SfxItemSet &rSet)
                 else
                 {
                     SdrPathSmoothKind eSmooth = pSdrView->GetMarkedPointsSmooth();
-                    sal_Bool bEnable = sal_False;
+                    bool bEnable = false;
                     switch (eSmooth)
                     {
                         case SDRPATHSMOOTH_DONTCARE  :
diff --git a/sw/source/core/uibase/shells/drawdlg.cxx b/sw/source/core/uibase/shells/drawdlg.cxx
index ef1b473372ab..ce37589eb08e 100644
--- a/sw/source/core/uibase/shells/drawdlg.cxx
+++ b/sw/source/core/uibase/shells/drawdlg.cxx
@@ -39,7 +39,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
     SwWrtShell*     pSh     = &GetShell();
     SdrView*        pView   = pSh->GetDrawView();
     SdrModel*       pDoc    = pView->GetModel();
-    sal_Bool            bChanged = pDoc->IsChanged();
+    bool            bChanged = pDoc->IsChanged();
     pDoc->SetChanged(false);
 
     SfxItemSet aNewAttr( pDoc->GetItemPool() );
@@ -75,7 +75,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
 
         case SID_ATTRIBUTES_AREA:
         {
-            sal_Bool bHasMarked = pView->AreObjectsMarked();
+            bool bHasMarked = pView->AreObjectsMarked();
 
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( NULL,
@@ -112,7 +112,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
 
         case SID_ATTRIBUTES_LINE:
         {
-            sal_Bool bHasMarked = pView->AreObjectsMarked();
+            bool bHasMarked = pView->AreObjectsMarked();
 
             const SdrObject* pObj = NULL;
             const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -172,7 +172,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
     SwWrtShell* pSh   = &GetShell();
     SdrView*    pView = pSh->GetDrawView();
     const SfxItemSet* pArgs = rReq.GetArgs();
-    sal_Bool        bChanged = pView->GetModel()->IsChanged();
+    bool        bChanged = pView->GetModel()->IsChanged();
     pView->GetModel()->SetChanged(false);
 
     GetView().NoRotate();
@@ -222,7 +222,7 @@ void SwDrawShell::GetDrawAttrState(SfxItemSet& rSet)
 
     if (pSdrView->AreObjectsMarked())
     {
-        sal_Bool bDisable = Disable( rSet );
+        bool bDisable = Disable( rSet );
 
         if( !bDisable )
             pSdrView->GetAttributes( rSet );
diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx
index 8906cea170b3..b4328a642509 100644
--- a/sw/source/core/uibase/shells/drawsh.cxx
+++ b/sw/source/core/uibase/shells/drawsh.cxx
@@ -199,7 +199,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
     const SfxItemSet    *pArgs = rReq.GetArgs();
     SfxBindings         &rBnd  = GetView().GetViewFrame()->GetBindings();
     sal_uInt16               nSlotId = rReq.GetSlot();
-    sal_Bool                 bChanged = pSdrView->GetModel()->IsChanged();
+    bool                 bChanged = pSdrView->GetModel()->IsChanged();
 
     pSdrView->GetModel()->SetChanged(false);
 
@@ -439,7 +439,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
 
             case SID_OBJECT_ROTATE:
             {
-                const sal_Bool bIsRotate = GetView().IsDrawRotate();
+                const bool bIsRotate = GetView().IsDrawRotate();
                 if ( (!bIsRotate && !pSdrView->IsRotateAllowed()) || bProtected )
                     rSet.DisableItem( nWhich );
                 else
@@ -524,7 +524,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
 {
     SwWrtShell &rSh = GetShell();
     SdrView*    pDrView = rSh.GetDrawView();
-    sal_Bool        bChanged = pDrView->GetModel()->IsChanged();
+    bool        bChanged = pDrView->GetModel()->IsChanged();
     pDrView->GetModel()->SetChanged(false);
 
     const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
diff --git a/sw/source/core/uibase/shells/drwbassh.cxx b/sw/source/core/uibase/shells/drwbassh.cxx
index d8a7ee97559c..a03492dae262 100644
--- a/sw/source/core/uibase/shells/drwbassh.cxx
+++ b/sw/source/core/uibase/shells/drwbassh.cxx
@@ -87,7 +87,7 @@ SwDrawBaseShell::SwDrawBaseShell(SwView &_rView)
     rWin.SetBezierMode(SID_BEZIER_MOVE);
 
     if ( !_rView.GetDrawFuncPtr() )
-        _rView.GetEditWin().StdDrawMode( OBJ_NONE, sal_True );
+        _rView.GetEditWin().StdDrawMode( OBJ_NONE, true );
 
     SwTransferable::CreateSelection( GetShell() );
 }
@@ -105,7 +105,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
     SdrView*    pSdrView = pSh->GetDrawView();
     const SfxItemSet *pArgs = rReq.GetArgs();
     sal_uInt16      nSlotId = rReq.GetSlot();
-    sal_Bool        bChanged = pSdrView->GetModel()->IsChanged();
+    bool        bChanged = pSdrView->GetModel()->IsChanged();
     pSdrView->GetModel()->SetChanged(false);
     const SfxPoolItem* pItem = 0;
     if(pArgs)
@@ -119,9 +119,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
         nSlotId++;
     }
 
-    sal_Bool bAlignPossible = pSh->IsAlignPossible();
+    bool bAlignPossible = pSh->IsAlignPossible();
 
-    sal_Bool bTopParam = sal_True, bBottomParam = sal_True;
+    bool bTopParam = true, bBottomParam = true;
     bool bDone = false;
     SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
 
@@ -152,7 +152,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                         SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                         OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-                        SfxAbstractDialog* pDlg = pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, sal_True, RC_DLG_SWWRAPDLG );
+                        SfxAbstractDialog* pDlg = pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG );
                         OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                         if (pDlg->Execute() == RET_OK)
@@ -230,9 +230,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                             pSdrView->GetAttributes( aSet );
 
                         aSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor));
-                        sal_Bool bRTL;
-                        sal_Bool bVertL2R;
-                        aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT, pSh->IsFrmVertical(sal_True, bRTL, bVertL2R)));
+                        bool bRTL;
+                        bool bVertL2R;
+                        aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT, pSh->IsFrmVertical(true, bRTL, bVertL2R)));
                         aSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_IN_RTL_TEXT, bRTL));
 
                         SwFrmFmt* pFrmFmt = FindFrmFmt( pObj );
@@ -503,14 +503,14 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
         break;
 
         case FN_FRAME_UP:
-            bTopParam = sal_False;
+            bTopParam = false;
             /* no break */
         case SID_FRAME_TO_TOP:
             pSh->SelectionToTop( bTopParam );
             break;
 
         case FN_FRAME_DOWN:
-            bBottomParam = sal_False;
+            bBottomParam = false;
             /* no break */
         case SID_FRAME_TO_BOTTOM:
             pSh->SelectionToBottom( bBottomParam );
@@ -733,9 +733,9 @@ void SwDrawBaseShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
     }
 }
 
-sal_Bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich)
+bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich)
 {
-    sal_Bool bDisable = GetShell().IsSelObjProtected(FLYPROTECT_CONTENT);
+    bool bDisable = GetShell().IsSelObjProtected(FLYPROTECT_CONTENT);
 
     if (bDisable)
     {
@@ -786,11 +786,11 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation
                            pValidation->bFollowTextFlow,
                            pValidation->bMirror, NULL, &pValidation->aPercentSize);
 
-    sal_Bool bIsInVertical( sal_False );
+    bool bIsInVertical( false );
     {
-        sal_Bool bRTL;
-        sal_Bool bVertL2R;
-        bIsInVertical = pSh->IsFrmVertical(sal_True, bRTL, bVertL2R);
+        bool bRTL;
+        bool bVertL2R;
+        bIsInVertical = pSh->IsFrmVertical(true, bRTL, bVertL2R);
     }
     if(bIsInVertical)
     {
diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
index b700ffeb618b..775e2bf81885 100644
--- a/sw/source/core/uibase/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
@@ -422,7 +422,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-                SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, 0, sal_True );
+                SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, 0, true );
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
                 sal_uInt16 nRet = pDlg->Execute();
                 if(RET_OK == nRet)
@@ -445,7 +445,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner();
             sal_uInt32 nCtrl = pOutliner->GetControlWord();
 
-            sal_Bool bSet = ((const SfxBoolItem&)rReq.GetArgs()->Get(
+            bool bSet = ((const SfxBoolItem&)rReq.GetArgs()->Get(
                                                     nSlot)).GetValue();
             if(bSet)
                 nCtrl |= EE_CNTRL_ONLINESPELLING|EE_CNTRL_ALLOWBIGOBJS;
@@ -618,7 +618,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
     while(nWhich)
     {
         sal_uInt16 nSlotId = GetPool().GetSlotId( nWhich );
-        sal_Bool bFlag = sal_False;
+        bool bFlag = false;
         switch( nSlotId )
         {
             case SID_LANGUAGE_STATUS://20412:
@@ -715,7 +715,7 @@ ASK_LINESPACE:
                     rSet.InvalidateItem( nSlotId ), nSlotId = 0;
                 else if( nLSpace == ((const SvxLineSpacingItem*)pLSpace)->
                                                 GetPropLineSpace() )
-                    bFlag = sal_True;
+                    bFlag = true;
                 else
                     nSlotId = 0;
             }
@@ -732,7 +732,7 @@ ASK_ESCAPE:
 
                 if( nEsc == ((const SvxEscapementItem*)
                                                 pEscItem)->GetEnumValue() )
-                    bFlag = sal_True;
+                    bFlag = true;
                 else
                     nSlotId = 0;
             }
@@ -847,7 +847,7 @@ ASK_ESCAPE:
         case SID_INSERT_ZWSP:
         {
             SvtCTLOptions aCTLOptions;
-            sal_Bool bEnabled = aCTLOptions.IsCTLFontEnabled();
+            bool bEnabled = aCTLOptions.IsCTLFontEnabled();
             GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, bEnabled );
             if(!bEnabled)
                 rSet.DisableItem(nWhich);
diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
index 99551ac9bc89..69bae229721d 100644
--- a/sw/source/core/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/core/uibase/shells/drwtxtsh.cxx
@@ -173,7 +173,7 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
     }
 }
 
-sal_Bool SwDrawTextShell::IsTextEdit()
+bool SwDrawTextShell::IsTextEdit()
 {
     return pSdrView->IsTextEdit();
 }
@@ -328,9 +328,9 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
                             if( RET_OK == nDialogRet )
                             {
                                 //get some parameters from the dialog
-                                sal_Bool bToSimplified = sal_True;
-                                sal_Bool bUseVariants = sal_True;
-                                sal_Bool bCommonTerms = sal_True;
+                                bool bToSimplified = true;
+                                bool bUseVariants = true;
+                                bool bCommonTerms = true;
                                 Reference< beans::XPropertySet >  xProp( xDialog, UNO_QUERY );
                                 if( xProp.is() )
                                 {
@@ -849,7 +849,7 @@ void SwDrawTextShell::GetStatePropPanelAttr(SfxItemSet &rSet)
             case SID_TABLE_VERT_NONE:
             case SID_TABLE_VERT_CENTER:
             case SID_TABLE_VERT_BOTTOM:
-                sal_Bool bContour = sal_False;
+                bool bContour = false;
                 SfxItemState eConState = aAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME );
                 if( eConState != SFX_ITEM_DONTCARE )
                 {
@@ -864,7 +864,7 @@ void SwDrawTextShell::GetStatePropPanelAttr(SfxItemSet &rSet)
                 if(SFX_ITEM_DONTCARE != eVState)
                 {
                     SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)aAttrs.Get(SDRATTR_TEXT_VERTADJUST)).GetValue();
-                    sal_Bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) ||
+                    bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) ||
                             (nSlotId == SID_TABLE_VERT_CENTER && eTVA == SDRTEXTVERTADJUST_CENTER) ||
                             (nSlotId == SID_TABLE_VERT_BOTTOM && eTVA == SDRTEXTVERTADJUST_BOTTOM);
                     rSet.Put(SfxBoolItem(nSlotId, bSet));
diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
index 9e2f3892aee7..6656c24f7b82 100644
--- a/sw/source/core/uibase/shells/frmsh.cxx
+++ b/sw/source/core/uibase/shells/frmsh.cxx
@@ -140,11 +140,11 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             break;
 
         case FN_FRAME_UP:
-            rSh.SelectionToTop( sal_False );
+            rSh.SelectionToTop( false );
             break;
 
         case FN_FRAME_DOWN:
-            rSh.SelectionToBottom( sal_False );
+            rSh.SelectionToBottom( false );
             break;
         case FN_INSERT_FRAME:
             if (!pArgs)
@@ -292,7 +292,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
         return;
     }
 
-    SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+    SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
     bool bUpdateMgr = true;
     bool bCopyToFmt = false;
     switch ( nSlot )
@@ -632,7 +632,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
         case FN_FRAME_MIRROR_ON_EVEN_PAGES:
         {
             SwFmtHoriOrient aHori(aMgr.GetHoriOrient());
-            sal_Bool bMirror = !aHori.IsPosToggle();
+            bool bMirror = !aHori.IsPosToggle();
             aHori.SetPosToggle(bMirror);
             SfxItemSet aSet(GetPool(), RES_HORI_ORIENT, RES_HORI_ORIENT);
             aSet.Put(aHori);
@@ -706,13 +706,13 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                             0 );
         rSh.GetFlyFrmAttr( aSet );
 
-        sal_Bool bProtect = rSh.IsSelObjProtected(FLYPROTECT_POS);
-        sal_Bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
+        bool bProtect = rSh.IsSelObjProtected(FLYPROTECT_POS);
+        bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
 
         bProtect |= bParentCntProt;
 
-        const sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_True);
-        SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
+        const sal_uInt16 eFrmType = rSh.GetFrmType(0,true);
+        SwFlyFrmAttrMgr aMgr( false, &rSh, FRMMGR_TYPE_NONE );
 
         SfxWhichIter aIter( rSet );
         sal_uInt16 nWhich = aIter.FirstWhich();
@@ -868,7 +868,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                         }
                         else
                         {
-                            sal_Bool bChainMode = rSh.GetView().GetEditWin().IsChainMode();
+                            bool bChainMode = rSh.GetView().GetEditWin().IsChainMode();
                             rSet.Put( SfxBoolItem( FN_FRAME_CHAIN, bChainMode ) );
                         }
                     }
diff --git a/sw/source/core/uibase/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx
index 4f0797bb45fd..3e5822a4421f 100644
--- a/sw/source/core/uibase/shells/grfsh.cxx
+++ b/sw/source/core/uibase/shells/grfsh.cxx
@@ -203,7 +203,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
         case FN_FORMAT_GRAFIC_DLG:
         case FN_DRAW_WRAP_DLG:
         {
-            SwFlyFrmAttrMgr aMgr( sal_False, &rSh, rSh.IsFrmSelected() ?
+            SwFlyFrmAttrMgr aMgr( false, &rSh, rSh.IsFrmSelected() ?
                                                FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
             const SwViewOption* pVOpt = rSh.GetViewOptions();
             SwViewOption aUsrPref( *pVOpt );
@@ -783,11 +783,11 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
                     const sal_uInt16 eGraphicType( rSh.GetGraphicType() );
                     if ( ( eGraphicType == GRAPHIC_NONE ||
                            eGraphicType == GRAPHIC_DEFAULT ) &&
-                         rSh.IsGrfSwapOut( sal_True ) )
+                         rSh.IsGrfSwapOut( true ) )
                     {
                         rSet.DisableItem( nWhich );
                         if( AddGrfUpdateSlot( nWhich ))
-                            rSh.GetGraphic(sal_False);  // start the loading
+                            rSh.GetGraphic(false);  // start the loading
                     }
                     else
                     {
diff --git a/sw/source/core/uibase/shells/langhelper.cxx b/sw/source/core/uibase/shells/langhelper.cxx
index a75d6655090f..e3d7178f8aad 100644
--- a/sw/source/core/uibase/shells/langhelper.cxx
+++ b/sw/source/core/uibase/shells/langhelper.cxx
@@ -173,7 +173,7 @@ namespace SwLangHelper
                 if (!bForSelection) // document language to be changed...
                 {
                     rSh.StartAction();
-                    rSh.LockView( sal_True );
+                    rSh.LockView( true );
                     rSh.Push();
 
                     // prepare to apply new language to all text in document
@@ -212,8 +212,8 @@ namespace SwLangHelper
                 if (!bForSelection)
                 {
                     // need to release view and restore selection...
-                    rSh.Pop( sal_False );
-                    rSh.LockView( sal_False );
+                    rSh.Pop( false );
+                    rSh.LockView( false );
                     rSh.EndAction();
                 }
             }
diff --git a/sw/source/core/uibase/shells/listsh.cxx b/sw/source/core/uibase/shells/listsh.cxx
index 6d2f7bd296ae..943d1bd14ac0 100644
--- a/sw/source/core/uibase/shells/listsh.cxx
+++ b/sw/source/core/uibase/shells/listsh.cxx
@@ -71,7 +71,7 @@ static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bU
     if ( nActPos < USHRT_MAX && rSh.IsOutlineMovable( nActPos ) )
     {
         rSh.Push();
-        rSh.MakeOutlineSel( nActPos, nActPos, sal_True );
+        rSh.MakeOutlineSel( nActPos, nActPos, true );
 
         if ( bMove )
         {
@@ -127,7 +127,7 @@ static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bU
         }
 
         rSh.ClearMark();
-        rSh.Pop( sal_False );
+        rSh.Pop( false );
     }
 }
 
@@ -214,8 +214,8 @@ void SwListShell::Execute(SfxRequest &rReq)
 
         case FN_NUM_OR_NONUM:
         {
-            sal_Bool bApi = rReq.IsAPI();
-            sal_Bool bDelete = !rSh.IsNoNum(!bApi);
+            bool bApi = rReq.IsAPI();
+            bool bDelete = !rSh.IsNoNum(!bApi);
             if(pArgs )
                 bDelete = ((SfxBoolItem &)pArgs->Get(rReq.GetSlot())).GetValue();
             rSh.NumOrNoNum( bDelete, !bApi );
@@ -240,7 +240,7 @@ void SwListShell::GetState(SfxItemSet &rSet)
         switch( nWhich )
         {
             case FN_NUM_OR_NONUM:
-                rSet.Put(SfxBoolItem(nWhich, GetShell().IsNoNum(sal_False)));
+                rSet.Put(SfxBoolItem(nWhich, GetShell().IsNoNum(false)));
             break;
             case FN_NUM_BULLET_OUTLINE_UP:
             case FN_NUM_BULLET_UP:
diff --git a/sw/source/core/uibase/shells/mediash.cxx b/sw/source/core/uibase/shells/mediash.cxx
index e5323f9c60a3..d4c257ee737e 100644
--- a/sw/source/core/uibase/shells/mediash.cxx
+++ b/sw/source/core/uibase/shells/mediash.cxx
@@ -86,7 +86,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
     {
         const SfxItemSet*   pArgs = rReq.GetArgs();
         sal_uInt16              nSlotId = rReq.GetSlot();
-        sal_Bool                bChanged = pSdrView->GetModel()->IsChanged();
+        bool                bChanged = pSdrView->GetModel()->IsChanged();
 
         pSdrView->GetModel()->SetChanged( false );
 
diff --git a/sw/source/core/uibase/shells/navsh.cxx b/sw/source/core/uibase/shells/navsh.cxx
index af68afaebc63..ee5be060295c 100644
--- a/sw/source/core/uibase/shells/navsh.cxx
+++ b/sw/source/core/uibase/shells/navsh.cxx
@@ -49,7 +49,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq)
     SdrView*    pSdrView = pSh->GetDrawView();
     const SfxItemSet *pArgs = rReq.GetArgs();
     sal_uInt16      nSlotId = rReq.GetSlot();
-    sal_Bool        bChanged = pSdrView->GetModel()->IsChanged();
+    bool        bChanged = pSdrView->GetModel()->IsChanged();
     pSdrView->GetModel()->SetChanged(false);
     SwNavigationMgr& aSwNavigationMgr = pSh->GetNavigationMgr();
     const SfxPoolItem* pItem;
diff --git a/sw/source/core/uibase/shells/tabsh.cxx b/sw/source/core/uibase/shells/tabsh.cxx
index 3fd9a853f63f..090fff85dd40 100644
--- a/sw/source/core/uibase/shells/tabsh.cxx
+++ b/sw/source/core/uibase/shells/tabsh.cxx
@@ -171,7 +171,7 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
         rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION);
 
     bool bSelectAll = rSh.StartsWithTable() && rSh.ExtendedSelectedAll(/*bFootnotes=*/false);
-    sal_Bool bTableSel = rSh.IsTableMode() || bSelectAll;
+    bool bTableSel = rSh.IsTableMode() || bSelectAll;
     if(!bTableSel)
     {
         rSh.StartAllAction();
@@ -210,7 +210,7 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
     if(!bTableSel)
     {
         rSh.ClearMark();
-        rSh.Pop(sal_False);
+        rSh.Pop(false);
         rSh.EndAllAction();
     }
 
@@ -295,7 +295,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
         // The border will be applied to the present selection.
         // If there is no selection, the table will be completely selected.
         // The background will always be applied to the current state.
-        sal_Bool bTableSel = rSh.IsTableMode();
+        bool bTableSel = rSh.IsTableMode();
         rSh.StartAllAction();
 
         if(bBackground)
@@ -342,7 +342,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
             {
                 rSh.ClearMark();
             }
-            rSh.Pop(sal_False);
+            rSh.Pop(false);
         }
 
         rSh.EndAllAction();
@@ -350,7 +350,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
 
     SwTabCols aTabCols;
     bool bTabCols = false;
-    sal_Bool bSingleLine = sal_False;
+    bool bSingleLine = false;
     SwTableRep* pRep = 0;
     SwFrmFmt *pFmt = rSh.GetTableFmt();
     SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
@@ -521,19 +521,19 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
             }
 
-            sal_Bool bLine = sal_False;
+            bool bLine = false;
             if( aBox.GetTop() != NULL )
-                aBox.SetLine(&aBorderLine, BOX_LINE_TOP), bLine |= sal_True;
+                aBox.SetLine(&aBorderLine, BOX_LINE_TOP), bLine |= true;
             if( aBox.GetBottom() != NULL )
-                aBox.SetLine(&aBorderLine, BOX_LINE_BOTTOM), bLine |= sal_True;
+                aBox.SetLine(&aBorderLine, BOX_LINE_BOTTOM), bLine |= true;
             if( aBox.GetLeft() != NULL )
-                aBox.SetLine(&aBorderLine, BOX_LINE_LEFT), bLine |= sal_True;
+                aBox.SetLine(&aBorderLine, BOX_LINE_LEFT), bLine |= true;
             if( aBox.GetRight() != NULL )
-                aBox.SetLine(&aBorderLine, BOX_LINE_RIGHT), bLine |= sal_True;
+                aBox.SetLine(&aBorderLine, BOX_LINE_RIGHT), bLine |= true;
             if( aInfo.GetHori() != NULL )
-                aInfo.SetLine(&aBorderLine, BOXINFO_LINE_HORI), bLine |= sal_True;
+                aInfo.SetLine(&aBorderLine, BOXINFO_LINE_HORI), bLine |= true;
             if( aInfo.GetVert() != NULL )
-                aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= sal_True;
+                aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= true;
 
             aCoreSet.Put( aBox  );
             aCoreSet.Put( aInfo );
@@ -707,7 +707,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
         break;
         case FN_GOTO_NEXT_CELL:
         {
-            sal_Bool bAppendLine = sal_True;
+            bool bAppendLine = true;
             if( pItem )
                 bAppendLine = ((SfxBoolItem*)pItem)->GetValue();
             rReq.SetReturnValue( SfxBoolItem( nSlot,
@@ -745,7 +745,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case FN_TABLE_ADJUST_CELLS:
         case FN_TABLE_BALANCE_CELLS:
         {
-            sal_Bool bBalance = (FN_TABLE_BALANCE_CELLS == nSlot);
+            bool bBalance = (FN_TABLE_BALANCE_CELLS == nSlot);
             if ( rSh.IsAdjustCellWidthAllowed(bBalance) )
             {
                 {
@@ -758,8 +758,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
         }
         break;
         case FN_TABLE_BALANCE_ROWS:
-            if ( rSh.BalanceRowHeight(sal_True) )
-                rSh.BalanceRowHeight(sal_False);
+            if ( rSh.BalanceRowHeight(true) )
+                rSh.BalanceRowHeight(false);
             bCallDone = true;
         break;
         case FN_TABLE_SELECT_ALL:
@@ -782,7 +782,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
         break;
         case FN_TABLE_SET_READ_ONLY_CELLS:
             rSh.ProtectCells();
-            rSh.ResetSelect( 0, sal_False );
+            rSh.ResetSelect( 0, false );
             bCallDone = true;
         break;
         case FN_TABLE_UNSET_READ_ONLY_CELLS:
@@ -821,7 +821,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
         {
             bool bColumn = rReq.GetSlot() == FN_TABLE_INSERT_COL;
             sal_uInt16 nCount = 0;
-            sal_Bool bAfter = sal_True;
+            bool bAfter = true;
             if (pItem)
             {
                 nCount = ((const SfxInt16Item* )pItem)->GetValue();
@@ -899,8 +899,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case FN_TABLE_SPLIT_CELLS:
         {
             long nCount=0;
-            sal_Bool bHorizontal=sal_True;
-            sal_Bool bProportional = sal_False;
+            bool bHorizontal=true;
+            bool bProportional = false;
             SFX_REQUEST_ARG( rReq, pSplit, SfxInt32Item, FN_TABLE_SPLIT_CELLS, false );
             SFX_REQUEST_ARG( rReq, pHor, SfxBoolItem, FN_PARAM_1, false );
             SFX_REQUEST_ARG( rReq, pProp, SfxBoolItem, FN_PARAM_2, false );
@@ -975,8 +975,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
 
         case FN_TABLE_MERGE_TABLE:
         {
-            sal_Bool bPrev = rSh.CanMergeTable( sal_True );
-            sal_Bool bNext = rSh.CanMergeTable( sal_False );
+            bool bPrev = rSh.CanMergeTable( true );
+            bool bNext = rSh.CanMergeTable( false );
 
             if( bPrev && bNext )
             {
@@ -985,7 +985,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 VclAbstractDialog* pDlg = pFact->CreateTblMergeDialog(GetView().GetWindow(), bPrev);
                 OSL_ENSURE(pDlg, "dialogdiet pDlg fail!");
                 if( RET_OK != pDlg->Execute())
-                    bPrev = bNext = sal_False;
+                    bPrev = bNext = false;
                 delete pDlg;
             }
 
@@ -1095,7 +1095,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
 // The last case branch which needs a table manager!!
         case FN_TABLE_SET_COL_WIDTH:
         {
-            SwTableFUNC aMgr( &rSh, sal_False);
+            SwTableFUNC aMgr( &rSh, false);
             aMgr.ColWidthDlg(GetView().GetWindow());
         }
         break;
@@ -1142,7 +1142,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 if(pSplit)
                     pSplit->SetValue(!pSplit->GetValue());
                 else
-                   pSplit = new SwFmtRowSplit(sal_True);
+                   pSplit = new SwFmtRowSplit(true);
             }
             else
             {
@@ -1184,19 +1184,19 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             break;
 
             case FN_TABLE_BALANCE_CELLS:
-                if ( !rSh.IsAdjustCellWidthAllowed(sal_True) )
+                if ( !rSh.IsAdjustCellWidthAllowed(true) )
                     rSet.DisableItem(FN_TABLE_BALANCE_CELLS);
             break;
 
             case FN_TABLE_BALANCE_ROWS:
-                if ( !rSh.BalanceRowHeight(sal_True) )
+                if ( !rSh.BalanceRowHeight(true) )
                     rSet.DisableItem(FN_TABLE_BALANCE_ROWS);
             break;
             case FN_OPTIMIZE_TABLE:
                 if ( !rSh.IsTableMode() &&
                         !rSh.IsAdjustCellWidthAllowed() &&
-                        !rSh.IsAdjustCellWidthAllowed(sal_True) &&
-                        !rSh.BalanceRowHeight(sal_True) )
+                        !rSh.IsAdjustCellWidthAllowed(true) &&
+                        !rSh.BalanceRowHeight(true) )
                     rSet.DisableItem(FN_OPTIMIZE_TABLE);
             break;
             case SID_INSERT_DIAGRAM:
@@ -1246,7 +1246,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case SID_TABLE_VERT_BOTTOM:
             {
                 sal_uInt16 nAlign = rSh.GetBoxAlign();
-                sal_Bool bSet = (nSlot == SID_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) ||
+                bool bSet = (nSlot == SID_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) ||
                             (nSlot == SID_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER) ||
                             (nSlot == SID_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM);
                 rSet.Put(SfxBoolItem(nSlot, bSet));
@@ -1258,7 +1258,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case FN_TABLE_MODE_VARIABLE  :
                 {
                     TblChgMode nMode = rSh.GetTblChgMode();
-                    sal_Bool bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) ||
+                    bool bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) ||
                             (nSlot == FN_TABLE_MODE_FIX_PROP && nMode == TBLFIX_CHGPROP) ||
                             (nSlot == FN_TABLE_MODE_VARIABLE && nMode == TBLVAR_CHGABS);
                     rSet.Put(SfxBoolItem(nSlot, bSet));
@@ -1280,8 +1280,8 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             break;
             case FN_TABLE_MERGE_TABLE:
             {
-                sal_Bool bAsk;
-                if( !rSh.CanMergeTable( sal_True, &bAsk ))
+                bool bAsk;
+                if( !rSh.CanMergeTable( true, &bAsk ))
                     rSet.DisableItem( nSlot );
             }
             break;
@@ -1378,7 +1378,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
                     const SvxLineItem &rLineItem = (const SvxLineItem&)pArgs->
                                                             Get( SID_FRAME_LINESTYLE );
                     const SvxBorderLine* pBorderLine = rLineItem.GetLine();
-                    rSh.SetTabLineStyle( 0, sal_True, pBorderLine);
+                    rSh.SetTabLineStyle( 0, true, pBorderLine);
                 }
                 else
                 {
diff --git a/sw/source/core/uibase/shells/textfld.cxx b/sw/source/core/uibase/shells/textfld.cxx
index c71b9e4def2a..ce2036618ca4 100644
--- a/sw/source/core/uibase/shells/textfld.cxx
+++ b/sw/source/core/uibase/shells/textfld.cxx
@@ -166,7 +166,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
         case FN_GOTO_NEXT_INPUTFLD:
         case FN_GOTO_PREV_INPUTFLD:
             {
-                sal_Bool bRet = sal_False;
+                bool bRet = false;
                 SwFieldType* pFld = rSh.GetFldType( 0, RES_INPUTFLD );
                 const bool bAddSetExpressionFlds = !( rSh.GetViewOptions()->IsReadonly() );
                 if ( pFld != NULL
@@ -186,9 +186,9 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     }
                     else
                     {
-                        rSh.StartInputFldDlg( rSh.GetCurFld( true ), sal_False );
+                        rSh.StartInputFldDlg( rSh.GetCurFld( true ), false );
                     }
-                    bRet = sal_True;
+                    bRet = true;
                 }
 
                 rReq.SetReturnValue( SfxBoolItem( nSlot, bRet ));
@@ -206,7 +206,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
         {
             case FN_INSERT_DBFIELD:
             {
-                sal_Bool bRes = sal_False;
+                bool bRes = false;
                 if( pItem )
                 {
                     sal_uLong  nFormat = 0;
@@ -252,7 +252,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
             case FN_INSERT_FIELD_CTRL:
             case FN_INSERT_FIELD:
             {
-                sal_Bool bRes = sal_False;
+                bool bRes = false;
                 if( pItem && nSlot != FN_INSERT_FIELD_CTRL)
                 {
                     sal_uLong  nFormat = 0;
@@ -381,9 +381,9 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     aFldMgr.InsertFld( aData );
 
                     rSh.Push();
-                    rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, sal_False);
+                    rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, false);
                     pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
-                    rSh.Pop(sal_False); // Restore cursor position
+                    rSh.Pop(false); // Restore cursor position
                  }
 
                 if (pPostIt)
@@ -425,7 +425,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 {
                     OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
 
-                    sal_Bool bTravel = sal_False;
+                    bool bTravel = false;
 
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -452,8 +452,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                         pActRed = rSh.SelPrevRedline();
                     }
 
-                    sal_Bool bPrev = pActRed != 0;
-                    rSh.Pop(sal_False);
+                    bool bPrev = pActRed != 0;
+                    rSh.Pop(false);
                     rSh.EndAction();
 
                     rSh.ClearMark();
@@ -462,15 +462,15 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     rSh.StartAction();
                     rSh.Push();
                     pActRed = rSh.SelNextRedline();
-                    sal_Bool bNext = pActRed != 0;
-                    rSh.Pop(sal_False); // Restore cursor position
+                    bool bNext = pActRed != 0;
+                    rSh.Pop(false); // Restore cursor position
 
                     if( rSh.IsCrsrPtAtEnd() )
                         rSh.SwapPam();
 
                     rSh.EndAction();
 
-                    bTravel |= bNext|bPrev;
+                    bTravel |= bNext || bPrev;
 
                     SvxAbstractDialogFactory* pFact2 = SvxAbstractDialogFactory::Create();
                     OSL_ENSURE(pFact2, "Dialogdiet fail!");
@@ -514,8 +514,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
             case FN_JAVAEDIT:
             {
                 OUString aType, aText;
-                sal_Bool bIsUrl=sal_False;
-                sal_Bool bNew=sal_False;
+                bool bIsUrl=false;
+                bool bNew=false;
                 bool bUpdate = false;
                 SwFldMgr aMgr;
                 if ( pItem )
@@ -530,7 +530,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
 
                     SwScriptField* pFld = (SwScriptField*)aMgr.GetCurFld();
                     bNew = !pFld || !(pFld->GetTyp()->Which() == RES_SCRIPTFLD);
-                    bUpdate = pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
+                    bUpdate = pFld && ( bIsUrl != (bool)pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
                 }
                 else
                 {
@@ -555,13 +555,13 @@ void SwTextShell::ExecField(SfxRequest &rReq)
 
                 if( bNew )
                 {
-                    SwInsertFld_Data aData(TYP_SCRIPTFLD, 0, aType, aText, bIsUrl);
+                    SwInsertFld_Data aData(TYP_SCRIPTFLD, 0, aType, aText, bIsUrl ? 1 : 0);
                     aMgr.InsertFld(aData);
                     rReq.Done();
                 }
                 else if( bUpdate )
                 {
-                    aMgr.UpdateCurFld( bIsUrl, aType, aText );
+                    aMgr.UpdateCurFld( bIsUrl ? 1 : 0, aType, aText );
                     rSh.SetUndoNoResetModified();
                     rReq.Done();
                 }
@@ -734,7 +734,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
         case FN_POSTIT :
         case FN_JAVAEDIT :
             {
-                sal_Bool bCurField = sal_False;
+                bool bCurField = false;
                 pField = rSh.GetCurFld();
                 if(nWhich == FN_POSTIT)
                     bCurField = pField && pField->GetTyp()->Which() == RES_POSTITFLD;
@@ -793,7 +793,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
         if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem))
         {
             // Select links
-            rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT, sal_False);
+            rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT, false);
         }
         switch (nType)
         {
@@ -815,13 +815,13 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
                         aINetFmt.SetMacro(SFX_EVENT_MOUSEOUT_OBJECT, *pMacro);
                 }
                 rSh.SttSelect();
-                rSh.InsertURL( aINetFmt, rName, sal_True );
+                rSh.InsertURL( aINetFmt, rName, true );
                 rSh.EndSelect();
             }
             break;
 
         case HLINK_BUTTON:
-            sal_Bool bSel = rSh.HasSelection();
+            bool bSel = rSh.HasSelection();
             if(bSel)
                 rSh.DelRight();
             InsertURLButton( rURL, rTarget, rName );
@@ -852,14 +852,14 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
         const SwRangeRedline *pActRed = pSh->SelNextRedline();
         pSh->Pop(pActRed != 0);
 
-        sal_Bool bEnable = sal_False;
+        bool bEnable = false;
 
         if (pActRed)
         {
             pSh->StartAction();
             pSh->Push();
             bEnable = pSh->SelNextRedline() != 0;
-            pSh->Pop(sal_False);
+            pSh->Pop(false);
             pSh->EndAction();
         }
 
@@ -902,14 +902,14 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
         const SwRangeRedline *pActRed = pSh->SelPrevRedline();
         pSh->Pop(pActRed != 0);
 
-        sal_Bool bEnable = sal_False;
+        bool bEnable = false;
 
         if (pActRed)
         {
             pSh->StartAction();
             pSh->Push();
             bEnable = pSh->SelPrevRedline() != 0;
-            pSh->Pop(sal_False);
+            pSh->Pop(false);
             pSh->EndAction();
         }
 
diff --git a/sw/source/core/uibase/shells/textglos.cxx b/sw/source/core/uibase/shells/textglos.cxx
index 365534a38549..04f0417042db 100644
--- a/sw/source/core/uibase/shells/textglos.cxx
+++ b/sw/source/core/uibase/shells/textglos.cxx
@@ -54,7 +54,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
             break;
         case FN_EXPAND_GLOSSARY:
         {
-            sal_Bool bReturn;
+            bool bReturn;
             bReturn = pGlosHdl->ExpandGlossary();
             rReq.SetReturnValue( SfxBoolItem( nSlot, bReturn ) );
             rReq.Done();
@@ -76,9 +76,9 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
                 ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc();
                 if ( fnSetActGroup )
                     (*fnSetActGroup)( aGroup );
-                pGlosHdl->SetCurGroup(aGroup, sal_True);
+                pGlosHdl->SetCurGroup(aGroup, true);
                 // Chosen group must be created in NewGlossary if necessary!
-                pGlosHdl->NewGlossary( aName, aShortName, sal_True );
+                pGlosHdl->NewGlossary( aName, aShortName, true );
                 rReq.Done();
             }
             bUpdateList = true;
@@ -108,7 +108,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
                 ::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc();
                 if ( fnSetActGroup )
                     (*fnSetActGroup)( aGroup );
-                pGlosHdl->SetCurGroup(aGroup, sal_True);
+                pGlosHdl->SetCurGroup(aGroup, true);
                 rReq.SetReturnValue(SfxBoolItem(nSlot, pGlosHdl->InsertGlossary( aName ) ? sal_True : sal_False));
                 rReq.Done();
             }
diff --git a/sw/source/core/uibase/shells/textidx.cxx b/sw/source/core/uibase/shells/textidx.cxx
index 05d9fc295c67..5bf32722e3c1 100644
--- a/sw/source/core/uibase/shells/textidx.cxx
+++ b/sw/source/core/uibase/shells/textidx.cxx
@@ -124,11 +124,11 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
             // Height = width for a more consistent preview (analogous to edit range)
             aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
             const SwTOXBase* pCurTOX = 0;
-            sal_Bool bGlobal = sal_False;
+            bool bGlobal = false;
             if(pItem)
             {
                 pCurTOX = (const SwTOXBase* )((SwPtrItem*)pItem)->GetValue();
-                bGlobal = sal_True;
+                bGlobal = true;
             }
             else
                 pCurTOX = rSh.GetCurTOX();
@@ -211,7 +211,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
     {
 
         bool bEnableEdit = true;
-        sal_Bool bInReadonly = rSh.HasReadonlySel();
+        bool bInReadonly = rSh.HasReadonlySel();
         if( rSh.HasSelection() || bInReadonly)
             bEnableEdit = false;
         else
diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx
index 0a8805b7ee2e..25499dc7c913 100644
--- a/sw/source/core/uibase/shells/textsh.cxx
+++ b/sw/source/core/uibase/shells/textsh.cxx
@@ -153,8 +153,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
         break;
 
     case FN_INSERT_SOFT_HYPHEN:
-        if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, 0 ) &&
-            CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( sal_True, -1 ))
+        if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true, 0 ) &&
+            CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true, -1 ))
             rSh.Insert( OUString( CHAR_SOFTHYPHEN ) );
         break;
 
@@ -269,7 +269,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                     }
                 }
 
-                rSh.InsertObject( xObj, 0, sal_True, nSlot);
+                rSh.InsertObject( xObj, 0, true, nSlot);
             }
         }
     }
@@ -342,7 +342,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
         else
         {
             OSL_ENSURE( !pNameItem || nSlot == SID_INSERT_OBJECT, "Superfluous argument!" );
-            rSh.InsertObject( xObj, pName, sal_True, nSlot);
+            rSh.InsertObject( xObj, pName, true, nSlot);
             rReq.Done();
         }
         break;
@@ -386,11 +386,11 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                             uno::makeAny( sal_True ) );
                     else
                         xSet->setPropertyValue("FrameIsScrollingMode",
-                            uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
+                            uno::makeAny( eScroll == ScrollingYes ) );
 
                     if ( pBorderItem )
                         xSet->setPropertyValue("FrameIsBorder",
-                            uno::makeAny( (sal_Bool) pBorderItem->GetValue() ) );
+                            uno::makeAny( pBorderItem->GetValue() ) );
 
                     if ( pMarginItem )
                     {
@@ -410,7 +410,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
         }
         else
         {
-            rSh.InsertObject( xObj, 0, sal_True, nSlot);
+            rSh.InsertObject( xObj, 0, true, nSlot);
             rReq.Done();
         }
     }
@@ -428,7 +428,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             else
             {
                 uno::Reference< chart2::data::XDataProvider > xDataProvider;
-                sal_Bool bFillWithData = sal_True;
+                bool bFillWithData = true;
                 OUString aRangeString;
                 if (!GetShell().IsTblComplexForChart())
                 {
@@ -441,9 +441,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                     xDataProvider.set( GetView().GetDocShell()->getIDocumentChartDataProviderAccess()->GetChartDataProvider() );
                 }
                 else
-                    bFillWithData = sal_False;  // will create chart with only it's default image
+                    bFillWithData = false;  // will create chart with only it's default image
 
-                SwTableFUNC( &rSh, sal_False ).InsertChart( xDataProvider, bFillWithData, aRangeString );
+                SwTableFUNC( &rSh, false ).InsertChart( xDataProvider, bFillWithData, aRangeString );
                 rSh.LaunchOLEObj();
 
                 svt::EmbeddedObjectRef& xObj = rSh.GetOLEObject();
@@ -471,7 +471,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             // the suggestion has to be removed before
             GetView().GetEditWin().StopQuickHelp();
             SvGlobalName aGlobalName( SO3_SM_CLASSID );
-            rSh.InsertObject( svt::EmbeddedObjectRef(), &aGlobalName, sal_True, 0 );
+            rSh.InsertObject( svt::EmbeddedObjectRef(), &aGlobalName, true, 0 );
         }
         break;
 
@@ -503,7 +503,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             Size aSize(16 * MM50, 8 * MM50);
             GetShell().LockPaint();
             GetShell().StartAllAction();
-            SwFlyFrmAttrMgr aMgr( sal_True, GetShellPtr(), FRMMGR_TYPE_TEXT );
+            SwFlyFrmAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
             if(nCols > 1)
             {
                 SwFmtCol aCol;
@@ -535,7 +535,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 
         }
         // Create new border
-        SwFlyFrmAttrMgr aMgr( sal_True, GetShellPtr(), FRMMGR_TYPE_TEXT );
+        SwFlyFrmAttrMgr aMgr( true, GetShellPtr(), FRMMGR_TYPE_TEXT );
         if(pArgs)
         {
             Size aSize(aMgr.GetSize());
@@ -694,7 +694,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                         GetView().GetDocShell()->GetCreateMode();
 
     rSh.Push();
-    const sal_Bool bCrsrInHidden = rSh.SelectHiddenRange();
+    const bool bCrsrInHidden = rSh.SelectHiddenRange();
     rSh.Pop();
 
     while ( nWhich )
@@ -794,7 +794,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                         // Get the text of the Link.
                         rSh.StartAction();
                         rSh.CreateCrsr();
-                        rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT,sal_True);
+                        rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT,true);
                         OUString sLinkName = rSh.GetSelTxt();
                         aHLinkItem.SetName(sLinkName);
                         aHLinkItem.SetInsertMode(HLINK_FIELD);
@@ -1106,7 +1106,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
             }
 
             rSh.SetMark();
-            rSh.ExtendSelection( sal_False, aChars.getLength() );
+            rSh.ExtendSelection( false, aChars.getLength() );
             rSh.SetAttrSet( aSet, nsSetAttrMode::SETATTR_DONTEXPAND | nsSetAttrMode::SETATTR_NOFORMATATTR );
             if( !rSh.IsCrsrPtAtEnd() )
                 rSh.SwapPam();
diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx
index d3f3256e145e..1df06f22da58 100644
--- a/sw/source/core/uibase/shells/textsh1.cxx
+++ b/sw/source/core/uibase/shells/textsh1.cxx
@@ -138,8 +138,8 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
                         SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,   SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,
                         0 );
     rWrtSh.GetCurAttr( aCoreSet );
-    sal_Bool bSel = rWrtSh.HasSelection();
-    sal_Bool bSelectionPut = sal_False;
+    bool bSel = rWrtSh.HasSelection();
+    bool bSelectionPut = false;
     if(bSel || rWrtSh.IsInWord())
     {
         if(!bSel)
@@ -150,10 +150,10 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
                 rWrtSh.SelWrd();
         }
         aCoreSet.Put(SfxStringItem(FN_PARAM_SELECTION, rWrtSh.GetSelTxt()));
-        bSelectionPut = sal_True;
+        bSelectionPut = true;
         if(!bSel)
         {
-            rWrtSh.Pop(sal_False);
+            rWrtSh.Pop(false);
             rWrtSh.EndAction();
         }
     }
@@ -200,7 +200,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
         ::ConvertAttrGenToChar(aTmpSet, CONV_ATTR_STD);
 
         const SfxPoolItem* pSelectionItem;
-        sal_Bool bInsert = sal_False;
+        bool bInsert = false;
         sal_Int32 nInsert = 0;
 
         // The old item is for unknown reasons back in the set again.
@@ -214,7 +214,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
                 rWrtSh.StartAction();
                 rWrtSh.Insert( sInsert );
                 rWrtSh.SetMark();
-                rWrtSh.ExtendSelection(sal_False, sInsert.getLength());
+                rWrtSh.ExtendSelection(false, sInsert.getLength());
                 SfxRequest aReq( rWrtSh.GetView().GetViewFrame(), FN_INSERT_STRING );
                 aReq.AppendItem( SfxStringItem( FN_INSERT_STRING, sInsert ) );
                 aReq.Done();
@@ -315,7 +315,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 //!! due to the selection changes coming below.
                 rWrtSh.StartAction();
                 // prevent view from jumping because of (temporary) selection changes
-                rWrtSh.LockView( sal_True );
+                rWrtSh.LockView( true );
 
                 // setting the new language...
                 if (!aNewLangTxt.isEmpty())
@@ -385,7 +385,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     }
                 }
 
-                rWrtSh.LockView( sal_False );
+                rWrtSh.LockView( false );
                 rWrtSh.EndAction();
             }
 
@@ -431,14 +431,14 @@ void SwTextShell::Execute(SfxRequest &rReq)
             rWrtSh.InsertFootnote( aStr, nSlot == FN_INSERT_ENDNOTE, !bFont );
             if ( bFont )
             {
-                rWrtSh.Left( CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+                rWrtSh.Left( CRSR_SKIP_CHARS, true, 1, false );
                 SfxItemSet aSet( rWrtSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
                 rWrtSh.GetCurAttr( aSet );
                 SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
                 SvxFontItem aFont( rFont.GetFamily(), pFont->GetValue(),
                                     rFont.GetStyleName(), rFont.GetPitch(), RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT );
                 rWrtSh.SetAttrSet( aSet, nsSetAttrMode::SETATTR_DONTEXPAND );
-                rWrtSh.ResetSelect(0, sal_False);
+                rWrtSh.ResetSelect(0, false);
                 rWrtSh.EndSelect();
                 rWrtSh.GotoFtnTxt();
             }
@@ -451,7 +451,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
             OSL_ENSURE(pFact, "Dialogdiet fail!");
             AbstractInsFootNoteDlg* pDlg = pFact->CreateInsFootNoteDlg(
-                GetView().GetWindow(), rWrtSh, sal_False);
+                GetView().GetWindow(), rWrtSh, false);
             OSL_ENSURE(pDlg, "Dialogdiet fail!");
             pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand());
             if ( pDlg->Execute() == RET_OK )
@@ -547,12 +547,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     aTemplateName = pDlg->GetTemplateName();
                     oPageNumber = pDlg->GetPageNumber();
 
-                    sal_Bool bIsNumberFilled = sal_False;
+                    bool bIsNumberFilled = false;
                     sal_uInt16 nPageNumber = 0;
 
                     if (oPageNumber)
                     {
-                        bIsNumberFilled = sal_True;
+                        bIsNumberFilled = true;
                         nPageNumber = oPageNumber.get();
                     }
 
@@ -638,7 +638,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 case RET_OK:
                 {
-                    pDlg->AcceptAll(sal_True);
+                    pDlg->AcceptAll(true);
                     SfxRequest aReq( pVFrame, FN_AUTOFORMAT_APPLY );
                     aReq.Done();
                     rReq.Ignore();
@@ -646,7 +646,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 }
 
                 case RET_CANCEL:
-                    pDlg->AcceptAll(sal_False);
+                    pDlg->AcceptAll(false);
                     rReq.Ignore();
                     break;
 
@@ -756,8 +756,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 OUString sFormula(((const SfxStringItem*)pItem)->GetValue());
                 SwFldMgr aFldMgr;
                 rWrtSh.StartAllAction();
-                sal_Bool bDelSel;
-                if( 0 != (bDelSel = rWrtSh.HasSelection()) )
+                bool bDelSel;
+                if( (bDelSel = rWrtSh.HasSelection()) )
                 {
                     rWrtSh.StartUndo( UNDO_START );
                     rWrtSh.DelRight();
@@ -813,7 +813,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         break;
         case FN_REMOVE_HYPERLINK:
         {
-            sal_Bool bSel = rWrtSh.HasSelection();
+            bool bSel = rWrtSh.HasSelection();
             if(!bSel)
             {
                 rWrtSh.StartAction();
@@ -827,7 +827,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             rWrtSh.ResetAttr( aAttribs );
             if(!bSel)
             {
-                rWrtSh.Pop(sal_False);
+                rWrtSh.Pop(false);
                 rWrtSh.EndAction();
             }
         }
@@ -854,7 +854,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             rWrtSh.Push();          //save current cursor
             SwLangHelper::SelectCurrentPara( rWrtSh );
             sw_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq );
-            rWrtSh.Pop( sal_False );    //restore old cursor
+            rWrtSh.Pop( false );    //restore old cursor
         }
         break;
         case SID_ATTR_LRSPACE :
@@ -895,7 +895,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &GetView()));
             SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
 
-            sal_Bool bApplyCharUnit = ::HasCharUnit(0 != PTR_CAST(SwWebView, &GetView()));
+            bool bApplyCharUnit = ::HasCharUnit(0 != PTR_CAST(SwWebView, &GetView()));
             SW_MOD()->PutItem(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bApplyCharUnit));
 
             SfxItemSet aCoreSet( GetPool(),
@@ -963,7 +963,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-                pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, sal_False, sDefPage );
+                pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, NULL, false, sDefPage );
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
             }
             SfxItemSet* pSet = NULL;
@@ -1047,7 +1047,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     //otherwise the SetNodeNumStart() value determines the start
                     //if it's set to something different than (sal_uInt16)0xFFFF
 
-                    sal_Bool bStart = ((SfxBoolItem&)pSet->Get(FN_NUMBER_NEWSTART)).GetValue();
+                    bool bStart = ((SfxBoolItem&)pSet->Get(FN_NUMBER_NEWSTART)).GetValue();
 
                     // Default value for restart value has to be (sal_uInt16)0xFFFF
                     // in order to indicate that the restart value of the list
@@ -1064,7 +1064,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 {
                     sal_uInt16 nNumStart = ((SfxUInt16Item&)pSet->Get(FN_NUMBER_NEWSTART_AT)).GetValue();
                     rWrtSh.SetNodeNumStart(nNumStart);
-                    rWrtSh.SetNumRuleStart(sal_False, pPaM);
+                    rWrtSh.SetNumRuleStart(false, pPaM);
                 }
                 // #i56253#
                 if ( bUndoNeeded )
@@ -1097,10 +1097,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
         case FN_SELECT_PARA:
         {
             if ( !rWrtSh.IsSttOfPara() )
-                rWrtSh.SttPara( sal_False );
+                rWrtSh.SttPara( false );
             else
                 rWrtSh.EnterStdMode();
-            rWrtSh.EndPara( sal_True );
+            rWrtSh.EndPara( true );
         }
         break;
 
@@ -1196,7 +1196,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             SwEditWin& rEdtWin = GetView().GetEditWin();
             SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
             SwApplyTemplate aTempl;
-            sal_Bool bSelection = rWrtSh.HasSelection();
+            bool bSelection = rWrtSh.HasSelection();
             if(bSelection)
             {
 
@@ -1246,7 +1246,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
         OUString sStyleName;
         if(pItem)
             sStyleName = ((const SfxStringItem*)pItem)->GetValue();
-        sal_Bool bOn = sal_True;
+        bool bOn = true;
         if( SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem))
             bOn = ((const SfxBoolItem*)pItem)->GetValue();
         rWrtSh.ChangeHeaderOrFooter(sStyleName, FN_INSERT_PAGEHEADER == nSlot, bOn, !rReq.IsAPI());
@@ -1455,7 +1455,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             {
                 const sal_uInt16 nNoType =
                     FRMTYPE_FLY_ANY | FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE;
-                if ( (rSh.GetFrmType(0,sal_True) & nNoType) )
+                if ( (rSh.GetFrmType(0,true) & nNoType) )
                     rSet.DisableItem(nWhich);
 
                 if ( rSh.CrsrInsideInputFld() )
@@ -1478,7 +1478,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
         case FN_INSERT_TABLE:
             if ( rSh.CrsrInsideInputFld()
                  || rSh.GetTableFmt()
-                 || (rSh.GetFrmType(0,sal_True) & FRMTYPE_FOOTNOTE) )
+                 || (rSh.GetFrmType(0,true) & FRMTYPE_FOOTNOTE) )
             {
                 rSet.DisableItem( nWhich );
             }
@@ -1803,7 +1803,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             case SID_INSERT_ZWSP:
             {
                 SvtCTLOptions aCTLOptions;
-                sal_Bool bEnabled = aCTLOptions.IsCTLFontEnabled();
+                bool bEnabled = aCTLOptions.IsCTLFontEnabled();
                 GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, bEnabled );
                 if(!bEnabled)
                     rSet.DisableItem(nWhich);
diff --git a/sw/source/core/uibase/shells/textsh2.cxx b/sw/source/core/uibase/shells/textsh2.cxx
index 9dd1854eb222..e1ad8be83e57 100644
--- a/sw/source/core/uibase/shells/textsh2.cxx
+++ b/sw/source/core/uibase/shells/textsh2.cxx
@@ -165,7 +165,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
         case FN_QRY_MERGE_FIELD:
             {
                 // we don't get any cursor, so we must create our own
-                sal_Bool bDisposeResultSet = sal_False;
+                bool bDisposeResultSet = false;
                 if ( !xCursor.is() )
                 {
                     xCursor = SwDBMgr::createCursor(sSourceArg,sCommandArg,nCommandTypeArg,xConnection);
diff --git a/sw/source/core/uibase/shells/txtattr.cxx b/sw/source/core/uibase/shells/txtattr.cxx
index 628529c74d5c..3b62eaacd408 100644
--- a/sw/source/core/uibase/shells/txtattr.cxx
+++ b/sw/source/core/uibase/shells/txtattr.cxx
@@ -374,7 +374,7 @@ SET_LINESPACE:
                     SwNumRule aSetRule( pCurRule->GetName(),
                                         pCurRule->Get( 0 ).GetPositionAndSpaceMode() );
                     aSetRule.SetSvxRule( aRule, GetShell().GetDoc());
-                    aSetRule.SetAutoRule( sal_True );
+                    aSetRule.SetAutoRule( true );
                     // no start or continuation of a list - list style is only changed
                     GetShell().SetCurNumRule( aSetRule, false );
                 }
@@ -496,7 +496,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
 
     SfxWhichIter aIter(rSet);
     sal_uInt16 nSlot = aIter.FirstWhich();
-    sal_Bool bFlag = sal_False;
+    bool bFlag = false;
     SfxBoolItem aFlagItem;
     const SfxPoolItem* pItem = 0;
     int eAdjust = -1;   // Illegal value to recognize DONTCARE.
diff --git a/sw/source/core/uibase/shells/txtcrsr.cxx b/sw/source/core/uibase/shells/txtcrsr.cxx
index 8738642557ac..5882d50ac204 100644
--- a/sw/source/core/uibase/shells/txtcrsr.cxx
+++ b/sw/source/core/uibase/shells/txtcrsr.cxx
@@ -82,8 +82,8 @@ void SwTextShell::ExecBasicMove(SfxRequest &rReq)
     {
         switch(nSlot)
         {
-        case FN_CHAR_LEFT:  rSh.Left( CRSR_SKIP_CELLS,  bSelect, 1, sal_False, sal_True ); break;
-        case FN_CHAR_RIGHT: rSh.Right( CRSR_SKIP_CELLS, bSelect, 1, sal_False, sal_True ); break;
+        case FN_CHAR_LEFT:  rSh.Left( CRSR_SKIP_CELLS,  bSelect, 1, false, true ); break;
+        case FN_CHAR_RIGHT: rSh.Right( CRSR_SKIP_CELLS, bSelect, 1, false, true ); break;
         case FN_LINE_UP:    rSh.Up   ( bSelect, 1 ); break;
         case FN_LINE_DOWN:  rSh.Down ( bSelect, 1 ); break;
         default: OSL_FAIL("wrong Dispatcher"); return;
@@ -91,7 +91,7 @@ void SwTextShell::ExecBasicMove(SfxRequest &rReq)
     }
 
     //#i42732# - notify the edit window that from now on we do not use the input language
-    rTmpEditWin.SetUseInputLanguage( sal_False );
+    rTmpEditWin.SetUseInputLanguage( false );
 }
 
 void SwTextShell::ExecMove(SfxRequest &rReq)
@@ -101,15 +101,15 @@ void SwTextShell::ExecMove(SfxRequest &rReq)
     rTmpEditWin.FlushInBuffer();
 
     sal_uInt16 nSlot = rReq.GetSlot();
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     switch ( nSlot )
     {
         case FN_START_OF_LINE_SEL:
-        case FN_START_OF_LINE:      bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, sal_False );
+        case FN_START_OF_LINE:      bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, false );
         break;
 
         case FN_END_OF_LINE_SEL:
-        case FN_END_OF_LINE:        bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, sal_False );
+        case FN_END_OF_LINE:        bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, false );
         break;
 
         case FN_START_OF_DOCUMENT_SEL:
@@ -132,7 +132,7 @@ void SwTextShell::ExecMove(SfxRequest &rReq)
         rReq.Ignore();
 
     //#i42732# - notify the edit window that from now on we do not use the input language
-    rTmpEditWin.SetUseInputLanguage( sal_False );
+    rTmpEditWin.SetUseInputLanguage( false );
 }
 
 void SwTextShell::ExecMovePage(SfxRequest &rReq)
@@ -170,12 +170,12 @@ void SwTextShell::ExecMoveCol(SfxRequest &rReq)
     SwWrtShell &rSh = GetShell();
     switch ( rReq.GetSlot() )
     {
-        case FN_START_OF_COLUMN:      rSh.StartOfColumn    ( sal_False ); break;
-        case FN_END_OF_COLUMN:        rSh.EndOfColumn      ( sal_False ); break;
-        case FN_START_OF_NEXT_COLUMN: rSh.StartOfNextColumn( sal_False ) ; break;
-        case FN_END_OF_NEXT_COLUMN:   rSh.EndOfNextColumn  ( sal_False ); break;
-        case FN_START_OF_PREV_COLUMN: rSh.StartOfPrevColumn( sal_False ); break;
-        case FN_END_OF_PREV_COLUMN:   rSh.EndOfPrevColumn  ( sal_False ); break;
+        case FN_START_OF_COLUMN:      rSh.StartOfColumn    ( false ); break;
+        case FN_END_OF_COLUMN:        rSh.EndOfColumn      ( false ); break;
+        case FN_START_OF_NEXT_COLUMN: rSh.StartOfNextColumn( false ) ; break;
+        case FN_END_OF_NEXT_COLUMN:   rSh.EndOfNextColumn  ( false ); break;
+        case FN_START_OF_PREV_COLUMN: rSh.StartOfPrevColumn( false ); break;
+        case FN_END_OF_PREV_COLUMN:   rSh.EndOfPrevColumn  ( false ); break;
         default: OSL_FAIL("wrong dispatcher"); return;
     }
     rReq.Done();
@@ -213,10 +213,10 @@ void SwTextShell::ExecMoveLingu(SfxRequest &rReq)
         case FN_PREV_SENT:      rSh.BwdSentence( FN_PREV_SENT_SEL == nSlot );
         break;
 
-        case FN_NEXT_PARA:      rSh.FwdPara    ( sal_False );
+        case FN_NEXT_PARA:      rSh.FwdPara    ( false );
         break;
 
-        case FN_PREV_PARA:      rSh.BwdPara    ( sal_False );
+        case FN_PREV_PARA:      rSh.BwdPara    ( false );
         break;
         default: OSL_FAIL("wrong dispatcher"); return;
     }
@@ -227,7 +227,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
 {
     SwWrtShell &rSh = GetShell();
     sal_uInt16 nSlot = rReq.GetSlot();
-    sal_Bool bSetRetVal = sal_True, bRet = sal_True;
+    bool bSetRetVal = true, bRet = true;
     switch ( nSlot )
     {
         case SID_FM_TOGGLECONTROLFOCUS:
@@ -248,7 +248,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
                 if ( !pFilter.get() )
                     break;
 
-                const SdrObject* pNearestControl = rSh.GetBestObject( sal_True, GOTOOBJ_DRAW_CONTROL, sal_False, pFilter.get() );
+                const SdrObject* pNearestControl = rSh.GetBestObject( true, GOTOOBJ_DRAW_CONTROL, false, pFilter.get() );
                 if ( !pNearestControl )
                     break;
 
@@ -261,7 +261,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
             }
             break;
         case FN_CNTNT_TO_NEXT_FRAME:
-            bRet = rSh.GotoObj(sal_True, GOTOOBJ_GOTO_ANY);
+            bRet = rSh.GotoObj(true, GOTOOBJ_GOTO_ANY);
             if(bRet)
             {
                 rSh.HideCrsr();
@@ -278,7 +278,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
             break;
         case FN_TO_HEADER:
             rSh.MoveCrsr();
-            if ( FRMTYPE_HEADER & rSh.GetFrmType(0,sal_False) )
+            if ( FRMTYPE_HEADER & rSh.GetFrmType(0,false) )
                 rSh.SttPg();
             else
             {
@@ -286,11 +286,11 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
                 if ( !bMoved )
                     rSh.SttPg();
             }
-            bSetRetVal = sal_False;
+            bSetRetVal = false;
             break;
         case FN_TO_FOOTER:
             rSh.MoveCrsr();
-            if ( FRMTYPE_FOOTER & rSh.GetFrmType(0,sal_False) )
+            if ( FRMTYPE_FOOTER & rSh.GetFrmType(0,false) )
                 rSh.EndPg();
             else
             {
@@ -298,15 +298,15 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
                 if ( !bMoved )
                     rSh.EndPg();
             }
-            bSetRetVal = sal_False;
+            bSetRetVal = false;
             break;
         case FN_FOOTNOTE_TO_ANCHOR:
             rSh.MoveCrsr();
-            if ( FRMTYPE_FOOTNOTE & rSh.GetFrmType(0,sal_False) )
+            if ( FRMTYPE_FOOTNOTE & rSh.GetFrmType(0,false) )
                 rSh.GotoFtnAnchor();
             else
                 rSh.GotoFtnTxt();
-            bSetRetVal = sal_False;
+            bSetRetVal = false;
             break;
         case FN_TO_FOOTNOTE_AREA :
             rSh.GotoFtnTxt();
@@ -325,22 +325,22 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
         break;
 
         case FN_NEXT_TOXMARK:
-            bRet = rSh.GotoNxtPrvTOXMark( sal_True );
+            bRet = rSh.GotoNxtPrvTOXMark( true );
             break;
         case FN_PREV_TOXMARK:
-            bRet = rSh.GotoNxtPrvTOXMark( sal_False );
+            bRet = rSh.GotoNxtPrvTOXMark( false );
             break;
         case FN_NEXT_TBLFML:
-            bRet = rSh.GotoNxtPrvTblFormula( sal_True, sal_False );
+            bRet = rSh.GotoNxtPrvTblFormula( true, false );
             break;
         case FN_PREV_TBLFML:
-            bRet = rSh.GotoNxtPrvTblFormula( sal_False, sal_False );
+            bRet = rSh.GotoNxtPrvTblFormula( false, false );
             break;
         case FN_NEXT_TBLFML_ERR:
-            bRet = rSh.GotoNxtPrvTblFormula( sal_True, sal_True );
+            bRet = rSh.GotoNxtPrvTblFormula( true, true );
             break;
         case FN_PREV_TBLFML_ERR:
-            bRet = rSh.GotoNxtPrvTblFormula( sal_False, sal_True );
+            bRet = rSh.GotoNxtPrvTblFormula( false, true );
             break;
 
         default:
@@ -352,7 +352,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
         rReq.SetReturnValue(SfxBoolItem( nSlot, bRet ));
     rReq.Done();
 
-    sal_Bool bInHeader = sal_True;
+    bool bInHeader = true;
     if ( rSh.IsInHeaderFooter( &bInHeader ) )
     {
         if ( !bInHeader )
diff --git a/sw/source/core/uibase/shells/txtnum.cxx b/sw/source/core/uibase/shells/txtnum.cxx
index 1d211b6efb4f..d3da57a3bfdf 100644
--- a/sw/source/core/uibase/shells/txtnum.cxx
+++ b/sw/source/core/uibase/shells/txtnum.cxx
@@ -50,7 +50,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
     {
         GetShell().StartAllAction();
         SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , false );
-        sal_Bool bMode = !GetShell().SelectionHasNumber(); // #i29560#
+        bool bMode = !GetShell().SelectionHasNumber(); // #i29560#
         if ( pItem )
             bMode = pItem->GetValue();
         else
@@ -64,7 +64,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
             else
                 GetShell().NumOrBulletOff(); // #i29560#
         }
-        sal_Bool bNewResult = GetShell().SelectionHasNumber();
+        bool bNewResult = GetShell().SelectionHasNumber();
         if (bNewResult!=bMode) {
             SfxBindings& rBindings = GetView().GetViewFrame()->GetBindings();
             SfxBoolItem aItem(FN_NUM_NUMBERING_ON,!bNewResult);
@@ -79,7 +79,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
     {
         GetShell().StartAllAction();
         SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , false );
-        sal_Bool bMode = !GetShell().SelectionHasBullet(); // #i29560#
+        bool bMode = !GetShell().SelectionHasBullet(); // #i29560#
         if ( pItem )
             bMode = pItem->GetValue();
         else
@@ -93,7 +93,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
             else
                 GetShell().NumOrBulletOff(); // #i29560#
         }
-        sal_Bool bNewResult = GetShell().SelectionHasBullet();
+        bool bNewResult = GetShell().SelectionHasBullet();
         if (bNewResult!=bMode) {
             SfxBindings& rBindings = GetView().GetViewFrame()->GetBindings();
             SfxBoolItem aItem(FN_NUM_BULLET_ON,!bNewResult);
@@ -201,7 +201,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
                                     : GetShell().GetUniqueNumRuleName(),
                     numfunc::GetDefaultPositionAndSpaceMode() );
                 aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc() );
-                aSetRule.SetAutoRule( sal_True );
+                aSetRule.SetAutoRule( true );
                 // No start of new list, if an existing list style is edited.
                 // Otherwise start a new list.
                 const bool bCreateList = ( pNumRuleAtCurrentSelection == NULL );
@@ -219,7 +219,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
                     GetShell().GetUniqueNumRuleName(),
                     numfunc::GetDefaultPositionAndSpaceMode() );
                 aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc() );
-                aSetRule.SetAutoRule( sal_True );
+                aSetRule.SetAutoRule( true );
                 // start new list
                 GetShell().SetCurNumRule( aSetRule, true );
             }
@@ -285,7 +285,7 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq)
                         pNBOTypeMgr->ApplyNumRule( aNewSvxNumRule, nChoosenItemIdx - 1, nActNumLvl );
 
                         aNewNumRule.SetSvxRule( aNewSvxNumRule, GetShell().GetDoc() );
-                        aNewNumRule.SetAutoRule( sal_True );
+                        aNewNumRule.SetAutoRule( true );
                         const bool bCreateNewList = ( pNumRuleAtCurrentSelection == NULL );
                         GetShell().SetCurNumRule( aNewNumRule, bCreateNewList );
                     }
diff --git a/sw/source/core/uibase/sidebar/PageMarginControl.cxx b/sw/source/core/uibase/sidebar/PageMarginControl.cxx
index dd3d031c8dff..6a0f181d0ce5 100644
--- a/sw/source/core/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageMarginControl.cxx
@@ -45,7 +45,7 @@ PageMarginControl::PageMarginControl(
     const SvxLongULSpaceItem& aPageULMargin,
     const bool bMirrored,
     const Size aPageSize,
-    const sal_Bool bLandscape,
+    const bool bLandscape,
     const FieldUnit eFUnit,
     const SfxMapUnit eUnit )
     : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) )
diff --git a/sw/source/core/uibase/sidebar/PageMarginControl.hxx b/sw/source/core/uibase/sidebar/PageMarginControl.hxx
index 32010596f4d0..ee57102dd941 100644
--- a/sw/source/core/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageMarginControl.hxx
@@ -57,7 +57,7 @@ public:
         const SvxLongULSpaceItem& aPageULMargin,
         const bool bMirrored,
         const Size aPageSize,
-        const sal_Bool bLandscape,
+        const bool bLandscape,
         const FieldUnit eFUnit,
         const SfxMapUnit eUnit );
     virtual ~PageMarginControl(void);
diff --git a/sw/source/core/uibase/sidebar/PageOrientationControl.cxx b/sw/source/core/uibase/sidebar/PageOrientationControl.cxx
index 2dbf8bf8762a..53236610a167 100644
--- a/sw/source/core/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageOrientationControl.cxx
@@ -31,7 +31,7 @@ namespace sw { namespace sidebar {
 PageOrientationControl::PageOrientationControl(
     Window* pParent,
     PagePropertyPanel& rPanel,
-    const sal_Bool bLandscape )
+    const bool bLandscape )
     : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) )
     , mpOrientationValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) )
     , mbLandscape( bLandscape )
@@ -53,7 +53,7 @@ PageOrientationControl::PageOrientationControl(
     mpOrientationValueSet->SetNoSelection();
     mpOrientationValueSet->StartSelection();
     mpOrientationValueSet->Show();
-    mpOrientationValueSet->SelectItem( (mbLandscape == sal_True) ? 2 : 1 );
+    mpOrientationValueSet->SelectItem( mbLandscape ? 2 : 1 );
     mpOrientationValueSet->GrabFocus();
     mpOrientationValueSet->Format();
     mpOrientationValueSet->StartSelection();
diff --git a/sw/source/core/uibase/sidebar/PageOrientationControl.hxx b/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
index b6c6845397ce..e55ba25c8a99 100644
--- a/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
@@ -36,13 +36,13 @@ public:
     PageOrientationControl(
         Window* pParent,
         PagePropertyPanel& rPanel,
-        const sal_Bool bLandscape );
+        const bool bLandscape );
     virtual ~PageOrientationControl(void);
 
 private:
     ::svx::sidebar::ValueSetWithTextControl* mpOrientationValueSet;
 
-    sal_Bool mbLandscape;
+    bool mbLandscape;
 
     PagePropertyPanel& mrPagePropPanel;
 
diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
index 982d82b6061d..4ccf76517c6a 100644
--- a/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
@@ -278,7 +278,7 @@ IMPL_LINK( PagePropertyPanel, ClickOrientationHdl, ToolBox*, pToolBox )
     return 0L;
 }
 
-void PagePropertyPanel::ExecuteOrientationChange( const sal_Bool bLandscape )
+void PagePropertyPanel::ExecuteOrientationChange( const bool bLandscape )
 {
     StartUndo();
 
diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
index fb36c8805b04..044c4740756a 100644
--- a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
@@ -74,7 +74,7 @@ namespace sw { namespace sidebar {
         }
 
         ::svx::sidebar::PopupControl* CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent );
-        void ExecuteOrientationChange( const sal_Bool bLandscape );
+        void ExecuteOrientationChange( const bool bLandscape );
         void ClosePageOrientationPopup();
 
         ::svx::sidebar::PopupControl* CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent );
diff --git a/sw/source/core/uibase/sidebar/PageSizeControl.cxx b/sw/source/core/uibase/sidebar/PageSizeControl.cxx
index 038e033235f2..5e5cd9ddd825 100644
--- a/sw/source/core/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageSizeControl.cxx
@@ -39,7 +39,7 @@ PageSizeControl::PageSizeControl(
     Window* pParent,
     PagePropertyPanel& rPanel,
     const Paper ePaper,
-    const sal_Bool bLandscape,
+    const bool bLandscape,
     const FieldUnit eFUnit )
     : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) )
     , mpSizeValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) )
diff --git a/sw/source/core/uibase/sidebar/PageSizeControl.hxx b/sw/source/core/uibase/sidebar/PageSizeControl.hxx
index 86a3bff0b3e4..256715b2abfd 100644
--- a/sw/source/core/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageSizeControl.hxx
@@ -45,7 +45,7 @@ public:
         Window* pParent,
         PagePropertyPanel& rPanel,
         const Paper ePaper,
-        const sal_Bool bLandscape,
+        const bool bLandscape,
         const FieldUnit eFUnit );
     virtual ~PageSizeControl(void);
 
diff --git a/sw/source/core/uibase/table/chartins.cxx b/sw/source/core/uibase/table/chartins.cxx
index c33991127529..9a59c52ad5d7 100644
--- a/sw/source/core/uibase/table/chartins.cxx
+++ b/sw/source/core/uibase/table/chartins.cxx
@@ -75,7 +75,7 @@ Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, co
         Rectangle aDesktop = pParentWin->GetDesktopRectPixel();
         Size aSpace = pParentWin->LogicToPixel( Size( 8, 12 ), MAP_APPFONT );
 
-        sal_Bool bLayoutRTL = ::GetActiveView()->GetWrtShell().IsTableRightToLeft();
+        bool bLayoutRTL = ::GetActiveView()->GetWrtShell().IsTableRightToLeft();
         bool bCenterHor = false;
 
         if ( aDesktop.Bottom() - aObjAbs.Bottom() >= rDialogSize.Height() + aSpace.Height() )
@@ -162,7 +162,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
     }
 
     SwFlyFrmFmt *pFlyFrmFmt = 0;
-    xChartModel.set( SwTableFUNC( &rWrtShell, sal_False ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrmFmt ));
+    xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrmFmt ));
 
     //open wizard
     //@todo get context from writer if that has one
diff --git a/sw/source/core/uibase/table/swtablerep.cxx b/sw/source/core/uibase/table/swtablerep.cxx
index 640a9ee60e9d..5bd4c268651a 100644
--- a/sw/source/core/uibase/table/swtablerep.cxx
+++ b/sw/source/core/uibase/table/swtablerep.cxx
@@ -60,9 +60,9 @@ SwTableRep::SwTableRep( const SwTabCols& rTabCol )
     nRightSpace(0),
     nAlign(0),
     nWidthPercent(0),
-    bLineSelected(sal_False),
-    bWidthChanged(sal_False),
-    bColsChanged(sal_False)
+    bLineSelected(false),
+    bWidthChanged(false),
+    bColsChanged(false)
 {
     nAllCols = nColCount = rTabCol.Count();
     pTColumns = new TColumn[ nColCount + 1 ];
@@ -78,7 +78,7 @@ SwTableRep::SwTableRep( const SwTabCols& rTabCol )
         nStart = nEnd;
     }
     pTColumns[ nAllCols ].nWidth = rTabCol.GetRight() - rTabCol.GetLeft() - nStart;
-    pTColumns[ nAllCols ].bVisible = sal_True;
+    pTColumns[ nAllCols ].bVisible = true;
     nColCount++;
     nAllCols++;
 }
@@ -88,17 +88,17 @@ SwTableRep::~SwTableRep()
     delete[] pTColumns;
 }
 
-sal_Bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
+bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
 {
     long nOldLeft = rTabCols.GetLeft(),
          nOldRight = rTabCols.GetRight();
 
-    sal_Bool bSingleLine = sal_False;
+    bool bSingleLine = false;
 
     for ( size_t i = 0; i < rTabCols.Count(); ++i )
         if(!pTColumns[i].bVisible)
         {
-            bSingleLine = sal_True;
+            bSingleLine = true;
             break;
         }
 
@@ -121,13 +121,13 @@ sal_Bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
             nStart = nEnd;
         }
         pOldTColumns[nAllCols - 1].nWidth = rTabCols.GetRight() - rTabCols.GetLeft() - nStart;
-        pOldTColumns[nAllCols - 1].bVisible = sal_True;
+        pOldTColumns[nAllCols - 1].bVisible = true;
 
         sal_uInt16 nOldPos = 0;
         sal_uInt16 nNewPos = 0;
         SwTwips nOld = 0;
         SwTwips nNew = 0;
-        sal_Bool bOld = sal_False;
+        bool bOld = false;
         bool bFirst = true;
         i = 0;
 
diff --git a/sw/source/core/uibase/table/tablemgr.cxx b/sw/source/core/uibase/table/tablemgr.cxx
index 88064657977e..280f76d86f54 100644
--- a/sw/source/core/uibase/table/tablemgr.cxx
+++ b/sw/source/core/uibase/table/tablemgr.cxx
@@ -114,12 +114,12 @@ void SwTableFUNC::SetColWidth(sal_uInt16 nNum, SwTwips nNewWidth )
 {
     // set current width
     // move all of the following
-    sal_Bool bCurrentOnly = sal_False;
+    bool bCurrentOnly = false;
 
     if ( aCols.Count() > 0 )
     {
         if(aCols.Count() != GetColCount())
-            bCurrentOnly = sal_True;
+            bCurrentOnly = true;
         SwTwips nWidth = GetColWidth(nNum);
 
         int nDiff = (int)(nNewWidth - nWidth);
@@ -155,7 +155,7 @@ void SwTableFUNC::InitTabCols()
         pSh->GetTabCols( aCols );
 }
 
-SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, sal_Bool bCopyFmt)
+SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFmt)
     : pFmt(pShell->GetTableFmt()),
       pSh(pShell),
       bCopy(bCopyFmt)
@@ -186,7 +186,7 @@ void SwTableFUNC::UpdateChart()
 
 uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
         uno::Reference< chart2::data::XDataProvider > &rxDataProvider,
-        sal_Bool bFillWithData,
+        bool bFillWithData,
         const OUString &rCellRange,
         SwFlyFrmFmt** ppFlyFrmFmt )
 {
@@ -245,7 +245,7 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
         if ( !pClient )
         {
             pClient = new SwOleClient( &pSh->GetView(), &pSh->GetView().GetEditWin(), aEmbObjRef );
-            pSh->SetCheckForOLEInCaption( sal_True );
+            pSh->SetCheckForOLEInCaption( true );
         }
         pSh->CalcAndSetScale( aEmbObjRef );
         //#50270# We don't need to handle errors,
diff --git a/sw/source/core/uibase/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx
index c0ed364480a2..8cad6307f4bf 100644
--- a/sw/source/core/uibase/table/tablepg.hxx
+++ b/sw/source/core/uibase/table/tablepg.hxx
@@ -32,7 +32,7 @@ class SwTableRep;
 struct TColumn
 {
     SwTwips nWidth;
-    sal_Bool    bVisible;
+    bool    bVisible;
 };
 
 class SwFormatTablePage : public SfxTabPage
@@ -64,9 +64,9 @@ class SwFormatTablePage : public SfxTabPage
     SwTwips         nSaveWidth;
     SwTwips         nMinTableWidth;
     sal_uInt16          nOldAlign;
-    sal_Bool            bModified;
-    sal_Bool            bFull:1;
-    sal_Bool            bHtmlMode : 1;
+    bool            bModified;
+    bool            bFull:1;
+    bool            bHtmlMode : 1;
 
     void        Init();
     void        ModifyHdl(const Edit* pEdit);
@@ -110,11 +110,11 @@ class SwTableColumnPage : public SfxTabPage
     sal_uInt16          nNoOfVisibleCols;
     // Remember the width, when switching to autoalign
     sal_uInt16          aValueTbl[MET_FIELDS];// primary assignment of the MetricFields
-    sal_Bool            bModified:1;
-    sal_Bool            bModifyTbl:1;
-    sal_Bool            bPercentMode:1;
+    bool            bModified:1;
+    bool            bModifyTbl:1;
+    bool            bPercentMode:1;
 
-    void        Init(sal_Bool bWeb);
+    void        Init(bool bWeb);
     DECL_LINK( AutoClickHdl, CheckBox * );
     void        ModifyHdl( MetricField* pEdit );
     DECL_LINK( UpHdl, MetricField * );
@@ -166,8 +166,8 @@ class SwTextFlowPage : public SfxTabPage
 
     SwWrtShell*     pShell;
 
-    sal_Bool            bPageBreak;
-    sal_Bool            bHtmlMode;
+    bool            bPageBreak;
+    bool            bHtmlMode;
 
     DECL_LINK(PageBreakHdl_Impl, void *);
     DECL_LINK(ApplyCollClickHdl_Impl, void *);
diff --git a/sw/source/core/uibase/uiview/formatclipboard.cxx b/sw/source/core/uibase/uiview/formatclipboard.cxx
index ed2144c1072a..efa48b876e0c 100644
--- a/sw/source/core/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/core/uibase/uiview/formatclipboard.cxx
@@ -290,7 +290,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
         // on the last (sort by there creation time) selection
         SwPaM* pCrsr = rWrtShell.GetCrsr();
 
-        sal_Bool bHasSelection = pCrsr->HasMark();
+        bool bHasSelection = pCrsr->HasMark();
         bool bForwardSelection = false;
 
         if(!bHasSelection && pCrsr->GetPrev() != pCrsr && pCrsr->GetPrev() != 0)
@@ -359,7 +359,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
         SdrView* pDrawView = rWrtShell.GetDrawView();
         if(pDrawView)
         {
-            sal_Bool bOnlyHardAttr = sal_True;
+            bool bOnlyHardAttr = true;
             if( pDrawView->AreObjectsMarked() )
             {
                 pItemSet_TxtAttr = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
@@ -408,7 +408,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
             m_aParaStyle = pFmt->GetName();
     }
 
-    rWrtShell.Pop(sal_False);
+    rWrtShell.Pop(false);
     rWrtShell.EndAction();
 }
 
@@ -537,7 +537,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
             SdrView* pDrawView = rWrtShell.GetDrawView();
             if(pDrawView)
             {
-                sal_Bool bReplaceAll = sal_True;
+                bool bReplaceAll = true;
                 pDrawView->SetAttrToMarked(*m_pItemSet_TxtAttr, bReplaceAll);
             }
         }
diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx
index d34c0da3c15f..4b110b28f0db 100644
--- a/sw/source/core/uibase/uiview/pview.cxx
+++ b/sw/source/core/uibase/uiview/pview.cxx
@@ -105,7 +105,7 @@ TYPEINIT1(SwPagePreview,SfxViewShell)
 #define MIN_PREVIEW_ZOOM 25
 #define MAX_PREVIEW_ZOOM 600
 
-static sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, sal_Bool bZoomIn)
+static sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, bool bZoomIn)
 {
     static const sal_uInt16 aZoomArr[] =
     {
@@ -185,7 +185,7 @@ SwPagePreviewWin::SwPagePreviewWin( Window *pParent, SwPagePreview& rPView )
     SetLineColor( GetBackground().GetColor());
     SetMapMode( MapMode(MAP_TWIP) );
 
-    const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(sal_False);
+    const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(false);
     mnRow = pUsrPref->GetPagePrevRow();     // 1 row
     mnCol = pUsrPref->GetPagePrevCol();     // 1 column
     mnSttPage = USHRT_MAX;
@@ -528,7 +528,7 @@ void SwPagePreviewWin::MouseButtonDown( const MouseEvent& rMEvt )
 
 void SwPagePreviewWin::SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol )
 {
-    SwMasterUsrPref *pOpt = (SwMasterUsrPref *)SW_MOD()->GetUsrPref(sal_False);
+    SwMasterUsrPref *pOpt = (SwMasterUsrPref *)SW_MOD()->GetUsrPref(false);
 
     if (nRow != pOpt->GetPagePrevRow() || nCol != pOpt->GetPagePrevCol())
     {
@@ -896,8 +896,8 @@ MOVEPAGE:
                         != pPPVPD->GetLandscape())
                     pPrinter->SetOrientation(pPPVPD->GetLandscape() ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
             }
-            ::SetAppPrintOptions( pViewWin->GetViewShell(), sal_False );
-            bNormalPrint = sal_False;
+            ::SetAppPrintOptions( pViewWin->GetViewShell(), false );
+            bNormalPrint = false;
             sal_uInt16 nPrtSlot = SID_PRINTDOC;
             rReq.SetSlot( nPrtSlot );
             SfxViewShell::ExecuteSlot( rReq, SfxViewShell::GetInterface() );
@@ -906,8 +906,8 @@ MOVEPAGE:
         }
         case SID_PRINTDOCDIRECT:
         case SID_PRINTDOC:
-            ::SetAppPrintOptions( pViewWin->GetViewShell(), sal_False );
-            bNormalPrint = sal_True;
+            ::SetAppPrintOptions( pViewWin->GetViewShell(), false );
+            bNormalPrint = true;
             SfxViewShell::ExecuteSlot( rReq, SfxViewShell::GetInterface() );
             return;
         case FN_CLOSE_PAGEPREVIEW:
@@ -1033,7 +1033,7 @@ void  SwPagePreview::GetState( SfxItemSet& rSet )
         break;
         case FN_SHOW_BOOKVIEW:
         {
-            sal_Bool b = GetViewShell()->GetViewOptions()->IsPagePrevBookview();
+            bool b = GetViewShell()->GetViewOptions()->IsPagePrevBookview();
             rSet.Put(SfxBoolItem(nWhich, b));
         }
         break;
@@ -1091,14 +1091,14 @@ void SwPagePreview::Init(const SwViewOption * pPrefs)
     if ( GetViewShell()->HasDrawView() )
         GetViewShell()->GetDrawView()->SetAnimationEnabled( false );
 
-    bNormalPrint = sal_True;
+    bNormalPrint = true;
 
     // Check and process the DocSize. The shell could not be found via
     // the handler, because the shell is unknown to the SFX management
     // within the CTOR phase.
 
     if( !pPrefs )
-        pPrefs = SW_MOD()->GetUsrPref(sal_False);
+        pPrefs = SW_MOD()->GetUsrPref(false);
 
     mbHScrollbarEnabled = pPrefs->IsViewHScrollBar();
     mbVScrollbarEnabled = pPrefs->IsViewVScrollBar();
@@ -1107,29 +1107,29 @@ void SwPagePreview::Init(const SwViewOption * pPrefs)
     // ATTENTION: Do cast the EditShell up, to use the SS.
     //            At the methodes the current shell will be queried!
     SwEditShell* pESh = (SwEditShell*)GetViewShell();
-    sal_Bool bIsModified = pESh->IsModified();
+    bool bIsModified = pESh->IsModified();
 
     SwViewOption aOpt( *pPrefs );
-    aOpt.SetPagePreview(sal_True);
-    aOpt.SetTab( sal_False );
-    aOpt.SetBlank( sal_False );
-    aOpt.SetHardBlank( sal_False );
-    aOpt.SetParagraph( sal_False );
-    aOpt.SetLineBreak( sal_False );
-    aOpt.SetPageBreak( sal_False );
-    aOpt.SetColumnBreak( sal_False );
-    aOpt.SetSoftHyph( sal_False );
-    aOpt.SetFldName( sal_False );
-    aOpt.SetPostIts( sal_False );
-    aOpt.SetShowHiddenChar( sal_False );
-    aOpt.SetShowHiddenField( sal_False );
-    aOpt.SetShowHiddenPara( sal_False );
-    aOpt.SetViewHRuler( sal_False );
-    aOpt.SetViewVRuler( sal_False );
-    aOpt.SetGraphic( sal_True );
-    aOpt.SetTable( sal_True );
-    aOpt.SetSnap( sal_False );
-    aOpt.SetGridVisible( sal_False );
+    aOpt.SetPagePreview(true);
+    aOpt.SetTab( false );
+    aOpt.SetBlank( false );
+    aOpt.SetHardBlank( false );
+    aOpt.SetParagraph( false );
+    aOpt.SetLineBreak( false );
+    aOpt.SetPageBreak( false );
+    aOpt.SetColumnBreak( false );
+    aOpt.SetSoftHyph( false );
+    aOpt.SetFldName( false );
+    aOpt.SetPostIts( false );
+    aOpt.SetShowHiddenChar( false );
+    aOpt.SetShowHiddenField( false );
+    aOpt.SetShowHiddenPara( false );
+    aOpt.SetViewHRuler( false );
+    aOpt.SetViewVRuler( false );
+    aOpt.SetGraphic( true );
+    aOpt.SetTable( true );
+    aOpt.SetSnap( false );
+    aOpt.SetGridVisible( false );
 
     GetViewShell()->ApplyViewOptions( aOpt );
     GetViewShell()->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions());
@@ -1161,8 +1161,8 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
     SetName(OUString("PageView" ));
     SetWindow( pViewWin );
     SetHelpId(SW_PAGEPREVIEW);
-    _CreateScrollbar( sal_True );
-    _CreateScrollbar( sal_False );
+    _CreateScrollbar( true );
+    _CreateScrollbar( false );
 
     SfxObjectShell* pObjShell = pViewFrame->GetObjectShell();
     if ( !pOldSh )
@@ -1193,7 +1193,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
         {
             // Set the current page as the first.
             sal_uInt16 nPhysPg, nVirtPg;
-            ((SwCrsrShell*)pVS)->GetPageNum( nPhysPg, nVirtPg, sal_True, sal_False );
+            ((SwCrsrShell*)pVS)->GetPageNum( nPhysPg, nVirtPg, true, false );
             if( 1 != pViewWin->GetCol() && 1 == nPhysPg )
                 --nPhysPg;
             pViewWin->SetSttPage( nPhysPg );
@@ -1238,7 +1238,7 @@ SwDocShell* SwPagePreview::GetDocShell()
     return PTR_CAST(SwDocShell, GetViewFrame()->GetObjectShell());
 }
 
-int SwPagePreview::_CreateScrollbar( sal_Bool bHori )
+int SwPagePreview::_CreateScrollbar( bool bHori )
 {
     Window *pMDI = &GetViewFrame()->GetWindow();
     SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar;
@@ -1289,7 +1289,7 @@ bool SwPagePreview::ChgPage( int eMvMode, int bUpdateScrollbar )
 }
 
 // From here, everything was taken from the SwView.
-void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ )
+void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ )
 {
     const StyleSettings &rSet = pViewWin->GetSettings().GetStyleSettings();
     const long nTmp = rSet.GetScrollBarSize();
@@ -1303,7 +1303,7 @@ void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*
 void  SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize )
 {
     SvBorder aBorder;
-    CalcAndSetBorderPixel( aBorder, sal_True );
+    CalcAndSetBorderPixel( aBorder, true );
     Rectangle aRect( rOfst, rSize );
     aRect += aBorder;
     ViewResizePixel( *pViewWin, aRect.TopLeft(), aRect.GetSize(),
@@ -1317,7 +1317,7 @@ void  SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize )
 void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize )
 {
     SvBorder aBorder;
-    CalcAndSetBorderPixel( aBorder, sal_False );
+    CalcAndSetBorderPixel( aBorder, false );
 
     // Never set EditWin !
 
@@ -1334,7 +1334,7 @@ void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize )
     }
 
     SvBorder aBorderNew;
-    CalcAndSetBorderPixel( aBorderNew, sal_False );
+    CalcAndSetBorderPixel( aBorderNew, false );
     ViewResizePixel( *pViewWin, rOfst, rSize, pViewWin->GetOutputSizePixel(),
                     *pVScrollbar, *pHScrollbar, *pScrollFill );
 }
@@ -1654,7 +1654,7 @@ sal_uInt16  SwPagePreview::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags,
             rESh.SetModified();
     }
     if ( ( nDiffFlags & SFX_PRINTER_OPTIONS ) == SFX_PRINTER_OPTIONS )
-        ::SetPrinter( rSh.getIDocumentDeviceAccess(), pNew, sal_False );
+        ::SetPrinter( rSh.getIDocumentDeviceAccess(), pNew, false );
 
     const bool bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION;
     const bool bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE;
@@ -1779,9 +1779,9 @@ void SwPagePreviewWin::Scroll(long nXMove, long nYMove, sal_uInt16 /*nFlags*/)
 
 }
 
-sal_Bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
+bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
 {
-    sal_Bool bOk = sal_False;
+    bool bOk = false;
     const CommandWheelData* pWData = rCEvt.GetWheelData();
     if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() )
     {
@@ -1804,7 +1804,7 @@ sal_Bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
             }
             SetZoom(SVX_ZOOM_PERCENT, nFactor);
         }
-        bOk = sal_True;
+        bOk = true;
     }
     else
         bOk = pViewWin->HandleScrollCommand( rCEvt, pHScrollbar, pVScrollbar );
@@ -1851,13 +1851,13 @@ void SwPagePreview::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibi
     GetViewShell()->ApplyAccessiblityOptions(rAccessibilityOptions);
 }
 
-void SwPagePreview::ShowHScrollbar(sal_Bool bShow)
+void SwPagePreview::ShowHScrollbar(bool bShow)
 {
     pHScrollbar->Show(bShow);
     InvalidateBorder();
 }
 
-void SwPagePreview::ShowVScrollbar(sal_Bool bShow)
+void SwPagePreview::ShowVScrollbar(bool bShow)
 {
     pVScrollbar->Show(bShow);
     InvalidateBorder();
diff --git a/sw/source/core/uibase/uiview/scroll.cxx b/sw/source/core/uibase/uiview/scroll.cxx
index 92ba2e43060a..c40fbffd58ec 100644
--- a/sw/source/core/uibase/uiview/scroll.cxx
+++ b/sw/source/core/uibase/uiview/scroll.cxx
@@ -23,13 +23,13 @@
 
 #define SCROLL_LINE_SIZE 250
 
-SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) :
+SwScrollbar::SwScrollbar( Window *pWin, bool bHoriz ) :
     ScrollBar( pWin,
     WinBits( WB_3DLOOK | WB_HIDE | ( bHoriz ? WB_HSCROLL : WB_VSCROLL)  ) ),
     bHori( bHoriz ),
-    bAuto( sal_False ),
-    bVisible(sal_False),
-    bSizeSet(sal_False)
+    bAuto( false ),
+    bVisible(false),
+    bSizeSet(false)
 {
     // SSA: --- RTL --- no mirroring for horizontal scrollbars
     if( bHoriz )
@@ -73,7 +73,7 @@ void SwScrollbar::ViewPortChgd( const Rectangle &rRect )
         AutoShow();
 }
 
-void SwScrollbar::ExtendedShow( sal_Bool bSet )
+void SwScrollbar::ExtendedShow( bool bSet )
 {
     bVisible = bSet;
     if( (!bSet ||  !bAuto) && IsUpdateMode() && bSizeSet)
@@ -83,13 +83,13 @@ void SwScrollbar::ExtendedShow( sal_Bool bSet )
 void SwScrollbar::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
 {
     ScrollBar::SetPosSizePixel(rNewPos, rNewSize);
-    bSizeSet = sal_True;
+    bSizeSet = true;
     if(bVisible)
         ExtendedShow();
 
 }
 
-void SwScrollbar::SetAuto(sal_Bool bSet)
+void SwScrollbar::SetAuto(bool bSet)
 {
     if(bAuto != bSet)
     {
@@ -97,7 +97,7 @@ void SwScrollbar::SetAuto(sal_Bool bSet)
 
         // hide autmatically - automatisch versteckt - then show
         if(!bAuto && bVisible && !ScrollBar::IsVisible())
-            ExtendedShow(sal_True);
+            ExtendedShow(true);
         else if(bAuto)
             AutoShow(); // or hide automatically
     }
diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx
index 156876e74902..b939c79f934c 100644
--- a/sw/source/core/uibase/uiview/srcview.cxx
+++ b/sw/source/core/uibase/uiview/srcview.cxx
@@ -218,7 +218,7 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
     SfxViewShell( pViewFrame, SWSRCVIEWFLAGS ),
     aEditWin( &pViewFrame->GetWindow(), this ),
     pSearchItem(0),
-    bSourceSaved(sal_False),
+    bSourceSaved(false),
     eLoadEncoding(RTL_TEXTENCODING_DONTKNOW)
 {
     Init();
@@ -262,7 +262,7 @@ void SwSrcView::Init()
         Load(pDocShell);
     else
     {
-        aEditWin.SetReadonly(sal_True);
+        aEditWin.SetReadonly(true);
     }
 
     SetNewWindowAllowed( false );
@@ -367,7 +367,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
             OSL_ENSURE( nWhich, "Which for SearchItem ?" );
             const SfxPoolItem& rItem = pTmpArgs->Get( nWhich );
             SetSearchItem( (const SvxSearchItem&)rItem);
-            StartSearchAndReplace( (const SvxSearchItem&)rItem, sal_False, rReq.IsAPI() );
+            StartSearchAndReplace( (const SvxSearchItem&)rItem, false, rReq.IsAPI() );
             if(aEditWin.IsModified())
                 GetDocShell()->GetDoc()->SetModified();
         }
@@ -377,7 +377,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
             SvxSearchItem* pSrchItem = GetSearchItem();
             if(pSrchItem)
             {
-                StartSearchAndReplace( *pSrchItem, sal_False, rReq.IsAPI() );
+                StartSearchAndReplace( *pSrchItem, false, rReq.IsAPI() );
                 if(aEditWin.IsModified())
                     GetDocShell()->GetDoc()->SetModified();
             }
@@ -565,15 +565,15 @@ void SwSrcView::SetSearchItem( const SvxSearchItem& rItem )
 }
 
 sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
-                                                    sal_Bool bFromStart,
-                                                    sal_Bool bApi,
-                                                    sal_Bool bRecursive)
+                                                  bool bFromStart,
+                                                  bool bApi,
+                                                  bool bRecursive)
 {
     ExtTextView* pTextView = aEditWin.GetTextView();
     TextSelection aSel;
     TextPaM aPaM;
 
-    sal_Bool bForward = !rSearchItem.GetBackward();
+    bool bForward = !rSearchItem.GetBackward();
     bool bAtStart = pTextView->GetSelection() == TextSelection( aPaM, aPaM );
 
     if( !bForward )
@@ -589,7 +589,7 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
     aSearchOpt.Locale = GetAppLanguageTag().getLocale();
 
     sal_uInt16 nFound;
-    sal_Bool bAll = sal_False;
+    bool bAll = false;
     switch( rSearchItem.GetCommand() )
     {
     case SVX_SEARCHCMD_FIND:
@@ -597,7 +597,7 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
         nFound = pTextView->Search( aSearchOpt, bForward ) ? 1 : 0;
         break;
 
-    case SVX_SEARCHCMD_REPLACE_ALL: bAll = sal_True;
+    case SVX_SEARCHCMD_REPLACE_ALL: bAll = true;
     case SVX_SEARCHCMD_REPLACE:
         nFound = pTextView->Replace( aSearchOpt, bAll, bForward );
         break;
@@ -651,7 +651,7 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
                 if (nRet == RET_YES)
                 {
                     pTextView->SetSelection( TextSelection( aPaM, aPaM ) );
-                    StartSearchAndReplace( rSearchItem, sal_False, sal_False, sal_True );
+                    StartSearchAndReplace( rSearchItem, false, false, true );
                 }
             }
         }
@@ -669,7 +669,7 @@ sal_uInt16 SwSrcView::SetPrinter(SfxPrinter* pNew, sal_uInt16 nDiffFlags, bool )
             pDocSh->SetModified();
     }
     if ( nDiffFlags & SFX_PRINTER_OPTIONS )
-        ::SetPrinter( pDocSh->getIDocumentDeviceAccess(), pNew, sal_True );
+        ::SetPrinter( pDocSh->getIDocumentDeviceAccess(), pNew, true );
 
     const bool bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION;
     const bool bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE;
@@ -777,7 +777,7 @@ void SwSrcView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     {
         // Broadcast only comes once!
         const SwDocShell* pDocSh = GetDocShell();
-        const sal_Bool bReadonly = pDocSh->IsReadOnly();
+        const bool bReadonly = pDocSh->IsReadOnly();
         aEditWin.SetReadonly(bReadonly);
     }
     SfxViewShell::Notify(rBC, rHint);
@@ -796,7 +796,7 @@ void SwSrcView::Load(SwDocShell* pDocShell)
 
     const SfxFilter* pFilter = pMedium->GetFilter();
     bool bHtml = pFilter && pFilter->GetUserData() == "HTML";
-    sal_Bool bDocModified = pDocShell->IsModified();
+    bool bDocModified = pDocShell->IsModified();
     if(bHtml && !bDocModified && pDocShell->HasName())
     {
         SvStream* pStream = pMedium->GetInStream();
@@ -849,7 +849,7 @@ void SwSrcView::Load(SwDocShell* pDocShell)
             if(nRes)
             {
                 ErrorHandler::HandleError(ErrCode(nRes));
-                aEditWin.SetReadonly(sal_True);
+                aEditWin.SetReadonly(true);
             }
             aMedium.Commit();
             SvStream* pInStream = aMedium.GetInStream();
diff --git a/sw/source/core/uibase/uiview/swcli.cxx b/sw/source/core/uibase/uiview/swcli.cxx
index 3ee05fef848a..d3e1f832293c 100644
--- a/sw/source/core/uibase/uiview/swcli.cxx
+++ b/sw/source/core/uibase/uiview/swcli.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star;
 
 SwOleClient::SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& xObj ) :
-    SfxInPlaceClient( pView, pWin, xObj.GetViewAspect() ), bInDoVerb( sal_False ),
+    SfxInPlaceClient( pView, pWin, xObj.GetViewAspect() ), bInDoVerb( false ),
     bOldCheckForOLEInCaption( pView->GetWrtShell().IsCheckForOLEInCaption() )
 {
     SetObject( xObj.GetObject() );
@@ -144,11 +144,11 @@ void SwOleClient::ViewChanged()
     aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight();
 
     SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize );
-    rSh.LockView( sal_True );   // Prevent scrolling in the EndAction
+    rSh.LockView( true );   // Prevent scrolling in the EndAction
     rSh.StartAllAction();
     rSh.RequestObjectResize( aRect, GetObject() );
     rSh.EndAllAction();
-    rSh.LockView( sal_False );
+    rSh.LockView( false );
 }
 
 void SwOleClient::MakeVisible()
diff --git a/sw/source/core/uibase/uiview/uivwimp.cxx b/sw/source/core/uibase/uiview/uivwimp.cxx
index 829a9646c830..9be563188c24 100644
--- a/sw/source/core/uibase/uiview/uivwimp.cxx
+++ b/sw/source/core/uibase/uiview/uivwimp.cxx
@@ -63,7 +63,7 @@ SwView_Impl::SwView_Impl(SwView* pShell)
 #if HAVE_FEATURE_DBCONNECTIVITY
     , pConfigItem(0)
     , nMailMergeRestartPage(0)
-    , bMailMergeSourceView(sal_True)
+    , bMailMergeSourceView(true)
 #endif
     , m_pDocInserter(NULL)
     , m_pRequest(NULL)
@@ -93,7 +93,7 @@ SwView_Impl::~SwView_Impl()
            pScanEvtLstnr->ViewDestroyed();
     if( xClipEvtLstnr.is() )
     {
-        pClipEvtLstnr->AddRemoveListener( sal_False );
+        pClipEvtLstnr->AddRemoveListener( false );
         pClipEvtLstnr->ViewDestroyed();
     }
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -126,7 +126,7 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
     {
         case SID_TWAIN_SELECT:
         {
-            sal_Bool bDone = sal_False;
+            bool bDone = false;
             Reference< XScannerManager2 > xScanMgr = SW_MOD()->GetScannerManager();
 
             if( xScanMgr.is() )
@@ -210,7 +210,7 @@ void SwView_Impl::AddClipboardListener()
     if(!xClipEvtLstnr.is())
     {
         xClipEvtLstnr = pClipEvtLstnr = new SwClipboardChangeListener( *pView );
-        pClipEvtLstnr->AddRemoveListener( sal_True );
+        pClipEvtLstnr->AddRemoveListener( true );
     }
 }
 
@@ -305,7 +305,7 @@ void SAL_CALL SwClipboardChangeListener::changedContents( const ::com::sun::star
     }
 }
 
-void SwClipboardChangeListener::AddRemoveListener( sal_Bool bAdd )
+void SwClipboardChangeListener::AddRemoveListener( bool bAdd )
 {
     pView->AddRemoveClipboardListener( Reference< XClipboardListener >( this ), bAdd );
 }
diff --git a/sw/source/core/uibase/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx
index b592a9231925..a343c712db9c 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -128,7 +128,7 @@ sal_uInt16          SwView::m_nWebInsertCtrlState     = FN_INSERT_TABLE;
 sal_uInt16          SwView::m_nInsertObjectCtrlState  = SID_INSERT_DIAGRAM;
 
 bool            SwView::m_bExtra      = false;
-sal_Bool            SwView::m_bFound      = sal_False;
+bool            SwView::m_bFound      = false;
 bool            SwView::m_bJustOpened = false;
 
 SvxSearchDialog*    SwView::m_pSrchDlg    = 0;
@@ -142,7 +142,7 @@ inline SfxDispatcher &SwView::GetDispatcher()
 
 void SwView::ImpSetVerb( int nSelType )
 {
-    sal_Bool bResetVerbs = m_bVerbsActive;
+    bool bResetVerbs = m_bVerbsActive;
     if ( !GetViewFrame()->GetFrame().IsInPlace() &&
          (nsSelectionType::SEL_OLE|nsSelectionType::SEL_GRF) & nSelType )
     {
@@ -151,15 +151,15 @@ void SwView::ImpSetVerb( int nSelType )
             if ( nSelType & nsSelectionType::SEL_OLE )
             {
                 SetVerbs( GetWrtShell().GetOLEObject()->getSupportedVerbs() );
-                m_bVerbsActive = sal_True;
-                bResetVerbs = sal_False;
+                m_bVerbsActive = true;
+                bResetVerbs = false;
             }
         }
     }
     if ( bResetVerbs )
     {
         SetVerbs( Sequence< embed::VerbDescriptor >() );
-        m_bVerbsActive = sal_False;
+        m_bVerbsActive = false;
     }
 }
 
@@ -228,11 +228,11 @@ void SwView::SelectShell()
         return;
 
     // Decision if the UpdateTable has to be called
-    sal_Bool bUpdateTable = sal_False;
+    bool bUpdateTable = false;
     const SwFrmFmt* pCurTableFmt = m_pWrtShell->GetTableFmt();
     if(pCurTableFmt && pCurTableFmt != m_pLastTableFormat)
     {
-        bUpdateTable = sal_True; // can only be executed later
+        bUpdateTable = true; // can only be executed later
     }
     m_pLastTableFormat = pCurTableFmt;
 
@@ -287,16 +287,16 @@ void SwView::SelectShell()
             }
         }
 
-        sal_Bool bInitFormShell = sal_False;
+        bool bInitFormShell = false;
         if (!m_pFormShell)
         {
-            bInitFormShell = sal_True;
+            bInitFormShell = true;
             m_pFormShell = new FmFormShell( this );
             m_pFormShell->SetControlActivationHandler( LINK( this, SwView, FormControlActivated ) );
             StartListening(*m_pFormShell);
         }
 
-        sal_Bool bSetExtInpCntxt = sal_False;
+        bool bSetExtInpCntxt = false;
         m_nSelectionType = nNewSelectionType;
         ShellModes eShellMode;
 
@@ -368,7 +368,7 @@ void SwView::SelectShell()
         }
         else if ( m_nSelectionType & nsSelectionType::SEL_DRW_TXT )
         {
-            bSetExtInpCntxt = sal_True;
+            bSetExtInpCntxt = true;
             eShellMode = SHELL_MODE_DRAWTEXT;
             rDispatcher.Push( *(new SwBaseShell( *this )) );
             m_pShell = new SwDrawTextShell( *this );
@@ -382,7 +382,7 @@ void SwView::SelectShell()
         }
         else
         {
-            bSetExtInpCntxt = sal_True;
+            bSetExtInpCntxt = true;
             eShellMode = SHELL_MODE_TEXT;
             sal_uInt32 nHelpId = 0;
             if ( m_nSelectionType & nsSelectionType::SEL_NUM )
@@ -414,7 +414,7 @@ void SwView::SelectShell()
         if( !GetDocShell()->IsReadOnly() )
         {
             if( bSetExtInpCntxt && GetWrtShell().HasReadonlySel() )
-                bSetExtInpCntxt = sal_False;
+                bSetExtInpCntxt = false;
 
             InputContext aCntxt( GetEditWin().GetInputContext() );
             aCntxt.SetOptions( bSetExtInpCntxt
@@ -444,7 +444,7 @@ void SwView::SelectShell()
     }
     // Opportune time for the communication with OLE objects?
     if ( GetDocShell()->GetDoc()->IsOLEPrtNotifyPending() )
-        GetDocShell()->GetDoc()->PrtOLENotify( sal_False );
+        GetDocShell()->GetDoc()->PrtOLENotify( false );
 
     // now the table-update
     if(bUpdateTable)
@@ -471,7 +471,7 @@ extern "C"
 IMPL_LINK_NOARG(SwView, AttrChangedNotify)
 {
      if ( GetEditWin().IsChainMode() )
-        GetEditWin().SetChainMode( sal_False );
+        GetEditWin().SetChainMode( false );
 
     //Opt: Not if PaintLocked. During unlock a notify will be once more triggered.
     if( !m_pWrtShell->IsPaintLocked() && !bNoInterrupt &&
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify)
              GetDispatcher().IsLocked() ||               //do not confuse the SFX
              GetViewFrame()->GetBindings().IsInUpdate() )//do not confuse the SFX
         {
-            m_bAttrChgNotified = sal_True;
+            m_bAttrChgNotified = true;
             m_aTimer.Start();
 
             const SfxPoolItem *pItem;
@@ -496,7 +496,7 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify)
                  !((SfxBoolItem*)pItem)->GetValue() )
             {
                 GetViewFrame()->GetBindings().ENTERREGISTRATIONS();
-                m_bAttrChgNotifiedWithRegistrations = sal_True;
+                m_bAttrChgNotifiedWithRegistrations = true;
             }
 
         }
@@ -527,17 +527,17 @@ IMPL_LINK_NOARG(SwView, TimeoutHdl)
     if ( m_bAttrChgNotifiedWithRegistrations )
     {
         GetViewFrame()->GetBindings().LEAVEREGISTRATIONS();
-        m_bAttrChgNotifiedWithRegistrations = sal_False;
+        m_bAttrChgNotifiedWithRegistrations = false;
     }
 
     _CheckReadonlyState();
     _CheckReadonlySelection();
 
-    sal_Bool bOldUndo = m_pWrtShell->DoesUndo();
-    m_pWrtShell->DoUndo( sal_False );
+    bool bOldUndo = m_pWrtShell->DoesUndo();
+    m_pWrtShell->DoUndo( false );
     SelectShell();
     m_pWrtShell->DoUndo( bOldUndo );
-    m_bAttrChgNotified = sal_False;
+    m_bAttrChgNotified = false;
     GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
 
     return 0;
@@ -553,7 +553,7 @@ void SwView::_CheckReadonlyState()
     // Otherwise the slot is known from other; like the BasidIde
     eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem );
     eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem );
-    sal_Bool bChgd = sal_False;
+    bool bChgd = false;
 
     if ( !m_pWrtShell->IsCrsrReadonly() )
     {
@@ -592,16 +592,16 @@ void SwView::_CheckReadonlyState()
             FN_SELECT_PARA,             SID_DEC_INDENT,
             SID_INC_INDENT
         };
-        static sal_Bool bFirst = sal_True;
+        static bool bFirst = true;
         if ( bFirst )
         {
             qsort( (void*)aROIds, sizeof(aROIds)/sizeof(sal_uInt16), sizeof(sal_uInt16), lcl_CmpIds );
-            bFirst = sal_False;
+            bFirst = false;
         }
         if ( SFX_ITEM_DISABLED == eStateRO )
         {
             rDis.SetSlotFilter( SFX_SLOT_FILTER_ENABLED_READONLY, sizeof(aROIds)/sizeof(sal_uInt16), aROIds );
-            bChgd = sal_True;
+            bChgd = true;
         }
     }
     else if( m_pWrtShell->IsAllProtect() )
@@ -609,22 +609,22 @@ void SwView::_CheckReadonlyState()
         if ( SFX_ITEM_DISABLED == eStateProtAll )
         {
             static sal_uInt16 aAllProtIds[] = { SID_SAVEDOC, FN_EDIT_REGION };
-            static sal_Bool bAllProtFirst = sal_True;
+            static bool bAllProtFirst = true;
             if ( bAllProtFirst )
             {
                 qsort( (void*)aAllProtIds, sizeof(aAllProtIds)/sizeof(sal_uInt16), sizeof(sal_uInt16), lcl_CmpIds );
-                bAllProtFirst = sal_False;
+                bAllProtFirst = false;
             }
             rDis.SetSlotFilter( SFX_SLOT_FILTER_ENABLED_READONLY,
                                 sizeof(aAllProtIds)/sizeof(sal_uInt16),
                                 aAllProtIds );
-            bChgd = sal_True;
+            bChgd = true;
         }
     }
     else if ( SFX_ITEM_DISABLED != eStateRO ||
                 SFX_ITEM_DISABLED != eStateProtAll )
     {
-        bChgd = sal_True;
+        bChgd = true;
         rDis.SetSlotFilter();
     }
     if ( bChgd )
@@ -718,10 +718,10 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     m_nLeftBorderDistance( 0 ),
     m_nRightBorderDistance( 0 ),
     m_bWheelScrollInProgress(false),
-    m_bInMailMerge(sal_False),
-    m_bInDtor(sal_False),
-    m_bOldShellWasPagePreview(sal_False),
-    m_bIsPreviewDoubleClick(sal_False),
+    m_bInMailMerge(false),
+    m_bInDtor(false),
+    m_bOldShellWasPagePreview(false),
+    m_bIsPreviewDoubleClick(false),
     m_bAnnotationMode(false)
 {
     // According to discussion with MBA and further
@@ -734,12 +734,12 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     m_bCenterCrsr = m_bTopCrsr = m_bAlwaysShowSel = m_bTabColFromDoc = m_bTabRowFromDoc =
     m_bSetTabColFromDoc = m_bSetTabRowFromDoc = m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations =
     m_bVerbsActive = m_bDrawRotate = m_bInOuterResizePixel = m_bInInnerResizePixel =
-    m_bPasteState = m_bPasteSpecialState = m_bMakeSelectionVisible = sal_False;
+    m_bPasteState = m_bPasteSpecialState = m_bMakeSelectionVisible = false;
 
     m_bShowAtResize = m_bDrawSelMode = bDocSzUpdated = sal_True;
 
-    _CreateScrollbar( sal_True );
-    _CreateScrollbar( sal_False );
+    _CreateScrollbar( true );
+    _CreateScrollbar( false );
 
     m_pViewImpl = new SwView_Impl(this);
     SetName(OUString("View"));
@@ -748,7 +748,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     m_aTimer.SetTimeout( 120 );
 
     SwDocShell* pDocSh = PTR_CAST( SwDocShell, _pFrame->GetObjectShell() );
-    sal_Bool bOldModifyFlag = pDocSh->IsEnableSetModified();
+    bool bOldModifyFlag = pDocSh->IsEnableSetModified();
     if(bOldModifyFlag)
         pDocSh->EnableSetModified( false );
     // HACK: SwDocShell has some cached font info, VCL informs about font updates,
@@ -768,7 +768,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     SvtLinguConfig().GetOptions( aLinguOpt );
     aUsrPref.SetOnlineSpell( aLinguOpt.bIsSpellAuto );
 
-    sal_Bool bOldShellWasSrcView = sal_False;
+    bool bOldShellWasSrcView = false;
 
     // determine if there is an existing view for
     // document
@@ -782,11 +782,11 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
             m_sSwViewData = ((SwPagePreview*)pExistingSh)->GetPrevSwViewData();
             m_sNewCrsrPos = ((SwPagePreview*)pExistingSh)->GetNewCrsrPos();
             m_nNewPage = ((SwPagePreview*)pExistingSh)->GetNewPage();
-            m_bOldShellWasPagePreview = sal_True;
+            m_bOldShellWasPagePreview = true;
             m_bIsPreviewDoubleClick = !m_sNewCrsrPos.isEmpty() || m_nNewPage != USHRT_MAX;
         }
         else if( pExistingSh->IsA( TYPE( SwSrcView ) ) )
-            bOldShellWasSrcView = sal_True;
+            bOldShellWasSrcView = true;
     }
 
     SAL_INFO( "sw.ui", "before create WrtShell" );
@@ -805,7 +805,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         SwDoc& rDoc = *((SwDocShell*)pDocSh)->GetDoc();
 
         if( !bOldShellWasSrcView && pWebDShell && !m_bOldShellWasPagePreview )
-            aUsrPref.setBrowseMode( sal_True );
+            aUsrPref.setBrowseMode( true );
         else
             aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) );
 
@@ -880,8 +880,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     SfxViewFrame* pViewFrame = GetViewFrame();
     if( pViewFrame->GetFrame().GetParentFrame())
     {
-        aUsrPref.SetViewHRuler(sal_False);
-        aUsrPref.SetViewVRuler(sal_False);
+        aUsrPref.SetViewHRuler(false);
+        aUsrPref.SetViewVRuler(false);
     }
 
     StartListening( *pViewFrame, true );
@@ -920,14 +920,14 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         //!((SvEmbeddedObject *)pDocSh)->GetVisArea().IsEmpty() )
         //SetVisArea( ((SvEmbeddedObject *)pDocSh)->GetVisArea(),sal_False);
         !pDocSh->GetVisArea(ASPECT_CONTENT).IsEmpty() )
-        SetVisArea( pDocSh->GetVisArea(ASPECT_CONTENT),sal_False);
+        SetVisArea( pDocSh->GetVisArea(ASPECT_CONTENT),false);
 
     SAL_WARN_IF(
         officecfg::Office::Common::Undo::Steps::get() <= 0,
         "sw", "/org.openoffice.Office.Common/Undo/Steps <= 0");
     m_pWrtShell->DoUndo( true );
 
-    const sal_Bool bBrowse = m_pWrtShell->GetViewOptions()->getBrowseMode();
+    const bool bBrowse = m_pWrtShell->GetViewOptions()->getBrowseMode();
     // Disable "multiple window"
     SetNewWindowAllowed(!bBrowse);
     // End of disabled multiple window
@@ -963,7 +963,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
         Execute( aSfxRequest );
         m_pWrtShell->GetDoc()->SetUpdateTOX( false );     // reset again
-        m_pWrtShell->SttEndDoc(sal_True);
+        m_pWrtShell->SttEndDoc(true);
     }
 
     // No ResetModified, if there is already a view to this doc.
@@ -1011,15 +1011,15 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     }
 
     m_aTimer.SetTimeoutHdl(LINK(this, SwView, TimeoutHdl));
-    m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = sal_False;
+    m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = false;
     if(bOldModifyFlag)
         pDocSh->EnableSetModified( true );
     InvalidateBorder();
 
-    if( !m_pHScrollbar->IsVisible( sal_True ) )
-        ShowHScrollbar( sal_False );
-    if( !m_pVScrollbar->IsVisible( sal_True ) )
-        ShowVScrollbar( sal_False );
+    if( !m_pHScrollbar->IsVisible( true ) )
+        ShowHScrollbar( false );
+    if( !m_pVScrollbar->IsVisible( true ) )
+        ShowVScrollbar( false );
 
     GetViewFrame()->GetWindow().AddChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
 }
@@ -1030,7 +1030,7 @@ SwView::~SwView()
     delete m_pPostItMgr;
     m_pPostItMgr = 0;
 
-    m_bInDtor = sal_True;
+    m_bInDtor = true;
     m_pEditWin->Hide(); // damit kein Paint Aerger machen kann!
     // An der SwDocShell den Pointer auf die View ruecksetzen
 
@@ -1151,7 +1151,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
         const long nAdd = m_pWrtShell->GetViewOptions()->getBrowseMode() ? DOCUMENTBORDER : DOCUMENTBORDER*2;
         if ( nBottom <= (m_pWrtShell->GetDocSize().Height()+nAdd) )
         {
-            m_pWrtShell->EnableSmooth( sal_False );
+            m_pWrtShell->EnableSmooth( false );
 
             const Rectangle aVis( nLeft, nTop, nRight, nBottom );
 
@@ -1165,7 +1165,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
                 ++nOff;
             }
 
-            sal_Bool bSelectObj = (0 != rUserData.getToken( nOff, ';', nPos ).toInt32())
+            bool bSelectObj = (0 != rUserData.getToken( nOff, ';', nPos ).toInt32())
                                 && m_pWrtShell->IsObjSelectable( aCrsrPos );
 
             // restore editing position
@@ -1209,7 +1209,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
                 Point aCrsrPos2( nXTmp, nYTmp );
                 bSelectObj = m_pWrtShell->IsObjSelectable( aCrsrPos2 );
 
-                m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos2, sal_False );
+                m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos2, false );
                 if( bSelectObj )
                 {
                     m_pWrtShell->SelectObj( aCrsrPos2 );
@@ -1220,7 +1220,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
             }
             else if(USHRT_MAX != m_nNewPage)
             {
-                m_pWrtShell->GotoPage(m_nNewPage, sal_True);
+                m_pWrtShell->GotoPage(m_nNewPage, true);
                 m_nNewPage = USHRT_MAX;
             }
 
@@ -1231,10 +1231,10 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse )
             if( pVOpt->GetZoom() != nZoomFactor || pVOpt->GetZoomType() != eZoom )
                 SetZoom( eZoom, nZoomFactor);
 
-            m_pWrtShell->LockView( sal_True );
+            m_pWrtShell->LockView( true );
             m_pWrtShell->EndAction();
-            m_pWrtShell->LockView( sal_False );
-            m_pWrtShell->EnableSmooth( sal_True );
+            m_pWrtShell->LockView( false );
+            m_pWrtShell->EnableSmooth( true );
         }
     }
 }
@@ -1260,12 +1260,12 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
         bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
         sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
 
-        sal_Bool bSelectedFrame = ( m_pWrtShell->GetSelFrmType() != FRMTYPE_NONE ),
-                 bGotVisibleLeft = sal_False,
-                 bGotVisibleTop = sal_False, bGotVisibleRight = sal_False,
-                 bGotVisibleBottom = sal_False, bGotZoomType = sal_False,
-                 bGotZoomFactor = sal_False, bGotIsSelectedFrame = sal_False,
-                 bGotViewLayoutColumns = sal_False, bGotViewLayoutBookMode = sal_False;
+        bool bSelectedFrame = ( m_pWrtShell->GetSelFrmType() != FRMTYPE_NONE ),
+                 bGotVisibleLeft = false,
+                 bGotVisibleTop = false, bGotVisibleRight = false,
+                 bGotVisibleBottom = false, bGotZoomType = false,
+                 bGotZoomFactor = false, bGotIsSelectedFrame = false,
+                 bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false;
 
         for (sal_Int16 i = 0 ; i < nLength; i++)
         {
@@ -1283,50 +1283,50 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
             {
                pValue->Value >>= nLeft;
                nLeft = convertMm100ToTwip( nLeft );
-               bGotVisibleLeft = sal_True;
+               bGotVisibleLeft = true;
             }
             else if ( pValue->Name == "VisibleTop" )
             {
                pValue->Value >>= nTop;
                nTop = convertMm100ToTwip( nTop );
-               bGotVisibleTop = sal_True;
+               bGotVisibleTop = true;
             }
             else if ( pValue->Name == "VisibleRight" )
             {
                pValue->Value >>= nRight;
                nRight = convertMm100ToTwip( nRight );
-               bGotVisibleRight = sal_True;
+               bGotVisibleRight = true;
             }
             else if ( pValue->Name == "VisibleBottom" )
             {
                pValue->Value >>= nBottom;
                nBottom = convertMm100ToTwip( nBottom );
-               bGotVisibleBottom = sal_True;
+               bGotVisibleBottom = true;
             }
             else if ( pValue->Name == "ZoomType" )
             {
                pValue->Value >>= nZoomType;
-               bGotZoomType = sal_True;
+               bGotZoomType = true;
             }
             else if ( pValue->Name == "ZoomFactor" )
             {
                pValue->Value >>= nZoomFactor;
-               bGotZoomFactor = sal_True;
+               bGotZoomFactor = true;
             }
             else if ( pValue->Name == "ViewLayoutColumns" )
             {
                pValue->Value >>= nViewLayoutColumns;
-               bGotViewLayoutColumns = sal_True;
+               bGotViewLayoutColumns = true;
             }
             else if ( pValue->Name == "ViewLayoutBookMode" )
             {
                bViewLayoutBookMode = * (sal_Bool *) pValue->Value.getValue();
-               bGotViewLayoutBookMode = sal_True;
+               bGotViewLayoutBookMode = true;
             }
             else if ( pValue->Name == "IsSelectedFrame" )
             {
                pValue->Value >>= bSelectedFrame;
-               bGotIsSelectedFrame = sal_True;
+               bGotIsSelectedFrame = true;
             }
             pValue++;
         }
@@ -1336,7 +1336,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
             const long nAdd = m_pWrtShell->GetViewOptions()->getBrowseMode() ? DOCUMENTBORDER : DOCUMENTBORDER*2;
             if (nBottom <= (m_pWrtShell->GetDocSize().Height()+nAdd) )
             {
-                m_pWrtShell->EnableSmooth( sal_False );
+                m_pWrtShell->EnableSmooth( false );
                 const Rectangle aVis( nLeft, nTop, nRight, nBottom );
 
                 SvxZoomType eZoom;
@@ -1348,8 +1348,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                 }
                 if (bGotIsSelectedFrame)
                 {
-                    sal_Bool bSelectObj = (sal_False != bSelectedFrame )
-                                        && m_pWrtShell->IsObjSelectable( aCrsrPos );
+                    bool bSelectObj = bSelectedFrame && m_pWrtShell->IsObjSelectable( aCrsrPos );
 
                     // set flag value to avoid macro execution.
                     bool bSavedFlagValue = m_pWrtShell->IsMacroExecAllowed();
@@ -1362,7 +1361,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                         m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj );
 
                         // Update the shell to toggle Header/Footer edit if needed
-                        sal_Bool bInHeader = sal_True;
+                        bool bInHeader = true;
                         if ( m_pWrtShell->IsInHeaderFooter( &bInHeader ) )
                         {
                             if ( !bInHeader )
@@ -1414,13 +1413,13 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                     m_pWrtShell->StartAction();
 
                 if ( bSetViewLayoutSettings )
-                    SetViewLayout( nViewLayoutColumns, bViewLayoutBookMode, sal_True );
+                    SetViewLayout( nViewLayoutColumns, bViewLayoutBookMode, true );
 
                 if ( bZoomNeedsViewLayout )
                     m_pWrtShell->StartAction();
 
                 if ( bSetViewSettings )
-                    SetZoom( eZoom, nZoomFactor, sal_True );
+                    SetZoom( eZoom, nZoomFactor, true );
 
 // os: changed: The user data has to be read if the view is switched back from page preview
 // go to the last editing position when opening own files
@@ -1447,10 +1446,10 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                         SetVisArea( aVis );
                 }
 
-                m_pWrtShell->LockView( sal_True );
+                m_pWrtShell->LockView( true );
                 m_pWrtShell->EndAction();
-                m_pWrtShell->LockView( sal_False );
-                m_pWrtShell->EnableSmooth( sal_True );
+                m_pWrtShell->LockView( false );
+                m_pWrtShell->EnableSmooth( true );
             }
         }
     }
@@ -1529,8 +1528,8 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
 void SwView::ShowCursor( bool bOn )
 {
     //don't scroll the cursor into the visible area
-    sal_Bool bUnlockView = !m_pWrtShell->IsViewLocked();
-    m_pWrtShell->LockView( sal_True );    //lock visible section
+    bool bUnlockView = !m_pWrtShell->IsViewLocked();
+    m_pWrtShell->LockView( true );    //lock visible section
 
     if( !bOn )
         m_pWrtShell->HideCrsr();
@@ -1538,7 +1537,7 @@ void SwView::ShowCursor( bool bOn )
         m_pWrtShell->ShowCrsr();
 
     if( bUnlockView )
-        m_pWrtShell->LockView( sal_False );
+        m_pWrtShell->LockView( false );
 }
 
 ErrCode SwView::DoVerb( long nVerb )
@@ -1587,7 +1586,7 @@ SwGlossaryHdl* SwView::GetGlosHdl()
 
 void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
-    sal_Bool bCallBase = sal_True;
+    bool bCallBase = true;
     if ( rHint.ISA(SfxSimpleHint) )
     {
         sal_uInt32 nId = ((SfxSimpleHint&)rHint).GetId();
@@ -1606,7 +1605,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             case SFX_HINT_MODECHANGED:
                 {
                     // Modal mode change-over?
-                    sal_Bool bModal = GetDocShell()->IsInModalMode();
+                    bool bModal = GetDocShell()->IsInModalMode();
                     m_pHRuler->SetActive( !bModal );
                     m_pVRuler->SetActive( !bModal );
                 }
@@ -1614,7 +1613,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 /* no break here */
 
             case SFX_HINT_TITLECHANGED:
-                if ( (GetDocShell()->IsReadOnly() ? 1 : 0) != GetWrtShell().GetViewOptions()->IsReadonly() )
+                if ( GetDocShell()->IsReadOnly() != GetWrtShell().GetViewOptions()->IsReadonly() )
                 {
                     SwWrtShell &rSh = GetWrtShell();
                     rSh.SetReadonlyOption( GetDocShell()->IsReadOnly() );
@@ -1647,7 +1646,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
             case SW_BROADCAST_DRAWVIEWS_CREATED:
                 {
-                    bCallBase = sal_False;
+                    bCallBase = false;
                     if ( GetFormShell() )
                     {
                         GetFormShell()->SetView(
@@ -1662,7 +1661,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     }
     else if(rHint.ISA(FmDesignModeChangedHint))
     {
-        sal_Bool bDesignMode = ((FmDesignModeChangedHint&)rHint).GetDesignMode();
+        bool bDesignMode = ((FmDesignModeChangedHint&)rHint).GetDesignMode();
         if (!bDesignMode && GetDrawFuncPtr())
         {
             GetDrawFuncPtr()->Deactivate();
@@ -1716,10 +1715,10 @@ void    SwView::StopShellTimer()
         if ( m_bAttrChgNotifiedWithRegistrations )
         {
             GetViewFrame()->GetBindings().LEAVEREGISTRATIONS();
-            m_bAttrChgNotifiedWithRegistrations = sal_False;
+            m_bAttrChgNotifiedWithRegistrations = false;
         }
         SelectShell();
-        m_bAttrChgNotified = sal_False;
+        m_bAttrChgNotified = false;
     }
 }
 
@@ -1739,7 +1738,7 @@ bool SwView::PrepareClose( bool bUI )
 
 // status methods for clipboard.
 // Status changes now notified from the clipboard.
-sal_Bool SwView::IsPasteAllowed()
+bool SwView::IsPasteAllowed()
 {
     sal_uInt16 nPasteDestination = SwTransferable::GetSotDestination( *m_pWrtShell );
     if( m_nLastPasteDestination != nPasteDestination )
@@ -1754,7 +1753,7 @@ sal_Bool SwView::IsPasteAllowed()
                                                     *m_pWrtShell, aDataHelper );
         }
         else
-            m_bPasteState = m_bPasteSpecialState = sal_False;
+            m_bPasteState = m_bPasteSpecialState = false;
 
         if( 0xFFFF == m_nLastPasteDestination )  // the init value
             m_pViewImpl->AddClipboardListener();
@@ -1763,10 +1762,10 @@ sal_Bool SwView::IsPasteAllowed()
     return m_bPasteState;
 }
 
-sal_Bool SwView::IsPasteSpecialAllowed()
+bool SwView::IsPasteSpecialAllowed()
 {
     if ( m_pFormShell && m_pFormShell->IsActiveControl() )
-        return sal_False;
+        return false;
 
     sal_uInt16 nPasteDestination = SwTransferable::GetSotDestination( *m_pWrtShell );
     if( m_nLastPasteDestination != nPasteDestination )
@@ -1781,7 +1780,7 @@ sal_Bool SwView::IsPasteSpecialAllowed()
                                                     *m_pWrtShell, aDataHelper );
         }
         else
-            m_bPasteState = m_bPasteSpecialState = sal_False;
+            m_bPasteState = m_bPasteSpecialState = false;
 
         if( 0xFFFF == m_nLastPasteDestination )  // the init value
             m_pViewImpl->AddClipboardListener();
diff --git a/sw/source/core/uibase/uiview/view0.cxx b/sw/source/core/uibase/uiview/view0.cxx
index a681c09dfd5a..e18be9af5e2b 100644
--- a/sw/source/core/uibase/uiview/view0.cxx
+++ b/sw/source/core/uibase/uiview/view0.cxx
@@ -141,7 +141,7 @@ void SwView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOpt
 #if HAVE_FEATURE_DBCONNECTIVITY
 
 void SwView::SetMailMergeConfigItem(SwMailMergeConfigItem*  pConfigItem,
-                sal_uInt16 nRestart, sal_Bool bIsSource)
+                sal_uInt16 nRestart, bool bIsSource)
 {
     m_pViewImpl->SetMailMergeConfigItem(pConfigItem, nRestart, bIsSource);
     UIFeatureChanged();
@@ -157,28 +157,28 @@ sal_uInt16 SwView::GetMailMergeRestartPage() const
     return m_pViewImpl->GetMailMergeRestartPage();
 }
 
-sal_Bool SwView::IsMailMergeSourceView() const
+bool SwView::IsMailMergeSourceView() const
 {
     return m_pViewImpl->IsMailMergeSourceView();
 }
 
 #endif
 
-static sal_Bool lcl_IsViewMarks( const SwViewOption& rVOpt )
+static bool lcl_IsViewMarks( const SwViewOption& rVOpt )
 {
     return  rVOpt.IsHardBlank() &&
             rVOpt.IsSoftHyph() &&
             SwViewOption::IsFieldShadings();
 }
-static void lcl_SetViewMarks(SwViewOption& rVOpt, sal_Bool bOn )
+static void lcl_SetViewMarks(SwViewOption& rVOpt, bool bOn )
 {
     rVOpt.SetHardBlank(bOn);
     rVOpt.SetSoftHyph(bOn);
     SwViewOption::SetAppearanceFlag(
-            VIEWOPT_FIELD_SHADINGS, bOn, sal_True);
+            VIEWOPT_FIELD_SHADINGS, bOn, true);
 }
 
-static void lcl_SetViewMetaChars( SwViewOption& rVOpt, sal_Bool bOn)
+static void lcl_SetViewMetaChars( SwViewOption& rVOpt, bool bOn)
 {
     rVOpt.SetViewMetaChars( bOn );
     if(bOn && !(rVOpt.IsParagraph()     ||
@@ -247,7 +247,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
 
     while(nWhich)
     {
-        sal_Bool bReadonly = GetDocShell()->IsReadOnly();
+        bool bReadonly = GetDocShell()->IsReadOnly();
         if ( bReadonly && nWhich != FN_VIEW_GRAPHIC )
         {
             rSet.DisableItem(nWhich);
@@ -257,7 +257,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
         {
             case FN_RULER:
             {
-                if(!pOpt->IsViewHRuler(sal_True) && !pOpt->IsViewVRuler(sal_True))
+                if(!pOpt->IsViewHRuler(true) && !pOpt->IsViewVRuler(true))
                 {
                     rSet.DisableItem(nWhich);
                     nWhich = 0;
@@ -269,7 +269,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
             case SID_BROWSER_MODE:
             case FN_PRINT_LAYOUT:
             {
-                sal_Bool bState = pOpt->getBrowseMode();
+                bool bState = pOpt->getBrowseMode();
                 if(FN_PRINT_LAYOUT == nWhich)
                     bState = !bState;
                 aBool.SetValue( bState );
@@ -352,7 +352,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
 void SwView::ExecViewOptions(SfxRequest &rReq)
 {
     SwViewOption* pOpt = new SwViewOption( *GetWrtShell().GetViewOptions() );
-    sal_Bool bModified = GetWrtShell().IsModified();
+    bool bModified = GetWrtShell().IsModified();
 
     int eState = STATE_TOGGLE;
     sal_Bool bSet = sal_False;
@@ -368,7 +368,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
         eState = bSet ? STATE_ON : STATE_OFF;
     }
 
-    sal_Bool bFlag = STATE_ON == eState;
+    bool bFlag = STATE_ON == eState;
     uno::Reference< linguistic2::XLinguProperties >  xLngProp( ::GetLinguPropertySet() );
 
     switch ( nSlot )
@@ -382,13 +382,13 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     case FN_VIEW_FIELDS:
         if( STATE_TOGGLE == eState )
             bFlag = !SwViewOption::IsFieldShadings() ;
-        SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bFlag, sal_True );
+        SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bFlag, true );
         break;
 
     case FN_VIEW_BOUNDS:
         if( STATE_TOGGLE == eState )
             bFlag = !SwViewOption::IsDocBoundaries();
-        SwViewOption::SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bFlag, sal_True );
+        SwViewOption::SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bFlag, true );
         break;
 
     case SID_GRID_VISIBLE:
@@ -480,7 +480,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     case FN_VIEW_TABLEGRID:
         if( STATE_TOGGLE == eState )
             bFlag = !SwViewOption::IsTableBoundaries();
-        SwViewOption::SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bFlag, sal_True );
+        SwViewOption::SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bFlag, true );
         break;
 
     case FN_VIEW_FIELDNAME:
@@ -527,7 +527,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
                 SwDoc *pDoc = pDocSh? pDocSh->GetDoc() : NULL;
 
                 // right now we don't have view options for automatic grammar checking. Thus...
-                sal_Bool bIsAutoGrammar = sal_False;
+                bool bIsAutoGrammar = false;
                 aCfg.GetProperty( UPN_IS_GRAMMAR_AUTO ) >>= bIsAutoGrammar;
 
                 if (pDoc && bIsAutoGrammar)
@@ -550,7 +550,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     }
 
     // Set UserPrefs, mark request as modified
-    sal_Bool bWebView =  0 != dynamic_cast<const SwWebView*>(this);
+    bool bWebView =  0 != dynamic_cast<const SwWebView*>(this);
     SwWrtShell &rSh = GetWrtShell();
     rSh.StartAction();
     SwModule* pModule = SW_MOD();
@@ -578,8 +578,8 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     if ( nSlot == SID_AUTOSPELL_CHECK )
         GetPostItMgr()->SetSpellChecking();
 
-    const sal_Bool bLockedView = rSh.IsViewLocked();
-    rSh.LockView( sal_True );    //lock visible section
+    const bool bLockedView = rSh.IsViewLocked();
+    rSh.LockView( true );    //lock visible section
     GetWrtShell().EndAction();
     if( bBrowseModeChanged && !bFlag )
         CalcVisArea( GetEditWin().GetOutputSizePixel() );
@@ -588,7 +588,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     delete pOpt;
     Invalidate(rReq.GetSlot());
     if(!pArgs)
-        rReq.AppendItem(SfxBoolItem(nSlot, (sal_Bool)bFlag));
+        rReq.AppendItem(SfxBoolItem(nSlot, bFlag));
     rReq.Done();
 }
 
diff --git a/sw/source/core/uibase/uiview/view1.cxx b/sw/source/core/uibase/uiview/view1.cxx
index e122d0c3820a..de2db60fc66c 100644
--- a/sw/source/core/uibase/uiview/view1.cxx
+++ b/sw/source/core/uibase/uiview/view1.cxx
@@ -44,7 +44,7 @@ void SwView::Activate(bool bMDIActivate)
 {
     // fdo#40438 Update the layout to make sure everything is correct before showing the content
     m_pWrtShell->StartAction();
-    m_pWrtShell->EndAction( sal_True );
+    m_pWrtShell->EndAction( true );
 
     // Register the current View at the DocShell.
     // The view remains active at the DocShell until it will
@@ -63,14 +63,14 @@ void SwView::Activate(bool bMDIActivate)
     if(m_bMakeSelectionVisible)
     {
         m_pWrtShell->MakeSelVisible();
-        m_bMakeSelectionVisible = sal_False;
+        m_bMakeSelectionVisible = false;
     }
     m_pHRuler->SetActive( true );
     m_pVRuler->SetActive( true );
 
     if ( bMDIActivate )
     {
-        m_pWrtShell->ShGetFcs(sal_False);     // Selections visible
+        m_pWrtShell->ShGetFcs(false);     // Selections visible
 
         if( !m_sSwViewData.isEmpty() )
         {
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index e33ea5d56ea4..77dc34c34ba1 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -165,7 +165,7 @@ static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, sal_uInt16 nWhi
         nWhichId == RES_CHRATR_CTL_LANGUAGE)
     {
         rWrtSh.StartAction();
-        rWrtSh.LockView( sal_True );
+        rWrtSh.LockView( true );
         rWrtSh.Push();
 
         // prepare to apply new language to all text in document
@@ -177,8 +177,8 @@ static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, sal_uInt16 nWhi
         aAttribs.insert( nWhichId );
         rWrtSh.ResetAttr( aAttribs );
 
-        rWrtSh.Pop( sal_False );
-        rWrtSh.LockView( sal_False );
+        rWrtSh.Pop( false );
+        rWrtSh.LockView( false );
         rWrtSh.EndAction();
     }
 }
@@ -205,8 +205,8 @@ OUString SwView::GetPageStr( sal_uInt16 nPg, sal_uInt16 nLogPg,
 }
 
 int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter,
-                                sal_Bool bLink, GraphicFilter *pFilter,
-                                Graphic* pPreviewGrf, sal_Bool bRule )
+                                bool bLink, GraphicFilter *pFilter,
+                                Graphic* pPreviewGrf, bool bRule )
 {
     SwWait aWait( *GetDocShell(), true );
 
@@ -240,7 +240,7 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter,
             }
         }
 
-        SwFlyFrmAttrMgr aFrameManager( sal_True, GetWrtShellPtr(), FRMMGR_TYPE_GRF );
+        SwFlyFrmAttrMgr aFrameManager( true, GetWrtShellPtr(), FRMMGR_TYPE_GRF );
         SwWrtShell& rShell = GetWrtShell();
 
         // #i123922# determine if we really want to insert or replace the graphic at a selected object
@@ -283,9 +283,9 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter,
     return aResult;
 }
 
-sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
+bool SwView::InsertGraphicDlg( SfxRequest& rReq )
 {
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
     SwDocShell* pDocShell = GetDocShell();
     sal_uInt16 nHtmlMode = ::GetHtmlMode(pDocShell);
     // when in HTML mode insert only as a link
@@ -298,7 +298,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
     uno::Reference < XFilePickerControlAccess > xCtrlAcc(xFP, UNO_QUERY);
     if(nHtmlMode & HTMLMODE_ON)
     {
-        sal_Bool bTrue = sal_True;
+        bool bTrue = true;
         Any aVal(&bTrue, ::getBooleanCppuType());
         xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aVal);
         xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False);
@@ -355,7 +355,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
     }
 
     SFX_REQUEST_ARG( rReq, pName, SfxStringItem, SID_INSERT_GRAPHIC , false );
-    sal_Bool bShowError = !pName;
+    bool bShowError = !pName;
     if( pName || ERRCODE_NONE == pFileDlg->Execute() )
     {
 
@@ -374,9 +374,9 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
             rReq.AppendItem( SfxStringItem( SID_INSERT_GRAPHIC, aFileName ) );
             rReq.AppendItem( SfxStringItem( FN_PARAM_FILTER, aFilterName ) );
 
-            sal_Bool bAsLink = sal_False;
+            bool bAsLink = false;
             if(nHtmlMode & HTMLMODE_ON)
-                bAsLink = sal_True;
+                bAsLink = true;
             else
             {
                 try
@@ -402,9 +402,9 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
         SFX_REQUEST_ARG( rReq, pAsLink, SfxBoolItem, FN_PARAM_1 , false );
         SFX_REQUEST_ARG( rReq, pStyle, SfxStringItem, FN_PARAM_2 , false );
 
-        sal_Bool bAsLink = sal_False;
+        bool bAsLink = false;
         if( nHtmlMode & HTMLMODE_ON )
-            bAsLink = sal_True;
+            bAsLink = true;
         else
         {
             if ( rReq.GetArgs() )
@@ -435,7 +435,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
             {
                 SvxLinkWarningDialog aWarnDlg(GetWindow(),pFileDlg->GetPath());
                 if( aWarnDlg.Execute() != RET_OK )
-                    bAsLink=sal_False; // don't store as link
+                    bAsLink=false; // don't store as link
             }
         }
 
@@ -506,7 +506,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
         else
         {
             // set the specific graphic attrbutes to the graphic
-            bReturn = sal_True;
+            bReturn = true;
             AutoCaption( GRAPHIC_CAP );
             rReq.Done();
         }
@@ -522,7 +522,7 @@ void SwView::Execute(SfxRequest &rReq)
     sal_uInt16 nSlot = rReq.GetSlot();
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
-    sal_Bool bIgnore = sal_False;
+    bool bIgnore = false;
     switch( nSlot )
     {
         case SID_CREATE_SW_DRAWVIEW:
@@ -559,7 +559,7 @@ void SwView::Execute(SfxRequest &rReq)
             rReq.SetReturnValue(SfxBoolItem(nSlot,
                                                 aVis != GetVisArea()));
             //#i42732# - notify the edit window that from now on we do not use the input language
-            rTmpWin.SetUseInputLanguage( sal_False );
+            rTmpWin.SetUseInputLanguage( false );
         }
         break;
         case FN_REDLINE_ON:
@@ -641,7 +641,7 @@ void SwView::Execute(SfxRequest &rReq)
                 rReq.AppendItem( SfxBoolItem( FN_REDLINE_PROTECT, ((nMode&nsRedlineMode_t::REDLINE_ON)==0) ) );
             }
             else
-                bIgnore = sal_True;
+                bIgnore = true;
         }
         break;
         case FN_REDLINE_SHOW:
@@ -786,7 +786,7 @@ void SwView::Execute(SfxRequest &rReq)
                     }
                 }
                 else
-                    bIgnore = sal_True;
+                    bIgnore = true;
             }
         break;
         case FN_SYNC_LABELS:
@@ -838,7 +838,7 @@ void SwView::Execute(SfxRequest &rReq)
             }
             else if ( GetEditWin().IsChainMode() )
             {
-                GetEditWin().SetChainMode( sal_False );
+                GetEditWin().SetChainMode( false );
             }
             else if( m_pWrtShell->GetFlyFrmFmt() )
             {
@@ -853,7 +853,7 @@ void SwView::Execute(SfxRequest &rReq)
             {
                 SfxBoolItem aItem( SID_WIN_FULLSCREEN, false );
                 GetViewFrame()->GetDispatcher()->Execute( SID_WIN_FULLSCREEN, SFX_CALLMODE_RECORD, &aItem, 0L );
-                bIgnore = sal_True;
+                bIgnore = true;
             }
         }
         break;
@@ -917,8 +917,8 @@ void SwView::Execute(SfxRequest &rReq)
         {
             m_pWrtShell->StartAction();
             m_pWrtShell->EnterStdMode();
-            sal_Bool bOldCrsrInReadOnly = m_pWrtShell->IsReadOnlyAvailable();
-            m_pWrtShell->SetReadOnlyAvailable( sal_True );
+            bool bOldCrsrInReadOnly = m_pWrtShell->IsReadOnlyAvailable();
+            m_pWrtShell->SetReadOnlyAvailable( true );
 
             for( sal_uInt16 i = 0; i < 2; ++i )
             {
@@ -937,13 +937,13 @@ void SwView::Execute(SfxRequest &rReq)
                     pBase = m_pWrtShell->GetCurTOX();
                 }
 
-                sal_Bool bAutoMarkApplied = sal_False;
+                bool bAutoMarkApplied = false;
                 while( pBase )
                 {
                     if(TOX_INDEX == pBase->GetType() && !bAutoMarkApplied)
                     {
                         m_pWrtShell->ApplyAutoMark();
-                        bAutoMarkApplied = sal_True;
+                        bAutoMarkApplied = true;
                     }
                     // pBase is needed only for the interface. Should be changed in future! (JP 1996)
                     m_pWrtShell->UpdateTableOf( *pBase );
@@ -990,7 +990,7 @@ void SwView::Execute(SfxRequest &rReq)
                 {
                     case FN_INSERT_CTRL:
                     {
-                        sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+                        bool bWeb = 0 != PTR_CAST(SwWebView, this);
                         if(bWeb)
                             SwView::m_nWebInsertCtrlState = nValue;
                         else
@@ -1085,13 +1085,13 @@ void SwView::Execute(SfxRequest &rReq)
             if(pVFrame->HasChildWindow(SID_BROWSER))
             {
                 const SwDBData& rData = GetWrtShell().GetDBDesc();
-                SW_MOD()->ShowDBObj(*this, rData, sal_False);
+                SW_MOD()->ShowDBObj(*this, rData, false);
             }
         }
         break;
         case FN_INSERT_FIELD_DATA_ONLY :
         {
-            sal_Bool bShow = sal_False;
+            bool bShow = false;
             if( pArgs &&
                 SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem ))
                 bShow = ((const SfxBoolItem*)pItem)->GetValue();
@@ -1119,7 +1119,7 @@ void SwView::Execute(SfxRequest &rReq)
                     pValues[0].Value <<= aData.sDataSource;
                     pValues[1].Value <<= aData.sCommand;
                     pValues[2].Value <<= aData.nCommandType;
-                    pDBMgr->ExecuteFormLetter(rSh, aProperties, sal_True);
+                    pDBMgr->ExecuteFormLetter(rSh, aProperties, true);
                 }
             }
 #endif
@@ -1129,8 +1129,8 @@ void SwView::Execute(SfxRequest &rReq)
         break;
         case FN_QRY_MERGE:
         {
-            sal_Bool bUseCurrentDocument = sal_True;
-            sal_Bool bQuery = !pArgs||SFX_ITEM_SET != pArgs->GetItemState(nSlot);
+            bool bUseCurrentDocument = true;
+            bool bQuery = !pArgs || SFX_ITEM_SET != pArgs->GetItemState(nSlot);
             if(bQuery)
             {
                 SfxViewFrame* pTmpFrame = GetViewFrame();
@@ -1364,7 +1364,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
             case FN_STAT_TEMPLATE:
             {
                 rSet.Put(SfxStringItem( FN_STAT_TEMPLATE,
-                                        rShell.GetCurPageStyle(sal_False)));
+                                        rShell.GetCurPageStyle(false)));
 
             }
             break;
@@ -1531,7 +1531,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 }
 
                 const SwNumRule* pNumRule = rShell.GetNumRuleAtCurrCrsrPos();
-                const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0;
+                const bool bOutlineNum = pNumRule && pNumRule->IsOutlineRule();
 
                 if (pNumRule && !bOutlineNum )  // cursor in numbering
                 {
@@ -1624,7 +1624,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
     SwWrtShell &rSh = GetWrtShell();
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem=NULL;
-    sal_Bool bUp = sal_False;
+    bool bUp = false;
     sal_uInt16 nWhich = rReq.GetSlot();
     switch( nWhich )
     {
@@ -1727,7 +1727,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
                     enum SvxZoomType eType = ((const SvxZoomItem *)pItem)->GetType();
                     SetZoom( eType, ((const SvxZoomItem *)pItem)->GetValue() );
                 }
-                bUp = sal_True;
+                bUp = true;
                 if ( pItem )
                     rReq.AppendItem( *pItem );
                 rReq.Done();
@@ -1750,7 +1750,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
                     SetViewLayout( nColumns, bBookMode );
                 }
 
-                bUp = sal_True;
+                bUp = true;
                 rReq.Done();
 
                 InvalidateRulerPos();
@@ -1768,7 +1768,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
                     SetZoom( SVX_ZOOM_PERCENT, nCurrentZoom );
                 }
 
-                bUp = sal_True;
+                bUp = true;
                 rReq.Done();
             }
         }
@@ -1840,23 +1840,23 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
                 else
                     rSh.ToggleBlockMode();
             }
-            bUp = sal_True;
+            bUp = true;
             break;
         }
         case FN_SET_ADD_MODE:
             rSh.ToggleAddMode();
             nWhich = FN_STAT_SELMODE;
-            bUp = sal_True;
+            bUp = true;
         break;
         case FN_SET_BLOCK_MODE:
             rSh.ToggleBlockMode();
             nWhich = FN_STAT_SELMODE;
-            bUp = sal_True;
+            bUp = true;
         break;
         case FN_SET_EXT_MODE:
             rSh.ToggleExtMode();
             nWhich = FN_STAT_SELMODE;
-            bUp = sal_True;
+            bUp = true;
         break;
         case SID_ATTR_INSERT:
             SwPostItMgr* pMgr = GetPostItMgr();
@@ -1866,7 +1866,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
             }
             else
                 rSh.ToggleInsMode();
-            bUp = sal_True;
+            bUp = true;
         break;
 
     }
@@ -1882,7 +1882,7 @@ void SwView::InsFrmMode(sal_uInt16 nCols)
 {
     if ( m_pWrtShell->HasWholeTabSelection() )
     {
-        SwFlyFrmAttrMgr aMgr( sal_True, m_pWrtShell, FRMMGR_TYPE_TEXT );
+        SwFlyFrmAttrMgr aMgr( true, m_pWrtShell, FRMMGR_TYPE_TEXT );
 
         const SwFrmFmt &rPageFmt =
                 m_pWrtShell->GetPageDesc(m_pWrtShell->GetCurPageDesc()).GetMaster();
@@ -1905,7 +1905,7 @@ void SwView::InsFrmMode(sal_uInt16 nCols)
 /// show "edit link" dialog
 void SwView::EditLinkDlg()
 {
-    sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+    bool bWeb = 0 != PTR_CAST(SwWebView, this);
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     boost::scoped_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( &GetViewFrame()->GetWindow(), &GetWrtShell().GetLinkManager(), bWeb ));
     if ( pDlg )
@@ -1920,14 +1920,14 @@ bool SwView::JumpToSwMark( const OUString& rMark )
     if( !rMark.isEmpty() )
     {
         // place bookmark at top-center
-        sal_Bool bSaveCC = IsCrsrAtCenter();
-        sal_Bool bSaveCT = IsCrsrAtTop();
-        SetCrsrAtTop( sal_True );
+        bool bSaveCC = IsCrsrAtCenter();
+        bool bSaveCT = IsCrsrAtTop();
+        SetCrsrAtTop( true );
 
         // For scrolling the FrameSet, the corresponding shell needs to have the focus.
-        sal_Bool bHasShFocus = m_pWrtShell->HasShFcs();
+        bool bHasShFocus = m_pWrtShell->HasShFcs();
         if( !bHasShFocus )
-            m_pWrtShell->ShGetFcs( sal_False );
+            m_pWrtShell->ShGetFcs( false );
 
         const SwFmtINetFmt* pINet;
         OUString sCmp;
@@ -1996,7 +1996,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
                                     TransliterationModules_IGNORE_CASE );
 
                 //todo/mba: assuming that notes shouldn't be searched
-                sal_Bool bSearchInNotes = sal_False;
+                bool bSearchInNotes = false;
                 if( m_pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END ))
                 {
                     m_pWrtShell->EnterStdMode(); // remove the selection
@@ -2004,7 +2004,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
                 }
             }
             else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) )
-                m_pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = true;
+                m_pWrtShell->GotoMark( ppMark->get(), false, true ), bRet = true;
             else if( 0 != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) {
                 m_pWrtShell->addCurrentPosition();
                 bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
@@ -2028,13 +2028,13 @@ bool SwView::JumpToSwMark( const OUString& rMark )
             }
         }
         else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)))
-            m_pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = true;
+            m_pWrtShell->GotoMark( ppMark->get(), false, true ), bRet = true;
         else if( 0 != ( pINet = m_pWrtShell->FindINetAttr( sMark ) ))
             bRet = m_pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
 
         // make selection visible later
         if ( m_aVisArea.IsEmpty() )
-            m_bMakeSelectionVisible = sal_True;
+            m_bMakeSelectionVisible = true;
 
         // reset ViewStatus
         SetCrsrAtTop( bSaveCT, bSaveCC );
@@ -2134,19 +2134,19 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, const OUS
 
 long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVersion )
 {
-    sal_Bool bInsert = sal_False, bCompare = sal_False;
+    bool bInsert = false, bCompare = false;
     long nFound = 0;
     SwDocShell* pDocSh = GetDocShell();
 
     switch( nSlotId )
     {
         case SID_DOCUMENT_MERGE:                        break;
-        case SID_DOCUMENT_COMPARE: bCompare = sal_True; break;
-        case SID_INSERTDOC:        bInsert = sal_True;  break;
+        case SID_DOCUMENT_COMPARE: bCompare = true; break;
+        case SID_INSERTDOC:        bInsert = true;  break;
 
         default:
             OSL_ENSURE( !this, "unknown SlotId!" );
-            bInsert = sal_True;
+            bInsert = true;
             nSlotId = SID_INSERTDOC;
             break;
     }
@@ -2215,7 +2215,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
                 {
                     SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() );
                     Execute( aReq );
-                    m_pWrtShell->SetUpdateTOX( sal_False ); // reset
+                    m_pWrtShell->SetUpdateTOX( false ); // reset
                 }
 
                 if( pDoc )
@@ -2274,7 +2274,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
     return nFound;
 }
 
-void SwView::EnableMailMerge(sal_Bool bEnable )
+void SwView::EnableMailMerge(bool bEnable )
 {
     m_bInMailMerge = bEnable;
     SfxBindings& rBind = GetViewFrame()->GetBindings();
@@ -2286,7 +2286,7 @@ void SwView::EnableMailMerge(sal_Bool bEnable )
 
 namespace
 {
-    sal_Bool lcl_NeedAdditionalDataSource( const uno::Reference< XDatabaseContext >& _rDatasourceContext )
+    bool lcl_NeedAdditionalDataSource( const uno::Reference< XDatabaseContext >& _rDatasourceContext )
     {
         Sequence < OUString > aNames = _rDatasourceContext->getElementNames();
 
@@ -2300,7 +2300,7 @@ namespace
 
 #endif
 
-void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
+void SwView::GenerateFormLetter(bool bUseCurrentDocument)
 {
 #if !HAVE_FEATURE_DBCONNECTIVITY
     (void) bUseCurrentDocument;
@@ -2312,7 +2312,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
             //check availability of data sources (except biblio source)
             uno::Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
             uno::Reference<XDatabaseContext>  xDBContext = DatabaseContext::create(xContext);
-            sal_Bool bCallAddressPilot = sal_False;
+            bool bCallAddressPilot = false;
             if ( lcl_NeedAdditionalDataSource( xDBContext ) )
             {
                 // no data sources are available - create a new one
@@ -2322,7 +2322,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
                 // no cancel allowed
                 if (RET_OK != aQuery.Execute())
                     return;
-                bCallAddressPilot = sal_True;
+                bCallAddressPilot = true;
             }
             else
             {
@@ -2410,7 +2410,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
             pValues[0].Value <<= aData.sDataSource;
             pValues[1].Value <<= aData.sCommand;
             pValues[2].Value <<= aData.nCommandType;
-            pDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, sal_True);
+            pDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, true);
         }
     }
     else
@@ -2422,14 +2422,14 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
         pDocTemplDlg->SelectTemplateFolder();
 
         int nRet = pDocTemplDlg->Execute();
-        sal_Bool bNewWin = sal_False;
+        bool bNewWin = false;
         if ( nRet == RET_OK )
         {
             if ( pTopWin != pSfxApp->GetTopWindow() )
             {
                 // the dialogue opens a document -> a new TopWindow appears
                 pTopWin = pSfxApp->GetTopWindow();
-                bNewWin = sal_True;
+                bNewWin = true;
             }
         }
 
diff --git a/sw/source/core/uibase/uiview/viewcoll.cxx b/sw/source/core/uibase/uiview/viewcoll.cxx
index 1c87105ba737..f5de814bf074 100644
--- a/sw/source/core/uibase/uiview/viewcoll.cxx
+++ b/sw/source/core/uibase/uiview/viewcoll.cxx
@@ -49,7 +49,7 @@ void SwView::ExecColl(SfxRequest &rReq)
                     SFX_ITEM_SET == pArgs->GetItemState( nWhich , true, &pItem ))
                 {
                     if( ((SfxStringItem*)pItem)->GetValue() !=
-                                            GetWrtShell().GetCurPageStyle(sal_False) )
+                                            GetWrtShell().GetCurPageStyle(false) )
                     {
                         SfxStringItem aName(SID_STYLE_APPLY,
                                    ((SfxStringItem*)pItem)->GetValue());
diff --git a/sw/source/core/uibase/uiview/viewdlg.cxx b/sw/source/core/uibase/uiview/viewdlg.cxx
index b41d6ca345e5..a969481b7832 100644
--- a/sw/source/core/uibase/uiview/viewdlg.cxx
+++ b/sw/source/core/uibase/uiview/viewdlg.cxx
@@ -53,7 +53,7 @@ void SwView::ExecDlg(SfxRequest &rReq)
                 sal_uInt16 nOldValue = m_pWrtShell->GetPageOffset();
                 sal_uInt16 nPage, nLogPage;
                 m_pWrtShell->GetPageNum( nPage, nLogPage,
-                   m_pWrtShell->IsCrsrVisible(), sal_False);
+                   m_pWrtShell->IsCrsrVisible(), false);
 
                 if(nValue != nOldValue || nValue != nLogPage)
                 {
diff --git a/sw/source/core/uibase/uiview/viewdlg2.cxx b/sw/source/core/uibase/uiview/viewdlg2.cxx
index af466021ead5..416f9447ae33 100644
--- a/sw/source/core/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/core/uibase/uiview/viewdlg2.cxx
@@ -69,7 +69,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
             SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
             OSL_ENSURE(pFact, "Dialogdiet fail!");
             boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
-                pMDI, *m_pWrtShell, sal_True));
+                pMDI, *m_pWrtShell, true));
             OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
             pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand());
@@ -84,11 +84,11 @@ void SwView::AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId)
 {
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-    sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+    bool bWeb = 0 != PTR_CAST(SwWebView, this);
     if (pModOpt->IsInsWithCaption(bWeb))
     {
         const InsCaptionOpt *pOpt = pModOpt->GetCapOption(bWeb, (SwCapObjType)nType, pOleId);
-        if (pOpt && pOpt->UseCaption() == sal_True)
+        if (pOpt && pOpt->UseCaption())
             InsertCaption(pOpt);
     }
 }
@@ -176,7 +176,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
     if(pType)
         ((SwSetExpFieldType*)pType)->SetSeqFormat(pOpt->GetNumType());
 
-    rSh.UpdateExpFlds( sal_True );
+    rSh.UpdateExpFlds( true );
 
     rSh.EndAllAction();
 
diff --git a/sw/source/core/uibase/uiview/viewdraw.cxx b/sw/source/core/uibase/uiview/viewdraw.cxx
index 98ba727f7f9e..c2c6b0f35b7e 100644
--- a/sw/source/core/uibase/uiview/viewdraw.cxx
+++ b/sw/source/core/uibase/uiview/viewdraw.cxx
@@ -78,7 +78,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
     const SfxAllEnumItem* pEItem = 0;
     const SfxStringItem* pStringItem = 0;
     SdrView *pSdrView = m_pWrtShell->GetDrawView();
-    sal_Bool bDeselect = sal_False;
+    bool bDeselect = false;
 
     sal_uInt16 nSlotId = rReq.GetSlot();
     if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlotId), false, &pItem))
@@ -109,7 +109,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
 
     if (nSlotId == SID_OBJECT_SELECT && m_nFormSfxId == nSlotId)
     {
-        bDeselect = sal_True;
+        bDeselect = true;
     }
     else if (nSlotId == SID_FM_CREATE_CONTROL)
     {
@@ -119,7 +119,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
             sal_uInt16 nNewId = pIdentifierItem->GetValue();
             if (nNewId == m_nFormSfxId)
             {
-                bDeselect = sal_True;
+                bDeselect = true;
                 GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE);  // Button should popping out
             }
         }
@@ -340,7 +340,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
     };
     GetViewFrame()->GetBindings().Invalidate(aInval);
 
-    sal_Bool bEndTextEdit = sal_True;
+    bool bEndTextEdit = true;
     if (pFuncPtr)
     {
         if (GetDrawFuncPtr())
@@ -358,7 +358,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
         {
             if(SID_OBJECT_SELECT == m_nDrawSfxId )
             {
-                m_pWrtShell->GotoObj(sal_True);
+                m_pWrtShell->GotoObj(true);
             }
             else
             {
@@ -375,7 +375,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
                 {
                     SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
                     BeginTextEdit(pObj);
-                    bEndTextEdit = sal_False;
+                    bEndTextEdit = false;
                 }
             }
         }
@@ -458,7 +458,7 @@ void SwView::NoRotate()
 
 // Enable DrawTextEditMode
 
-sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
+bool SwView::EnterDrawTextMode(const Point& aDocPos)
 {
     SdrObject* pObj;
     SdrPageView* pPV;
@@ -466,7 +466,7 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
     SdrView *pSdrView = pSh->GetDrawView();
     OSL_ENSURE( pSdrView, "EnterDrawTextMode without DrawView?" );
 
-    sal_Bool bReturn = sal_False;
+    bool bReturn = false;
 
     sal_uInt16 nOld = pSdrView->GetHitTolerancePixel();
     pSdrView->SetHitTolerancePixel( 2 );
@@ -492,7 +492,7 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
 
 // Enable DrawTextEditMode
 
-sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
+bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
         bool bIsNewObj, bool bSetSelectionToStart)
 {
     SwWrtShell *pSh = &GetWrtShell();
@@ -667,9 +667,9 @@ bool SwView::AreOnlyFormsSelected() const
     return bForm;
 }
 
-sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const
+bool SwView::HasDrwObj(SdrObject *pSdrObj) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if (pSdrObj->IsGroupObject())
     {
@@ -677,18 +677,18 @@ sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const
         sal_uInt32 nCnt = pList->GetObjCount();
 
         for (sal_uInt32 i = 0; i < nCnt; i++)
-            if ((bRet = HasDrwObj(pList->GetObj(i))) == sal_True)
+            if ((bRet = HasDrwObj(pList->GetObj(i))))
                 break;
     }
     else if (SdrInventor == pSdrObj->GetObjInventor() || pSdrObj->Is3DObj())
-        return sal_True;
+        return true;
 
     return bRet;
 }
 
-sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
+bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if (pSdrObj->IsGroupObject())
     {
@@ -696,11 +696,11 @@ sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
         sal_uInt32 nCnt = pList->GetObjCount();
 
         for (sal_uInt32 i = 0; i < nCnt; i++)
-            if ((bRet = HasOnlyObj(pList->GetObj(i), eObjInventor)) == sal_False)
+            if ((bRet = HasOnlyObj(pList->GetObj(i), eObjInventor)) == false)
                 break;
     }
     else if (eObjInventor == pSdrObj->GetObjInventor())
-        return sal_True;
+        return true;
 
     return bRet;
 }
@@ -713,26 +713,26 @@ IMPL_LINK(SwView, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
     return 0;
 }
 
-sal_Bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
+bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SdrView *pSdrView = m_pWrtShell->GetDrawView();
     OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
     Point aPos( GetEditWin().LogicToPixel( rPt ) );
 
     if (pOLV->IsWrongSpelledWordAtPos( aPos ))
     {
-        bRet = sal_True;
+        bRet = true;
         Link aLink = LINK(this, SwView, OnlineSpellCallback);
         pOLV->ExecuteSpellPopup( aPos,&aLink );
     }
     return bRet;
 }
 
-sal_Bool SwView::IsDrawTextHyphenate()
+bool SwView::IsDrawTextHyphenate()
 {
     SdrView *pSdrView = m_pWrtShell->GetDrawView();
-    sal_Bool bHyphenate = sal_False;
+    bool bHyphenate = false;
 
     SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool(),
                             EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
@@ -747,7 +747,7 @@ sal_Bool SwView::IsDrawTextHyphenate()
 void SwView::HyphenateDrawText()
 {
     SdrView *pSdrView = m_pWrtShell->GetDrawView();
-    sal_Bool bHyphenate = IsDrawTextHyphenate();
+    bool bHyphenate = IsDrawTextHyphenate();
 
     SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
     aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, !bHyphenate ) );
diff --git a/sw/source/core/uibase/uiview/viewfunc.hxx b/sw/source/core/uibase/uiview/viewfunc.hxx
index 9709df500ef9..f078338435d6 100644
--- a/sw/source/core/uibase/uiview/viewfunc.hxx
+++ b/sw/source/core/uibase/uiview/viewfunc.hxx
@@ -32,9 +32,9 @@ class SwViewShell;
 class Window;
 
 // The following functions are available in viewprt.cxx
-void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, sal_Bool bWeb );
+void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, bool bWeb );
 SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& );
-void SetAppPrintOptions( SwViewShell* pSh, sal_Bool bWeb );
+void SetAppPrintOptions( SwViewShell* pSh, bool bWeb );
 
 // The following functions are available in viewport.cxx
 void ViewResizePixel( const Window &rRef,
@@ -46,7 +46,7 @@ void ViewResizePixel( const Window &rRef,
                     Window& rScrollBarBox,
                     SvxRuler* pVRuler = 0,
                     SvxRuler* pHRuler = 0,
-                    sal_Bool bVRulerRight = sal_False );
+                    bool bVRulerRight = false );
 
 #endif
 
diff --git a/sw/source/core/uibase/uiview/viewling.cxx b/sw/source/core/uibase/uiview/viewling.cxx
index e2c41be29048..329f7e5282bf 100644
--- a/sw/source/core/uibase/uiview/viewling.cxx
+++ b/sw/source/core/uibase/uiview/viewling.cxx
@@ -106,7 +106,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
             break;
         case SID_HANGUL_HANJA_CONVERSION:
             StartTextConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, NULL,
-                    i18n::TextConversionOption::CHARACTER_BY_CHARACTER, sal_True );
+                    i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true );
             break;
         case SID_CHINESE_CONVERSION:
         {
@@ -140,9 +140,9 @@ void SwView::ExecLingu(SfxRequest &rReq)
                         if( RET_OK == nDialogRet )
                         {
                             //get some parameters from the dialog
-                            sal_Bool bToSimplified = sal_True;
-                            sal_Bool bUseVariants = sal_True;
-                            sal_Bool bCommonTerms = sal_True;
+                            bool bToSimplified = true;
+                            bool bUseVariants = true;
+                            bool bCommonTerms = true;
                             Reference< beans::XPropertySet >  xProp( xDialog, UNO_QUERY );
                             if( xProp.is() )
                             {
@@ -174,7 +174,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
 
                             // remember cursor position data for later restoration of the cursor
                             const SwPosition *pPoint = m_pWrtShell->GetCrsr()->GetPoint();
-                            sal_Bool bRestoreCursor = pPoint->nNode.GetNode().IsTxtNode();
+                            bool bRestoreCursor = pPoint->nNode.GetNode().IsTxtNode();
                             const SwNodeIndex aPointNodeIndex( pPoint->nNode );
                             sal_Int32 nPointIndex = pPoint->nContent.GetIndex();
 
@@ -182,7 +182,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
                             // document should be undone in a single undo step.
                             m_pWrtShell->StartUndo( UNDO_OVERWRITE );
 
-                            StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, sal_False );
+                            StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false );
 
                             m_pWrtShell->EndUndo( UNDO_OVERWRITE );
 
@@ -225,7 +225,7 @@ void SwView::StartTextConversion(
         LanguageType nTargetLang,
         const Font *pTargetFont,
         sal_Int32 nOptions,
-        sal_Bool bIsInteractive )
+        bool bIsInteractive )
 {
     // do not do text conversion if it is active elsewhere
     if (GetWrtShell().HasConvIter())
@@ -233,20 +233,20 @@ void SwView::StartTextConversion(
         return;
     }
 
-    SpellKontext(sal_True);
+    SpellKontext(true);
 
     const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions();
-    const sal_Bool bOldIdle = pVOpt->IsIdle();
-    pVOpt->SetIdle( sal_False );
+    const bool bOldIdle = pVOpt->IsIdle();
+    pVOpt->SetIdle( false );
 
-    sal_Bool bOldIns = m_pWrtShell->IsInsMode();
-    m_pWrtShell->SetInsMode( sal_True );
+    bool bOldIns = m_pWrtShell->IsInsMode();
+    m_pWrtShell->SetInsMode( true );
 
     const bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection() ||
         m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext();
 
     const bool  bStart = bSelection || m_pWrtShell->IsStartOfDoc();
-    const bool  bOther = !bSelection && !(m_pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY);
+    const bool  bOther = !bSelection && !(m_pWrtShell->GetFrmType(0,true) & FRMTYPE_BODY);
 
     {
         const uno::Reference< uno::XComponentContext > xContext(
@@ -259,7 +259,7 @@ void SwView::StartTextConversion(
 
     m_pWrtShell->SetInsMode( bOldIns );
     pVOpt->SetIdle( bOldIdle );
-    SpellKontext(sal_False);
+    SpellKontext(false);
 }
 
 // spellcheck and text conversion related stuff
@@ -269,7 +269,7 @@ void SwView::SpellStart( SvxSpellArea eWhich,
         SwConversionArgs *pConvArgs )
 {
     Reference< XLinguProperties >  xProp = ::GetLinguPropertySet();
-    sal_Bool bIsWrapReverse = (!pConvArgs && xProp.is()) ? xProp->getIsWrapReverse() : sal_False;
+    bool bIsWrapReverse = (!pConvArgs && xProp.is()) ? xProp->getIsWrapReverse() : sal_False;
 
     SwDocPositions eStart = DOCPOS_START;
     SwDocPositions eEnde  = DOCPOS_END;
@@ -442,27 +442,27 @@ void SwView::HyphenateDocument()
     else
     {
         SwViewOption* pVOpt = (SwViewOption*)m_pWrtShell->GetViewOptions();
-        sal_Bool bOldIdle = pVOpt->IsIdle();
-        pVOpt->SetIdle( sal_False );
+        bool bOldIdle = pVOpt->IsIdle();
+        pVOpt->SetIdle( false );
 
         Reference< XLinguProperties >  xProp( ::GetLinguPropertySet() );
 
         m_pWrtShell->StartUndo(UNDO_INSATTR);         // valid later
 
-        sal_Bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False;
-        sal_Bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection() ||
+        bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False;
+        bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection() ||
             m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext();
-        sal_Bool bOther = m_pWrtShell->HasOtherCnt() && bHyphSpecial && !bSelection;
-        sal_Bool bStart = bSelection || ( !bOther && m_pWrtShell->IsStartOfDoc() );
+        bool bOther = m_pWrtShell->HasOtherCnt() && bHyphSpecial && !bSelection;
+        bool bStart = bSelection || ( !bOther && m_pWrtShell->IsStartOfDoc() );
         bool bStop = false;
-        if( !bOther && !(m_pWrtShell->GetFrmType(0,sal_True) & FRMTYPE_BODY) && !bSelection )
+        if( !bOther && !(m_pWrtShell->GetFrmType(0,true) & FRMTYPE_BODY) && !bSelection )
         // turned on no special area
         {
             // I want also in special areas hyphenation
             QueryBox aBox( &GetEditWin(), SW_RES( DLG_SPECIAL_FORCED ) );
             if( aBox.Execute() == RET_YES )
             {
-                bOther = sal_True;
+                bOther = true;
                 if (xProp.is())
                 {
                     xProp->setIsHyphSpecial( sal_True );
@@ -488,7 +488,7 @@ bool SwView::IsValidSelectionForThesaurus() const
     // to be within a single paragraph
 
     const bool bMultiSel = m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext();
-    const sal_Bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection();
+    const bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection();
     return !bMultiSel && (!bSelection || m_pWrtShell->IsSelOnePara() );
 }
 
@@ -499,8 +499,8 @@ OUString SwView::GetThesaurusLookUpText( bool bSelection ) const
 
 void SwView::InsertThesaurusSynonym( const OUString &rSynonmText, const OUString &rLookUpText, bool bSelection )
 {
-    sal_Bool bOldIns = m_pWrtShell->IsInsMode();
-    m_pWrtShell->SetInsMode( sal_True );
+    bool bOldIns = m_pWrtShell->IsInsMode();
+    m_pWrtShell->SetInsMode( true );
 
     m_pWrtShell->StartAllAction();
     m_pWrtShell->StartUndo(UNDO_DELETE);
@@ -508,7 +508,7 @@ void SwView::InsertThesaurusSynonym( const OUString &rSynonmText, const OUString
     if( !bSelection )
     {
         if(m_pWrtShell->IsEndWrd())
-            m_pWrtShell->Left(CRSR_SKIP_CELLS, sal_False, 1, sal_False );
+            m_pWrtShell->Left(CRSR_SKIP_CELLS, false, 1, false );
 
         m_pWrtShell->SelWrd();
 
@@ -561,11 +561,11 @@ void SwView::StartThesaurus()
     }
 
     SwViewOption* pVOpt = (SwViewOption*)m_pWrtShell->GetViewOptions();
-    sal_Bool bOldIdle = pVOpt->IsIdle();
-    pVOpt->SetIdle( sal_False );
+    bool bOldIdle = pVOpt->IsIdle();
+    pVOpt->SetIdle( false );
 
     // get initial LookUp text
-    const sal_Bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection();
+    const bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection();
     OUString aTmp = GetThesaurusLookUpText( bSelection );
 
     Reference< XThesaurus >  xThes( ::GetThesaurus() );
@@ -626,9 +626,9 @@ IMPL_STATIC_LINK_NOINSTANCE( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecu
 }
 //!! End of extra code for context menu modifying extensions
 
-sal_Bool SwView::ExecSpellPopup(const Point& rPt)
+bool SwView::ExecSpellPopup(const Point& rPt)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions();
     if( pVOpt->IsOnlineSpell() &&
         !m_pWrtShell->IsSelection())
@@ -637,8 +637,8 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
             bRet = ExecDrwTxtSpellPopup(rPt);
         else if (!m_pWrtShell->IsSelFrmMode())
         {
-            const sal_Bool bOldViewLock = m_pWrtShell->IsViewLocked();
-            m_pWrtShell->LockView( sal_True );
+            const bool bOldViewLock = m_pWrtShell->IsViewLocked();
+            m_pWrtShell->LockView( true );
             m_pWrtShell->Push();
             SwRect aToFill;
 
@@ -680,7 +680,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
                     OSL_FAIL("text node expected but not found" );
                 }
 
-                bRet = sal_True;
+                bRet = true;
                 m_pWrtShell->SttSelect();
                 boost::scoped_ptr< SwSpellPopup > pPopup;
                 if (bUseGrammarContext)
@@ -756,7 +756,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
                 }
             }
 
-            m_pWrtShell->Pop( sal_False );
+            m_pWrtShell->Pop( false );
             m_pWrtShell->LockView( bOldViewLock );
         }
     }
@@ -768,11 +768,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
    This function shows the popup menu for smarttag
    actions.
 */
-sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
+bool SwView::ExecSmartTagPopup( const Point& rPt )
 {
-    sal_Bool bRet = sal_False;
-    const sal_Bool bOldViewLock = m_pWrtShell->IsViewLocked();
-    m_pWrtShell->LockView( sal_True );
+    bool bRet = false;
+    const bool bOldViewLock = m_pWrtShell->IsViewLocked();
+    m_pWrtShell->LockView( true );
     m_pWrtShell->Push();
 
     // get word that was clicked on
@@ -785,13 +785,13 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
     m_pWrtShell->GetSmartTagTerm( rPt, aToFill, aSmartTagTypes, aStringKeyMaps, xRange);
     if ( xRange.is() && aSmartTagTypes.getLength() )
     {
-        bRet = sal_True;
+        bRet = true;
         m_pWrtShell->SttSelect();
         SwSmartTagPopup aPopup( this, aSmartTagTypes, aStringKeyMaps, xRange );
         aPopup.Execute( aToFill.SVRect(), m_pEditWin );
     }
 
-    m_pWrtShell->Pop( sal_False );
+    m_pWrtShell->Pop( false );
     m_pWrtShell->LockView( bOldViewLock );
 
     return bRet;
diff --git a/sw/source/core/uibase/uiview/viewmdi.cxx b/sw/source/core/uibase/uiview/viewmdi.cxx
index 4ff2f9443fea..216d9dcc4e08 100644
--- a/sw/source/core/uibase/uiview/viewmdi.cxx
+++ b/sw/source/core/uibase/uiview/viewmdi.cxx
@@ -59,7 +59,7 @@ sal_Int32 SwView::m_nActMark = 0;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
-void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly )
+void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, bool bViewOnly )
 {
     bool const bCrsrIsVisible(m_pWrtShell->IsCrsrVisible());
     _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly );
@@ -69,10 +69,10 @@ void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly )
 }
 
 void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
-                        short nFactor, sal_Bool bViewOnly )
+                        short nFactor, bool bViewOnly )
 {
-    sal_Bool bUnLockView = !m_pWrtShell->IsViewLocked();
-    m_pWrtShell->LockView( sal_True );
+    bool bUnLockView = !m_pWrtShell->IsViewLocked();
+    m_pWrtShell->LockView( true );
     m_pWrtShell->LockPaint();
 
     {
@@ -80,7 +80,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
 
     long nFac = nFactor;
 
-    sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+    bool bWeb = 0 != PTR_CAST(SwWebView, this);
     SwMasterUsrPref *pUsrPref = (SwMasterUsrPref*)SW_MOD()->GetUsrPref(bWeb);
 
     const SwPageDesc &rDesc = m_pWrtShell->GetPageDesc( m_pWrtShell->GetCurPageDesc() );
@@ -202,13 +202,13 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
     }
     m_pWrtShell->UnlockPaint();
     if( bUnLockView )
-        m_pWrtShell->LockView( sal_False );
+        m_pWrtShell->LockView( false );
 }
 
-void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewOnly )
+void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly )
 {
-    const sal_Bool bUnLockView = !m_pWrtShell->IsViewLocked();
-    m_pWrtShell->LockView( sal_True );
+    const bool bUnLockView = !m_pWrtShell->IsViewLocked();
+    m_pWrtShell->LockView( true );
     m_pWrtShell->LockPaint();
 
     {
@@ -217,7 +217,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewO
 
     if ( !GetViewFrame()->GetFrame().IsInPlace() && !bViewOnly )
     {
-        const sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+        const bool bWeb = 0 != PTR_CAST(SwWebView, this);
         SwMasterUsrPref *pUsrPref = (SwMasterUsrPref*)SW_MOD()->GetUsrPref(bWeb);
 
         // Update MasterUsrPrefs and after that update the ViewOptions of the current View.
@@ -251,7 +251,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, sal_Bool bViewO
 
     m_pWrtShell->UnlockPaint();
     if( bUnLockView )
-        m_pWrtShell->LockView( sal_False );
+        m_pWrtShell->LockView( false );
 
     SfxBindings& rBnd = GetViewFrame()->GetBindings();
     rBnd.Invalidate( SID_ATTR_VIEWLAYOUT );
@@ -273,15 +273,15 @@ IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent )
         {
             case VCLEVENT_WINDOW_HIDE:
                 if( pChildWin == m_pHScrollbar )
-                    ShowHScrollbar( sal_False );
+                    ShowHScrollbar( false );
                 else if( pChildWin == m_pVScrollbar )
-                    ShowVScrollbar( sal_False );
+                    ShowVScrollbar( false );
                 break;
             case VCLEVENT_WINDOW_SHOW:
                 if( pChildWin == m_pHScrollbar )
-                    ShowHScrollbar( sal_True );
+                    ShowHScrollbar( true );
                 else if( pChildWin == m_pVScrollbar )
-                    ShowVScrollbar( sal_True );
+                    ShowVScrollbar( true );
                 break;
         }
     }
@@ -289,7 +289,7 @@ IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent )
     return 0;
 }
 
-int SwView::_CreateScrollbar( sal_Bool bHori )
+int SwView::_CreateScrollbar( bool bHori )
 {
     Window *pMDI = &GetViewFrame()->GetWindow();
     SwScrollbar** ppScrollbar = bHori ? &m_pHScrollbar : &m_pVScrollbar;
@@ -344,7 +344,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
                 eType = GOTOOBJ_FLY_GRF;
             else if(m_nMoveType == NID_OLE)
                 eType = GOTOOBJ_FLY_OLE;
-            sal_Bool bSuccess = bNext ?
+            bool bSuccess = bNext ?
                     rSh.GotoNextFly(eType) :
                         rSh.GotoPrevFly(eType);
             if(bSuccess)
@@ -442,7 +442,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
         case NID_SRCH_REP:
         if(m_pSrchItem)
         {
-            sal_Bool bBackward = m_pSrchItem->GetBackward();
+            bool bBackward = m_pSrchItem->GetBackward();
             if(rSh.HasSelection() && !bNext == rSh.IsCrsrPtAtEnd())
                 rSh.SwapPam();
             m_pSrchItem->SetBackward(!bNext);
@@ -460,7 +460,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
             break;
 
         case NID_TABLE_FORMULA_ERROR:
-            rSh.GotoNxtPrvTblFormula( bNext, sal_True );
+            rSh.GotoNxtPrvTblFormula( bNext, true );
             break;
     }
     pThis->m_pEditWin->GrabFocus();
@@ -569,28 +569,28 @@ void SwView::SetActMark(sal_Int32 nSet)
     m_nActMark = nSet;
 }
 
-void SwView::ShowHScrollbar(sal_Bool bShow)
+void SwView::ShowHScrollbar(bool bShow)
 {
     OSL_ENSURE(m_pHScrollbar, "Scrollbar invalid");
     m_pHScrollbar->ExtendedShow(bShow);
 }
 
-sal_Bool SwView::IsHScrollbarVisible()const
+bool SwView::IsHScrollbarVisible()const
 {
     OSL_ENSURE(m_pHScrollbar, "Scrollbar invalid");
-    return m_pHScrollbar->IsVisible( sal_False ) || m_pHScrollbar->IsAuto();
+    return m_pHScrollbar->IsVisible( false ) || m_pHScrollbar->IsAuto();
 }
 
-void SwView::ShowVScrollbar(sal_Bool bShow)
+void SwView::ShowVScrollbar(bool bShow)
 {
     OSL_ENSURE(m_pVScrollbar, "Scrollbar invalid");
     m_pVScrollbar->ExtendedShow(bShow);
 }
 
-sal_Bool SwView::IsVScrollbarVisible()const
+bool SwView::IsVScrollbarVisible()const
 {
     OSL_ENSURE(m_pVScrollbar, "Scrollbar invalid");
-    return m_pVScrollbar->IsVisible( sal_False );
+    return m_pVScrollbar->IsVisible( false );
 }
 
 void SwView::EnableHScrollbar(bool bEnable)
diff --git a/sw/source/core/uibase/uiview/viewport.cxx b/sw/source/core/uibase/uiview/viewport.cxx
index d13a0730eb3a..574c402d3c8d 100644
--- a/sw/source/core/uibase/uiview/viewport.cxx
+++ b/sw/source/core/uibase/uiview/viewport.cxx
@@ -200,7 +200,7 @@ m_aDocSz = rSz;
     }
 
     if ( bModified )
-        SetVisArea( aNewVisArea, sal_False );
+        SetVisArea( aNewVisArea, false );
 
     if ( UpdateScrollbars() && !m_bInOuterResizePixel && !m_bInInnerResizePixel &&
             !GetViewFrame()->GetFrame().IsInPlace())
@@ -210,7 +210,7 @@ m_aDocSz = rSz;
 
 // Set VisArea newly
 
-void SwView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar )
+void SwView::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar )
 {
     const Size aOldSz( m_aVisArea.GetSize() );
 
@@ -257,7 +257,7 @@ void SwView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar )
 
     m_aVisArea = aLR;
 
-    const sal_Bool bOuterResize = bUpdateScrollbar && UpdateScrollbars();
+    const bool bOuterResize = bUpdateScrollbar && UpdateScrollbars();
 
     if ( m_pWrtShell )
     {
@@ -265,7 +265,7 @@ void SwView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar )
         if ( aOldSz != m_pWrtShell->VisArea().SSize() &&
              ( std::abs(aOldSz.Width() - m_pWrtShell->VisArea().Width()) > 2 ||
                 std::abs(aOldSz.Height() - m_pWrtShell->VisArea().Height()) > 2 ) )
-            m_pWrtShell->CheckBrowseView( sal_False );
+            m_pWrtShell->CheckBrowseView( false );
     }
 
     if ( !bProtectDocShellVisArea )
@@ -299,7 +299,7 @@ void SwView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar )
 
 // Set Pos VisArea
 
-void SwView::SetVisArea( const Point &rPt, sal_Bool bUpdateScrollbar )
+void SwView::SetVisArea( const Point &rPt, bool bUpdateScrollbar )
 {
     // Align once, so brushes will be inserted correctly.
     // This goes wrong in the BrowseView, because the entire document may
@@ -338,7 +338,7 @@ void SwView::CheckVisArea()
             Rectangle aNewVisArea( m_aVisArea );
             aNewVisArea.Move( DOCUMENTBORDER - m_aVisArea.Left(),
                               DOCUMENTBORDER - m_aVisArea.Top() );
-            SetVisArea( aNewVisArea, sal_True );
+            SetVisArea( aNewVisArea, true );
         }
     }
 }
@@ -398,7 +398,7 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect,
 
 // Scrolling
 
-sal_Bool SwView::IsScroll( const Rectangle &rRect ) const
+bool SwView::IsScroll( const Rectangle &rRect ) const
 {
     return m_bCenterCrsr || m_bTopCrsr || !m_aVisArea.IsInside(rRect);
 }
@@ -527,10 +527,10 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan
 /// Scroll page by page
 //  Returns the value by which to be scrolled with PageUp / Down
 
-sal_Bool SwView::GetPageScrollUpOffset( SwTwips &rOff ) const
+bool SwView::GetPageScrollUpOffset( SwTwips &rOff ) const
 {
     if ( !m_aVisArea.Top() || !m_aVisArea.GetHeight() )
-        return sal_False;
+        return false;
     long nYScrl = GetYScroll() / 2;
     rOff = -(m_aVisArea.GetHeight() - nYScrl);
     // Do not scroll before the beginning of the document.
@@ -538,14 +538,14 @@ sal_Bool SwView::GetPageScrollUpOffset( SwTwips &rOff ) const
         rOff = rOff - m_aVisArea.Top();
     else if( GetWrtShell().GetCharRect().Top() < (m_aVisArea.Top() + nYScrl))
         rOff += nYScrl;
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwView::GetPageScrollDownOffset( SwTwips &rOff ) const
+bool SwView::GetPageScrollDownOffset( SwTwips &rOff ) const
 {
     if ( !m_aVisArea.GetHeight() ||
          (m_aVisArea.GetHeight() > m_aDocSz.Height()) )
-        return sal_False;
+        return false;
     long nYScrl = GetYScroll() / 2;
     rOff = m_aVisArea.GetHeight() - nYScrl;
     // Do not scroll past the end of the document.
@@ -584,7 +584,7 @@ long SwView::PageDown()
 long SwView::PhyPageUp()
 {
     // Check for the currently visible page, do not format
-    sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum( sal_False );
+    sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum( false );
 
     if( USHRT_MAX != nActPage )
     {
@@ -603,7 +603,7 @@ long SwView::PhyPageUp()
 long SwView::PhyPageDown()
 {
     // Check for the currently visible page, do not format
-    sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum( sal_True );
+    sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum( true );
     // If the last page of the document is visible, do nothing.
     if( USHRT_MAX != nActPage )
     {
@@ -619,16 +619,16 @@ long SwView::PhyPageDown()
     return 1;
 }
 
-long SwView::PageUpCrsr( sal_Bool bSelect )
+long SwView::PageUpCrsr( bool bSelect )
 {
     if ( !bSelect )
     {
-        const sal_uInt16 eType = m_pWrtShell->GetFrmType(0,sal_True);
+        const sal_uInt16 eType = m_pWrtShell->GetFrmType(0,true);
         if ( eType & FRMTYPE_FOOTNOTE )
         {
             m_pWrtShell->MoveCrsr();
             m_pWrtShell->GotoFtnAnchor();
-            m_pWrtShell->Right(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+            m_pWrtShell->Right(CRSR_SKIP_CHARS, false, 1, false );
             return 1;
         }
     }
@@ -645,7 +645,7 @@ long SwView::PageUpCrsr( sal_Bool bSelect )
     return sal_False;
 }
 
-long SwView::PageDownCrsr(sal_Bool bSelect)
+long SwView::PageDownCrsr(bool bSelect)
 {
     SwTwips lOff = 0;
     if ( GetPageScrollDownOffset( lOff ) &&
@@ -667,7 +667,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
         return 0;
 
     if ( pScrollbar->GetType() == SCROLL_DRAG )
-        m_pWrtShell->EnableSmooth( sal_False );
+        m_pWrtShell->EnableSmooth( false );
 
     if(!m_pWrtShell->GetViewOptions()->getBrowseMode() &&
         pScrollbar->GetType() == SCROLL_DRAG)
@@ -688,7 +688,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
             sal_uInt16 nVirtNum = 1;
 
             OUString sDisplay;
-            if(m_pWrtShell->GetPageNumber( aPos.Y(), sal_False, nPhNum, nVirtNum, sDisplay ))
+            if(m_pWrtShell->GetPageNumber( aPos.Y(), false, nPhNum, nVirtNum, sDisplay ))
             {
                 // The end scrollhandler invalidate the FN_STAT_PAGE,
                 // so we don't must do it again.
@@ -727,7 +727,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
         EndScrollHdl(pScrollbar);
 
     if ( pScrollbar->GetType() == SCROLL_DRAG )
-        m_pWrtShell->EnableSmooth( sal_True );
+        m_pWrtShell->EnableSmooth( true );
 
     return 0;
 }
@@ -749,7 +749,7 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
         if ( bBorder && aPos == m_aVisArea.TopLeft() )
             UpdateScrollbars();
         else
-            SetVisArea( aPos, sal_False );
+            SetVisArea( aPos, false );
 
         GetViewFrame()->GetBindings().Update(FN_STAT_PAGE);
     }
@@ -801,9 +801,9 @@ void SwView::CalcVisArea( const Size &rOutPixel )
 
 // Rearrange control elements
 
-void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ )
+void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ )
 {
-    sal_Bool bRightVRuler = m_pWrtShell->GetViewOptions()->IsVRulerRight();
+    bool bRightVRuler = m_pWrtShell->GetViewOptions()->IsVRulerRight();
     if ( m_pVRuler->IsVisible() )
     {
         long nWidth = m_pVRuler->GetSizePixel().Width();
@@ -819,14 +819,14 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ )
 
     const StyleSettings &rSet = GetEditWin().GetSettings().GetStyleSettings();
     const long nTmp = rSet.GetScrollBarSize();
-    if( m_pVScrollbar->IsVisible(sal_True) )
+    if( m_pVScrollbar->IsVisible(true) )
     {
         if(bRightVRuler)
             rToFill.Left() = nTmp;
         else
             rToFill.Right()  = nTmp;
     }
-    if ( m_pHScrollbar->IsVisible(sal_True) )
+    if ( m_pHScrollbar->IsVisible(true) )
         rToFill.Bottom() = nTmp;
 
     SetBorderPixel( rToFill );
@@ -841,14 +841,14 @@ void ViewResizePixel( const Window &rRef,
                     Window& rScrollBarBox,
                     SvxRuler* pVRuler,
                     SvxRuler* pHRuler,
-                    sal_Bool bVRulerRight )
+                    bool bVRulerRight )
 {
 // ViewResizePixel is also used by Preview!!!
 
-    const sal_Bool bHRuler = pHRuler && pHRuler->IsVisible();
+    const bool bHRuler = pHRuler && pHRuler->IsVisible();
     const long nHLinSzHeight = bHRuler ?
                         pHRuler->GetSizePixel().Height() : 0;
-    const sal_Bool bVRuler = pVRuler && pVRuler->IsVisible();
+    const bool bVRuler = pVRuler && pVRuler->IsVisible();
     const long nVLinSzWidth = bVRuler ?
                         pVRuler->GetSizePixel().Width() : 0;
 
@@ -932,7 +932,7 @@ void ViewResizePixel( const Window &rRef,
 
 void SwView::ShowAtResize()
 {
-    m_bShowAtResize = sal_False;
+    m_bShowAtResize = false;
     if ( m_pWrtShell->GetViewOptions()->IsViewHRuler() )
         m_pHRuler->Show();
 }
@@ -951,15 +951,15 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
                         Fraction( aSize.Height(), aObjSizePixel.Height() ) );
     }
 
-    m_bInInnerResizePixel = sal_True;
-    const sal_Bool bHScrollVisible = m_pHScrollbar->IsVisible(sal_True);
-    const sal_Bool bVScrollVisible = m_pVScrollbar->IsVisible(sal_True);
-    sal_Bool bRepeat = sal_False;
+    m_bInInnerResizePixel = true;
+    const bool bHScrollVisible = m_pHScrollbar->IsVisible(true);
+    const bool bVScrollVisible = m_pVScrollbar->IsVisible(true);
+    bool bRepeat = false;
     do
     {
         Size aSz( rSize );
         SvBorder aBorder;
-        CalcAndSetBorderPixel( aBorder, sal_True );
+        CalcAndSetBorderPixel( aBorder, true );
         if ( GetViewFrame()->GetFrame().IsInPlace() )
         {
             Size aViewSize( aSz );
@@ -1007,13 +1007,13 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
         // Visibility changes of the automatic horizontal scrollbar
         // require to repeat the ViewResizePixel() call - but only once!
         if(bRepeat)
-            bRepeat = sal_False;
-        else if(bHScrollVisible != m_pHScrollbar->IsVisible(sal_True) ||
-                bVScrollVisible != m_pVScrollbar->IsVisible(sal_True))
-            bRepeat = sal_True;
+            bRepeat = false;
+        else if(bHScrollVisible != m_pHScrollbar->IsVisible(true) ||
+                bVScrollVisible != m_pVScrollbar->IsVisible(true))
+            bRepeat = true;
     }while( bRepeat );
     bProtectDocShellVisArea = false;
-    m_bInInnerResizePixel = sal_False;
+    m_bInInnerResizePixel = false;
 }
 
 void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
@@ -1021,13 +1021,13 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
     // #i16909# return, if no size (caused by minimize window).
     if ( m_bInOuterResizePixel || ( !rSize.Width() && !rSize.Height() ) )
         return;
-    m_bInOuterResizePixel = sal_True;
+    m_bInOuterResizePixel = true;
 
     // Determine whether scroll bars may be displayed.
-    sal_Bool bShowH = sal_True,
-         bShowV = sal_True,
-         bAuto  = sal_True,
-         bHAuto = sal_True;
+    bool bShowH = true,
+         bShowV = true,
+         bAuto  = true,
+         bHAuto = true;
 
     const SwViewOption *pVOpt = m_pWrtShell->GetViewOptions();
     if ( !pVOpt->IsReadonly() || pVOpt->IsStarOneSetting() )
@@ -1046,32 +1046,32 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
     }
 
     SwDocShell* pDocSh = GetDocShell();
-    sal_Bool bIsPreview = pDocSh->IsPreview();
+    bool bIsPreview = pDocSh->IsPreview();
     if( bIsPreview )
     {
-        bShowH = bShowV = bHAuto = bAuto = sal_False;
+        bShowH = bShowV = bHAuto = bAuto = false;
     }
-    if(m_pHScrollbar->IsVisible(sal_False) != bShowH && !bHAuto)
+    if(m_pHScrollbar->IsVisible(false) != bShowH && !bHAuto)
         ShowHScrollbar(bShowH);
     m_pHScrollbar->SetAuto( bHAuto );
-    if(m_pVScrollbar->IsVisible(sal_False) != bShowV && !bAuto)
+    if(m_pVScrollbar->IsVisible(false) != bShowV && !bAuto)
         ShowVScrollbar(bShowV);
     m_pVScrollbar->SetAuto(bAuto);
 
     SET_CURR_SHELL( m_pWrtShell );
-    sal_Bool bRepeat = sal_False;
+    bool bRepeat = false;
     long nCnt = 0;
 
-    sal_Bool bUnLockView = !m_pWrtShell->IsViewLocked();
-    m_pWrtShell->LockView( sal_True );
+    bool bUnLockView = !m_pWrtShell->IsViewLocked();
+    m_pWrtShell->LockView( true );
     m_pWrtShell->LockPaint();
 
     do {
         ++nCnt;
-        const sal_Bool bScroll1 = m_pVScrollbar->IsVisible(sal_True);
-        const sal_Bool bScroll2 = m_pHScrollbar->IsVisible(sal_True);
+        const bool bScroll1 = m_pVScrollbar->IsVisible(true);
+        const bool bScroll2 = m_pHScrollbar->IsVisible(true);
         SvBorder aBorder;
-        CalcAndSetBorderPixel( aBorder, sal_False );
+        CalcAndSetBorderPixel( aBorder, false );
         const Size aEditSz( GetEditWin().GetOutputSizePixel() );
         ViewResizePixel( GetEditWin(), rOfst, rSize, aEditSz, *m_pVScrollbar,
                                 *m_pHScrollbar, *m_pScrollFill, m_pVRuler, m_pHRuler,
@@ -1105,12 +1105,12 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
                             pDocSh->SfxInPlaceObject::GetVisArea() );*/
         if ( m_pWrtShell->GetViewOptions()->GetZoomType() != SVX_ZOOM_PERCENT &&
              !m_pWrtShell->GetViewOptions()->getBrowseMode() )
-            _SetZoom( aEditSz, (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType(), 100, sal_True );
+            _SetZoom( aEditSz, (SvxZoomType)m_pWrtShell->GetViewOptions()->GetZoomType(), 100, true );
         m_pWrtShell->EndAction();
 
-        bRepeat = bScroll1 != m_pVScrollbar->IsVisible(sal_True);
+        bRepeat = bScroll1 != m_pVScrollbar->IsVisible(true);
         if ( !bRepeat )
-            bRepeat = bScroll2 != m_pHScrollbar->IsVisible(sal_True);
+            bRepeat = bScroll2 != m_pHScrollbar->IsVisible(true);
 
         // Do no infinite loops.
         // If possible stop when the (auto-) scroll bars are visible.
@@ -1118,16 +1118,16 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
              ( nCnt > 10 || ( nCnt > 3 && bHAuto && bAuto ) )
            )
         {
-            bRepeat = sal_False;
+            bRepeat = false;
         }
 
     } while ( bRepeat );
 
     m_pWrtShell->UnlockPaint();
     if( bUnLockView )
-        m_pWrtShell->LockView( sal_False );
+        m_pWrtShell->LockView( false );
 
-    m_bInOuterResizePixel = sal_False;
+    m_bInOuterResizePixel = false;
 
     if ( m_pPostItMgr )
     {
@@ -1146,9 +1146,9 @@ void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
     SfxViewShell::SetZoomFactor( rX, rY );
 }
 
-sal_Bool SwView::UpdateScrollbars()
+bool SwView::UpdateScrollbars()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if ( !m_aVisArea.IsEmpty() )
     {
         const bool bBorder = IsDocumentBorder();
@@ -1165,19 +1165,19 @@ sal_Bool SwView::UpdateScrollbars()
         aTmpSz.Width() += lOfst; aTmpSz.Height() += lOfst;
 
         {
-            const sal_Bool bVScrollVisible = m_pVScrollbar->IsVisible(sal_True);
+            const bool bVScrollVisible = m_pVScrollbar->IsVisible(true);
             m_pVScrollbar->DocSzChgd( aTmpSz );
             m_pVScrollbar->ViewPortChgd( aTmpRect );
-            if ( bVScrollVisible != m_pVScrollbar->IsVisible(sal_True) )
-                bRet = sal_True;
+            if ( bVScrollVisible != m_pVScrollbar->IsVisible(true) )
+                bRet = true;
         }
         {
-            const sal_Bool bHScrollVisible = m_pHScrollbar->IsVisible(sal_True);
+            const bool bHScrollVisible = m_pHScrollbar->IsVisible(true);
             m_pHScrollbar->DocSzChgd( aTmpSz );
             m_pHScrollbar->ViewPortChgd( aTmpRect );
-            if ( bHScrollVisible != m_pHScrollbar->IsVisible(sal_True) )
-                bRet = sal_True;
-            m_pScrollFill->Show(m_pHScrollbar->IsVisible(sal_True) && m_pVScrollbar->IsVisible(sal_True) );
+            if ( bHScrollVisible != m_pHScrollbar->IsVisible(true) )
+                bRet = true;
+            m_pScrollFill->Show(m_pHScrollbar->IsVisible(true) && m_pVScrollbar->IsVisible(true) );
         }
     }
     return bRet;
@@ -1190,9 +1190,9 @@ void SwView::Move()
     SfxViewShell::Move();
 }
 
-sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
+bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
 {
-    sal_Bool bOk = sal_False;
+    bool bOk = false;
     const CommandWheelData* pWData = rCEvt.GetWheelData();
     if (pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode())
     {
@@ -1203,7 +1203,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
             nFact = std::min( (long) 600, basegfx::zoomtools::zoomIn( nFact ));
 
         SetZoom( SVX_ZOOM_PERCENT, nFact );
-        bOk = sal_True;
+        bOk = true;
     }
     else if (pWData && COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode())
     {
@@ -1245,7 +1245,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
             m_pEditWin->HandleScrollCommand(event, m_pHScrollbar, m_pVScrollbar);
         }
 
-        bOk = sal_True;
+        bOk = true;
     }
     else
     {
@@ -1262,7 +1262,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
                 PhyPageDown();
             else
                 PhyPageUp();
-            bOk = sal_True;
+            bOk = true;
         }
         else
             bOk = m_pEditWin->HandleScrollCommand(rCEvt, m_pHScrollbar, m_pVScrollbar);
diff --git a/sw/source/core/uibase/uiview/viewprt.cxx b/sw/source/core/uibase/uiview/viewprt.cxx
index dd664ac70cb6..496b48765747 100644
--- a/sw/source/core/uibase/uiview/viewprt.cxx
+++ b/sw/source/core/uibase/uiview/viewprt.cxx
@@ -75,7 +75,7 @@ SfxPrinter* SwView::GetPrinter( bool bCreate )
     SfxPrinter *pPrt = pIDDA->getPrinter( bCreate );
     if ( pOld != pPrt )
     {
-        sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+        bool bWeb = 0 != PTR_CAST(SwWebView, this);
         ::SetAppPrintOptions( &GetWrtShell(), bWeb );
     }
     return pPrt;
@@ -83,7 +83,7 @@ SfxPrinter* SwView::GetPrinter( bool bCreate )
 
 // Propagate printer change
 
-void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, sal_Bool bWeb )
+void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, bool bWeb )
 {
     SwPrintOptions* pOpt = SW_MOD()->GetPrtOptions(bWeb);
     if( !pOpt)
@@ -116,12 +116,12 @@ sal_uInt16 SwView::SetPrinter(SfxPrinter* pNew, sal_uInt16 nDiffFlags, bool  )
         if ( nDiffFlags & SFX_PRINTER_PRINTER )
             rSh.SetModified();
     }
-    sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+    bool bWeb = 0 != PTR_CAST(SwWebView, this);
     if ( nDiffFlags & SFX_PRINTER_OPTIONS )
         ::SetPrinter( rSh.getIDocumentDeviceAccess(), pNew, bWeb );
 
-    const sal_Bool bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION ? sal_True : sal_False;
-    const sal_Bool bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE ? sal_True : sal_False;
+    const bool bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION ? sal_True : sal_False;
+    const bool bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE ? sal_True : sal_False;
     if ( bChgOri || bChgSize )
     {
         rSh.StartAllAction();
@@ -149,14 +149,14 @@ bool SwView::HasPrintOptionsPage() const
 SfxTabPage* SwView::CreatePrintOptionsPage(Window* pParent,
                                                     const SfxItemSet& rSet)
 {
-    return ::CreatePrintOptionsPage( pParent, rSet, sal_False );
+    return ::CreatePrintOptionsPage( pParent, rSet, false );
 }
 
 // Print dispatcher
 
 void SwView::ExecutePrint(SfxRequest& rReq)
 {
-    sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
+    bool bWeb = 0 != PTR_CAST(SwWebView, this);
     ::SetAppPrintOptions( &GetWrtShell(), bWeb );
     switch (rReq.GetSlot())
     {
@@ -192,11 +192,11 @@ void SwView::ExecutePrint(SfxRequest& rReq)
         {
             SwWrtShell* pSh = &GetWrtShell();
             SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false);
-            sal_Bool bSilent = pSilentItem ? pSilentItem->GetValue() : sal_False;
+            bool bSilent = pSilentItem ? pSilentItem->GetValue() : sal_False;
             SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, false);
             if(pPrintFromMergeItem)
                 rReq.RemoveItem(FN_QRY_MERGE);
-            sal_Bool bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : sal_False;
+            bool bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : sal_False;
             SwMiscConfig aMiscConfig;
             bool bPrintSelection = false;
             if(!bSilent && !bFromMerge &&
@@ -246,7 +246,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
 // Create page printer/additions for SwView and SwPagePreview
 
 SfxTabPage* CreatePrintOptionsPage( Window *pParent,
-                                const SfxItemSet &rOptions, sal_Bool bPreview )
+                                const SfxItemSet &rOptions, bool bPreview )
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "No Print Dialog");
@@ -270,7 +270,7 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent,
     return pPage;
 }
 
-void SetAppPrintOptions( SwViewShell* pSh, sal_Bool bWeb )
+void SetAppPrintOptions( SwViewShell* pSh, bool bWeb )
 {
     const IDocumentDeviceAccess* pIDDA = pSh->getIDocumentDeviceAccess();
     SwPrintData aPrtData = pIDDA->getPrintData();
diff --git a/sw/source/core/uibase/uiview/viewsrch.cxx b/sw/source/core/uibase/uiview/viewsrch.cxx
index 6dd8370d8b7e..94e6dc6b91c7 100644
--- a/sw/source/core/uibase/uiview/viewsrch.cxx
+++ b/sw/source/core/uibase/uiview/viewsrch.cxx
@@ -73,9 +73,9 @@ using namespace ::com::sun::star::util;
 struct SwSearchOptions
 {
     SwDocPositions eStart, eEnd;
-    sal_Bool bDontWrap;
+    bool bDontWrap;
 
-    SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward );
+    SwSearchOptions( SwWrtShell* pSh, bool bBackward );
 };
 
 static Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
@@ -83,15 +83,15 @@ static Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
     return pSrchDlg && pSrchDlg->IsVisible() ? pSrchDlg : 0;
 }
 
-void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
+void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
 {
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem = 0;
-    sal_Bool bQuiet = sal_False;
+    bool bQuiet = false;
     if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_SEARCH_QUIET, false, &pItem))
         bQuiet = ((const SfxBoolItem*) pItem)->GetValue();
 
-    sal_Bool bApi = bQuiet | bNoMessage;
+    bool bApi = bQuiet || bNoMessage;
 
     sal_uInt16 nSlot = rReq.GetSlot();
     if (nSlot == FN_REPEAT_SEARCH && !m_pSrchItem)
@@ -187,7 +187,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
             {
             case SVX_SEARCHCMD_FIND:
             {
-                sal_Bool bRet = SearchAndWrap(bApi);
+                bool bRet = SearchAndWrap(bApi);
                 if( bRet )
                     Scroll(m_pWrtShell->GetCharRect().SVRect());
                 rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
@@ -207,14 +207,14 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
             break;
             case SVX_SEARCHCMD_FIND_ALL:
             {
-                sal_Bool bRet = SearchAll();
+                bool bRet = SearchAll();
                 if( !bRet )
                 {
 #if HAVE_FEATURE_DESKTOP
                     if( !bApi )
                         SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
 #endif
-                    m_bFound = sal_False;
+                    m_bFound = false;
                 }
                 rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
 #if HAVE_FEATURE_DESKTOP
@@ -245,7 +245,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
                     {
                         // Prevent, that the replaced string will be found again
                         // if the replacement string is containing the search string.
-                        sal_Bool bBack = m_pSrchItem->GetBackward();
+                        bool bBack = m_pSrchItem->GetBackward();
                         if (bBack)
                             m_pWrtShell->Push();
                         OUString aReplace( m_pSrchItem->GetReplaceString() );
@@ -272,7 +272,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
 
                     sal_uInt16 nOldCmd = m_pSrchItem->GetCommand();
                     m_pSrchItem->SetCommand( nCmd );
-                    sal_Bool bRet = SearchAndWrap(bApi);
+                    bool bRet = SearchAndWrap(bApi);
                     if( bRet )
                         Scroll( m_pWrtShell->GetCharRect().SVRect());
                     m_pSrchItem->SetCommand( nOldCmd );
@@ -336,7 +336,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
                         if( !bApi )
                             SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
 #endif
-                        m_bFound = sal_False;
+                        m_bFound = false;
                         return;
                     }
 
@@ -451,7 +451,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
     }
 }
 
-sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
+bool SwView::SearchAndWrap(bool bApi)
 {
     SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() );
 
@@ -473,7 +473,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
     boost::scoped_ptr<SwWait> pWait(new SwWait( *GetDocShell(), true ));
     if( FUNC_Search( aOpts ) )
     {
-        m_bFound = sal_True;
+        m_bFound = true;
         if(m_pWrtShell->IsSelFrmMode())
         {
             m_pWrtShell->UnSelectFrm();
@@ -481,7 +481,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
         }
         m_pWrtShell->Pop();
         m_pWrtShell->EndAllAction();
-        return sal_True;
+        return true;
     }
     pWait.reset();
 
@@ -493,10 +493,10 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
         m_bExtra = true;
         if( FUNC_Search( aOpts ) )
         {
-            m_bFound = sal_True;
+            m_bFound = true;
             m_pWrtShell->Pop();
             m_pWrtShell->EndAllAction();
-            return sal_True;
+            return true;
         }
         m_bExtra = false;
     }
@@ -513,15 +513,15 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
             SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
 #endif
         }
-        m_bFound = sal_False;
+        m_bFound = false;
         m_pWrtShell->Pop();
-        return sal_False;
+        return false;
     }
     m_pWrtShell->EndAllAction();
         // Try again with WrapAround?
 
     m_pWrtShell->StartAllAction();
-    m_pWrtShell->Pop(sal_False);
+    m_pWrtShell->Pop(false);
     pWait.reset(new SwWait( *GetDocShell(), true ));
 
     bool bSrchBkwrd = DOCPOS_START == aOpts.eEnd;
@@ -550,7 +550,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
     return m_bFound;
 }
 
-sal_Bool SwView::SearchAll(sal_uInt16* pFound)
+bool SwView::SearchAll(sal_uInt16* pFound)
 {
     SwWait aWait( *GetDocShell(), true );
     m_pWrtShell->StartAllAction();
@@ -603,7 +603,7 @@ void SwView::Replace()
         if (GetPostItMgr()->HasActiveSidebarWin())
             GetPostItMgr()->Replace(m_pSrchItem);
 
-        sal_Bool bReqReplace = true;
+        bool bReqReplace = true;
 
         if(m_pWrtShell->HasSelection())
         {
@@ -611,7 +611,7 @@ void SwView::Replace()
             //save state
             SwPosition aStartPos = (* m_pWrtShell->GetSwCrsr()->Start());
             SwPosition aEndPos = (* m_pWrtShell->GetSwCrsr()->End());
-            sal_Bool   bHasSelection = m_pSrchItem->GetSelection();
+            bool   bHasSelection = m_pSrchItem->GetSelection();
             sal_uInt16 nOldCmd = m_pSrchItem->GetCommand();
 
             //set state for checking if current selection has a match
@@ -653,7 +653,7 @@ void SwView::Replace()
         if( bReqReplace )
         {
 
-            sal_Bool bReplaced = m_pWrtShell->SwEditShell::Replace( m_pSrchItem->GetReplaceString(),
+            bool bReplaced = m_pWrtShell->SwEditShell::Replace( m_pSrchItem->GetReplaceString(),
                                                                   m_pSrchItem->GetRegExp());
             if( bReplaced && m_pReplList && m_pReplList->Count() && m_pWrtShell->HasSelection() )
             {
@@ -671,7 +671,7 @@ void SwView::Replace()
     m_pWrtShell->EndAllAction();
 }
 
-SwSearchOptions::SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward )
+SwSearchOptions::SwSearchOptions( SwWrtShell* pSh, bool bBackward )
 {
     eStart = DOCPOS_CURR;
     if( bBackward )
@@ -691,7 +691,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
 #if HAVE_FEATURE_DESKTOP
     SvxSearchDialogWrapper::SetSearchLabel(SL_Empty);
 #endif
-    sal_Bool bDoReplace = m_pSrchItem->GetCommand() == SVX_SEARCHCMD_REPLACE ||
+    bool bDoReplace = m_pSrchItem->GetCommand() == SVX_SEARCHCMD_REPLACE ||
                       m_pSrchItem->GetCommand() == SVX_SEARCHCMD_REPLACE_ALL;
 
     int eRanges = m_pSrchItem->GetSelection() ?
diff --git a/sw/source/core/uibase/uiview/viewstat.cxx b/sw/source/core/uibase/uiview/viewstat.cxx
index 775e3402e62d..f545c04e55d3 100644
--- a/sw/source/core/uibase/uiview/viewstat.cxx
+++ b/sw/source/core/uibase/uiview/viewstat.cxx
@@ -96,7 +96,7 @@ void SwView::GetState(SfxItemSet &rSet)
                 {
                     // There are captions for graphics, OLE objects, frames and tables
                     if( !bGetFrmType )
-                        eFrmType = m_pWrtShell->GetFrmType(0,sal_True), bGetFrmType = sal_True;
+                        eFrmType = m_pWrtShell->GetFrmType(0,true), bGetFrmType = sal_True;
                     if (! ( ((eFrmType & FRMTYPE_FLY_ANY) && m_nSelectionType != nsSelectionType::SEL_DRW_TXT)||
                         m_nSelectionType & nsSelectionType::SEL_TBL ||
                         m_nSelectionType & nsSelectionType::SEL_DRW) )
@@ -126,7 +126,7 @@ void SwView::GetState(SfxItemSet &rSet)
 
             case FN_CHANGE_PAGENUM:
             {
-                sal_uInt16 nType = m_pWrtShell->GetFrmType(0,sal_True);
+                sal_uInt16 nType = m_pWrtShell->GetFrmType(0,true);
                 if( ( FRMTYPE_FLY_ANY | FRMTYPE_HEADER | FRMTYPE_FOOTER |
                       FRMTYPE_FOOTNOTE | FRMTYPE_DRAWOBJ ) & nType )
                     rSet.DisableItem(nWhich);
@@ -156,7 +156,7 @@ void SwView::GetState(SfxItemSet &rSet)
                 const SwPageDesc& rDesc = m_pWrtShell->GetPageDesc( nCurIdx );
                 const SwFrmFmt& rMaster = rDesc.GetMaster();
                 const SvxBrushItem& rBrush = (const SvxBrushItem&)
-                                    rMaster.GetFmtAttr(RES_BACKGROUND, sal_True);
+                                    rMaster.GetFmtAttr(RES_BACKGROUND, true);
                 rSet.Put(rBrush);
             }
             break;
diff --git a/sw/source/core/uibase/uiview/viewtab.cxx b/sw/source/core/uibase/uiview/viewtab.cxx
index 6d60fbd4b5d3..c47ed97f04f4 100644
--- a/sw/source/core/uibase/uiview/viewtab.cxx
+++ b/sw/source/core/uibase/uiview/viewtab.cxx
@@ -142,7 +142,7 @@ static void lcl_ConvertToCols(const SvxColumnItem& rColItem,
     // calculated columns and margins should result in the width of the last column.
     rArr[rColItem.Count()-1].SetWishWidth( rCols.GetWishWidth() - (sal_uInt16)nSumAll );
 
-    rCols.SetOrtho(sal_False, 0, 0 );
+    rCols.SetOrtho(false, 0, 0 );
 }
 
 // Delete tabs
@@ -221,7 +221,7 @@ void ResizeFrameCols(SwFmtCol& rCol,
     else
         rArr.back().SetWishWidth(rArr.back().GetWishWidth() + (sal_uInt16)nWishDiff);
     // Reset auto width
-    rCol.SetOrtho(sal_False, 0, 0 );
+    rCol.SetOrtho(false, 0, 0 );
 }
 
 // Here all changes to the tab bar will be shot again into the model.
@@ -230,9 +230,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
     SwWrtShell &rSh         = GetWrtShell();
     const sal_uInt16 nFrmType   = rSh.IsObjSelected() ?
                                     FRMTYPE_DRAWOBJ :
-                                        rSh.GetFrmType(0,sal_True);
-    const sal_Bool bFrmSelection = rSh.IsFrmSelected();
-    const sal_Bool bBrowse = rSh.GetViewOptions()->getBrowseMode();
+                                        rSh.GetFrmType(0,true);
+    const bool bFrmSelection = rSh.IsFrmSelected();
+    const bool bBrowse = rSh.GetViewOptions()->getBrowseMode();
 
     const sal_uInt16 nSlot      = rReq.GetSlot();
     const SfxItemSet* pReqArgs = rReq.GetArgs();
@@ -271,10 +271,10 @@ void SwView::ExecTabWin( SfxRequest& rReq )
 
                 bool bVerticalFrame(false);
                 {
-                    sal_Bool bRTL;
-                    sal_Bool bVertL2R;
+                    bool bRTL;
+                    bool bVertL2R;
                     bVerticalFrame = ( bFrmSelection &&
-                                       rSh.IsFrmVertical(sal_True, bRTL, bVertL2R) ) ||
+                                       rSh.IsFrmVertical(true, bRTL, bVertL2R) ) ||
                                      ( !bFrmSelection && bVerticalWriting);
                 }
                 long nDeltaX = bVerticalFrame ?
@@ -433,10 +433,10 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 SfxItemSet aSet( GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
                                             RES_VERT_ORIENT, RES_HORI_ORIENT, 0 );
                 //which of the orientation attributes is to be put depends on the frame's environment
-                sal_Bool bRTL;
-                sal_Bool bVertL2R;
+                bool bRTL;
+                bool bVertL2R;
                 if ( ( bFrmSelection &&
-                       rSh.IsFrmVertical(sal_True, bRTL, bVertL2R ) ) ||
+                       rSh.IsFrmVertical(true, bRTL, bVertL2R ) ) ||
                      ( !bFrmSelection && bVerticalWriting ) )
                 {
                     SwFmtHoriOrient aHoriOrient(pFmt->GetHoriOrient());
@@ -592,7 +592,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             aCols.Init( nCount, nGutterWidth, nWidth );
             aCols.SetWishWidth( nWidth );
             aCols.SetGutterWidth( nGutterWidth, nWidth );
-            aCols.SetOrtho( sal_False, nGutterWidth, nWidth );
+            aCols.SetOrtho( false, nGutterWidth, nWidth );
 
             long nColumnLeft = 0;
             long nColumnRight = 0;
@@ -769,7 +769,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
             {
                 OSL_ENSURE(aColItem.Count(), "ColDesc is empty!!");
 
-                const sal_Bool bSingleLine = ((const SfxBoolItem&)rReq.
+                const bool bSingleLine = ((const SfxBoolItem&)rReq.
                                 GetArgs()->Get(SID_RULER_ACT_LINE_ONLY)).GetValue();
 
                 SwTabCols aTabCols;
@@ -790,7 +790,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                 // Tabcols sequentially
                 // The last column is defined by the edge.
                 // Columns in right-to-left tables need to be mirrored
-                sal_Bool bIsTableRTL =
+                bool bIsTableRTL =
                     IsTabColFromDoc() ?
                           rSh.IsMouseTableRightToLeft(m_aTabColFromDocPos)
                         : rSh.IsTableRightToLeft();
@@ -819,7 +819,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                     if( !rSh.IsViewLocked() )
                     {
                         bUnlockView = true;
-                        rSh.LockView( sal_True );
+                        rSh.LockView( true );
                     }
                     rSh.SetMouseTabCols( aTabCols, bSingleLine,
                                                    m_aTabColFromDocPos );
@@ -930,7 +930,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                         aTabCols.SetHidden( i, !rCol.bVisible );
                     }
                 }
-                sal_Bool bSingleLine = sal_False;
+                bool bSingleLine = false;
                 const SfxPoolItem* pSingleLine;
                 if( SFX_ITEM_SET == rReq.GetArgs()->GetItemState(SID_RULER_ACT_LINE_ONLY, false, &pSingleLine))
                     bSingleLine = ((const SfxBoolItem*)pSingleLine)->GetValue();
@@ -939,7 +939,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
                     if( !rSh.IsViewLocked() )
                     {
                         bUnlockView = true;
-                        rSh.LockView( sal_True );
+                        rSh.LockView( true );
                     }
                     rSh.SetMouseTabRows( aTabCols, bSingleLine, m_aTabColFromDocPos );
                 }
@@ -955,9 +955,9 @@ void SwView::ExecTabWin( SfxRequest& rReq )
     rSh.EndAllAction();
 
     if( bUnlockView )
-        rSh.LockView( sal_False );
+        rSh.LockView( false );
 
-    m_bSetTabColFromDoc = m_bSetTabRowFromDoc = m_bTabColFromDoc = m_bTabRowFromDoc = sal_False;
+    m_bSetTabColFromDoc = m_bSetTabRowFromDoc = m_bTabColFromDoc = m_bTabRowFromDoc = false;
     SetNumRuleNodeFromDoc(NULL);
 }
 
@@ -971,10 +971,10 @@ void SwView::StateTabWin(SfxItemSet& rSet)
     const Point* pPt = IsTabColFromDoc() || IsTabRowFromDoc() ? &m_aTabColFromDocPos : 0;
     const sal_uInt16 nFrmType   = rSh.IsObjSelected()
                 ? FRMTYPE_DRAWOBJ
-                : rSh.GetFrmType( pPt, sal_True );
+                : rSh.GetFrmType( pPt, true );
 
-    const sal_Bool  bFrmSelection = rSh.IsFrmSelected();
-    const sal_Bool bBrowse = rSh.GetViewOptions()->getBrowseMode();
+    const bool  bFrmSelection = rSh.IsFrmSelected();
+    const bool bBrowse = rSh.GetViewOptions()->getBrowseMode();
     // PageOffset/limiter
     const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, pPt );
     const SwRect& rPagePrtRect = rSh.GetAnyCurRect( RECT_PAGE_PRT, pPt );
@@ -1397,7 +1397,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 rSet.DisableItem(nWhich);
             else
             {
-                sal_Bool bFlag = rSh.IsInRightToLeftText();
+                bool bFlag = rSh.IsInRightToLeftText();
                 rSet.Put(SfxBoolItem(nWhich, bFlag));
             }
         }
@@ -1408,9 +1408,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         {
             bool bFrameHasVerticalColumns(false);
             {
-                sal_Bool bFrameRTL;
-                sal_Bool bFrameVertL2R;
-                bFrameHasVerticalColumns = rSh.IsFrmVertical(sal_False, bFrameRTL, bFrameVertL2R) &&
+                bool bFrameRTL;
+                bool bFrameVertL2R;
+                bFrameHasVerticalColumns = rSh.IsFrmVertical(false, bFrameRTL, bFrameVertL2R) &&
                                            bFrmSelection;
             }
             bool bHasTable = ( IsTabColFromDoc() ||
@@ -1431,7 +1431,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             {
                 SwTabCols aTabCols;
                 size_t nNum = 0;
-                if ( 0 != ( m_bSetTabColFromDoc = IsTabColFromDoc() ) )
+                if ( ( m_bSetTabColFromDoc = IsTabColFromDoc() ) )
                 {
                     rSh.GetMouseTabCols( aTabCols, m_aTabColFromDocPos );
                     nNum = rSh.GetCurMouseTabColNum( m_aTabColFromDocPos );
@@ -1458,7 +1458,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                        nEnd;
 
                 //columns in right-to-left tables need to be mirrored
-                sal_Bool bIsTableRTL =
+                bool bIsTableRTL =
                     IsTabColFromDoc() ?
                           rSh.IsMouseTableRightToLeft(m_aTabColFromDocPos)
                         : rSh.IsTableRightToLeft();
@@ -1517,7 +1517,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     !bFrmSelection &&
                      nFrmType & FRMTYPE_COLSECT )
                 {
-                    const SwSection *pSect = rSh.GetAnySection(sal_False, pPt);
+                    const SwSection *pSect = rSh.GetAnySection(false, pPt);
                     OSL_ENSURE( pSect, "Which section?");
                     if( pSect )
                     {
@@ -1656,9 +1656,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         {
             bool bFrameHasVerticalColumns(false);
             {
-                sal_Bool bFrameRTL;
-                sal_Bool bFrameVertL2R;
-                bFrameHasVerticalColumns = rSh.IsFrmVertical(sal_False, bFrameRTL, bFrameVertL2R) &&
+                bool bFrameRTL;
+                bool bFrameVertL2R;
+                bFrameHasVerticalColumns = rSh.IsFrmVertical(false, bFrameRTL, bFrameVertL2R) &&
                                            bFrmSelection;
             }
 
@@ -1674,7 +1674,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 SwTabCols aTabCols;
                 //no current value necessary
                 sal_uInt16    nNum = 0;
-                if ( 0 != ( m_bSetTabRowFromDoc = IsTabRowFromDoc() ) )
+                if ( ( m_bSetTabRowFromDoc = IsTabRowFromDoc() ) )
                 {
                     rSh.GetMouseTabRows( aTabCols, m_aTabColFromDocPos );
                 }
@@ -1875,7 +1875,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                 }
                 else
                 {   // Here only for table in multi-column pages and borders.
-                    sal_Bool bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? sal_True : sal_False;
+                    bool bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? sal_True : sal_False;
                     bool bFrame = (nFrmType & FRMTYPE_FLY_ANY);
                     bool bColSct =  (nFrmType & ( bSectOutTbl
                                                     ? FRMTYPE_COLSECTOUTTAB
diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
index ad30b94411d5..0a6c16166261 100644
--- a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
@@ -330,7 +330,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_FIELD_AUTO_UPDATE:
         {
-            sal_Bool bUpdateField = *(sal_Bool*)rValue.getValue();
+            bool bUpdateField = *(sal_Bool*)rValue.getValue();
             SwFldUpdateFlags nFlag = mpDoc->getFieldUpdateFlags(true);
             mpDoc->setFieldUpdateFlags( bUpdateField ?
                                         nFlag == AUTOUPD_FIELD_AND_CHARTS ?
@@ -341,7 +341,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_CHART_AUTO_UPDATE:
         {
-            sal_Bool bUpdateChart = *(sal_Bool*)rValue.getValue();
+            bool bUpdateChart = *(sal_Bool*)rValue.getValue();
             SwFldUpdateFlags nFlag = mpDoc->getFieldUpdateFlags(true);
             mpDoc->setFieldUpdateFlags( (nFlag == AUTOUPD_FIELD_ONLY || nFlag == AUTOUPD_FIELD_AND_CHARTS ) ?
                                         bUpdateChart ?
@@ -352,21 +352,21 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_ADD_PARA_TABLE_SPACING:
         {
-            sal_Bool bParaSpace = sal_False;
+            bool bParaSpace = false;
             rValue >>= bParaSpace;
             mpDoc->set(IDocumentSettingAccess::PARA_SPACE_MAX, bParaSpace );
         }
         break;
         case HANDLE_ADD_PARA_TABLE_SPACING_AT_START:
         {
-            sal_Bool bParaSpacePage = sal_False;
+            bool bParaSpacePage = false;
             rValue >>= bParaSpacePage;
             mpDoc->set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bParaSpacePage );
         }
         break;
         case HANDLE_ALIGN_TAB_STOP_POSITION:
         {
-            sal_Bool bAlignTab = *(sal_Bool*)rValue.getValue();
+            bool bAlignTab = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::TAB_COMPAT, bAlignTab);
         }
         break;
@@ -431,7 +431,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_IS_KERN_ASIAN_PUNCTUATION:
         {
-            sal_Bool bIsKern = *(sal_Bool*)(rValue).getValue();
+            bool bIsKern = *(sal_Bool*)(rValue).getValue();
             mpDoc->set(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION, bIsKern);
             SwEditShell* pEditSh = mpDoc->GetEditShell();
             if(pEditSh)
@@ -461,7 +461,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS:
         {
-            sal_Bool bSaveGlobal = *(sal_Bool*)rValue.getValue();
+            bool bSaveGlobal = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT_SAVE_LINKS, bSaveGlobal );
         }
         break;
@@ -523,7 +523,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_IS_LABEL_DOC :
         {
-            sal_Bool bSet = sal_False;
+            bool bSet = false;
             if(!(rValue >>= bSet))
                 throw IllegalArgumentException();
             mpDoc->set(IDocumentSettingAccess::LABEL_DOCUMENT, bSet);
@@ -531,31 +531,31 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_IS_ADD_FLY_OFFSET:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::ADD_FLY_OFFSETS, bTmp);
         }
         break;
         case HANDLE_IS_ADD_EXTERNAL_LEADING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::ADD_EXT_LEADING, bTmp);
         }
         break;
         case HANDLE_OLD_NUMBERING: // #111955#
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::OLD_NUMBERING, bTmp);
         }
         break;
         case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, bTmp);
         }
         break;
         case HANDLE_ALLOW_PRINTJOB_CANCEL:
         {
-            sal_Bool bState = sal_False;
+            bool bState = false;
             if (!(rValue >>= bState))
                 throw IllegalArgumentException();
             mpDocSh->Stamp_SetPrintCancelState(bState);
@@ -563,25 +563,25 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_USE_FORMER_LINE_SPACING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::OLD_LINE_SPACING, bTmp);
         }
         break;
         case HANDLE_ADD_PARA_SPACING_TO_TABLE_CELLS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS, bTmp);
         }
         break;
         case HANDLE_USE_FORMER_OBJECT_POSITIONING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, bTmp);
         }
         break;
         case HANDLE_USE_FORMER_TEXT_WRAPPING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, bTmp);
         }
         break;
@@ -602,37 +602,37 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_CONSIDER_WRAP_ON_OBJPOS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, bTmp );
         }
         break;
         case HANDLE_IGNORE_FIRST_LINE_INDENT_IN_NUMBERING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING, bTmp);
         }
         break;
         case HANDLE_DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK, bTmp);
         }
         break;
         case HANDLE_DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, bTmp);
         }
         break;
         case HANDLE_TABLE_ROW_KEEP:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::TABLE_ROW_KEEP, bTmp);
         }
         break;
         case HANDLE_IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, bTmp);
         }
         break;
@@ -643,19 +643,19 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE, bTmp);
         }
         break;
         case HANDLE_CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAMES:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME, bTmp);
         }
         break;
         case HANDLE_UNIX_FORCE_ZERO_EXT_LEADING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::UNIX_FORCE_ZERO_EXT_LEADING, bTmp);
         }
         break;
@@ -664,7 +664,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_TABS_RELATIVE_TO_INDENT:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp);
         }
         break;
@@ -684,14 +684,14 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_PROTECT_FORM:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::PROTECT_FORM, bTmp);
         }
         break;
         // #i89181#
         case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp);
         }
         break;
@@ -712,84 +712,84 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_MATH_BASELINE_ALIGNMENT:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, bTmp );
         }
         break;
         case HANDLE_INVERT_BORDER_SPACING:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp);
         }
         break;
         case HANDLE_COLLAPSE_EMPTY_CELL_PARA:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::COLLAPSE_EMPTY_CELL_PARA, bTmp);
         }
         break;
         case HANDLE_SMALL_CAPS_PERCENTAGE_66:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::SMALL_CAPS_PERCENTAGE_66, bTmp);
         }
         break;
         case HANDLE_TAB_OVERFLOW:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::TAB_OVERFLOW, bTmp);
         }
         break;
         case HANDLE_UNBREAKABLE_NUMBERINGS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS, bTmp);
         }
         break;
         case HANDLE_STYLES_NODEFAULT:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::STYLES_NODEFAULT, bTmp);
         }
         break;
         case HANDLE_FLOATTABLE_NOMARGINS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::FLOATTABLE_NOMARGINS, bTmp);
         }
         break;
         case HANDLE_CLIPPED_PICTURES:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::CLIPPED_PICTURES, bTmp);
         }
         break;
         case HANDLE_BACKGROUND_PARA_OVER_DRAWINGS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::BACKGROUND_PARA_OVER_DRAWINGS, bTmp);
         }
         break;
         case HANDLE_EMBED_FONTS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::EMBED_FONTS, bTmp);
         }
         case HANDLE_EMBED_SYSTEM_FONTS:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::EMBED_SYSTEM_FONTS, bTmp);
         }
         break;
         case HANDLE_TAB_OVER_MARGIN:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::TAB_OVER_MARGIN, bTmp);
         }
         break;
         case HANDLE_SURROUND_TEXT_WRAP_SMALL:
         {
-            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            bool bTmp = *(sal_Bool*)rValue.getValue();
             mpDoc->set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, bTmp);
         }
         break;
@@ -969,7 +969,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_IS_LABEL_DOC:
         {
-            sal_Bool bLabel = mpDoc->get(IDocumentSettingAccess::LABEL_DOCUMENT);
+            bool bLabel = mpDoc->get(IDocumentSettingAccess::LABEL_DOCUMENT);
             rValue <<= bLabel;
         }
         break;
diff --git a/sw/source/core/uibase/uno/SwXFilterOptions.cxx b/sw/source/core/uibase/uno/SwXFilterOptions.cxx
index b944a9e0b6f4..166c2cfe3e1e 100644
--- a/sw/source/core/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/core/uibase/uno/SwXFilterOptions.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::lang;
 #define FILTER_OPTIONS_NAME             "FilterOptions"
 
 SwXFilterOptions::SwXFilterOptions() :
-    bExport( sal_False )
+    bExport( false )
 {
 }
 
@@ -140,14 +140,14 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti
 void   SwXFilterOptions::setTargetDocument( const uno::Reference< XComponent >& xDoc )
     throw (IllegalArgumentException, uno::RuntimeException, std::exception)
 {
-    bExport = sal_False;
+    bExport = false;
     xModel = xDoc;
 }
 
 void   SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& xDoc )
         throw (IllegalArgumentException,uno::RuntimeException, std::exception)
 {
-    bExport = sal_True;
+    bExport = true;
     xModel = xDoc;
 }
 
diff --git a/sw/source/core/uibase/uno/unoatxt.cxx b/sw/source/core/uibase/uno/unoatxt.cxx
index 54e9c493b0b0..438e250da043 100644
--- a/sw/source/core/uibase/uno/unoatxt.cxx
+++ b/sw/source/core/uibase/uno/unoatxt.cxx
@@ -268,7 +268,7 @@ uno::Sequence< OUString > SwXAutoTextGroup::getTitles(void) throw( uno::RuntimeE
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = 0;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
         nCount = pGlosGroup->GetCount();
     else
@@ -292,7 +292,7 @@ void SwXAutoTextGroup::renameByName(const OUString& aElementName,
     // throw exception only if the programmatic name is to be changed into an existing name
     if(aNewElementName != aElementName && hasByName(aNewElementName))
         throw container::ElementExistException();
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
     {
         sal_uInt16 nIdx = pGlosGroup->GetIndex( aElementName);
@@ -365,7 +365,7 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
     if(!xTextRange.is())
         throw uno::RuntimeException();
 
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     OUString sShortName(aName);
     OUString sLongName(aTitle);
     if(pGlosGroup && !pGlosGroup->GetError())
@@ -439,7 +439,7 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
 void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
     {
         sal_uInt16 nIdx = pGlosGroup->GetIndex(aEntryName);
@@ -506,7 +506,7 @@ sal_Int32 SwXAutoTextGroup::getCount(void) throw( uno::RuntimeException, std::ex
 {
     SolarMutexGuard aGuard;
     int nCount = 0;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
         nCount = pGlosGroup->GetCount();
     else
@@ -521,7 +521,7 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex)
     SolarMutexGuard aGuard;
     uno::Any aRet;
     sal_uInt16 nCount = 0;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
         nCount = pGlosGroup->GetCount();
     else
@@ -543,7 +543,7 @@ uno::Type SwXAutoTextGroup::getElementType(void) throw( uno::RuntimeException, s
 sal_Bool SwXAutoTextGroup::hasElements(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     sal_uInt16 nCount = 0;
     if(pGlosGroup && !pGlosGroup->GetError())
         nCount = pGlosGroup->GetCount();
@@ -569,7 +569,7 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames(void)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = 0;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
         nCount = pGlosGroup->GetCount();
     else
@@ -588,9 +588,9 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName)
     throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt16 nCount = 0;
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(pGlosGroup && !pGlosGroup->GetError())
         nCount = pGlosGroup->GetCount();
     else
@@ -627,7 +627,7 @@ void SwXAutoTextGroup::setPropertyValue(
     if(!pEntry)
         throw beans::UnknownPropertyException();
 
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(!pGlosGroup || pGlosGroup->GetError())
         throw uno::RuntimeException();
     switch(pEntry->nWID)
@@ -656,7 +656,7 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
 
     if(!pEntry)
         throw beans::UnknownPropertyException();
-    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0;
+    SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
     if(!pGlosGroup  || pGlosGroup->GetError())
         throw uno::RuntimeException();
 
@@ -819,7 +819,7 @@ void SwXAutoTextEntry::GetBodyText ()
 {
     SolarMutexGuard aGuard;
 
-    xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, sal_False );
+    xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, false );
     OSL_ENSURE( xDocSh.Is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" );
 
     // start listening at the document
diff --git a/sw/source/core/uibase/uno/unodispatch.cxx b/sw/source/core/uibase/uno/unodispatch.cxx
index 84fa31eea052..d05572238cf7 100644
--- a/sw/source/core/uibase/uno/unodispatch.cxx
+++ b/sw/source/core/uibase/uno/unodispatch.cxx
@@ -186,8 +186,8 @@ void    SwXDispatchProviderInterceptor::Invalidate()
 
 SwXDispatch::SwXDispatch(SwView& rVw) :
     m_pView(&rVw),
-    m_bOldEnable(sal_False),
-    m_bListenerAdded(sal_False)
+    m_bOldEnable(false),
+    m_bListenerAdded(false)
 {
 }
 
@@ -275,7 +275,7 @@ void SwXDispatch::addStatusListener(
     if(!m_pView)
         throw uno::RuntimeException();
     ShellModes eMode = m_pView->GetShellMode();
-    sal_Bool bEnable = SHELL_MODE_TEXT == eMode  ||
+    bool bEnable = SHELL_MODE_TEXT == eMode  ||
                        SHELL_MODE_LIST_TEXT == eMode  ||
                        SHELL_MODE_TABLE_TEXT == eMode  ||
                        SHELL_MODE_TABLE_LIST_TEXT == eMode;
@@ -313,7 +313,7 @@ void SwXDispatch::addStatusListener(
         uno::Reference<view::XSelectionSupplier> xSupplier = m_pView->GetUNOObject();
         uno::Reference<view::XSelectionChangeListener> xThis = this;
         xSupplier->addSelectionChangeListener(xThis);
-        m_bListenerAdded = sal_True;
+        m_bListenerAdded = true;
     }
 }
 
@@ -335,14 +335,14 @@ void SwXDispatch::removeStatusListener(
         uno::Reference<view::XSelectionSupplier> xSupplier = m_pView->GetUNOObject();
         uno::Reference<view::XSelectionChangeListener> xThis = this;
         xSupplier->removeSelectionChangeListener(xThis);
-        m_bListenerAdded = sal_False;
+        m_bListenerAdded = false;
     }
 }
 
 void SwXDispatch::selectionChanged( const lang::EventObject&  ) throw(uno::RuntimeException, std::exception)
 {
     ShellModes eMode = m_pView->GetShellMode();
-    sal_Bool bEnable = SHELL_MODE_TEXT == eMode  ||
+    bool bEnable = SHELL_MODE_TEXT == eMode  ||
                        SHELL_MODE_LIST_TEXT == eMode  ||
                        SHELL_MODE_TABLE_TEXT == eMode  ||
                        SHELL_MODE_TABLE_LIST_TEXT == eMode;
@@ -370,7 +370,7 @@ void SwXDispatch::disposing( const lang::EventObject& rSource ) throw(uno::Runti
     uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY);
     uno::Reference<view::XSelectionChangeListener> xThis = this;
     xSupplier->removeSelectionChangeListener(xThis);
-    m_bListenerAdded = sal_False;
+    m_bListenerAdded = false;
 
     lang::EventObject aObject;
     aObject.Source = (cppu::OWeakObject*)this;
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 099248b41004..3ddac23d7b1d 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -140,7 +140,7 @@ static bool LoadFromURL_impl(
     Reference< frame::XModel > xTmpModel;
     Sequence < PropertyValue > aArgs( 1 );
     aArgs[0].Name = "Hidden";
-    sal_Bool bVal = sal_True;
+    bool bVal = true;
     aArgs[0].Value <<= bVal;
     try
     {
@@ -247,7 +247,7 @@ namespace
         bool bSuccess = false;
         try
         {
-            sal_Bool bDeliverOwnership = ( 0 == m_nPendingDeleteAttempts );
+            bool bDeliverOwnership = ( 0 == m_nPendingDeleteAttempts );
                 // if this is our last attemt, then anybody which vetoes this has to take the consequences
                 // (means take the ownership)
             m_xDocument->close( bDeliverOwnership );
@@ -374,13 +374,13 @@ SwXMailMerge::SwXMailMerge() :
     pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_MAILMERGE ) ),
     nDataCommandType(sdb::CommandType::TABLE),
     nOutputType(MailMergeType::PRINTER),
-    bEscapeProcessing(sal_True),     //!! allow to process properties like "Filter", "Order", ...
-    bSinglePrintJobs(sal_False),
-    bFileNameFromColumn(sal_False),
-    bSendAsHTML(sal_False),
-    bSendAsAttachment(sal_False),
-    bSaveAsSingleFile(sal_False),
-    bDisposing(sal_False),
+    bEscapeProcessing(true),     //!! allow to process properties like "Filter", "Order", ...
+    bSinglePrintJobs(false),
+    bFileNameFromColumn(false),
+    bSendAsHTML(false),
+    bSendAsAttachment(false),
+    bSaveAsSingleFile(false),
+    bDisposing(false),
     m_pMgr(0)
 {
     // create empty document
@@ -452,9 +452,9 @@ uno::Any SAL_CALL SwXMailMerge::execute(
     OUString   aCurFileNamePrefix       = aFileNamePrefix;
     sal_Int32  nCurDataCommandType      = nDataCommandType;
     sal_Int16  nCurOutputType           = nOutputType;
-    sal_Bool   bCurEscapeProcessing     = bEscapeProcessing;
-    sal_Bool   bCurSinglePrintJobs      = bSinglePrintJobs;
-    sal_Bool   bCurFileNameFromColumn   = bFileNameFromColumn;
+    bool   bCurEscapeProcessing     = bEscapeProcessing;
+    bool   bCurSinglePrintJobs      = bSinglePrintJobs;
+    bool   bCurFileNameFromColumn   = bFileNameFromColumn;
 
     SfxObjectShellRef xCurDocSh = xDocSh;   // the document
 
@@ -465,7 +465,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
         const OUString &rName   = pArguments[i].Name;
         const Any &rValue       = pArguments[i].Value;
 
-        sal_Bool bOK = sal_True;
+        bool bOK = true;
         if (rName == UNO_NAME_SELECTION)
             bOK = rValue >>= aCurSelection;
         else if (rName == UNO_NAME_RESULT_SET)
@@ -687,7 +687,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
         pIDDA->setPrintData( aPrtData );
         // #i25686# printing should not be done asynchronously to prevent dangling offices
         // when mail merge is called as command line macro
-        aMergeDesc.bPrintAsync = sal_False;
+        aMergeDesc.bPrintAsync = false;
         aMergeDesc.aPrintOptions = aPrintSettings;
         aMergeDesc.bCreateSingleFile = true;
     }
@@ -750,7 +750,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
             aMergeDesc.bSendAsHTML       = bSendAsHTML;
             aMergeDesc.bSendAsAttachment = bSendAsAttachment;
 
-            aMergeDesc.bCreateSingleFile = sal_False;
+            aMergeDesc.bCreateSingleFile = false;
             pMMConfigItem.reset(new SwMailMergeConfigItem);
             aMergeDesc.pMailMergeConfigItem = pMMConfigItem.get();
             aMergeDesc.xSmtpServer = SwMailMergeHelper::ConnectToSmtpServer(
@@ -786,13 +786,13 @@ uno::Any SAL_CALL SwXMailMerge::execute(
     if ( !bStoredAsTemporary )
         throw RuntimeException("Failed to save temporary file.", static_cast < cppu::OWeakObject * > ( this ) );
 
-    pMgr->SetMergeSilent( sal_True );       // suppress dialogs, message boxes, etc.
+    pMgr->SetMergeSilent( true );       // suppress dialogs, message boxes, etc.
     const SwXMailMerge *pOldSrc = pMgr->GetMailMergeEvtSrc();
     OSL_ENSURE( !pOldSrc || pOldSrc == this, "Ooops... different event source already set." );
     pMgr->SetMailMergeEvtSrc( this );   // launch events for listeners
 
     SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), xCurDocSh));
-    sal_Bool bSucc = pMgr->MergeNew( aMergeDesc );
+    bool bSucc = pMgr->MergeNew( aMergeDesc );
     SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), xCurDocSh));
 
     pMgr->SetMailMergeEvtSrc( pOldSrc );
@@ -913,7 +913,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
         Any aOld( pData, pCur->aType );
 
         bool bChanged = false;
-        sal_Bool bOK = sal_True;
+        bool bOK = true;
         if (aOld != rValue)
         {
             if (pData == &aSelection)
@@ -1125,7 +1125,7 @@ void SAL_CALL SwXMailMerge::dispose()
 
     if (!bDisposing)
     {
-        bDisposing = sal_True;
+        bDisposing = true;
 
         EventObject aEvtObj( (XPropertySet *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
diff --git a/sw/source/core/uibase/uno/unomod.cxx b/sw/source/core/uibase/uno/unomod.cxx
index 15457df95141..d70e371ac9cf 100644
--- a/sw/source/core/uibase/uno/unomod.cxx
+++ b/sw/source/core/uibase/uno/unomod.cxx
@@ -230,7 +230,7 @@ Reference< XPropertySet >  SwXModule::getViewSettings(void) throw( uno::RuntimeE
     {
         ((SwXModule*)this)->pxViewSettings = new Reference< XPropertySet > ;
         OSL_FAIL("Web or Text?");
-        *pxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( sal_False, 0 ) );
+        *pxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( false, 0 ) );
     }
     return *pxViewSettings;
 }
@@ -281,10 +281,10 @@ void SwXPrintSettings::_preSetValues ()
     switch (meType)
     {
         case PRINT_SETTINGS_MODULE:
-            mpPrtOpt = SW_MOD()->GetPrtOptions( sal_False );
+            mpPrtOpt = SW_MOD()->GetPrtOptions( false );
         break;
         case PRINT_SETTINGS_WEB:
-            mpPrtOpt = SW_MOD()->GetPrtOptions( sal_True );
+            mpPrtOpt = SW_MOD()->GetPrtOptions( true );
         break;
         case PRINT_SETTINGS_DOCUMENT:
         {
@@ -299,7 +299,7 @@ void SwXPrintSettings::_preSetValues ()
 void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
-    sal_Bool bVal;
+    bool bVal;
     if ( rInfo.mnHandle != HANDLE_PRINTSET_ANNOTATION_MODE &&
          rInfo.mnHandle != HANDLE_PRINTSET_FAX_NAME )
         bVal = *(sal_Bool*)rValue.getValue();
@@ -438,10 +438,10 @@ void SwXPrintSettings::_preGetValues ()
     switch (meType)
     {
         case PRINT_SETTINGS_MODULE:
-            mpPrtOpt = SW_MOD()->GetPrtOptions( sal_False );
+            mpPrtOpt = SW_MOD()->GetPrtOptions( false );
         break;
         case PRINT_SETTINGS_WEB:
-            mpPrtOpt = SW_MOD()->GetPrtOptions( sal_True );
+            mpPrtOpt = SW_MOD()->GetPrtOptions( true );
         break;
         case PRINT_SETTINGS_DOCUMENT:
         {
@@ -551,18 +551,18 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( Run
     return aRet;
 }
 
-SwXViewSettings::SwXViewSettings(sal_Bool bWebView, SwView* pVw)
+SwXViewSettings::SwXViewSettings(bool bWebView, SwView* pVw)
     : ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() )
     , pView(pVw)
     , mpViewOption(NULL)
     , mpConstViewOption(NULL)
-    , bObjectValid(sal_True)
+    , bObjectValid(true)
     , bWeb(bWebView)
     , mbApplyZoom(false)
     , eHRulerUnit(FUNIT_CM)
-    , mbApplyHRulerMetric(sal_False)
+    , mbApplyHRulerMetric(false)
     , eVRulerUnit(FUNIT_CM)
-    , mbApplyVRulerMetric(sal_False)
+    , mbApplyVRulerMetric(false)
 {
     // This property only exists if we have a view (ie, not at the module )
     if ( !pView )
@@ -590,15 +590,15 @@ void SwXViewSettings::_preSetValues ()
         pVOpt = SW_MOD()->GetViewOption(bWeb);
 
     mpViewOption = new SwViewOption (*pVOpt);
-    mbApplyZoom = sal_False;
+    mbApplyZoom = false;
     if(pView)
-        mpViewOption->SetStarOneSetting(sal_True);
+        mpViewOption->SetStarOneSetting(true);
 }
 
 void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
-    sal_Bool bVal = HANDLE_VIEWSET_ZOOM != rInfo.mnHandle ?
+    bool bVal = HANDLE_VIEWSET_ZOOM != rInfo.mnHandle ?
         *(sal_Bool*)rValue.getValue() : sal_False;
     // the API flag should not be set to the application's view settings
     switch( rInfo.mnHandle )
@@ -614,10 +614,10 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
         case  HANDLE_VIEWSET_DRAWINGS              :   mpViewOption->SetDraw(bVal); break;
         case  HANDLE_VIEWSET_FIELD_COMMANDS        :   mpViewOption->SetFldName(bVal);  break;
         case  HANDLE_VIEWSET_ANNOTATIONS           :   mpViewOption->SetPostIts(bVal);  break;
-        case  HANDLE_VIEWSET_INDEX_MARK_BACKGROUND :   mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, sal_True);  break;
+        case  HANDLE_VIEWSET_INDEX_MARK_BACKGROUND :   mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true);  break;
         case  HANDLE_VIEWSET_NONPRINTING_CHARACTERS:   mpViewOption->SetViewMetaChars( bVal ); break;
-        case  HANDLE_VIEWSET_FOOTNOTE_BACKGROUND   :   mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, sal_True); break;
-        case  HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND :   mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, sal_True);    break;
+        case  HANDLE_VIEWSET_FOOTNOTE_BACKGROUND   :   mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break;
+        case  HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND :   mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true);    break;
         case  HANDLE_VIEWSET_PARA_BREAKS           :   mpViewOption->SetParagraph(bVal);    break;
         case  HANDLE_VIEWSET_SOFT_HYPHENS          :   mpViewOption->SetSoftHyph(bVal); break;
         case  HANDLE_VIEWSET_SPACES                :   mpViewOption->SetBlank(bVal);    break;
@@ -627,7 +627,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
         case  HANDLE_VIEWSET_HIDDEN_TEXT           :   mpViewOption->SetShowHiddenField(bVal);  break;
         case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   mpViewOption->SetShowHiddenChar(bVal); break;
         case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS     :   mpViewOption->SetShowHiddenPara(bVal);   break;
-        case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, sal_True);    break;
+        case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, true);    break;
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);    break;
         case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal); break;
         case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal); break;
@@ -676,7 +676,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
             if(!(rValue >>= nZoom) || nZoom > 1000 || nZoom < 5)
                 throw lang::IllegalArgumentException();
             mpViewOption->SetZoom((sal_uInt16)nZoom);
-            mbApplyZoom = sal_True;
+            mbApplyZoom = true;
         }
         break;
         case HANDLE_VIEWSET_ZOOM_TYPE:
@@ -707,7 +707,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
                         OUString( "SwXViewSettings: invalid zoom type"), 0, 0);
             }
             mpViewOption->SetZoomType( eZoom );
-            mbApplyZoom = sal_True;
+            mbApplyZoom = true;
         }
         break;
         case HANDLE_VIEWSET_ONLINE_LAYOUT :
@@ -761,12 +761,12 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
                 if( rInfo.mnHandle == HANDLE_VIEWSET_HORI_RULER_METRIC )
                 {
                     eHRulerUnit = nUnit;
-                    mbApplyHRulerMetric = sal_True;
+                    mbApplyHRulerMetric = true;
                 }
                 else
                 {
                     eVRulerUnit = nUnit;
-                    mbApplyVRulerMetric = sal_True;
+                    mbApplyVRulerMetric = true;
                 }
                 break;
                 default:
@@ -786,7 +786,7 @@ void SwXViewSettings::_postSetValues ()
     {
         if(mbApplyZoom )
             pView->SetZoom( (SvxZoomType)mpViewOption->GetZoomType(),
-                            mpViewOption->GetZoom(), sal_True );
+                            mpViewOption->GetZoom(), true );
         if(mbApplyHRulerMetric)
             pView->ChangeTabMetric((FieldUnit)eHRulerUnit);
         if(mbApplyVRulerMetric)
@@ -796,9 +796,9 @@ void SwXViewSettings::_postSetValues ()
     else
     {
         if(mbApplyHRulerMetric)
-            SW_MOD()->ApplyRulerMetric( (FieldUnit)eHRulerUnit, sal_True, bWeb );
+            SW_MOD()->ApplyRulerMetric( (FieldUnit)eHRulerUnit, true, bWeb );
         if(mbApplyVRulerMetric)
-            SW_MOD()->ApplyRulerMetric( (FieldUnit)eVRulerUnit, sal_False, bWeb );
+            SW_MOD()->ApplyRulerMetric( (FieldUnit)eVRulerUnit, false, bWeb );
     }
 
     SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ? VIEWOPT_DEST_VIEW_ONLY
@@ -830,8 +830,8 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
     switch( rInfo.mnHandle )
     {
         case  HANDLE_VIEWSET_SHOW_RULER:                bBoolVal = mpConstViewOption->IsViewAnyRuler();   break;
-        case  HANDLE_VIEWSET_HRULER :                   bBoolVal = mpConstViewOption->IsViewHRuler(sal_True);   break;
-        case  HANDLE_VIEWSET_VRULER :                   bBoolVal = mpConstViewOption->IsViewVRuler(sal_True);break;
+        case  HANDLE_VIEWSET_HRULER :                   bBoolVal = mpConstViewOption->IsViewHRuler(true);   break;
+        case  HANDLE_VIEWSET_VRULER :                   bBoolVal = mpConstViewOption->IsViewVRuler(true);break;
         case  HANDLE_VIEWSET_VRULER_RIGHT          :   bBoolVal = mpConstViewOption->IsVRulerRight();break;
         case  HANDLE_VIEWSET_HSCROLL:                   bBoolVal = mpConstViewOption->IsViewHScrollBar();break;
         case  HANDLE_VIEWSET_VSCROLL:                   bBoolVal = mpConstViewOption->IsViewVScrollBar();break;
@@ -844,14 +844,14 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
         case  HANDLE_VIEWSET_NONPRINTING_CHARACTERS:   bBoolVal = mpConstViewOption->IsViewMetaChars(); break;
         case  HANDLE_VIEWSET_FOOTNOTE_BACKGROUND   :   bBoolVal = SwViewOption::IsFieldShadings();  break;
         case  HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND :   bBoolVal = SwViewOption::IsFieldShadings(); break;
-        case  HANDLE_VIEWSET_PARA_BREAKS           :   bBoolVal = mpConstViewOption->IsParagraph(sal_True); break;
+        case  HANDLE_VIEWSET_PARA_BREAKS           :   bBoolVal = mpConstViewOption->IsParagraph(true); break;
         case  HANDLE_VIEWSET_SOFT_HYPHENS          :   bBoolVal = mpConstViewOption->IsSoftHyph();  break;
-        case  HANDLE_VIEWSET_SPACES                :   bBoolVal = mpConstViewOption->IsBlank(sal_True); break;
+        case  HANDLE_VIEWSET_SPACES                :   bBoolVal = mpConstViewOption->IsBlank(true); break;
         case  HANDLE_VIEWSET_PROTECTED_SPACES      :   bBoolVal = mpConstViewOption->IsHardBlank(); break;
-        case  HANDLE_VIEWSET_TABSTOPS              :   bBoolVal = mpConstViewOption->IsTab(sal_True);   break;
-        case  HANDLE_VIEWSET_BREAKS                :   bBoolVal = mpConstViewOption->IsLineBreak(sal_True); break;
+        case  HANDLE_VIEWSET_TABSTOPS              :   bBoolVal = mpConstViewOption->IsTab(true);   break;
+        case  HANDLE_VIEWSET_BREAKS                :   bBoolVal = mpConstViewOption->IsLineBreak(true); break;
         case  HANDLE_VIEWSET_HIDDEN_TEXT           :   bBoolVal = mpConstViewOption->IsShowHiddenField();   break;
-        case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   bBoolVal = mpConstViewOption->IsShowHiddenChar(sal_True); break;
+        case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   bBoolVal = mpConstViewOption->IsShowHiddenChar(true); break;
         case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS     :   bBoolVal = mpConstViewOption->IsShowHiddenPara();    break;
         case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   bBoolVal = SwViewOption::IsTableBoundaries(); break;
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries(); break;
diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index c0d90325394e..e535fce7dc70 100644
--- a/sw/source/core/uibase/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
@@ -157,7 +157,7 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions(
     if (!pDocShell)
         return NULL;
 
-    const sal_Bool bWebDoc      = NULL != dynamic_cast< const SwWebDocShell * >(pDocShell);
+    const bool bWebDoc      = NULL != dynamic_cast< const SwWebDocShell * >(pDocShell);
     const bool bSwSrcView   = NULL != dynamic_cast< const SwSrcView * >(pView);
     const SwView * pSwView = dynamic_cast< const SwView * >(pView);
     const bool bHasSelection    = pSwView && pSwView->HasSelection( false );  // check for any selection, not just text selection
@@ -383,7 +383,7 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
     m_pPrintUIOptions( NULL ),
     m_pRenderData( NULL ),
     // #i117783#
-    bApplyPagePrintSettingsFromXPagePrintable( sal_False )
+    bApplyPagePrintSettingsFromXPagePrintable( false )
 {
 }
 
@@ -426,7 +426,7 @@ void SwXTextDocument::GetNumberFormatter()
             if ( pDocShell->GetDoc() )
             {
                 SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj(
-                                    pDocShell->GetDoc()->GetNumberFormatter( sal_True ));
+                                    pDocShell->GetDoc()->GetNumberFormatter( true ));
                 Reference< util::XNumberFormatsSupplier >  xTmp = pNumFmt;
                 xNumFmtAgg = Reference< XAggregation >(xTmp, UNO_QUERY);
             }
@@ -447,7 +447,7 @@ void SwXTextDocument::GetNumberFormatter()
             }
             OSL_ENSURE(pNumFmt, "No number formatter available");
             if (pNumFmt && !pNumFmt->GetNumberFormatter())
-                pNumFmt->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( sal_True ));
+                pNumFmt->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( true ));
         }
     }
 }
@@ -637,7 +637,7 @@ Reference< XIndexAccess >  SwXTextDocument::getFootnotes(void) throw( RuntimeExc
     if(!pxXFootnotes)
     {
         ((SwXTextDocument*)this)->pxXFootnotes = new Reference< XIndexAccess > ;
-        *pxXFootnotes = new SwXFootnotes(sal_False, pDocShell->GetDoc());
+        *pxXFootnotes = new SwXFootnotes(false, pDocShell->GetDoc());
     }
     return *pxXFootnotes;
 }
@@ -664,7 +664,7 @@ Reference< XIndexAccess >  SwXTextDocument::getEndnotes(void) throw( RuntimeExce
     if(!pxXEndnotes)
     {
         ((SwXTextDocument*)this)->pxXEndnotes = new Reference< XIndexAccess > ;
-        *pxXEndnotes = new SwXFootnotes(sal_True, pDocShell->GetDoc());
+        *pxXEndnotes = new SwXFootnotes(true, pDocShell->GetDoc());
     }
     return *pxXEndnotes;
 }
@@ -699,7 +699,7 @@ SwUnoCrsr*  SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xC
     xCrsr.set( static_cast<text::XWordCursor*>(pXTextCursor) );
 
     SwUnoCrsr *const pUnoCrsr = pXTextCursor->GetCursor();
-    pUnoCrsr->SetRemainInSection(sal_False);
+    pUnoCrsr->SetRemainInSection(false);
     return pUnoCrsr;
 }
 
@@ -726,7 +726,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
     SwDocPositions eEnd = pSearch->bBack ? DOCPOS_START : DOCPOS_END;
 
     // Search should take place anywhere
-    pUnoCrsr->SetRemainInSection(sal_False);
+    pUnoCrsr->SetRemainInSection(false);
     sal_uInt32 nResult;
     UnoActionContext aContext(pDocShell->GetDoc());
     //try attribute search first
@@ -744,7 +744,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
                             0);
         pSearch->FillSearchItemSet(aSearch);
         pSearch->FillReplaceItemSet(aReplace);
-        sal_Bool bCancel;
+        bool bCancel;
         nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles,
                     eStart, eEnd, bCancel,
                     (FindRanges)eRanges,
@@ -756,7 +756,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
         SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
         SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());
 
-        sal_Bool bCancel;
+        bool bCancel;
         nResult = pUnoCrsr->Find( *pSearchColl,
                     eStart, eEnd, bCancel,
                     (FindRanges)eRanges, pReplaceColl );
@@ -765,12 +765,12 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
     else
     {
         //todo/mba: assuming that notes should be omitted
-        sal_Bool bSearchInNotes = sal_False;
-        sal_Bool bCancel;
+        bool bSearchInNotes = false;
+        bool bCancel;
         nResult = pUnoCrsr->Find( aSearchOpt, bSearchInNotes,
             eStart, eEnd, bCancel,
             (FindRanges)eRanges,
-            sal_True );
+            true );
     }
     return (sal_Int32)nResult;
 
@@ -788,9 +788,10 @@ Reference< util::XSearchDescriptor >  SwXTextDocument::createSearchDescriptor(vo
 // Used for findAll/First/Next
 
 SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & xDesc,
-                                        Reference< XTextCursor > & xCrsr, sal_Bool bAll,
-                                                sal_Int32& nResult,
-                                                Reference< XInterface >  xLastResult)
+                                     Reference< XTextCursor > & xCrsr,
+                                     bool bAll,
+                                     sal_Int32& nResult,
+                                     Reference< XInterface >  xLastResult)
 {
     Reference< XUnoTunnel > xDescTunnel(xDesc, UNO_QUERY);
     if(!IsValid() || !xDescTunnel.is() || !xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId()))
@@ -800,7 +801,7 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
     const SwXTextSearch* pSearch = reinterpret_cast<const SwXTextSearch*>(
         xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId()));
 
-    sal_Bool bParentInExtra = sal_False;
+    bool bParentInExtra = false;
     if(xLastResult.is())
     {
         Reference<XUnoTunnel> xCursorTunnel( xLastResult, UNO_QUERY);
@@ -874,7 +875,7 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
                                 RES_TXTATR_INETFMT, RES_TXTATR_CHARFMT,
                                 0);
             pSearch->FillSearchItemSet(aSearch);
-            sal_Bool bCancel;
+            bool bCancel;
             nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles,
                         eStart, eEnd, bCancel,
                         (FindRanges)eRanges,
@@ -886,7 +887,7 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
             SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
             //pSearch->sReplaceText
             SwTxtFmtColl *pReplaceColl = 0;
-            sal_Bool bCancel;
+            bool bCancel;
             nResult = (sal_Int32)pUnoCrsr->Find( *pSearchColl,
                         eStart, eEnd, bCancel,
                         (FindRanges)eRanges, pReplaceColl );
@@ -894,12 +895,12 @@ SwUnoCrsr*  SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
         else
         {
             //todo/mba: assuming that notes should be omitted
-            sal_Bool bSearchInNotes = sal_False;
-            sal_Bool bCancel;
+            bool bSearchInNotes = false;
+            bool bCancel;
             nResult = (sal_Int32)pUnoCrsr->Find( aSearchOpt, bSearchInNotes,
                     eStart, eEnd, bCancel,
                     (FindRanges)eRanges,
-                    /*int bReplace =*/sal_False );
+                    /*bool bReplace =*/false );
         }
         nSearchProc++;
         if(nResult || (eRanges&(FND_IN_SELALL|FND_IN_OTHER)))
@@ -918,7 +919,7 @@ Reference< XIndexAccess >
     Reference< XInterface >  xTmp;
     sal_Int32 nResult = 0;
     Reference< XTextCursor >  xCrsr;
-    SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_True, nResult, xTmp);
+    SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, true, nResult, xTmp);
     if(!pResultCrsr)
         throw RuntimeException();
     Reference< XIndexAccess >  xRet;
@@ -934,7 +935,7 @@ Reference< XInterface >  SwXTextDocument::findFirst(const Reference< util::XSear
     Reference< XInterface >  xTmp;
     sal_Int32 nResult = 0;
     Reference< XTextCursor >  xCrsr;
-    SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_False, nResult, xTmp);
+    SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, false, nResult, xTmp);
     if(!pResultCrsr)
         throw RuntimeException();
     Reference< XInterface >  xRet;
@@ -959,7 +960,7 @@ Reference< XInterface >  SwXTextDocument::findNext(const Reference< XInterface >
     Reference< XTextCursor >  xCrsr;
     if(!xStartAt.is())
         throw RuntimeException();
-    SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, sal_False, nResult, xStartAt);
+    SwUnoCrsr* pResultCrsr = FindAny(xDesc, xCrsr, false, nResult, xStartAt);
     if(!pResultCrsr)
         throw RuntimeException();
     Reference< XInterface >  xRet;
@@ -1013,9 +1014,9 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void)
     return aSeq;
 }
 
-static sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException)
+static sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, bool& bException)
 {
-    bException = sal_False;
+    bException = false;
     TypeClass eType = rValue.getValueType().getTypeClass();
 
     sal_uInt32 nRet = 0;
@@ -1071,7 +1072,7 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue
         {
             OUString sName = pProperties[i].Name;
             const Any& rVal = pProperties[i].Value;
-            sal_Bool bException;
+            bool bException;
             sal_uInt32 nVal = lcl_Any_To_ULONG(rVal, bException);
             if( sName.equalsAscii("PageRows" ) )
             {
@@ -1115,7 +1116,7 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue
                 aData.SetLandscape(*(sal_Bool*)rVal.getValue());
             }
             else
-                bException = sal_True;
+                bException = true;
             if(bException)
                 throw RuntimeException();
         }
@@ -1196,7 +1197,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption
         }
 
         // #i117783#
-        bApplyPagePrintSettingsFromXPagePrintable = sal_True;
+        bApplyPagePrintSettingsFromXPagePrintable = true;
         pFrame->GetViewShell()->ExecuteSlot(aReq);
         // Frame close
         pFrame->DoClose();
@@ -1382,7 +1383,7 @@ SwXDrawPage* SwXTextDocument::GetDrawPage()
 
 void SwXTextDocument::Invalidate()
 {
-    bObjectValid = sal_False;
+    bObjectValid = false;
     if(xNumFmtAgg.is())
     {
         const uno::Type& rTunnelType = ::getCppuType((Reference <XUnoTunnel>*)0);
@@ -1408,7 +1409,7 @@ void SwXTextDocument::Reactivate(SwDocShell* pNewDocShell)
     if(pDocShell && pDocShell != pNewDocShell)
         Invalidate();
     pDocShell = pNewDocShell;
-    bObjectValid = sal_True;
+    bObjectValid = true;
 }
 
 void    SwXTextDocument::InitNewDoc()
@@ -1842,7 +1843,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
         case WID_DOC_CHANGES_RECORD:
         case WID_DOC_CHANGES_SHOW:
         {
-            sal_Bool bSet = *(sal_Bool*)aValue.getValue();
+            bool bSet = *(sal_Bool*)aValue.getValue();
             sal_uInt16 eMode = pDocShell->GetDoc()->GetRedlineMode();
             if(WID_DOC_CHANGES_SHOW == pEntry->nWID)
             {
@@ -1915,7 +1916,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
         case WID_DOC_AUTOMATIC_CONTROL_FOCUS:
         {
             SwDrawDocument * pDrawDoc;
-            sal_Bool bAuto = *(sal_Bool*) aValue.getValue();
+            bool bAuto = *(sal_Bool*) aValue.getValue();
 
             if ( 0 != ( pDrawDoc = dynamic_cast< SwDrawDocument * >( pDocShell->GetDoc()->GetDrawModel() ) ) )
                 pDrawDoc->SetAutoControlFocus( bAuto );
@@ -1935,7 +1936,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
         case WID_DOC_APPLY_FORM_DESIGN_MODE:
         {
             SwDrawDocument * pDrawDoc;
-            sal_Bool bMode = *(sal_Bool*)aValue.getValue();
+            bool bMode = *(sal_Bool*)aValue.getValue();
 
             if ( 0 != ( pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetDrawModel() ) ) )
                 pDrawDoc->SetOpenInDesignMode( bMode );
@@ -2029,7 +2030,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
         case WID_DOC_CHANGES_SHOW:
         {
             sal_uInt16 eMode = pDocShell->GetDoc()->GetRedlineMode();
-            sal_Bool bSet = sal_False;
+            bool bSet = false;
             if(WID_DOC_CHANGES_SHOW == pEntry->nWID)
             {
                 sal_uInt16 nMask = nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE;
@@ -2053,7 +2054,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
         break;
         case WID_DOC_HIDE_TIPS :
         {
-            sal_Bool bTemp = SW_MOD()->GetModuleConfig()->IsHideFieldTips();
+            bool bTemp = SW_MOD()->GetModuleConfig()->IsHideFieldTips();
             aAny.setValue(&bTemp, ::getBooleanCppuType());
         }
         break;
@@ -2080,29 +2081,29 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
         break;
         case WID_DOC_TWO_DIGIT_YEAR:
         {
-            aAny <<= static_cast < sal_Int16 > (pDocShell->GetDoc()->GetNumberFormatter ( sal_True )->GetYear2000());
+            aAny <<= static_cast < sal_Int16 > (pDocShell->GetDoc()->GetNumberFormatter ( true )->GetYear2000());
         }
         break;
         case WID_DOC_AUTOMATIC_CONTROL_FOCUS:
         {
             SwDrawDocument * pDrawDoc;
-            sal_Bool bAuto;
+            bool bAuto;
             if ( 0 != ( pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetDrawModel() ) ) )
                 bAuto = pDrawDoc->GetAutoControlFocus();
             else
-                bAuto = sal_False;
-            aAny.setValue(&bAuto, ::getBooleanCppuType());
+                bAuto = false;
+            aAny <<= bAuto;
         }
         break;
         case WID_DOC_APPLY_FORM_DESIGN_MODE:
         {
             SwDrawDocument * pDrawDoc;
-            sal_Bool bMode;
+            bool bMode;
             if ( 0 != ( pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetDrawModel() ) ) )
                 bMode = pDrawDoc->GetOpenInDesignMode();
             else
-                bMode = sal_True;
-            aAny.setValue(&bMode, ::getBooleanCppuType());
+                bMode = true;
+            aAny <<= bMode;
         }
         break;
         case WID_DOC_BASIC_LIBRARIES:
@@ -2579,7 +2580,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
 
             // since printing now also use the API for PDF export this option
             // should be set for printing as well ...
-            pViewShell->SetPDFExportOption( sal_True );
+            pViewShell->SetPDFExportOption( true );
             bool bOrigStatus = pRenderDocShell->IsEnableSetModified();
             // check configuration: shall update of printing information in DocInfo set the document to "modified"?
             bool bStateChanged = false;
@@ -2590,7 +2591,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             }
 
             // #122919# Force field update before PDF export
-            pViewShell->SwViewShell::UpdateFlds(sal_True);
+            pViewShell->SwViewShell::UpdateFlds(true);
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified( true );
 
@@ -2600,7 +2601,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             pViewShell->CalcLayout();
             pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
 
-            pViewShell->SetPDFExportOption( sal_False );
+            pViewShell->SetPDFExportOption( false );
 
             // enable view again
             pViewShell->EndAction();
@@ -2863,7 +2864,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
             }
         }
 
-        bApplyPagePrintSettingsFromXPagePrintable = sal_False;
+        bApplyPagePrintSettingsFromXPagePrintable = false;
     }
 
     m_pPrintUIOptions->appendPrintUIOptions( aRenderer );
@@ -2999,7 +3000,7 @@ void SAL_CALL SwXTextDocument::render(
 
                     // since printing now also use the API for PDF export this option
                     // should be set for printing as well ...
-                    pVwSh->SetPDFExportOption( sal_True );
+                    pVwSh->SetPDFExportOption( true );
 
                     // #i12836# enhanced pdf export
 
@@ -3034,7 +3035,7 @@ void SAL_CALL SwXTextDocument::render(
                         SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages,  true );
                     }
 
-                    pVwSh->SetPDFExportOption( sal_False );
+                    pVwSh->SetPDFExportOption( false );
 
                     // last page to be rendered? (not necessarily the last page of the document)
                     // -> do clean-up of data
@@ -3166,19 +3167,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
         LanguageType nLang = LANGUAGE_DONTKNOW;
         if (bLatin)
         {
-            nLang = rAttrSet.GetLanguage( sal_False ).GetLanguage();
+            nLang = rAttrSet.GetLanguage( false ).GetLanguage();
             if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
                 aAllLangs.insert( nLang );
         }
         if (bAsian)
         {
-            nLang = rAttrSet.GetCJKLanguage( sal_False ).GetLanguage();
+            nLang = rAttrSet.GetCJKLanguage( false ).GetLanguage();
             if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
                 aAllLangs.insert( nLang );
         }
         if (bComplex)
         {
-            nLang = rAttrSet.GetCTLLanguage( sal_False ).GetLanguage();
+            nLang = rAttrSet.GetCTLLanguage( false ).GetLanguage();
             if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
                 aAllLangs.insert( nLang );
         }
@@ -3191,19 +3192,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
         LanguageType nLang = LANGUAGE_DONTKNOW;
         if (bLatin)
         {
-            nLang = rAttrSet.GetLanguage( sal_False ).GetLanguage();
+            nLang = rAttrSet.GetLanguage( false ).GetLanguage();
             if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
                 aAllLangs.insert( nLang );
         }
         if (bAsian)
         {
-            nLang = rAttrSet.GetCJKLanguage( sal_False ).GetLanguage();
+            nLang = rAttrSet.GetCJKLanguage( false ).GetLanguage();
             if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
                 aAllLangs.insert( nLang );
         }
         if (bComplex)
         {
-            nLang = rAttrSet.GetCTLLanguage( sal_False ).GetLanguage();
+            nLang = rAttrSet.GetCTLLanguage( false ).GetLanguage();
             if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
                 aAllLangs.insert( nLang );
         }
@@ -3586,7 +3587,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames(void)
 sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName)
     throw( RuntimeException, std::exception )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     OUString sParam(rName);
     if(sParam.getLength() > sLinkSuffix.getLength() )
     {
@@ -3609,7 +3610,7 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName)
                     if(sParam ==
                         lcl_CreateOutlineString(i, rOutlineNodes, pOutlRule))
                     {
-                        bRet = sal_True;
+                        bRet = true;
                     }
                 }
             }
@@ -3630,7 +3631,7 @@ uno::Type  SwXLinkNameAccessWrapper::getElementType(void)
 
 sal_Bool SwXLinkNameAccessWrapper::hasElements(void) throw( RuntimeException, std::exception )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(pxDoc)
     {
         OSL_FAIL("not implemented");
@@ -3950,15 +3951,15 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
     // disable anything in the view that should not be printed (or exported to PDF) by default
     // (see also dialog "Tools/Options - StarOffice Writer - Formatting Aids"
     // in section "Display of ...")
-    aRenderViewOptions.SetParagraph( sal_False );             // paragraph end
-    aRenderViewOptions.SetSoftHyph( sal_False );              // aka custom hyphens
-    aRenderViewOptions.SetBlank( sal_False );                 // spaces
-    aRenderViewOptions.SetHardBlank( sal_False );             // non-breaking spaces
-    aRenderViewOptions.SetTab( sal_False );                   // tabs
-    aRenderViewOptions.SetLineBreak( sal_False );             // breaks (type 1)
-    aRenderViewOptions.SetPageBreak( sal_False );             // breaks (type 2)
-    aRenderViewOptions.SetColumnBreak( sal_False );           // breaks (type 3)
-    sal_Bool bVal = pPrtOptions? pPrtOptions->bPrintHiddenText : sal_False;
+    aRenderViewOptions.SetParagraph( false );             // paragraph end
+    aRenderViewOptions.SetSoftHyph( false );              // aka custom hyphens
+    aRenderViewOptions.SetBlank( false );                 // spaces
+    aRenderViewOptions.SetHardBlank( false );             // non-breaking spaces
+    aRenderViewOptions.SetTab( false );                   // tabs
+    aRenderViewOptions.SetLineBreak( false );             // breaks (type 1)
+    aRenderViewOptions.SetPageBreak( false );             // breaks (type 2)
+    aRenderViewOptions.SetColumnBreak( false );           // breaks (type 3)
+    bool bVal = pPrtOptions? pPrtOptions->bPrintHiddenText : sal_False;
     if (bContainsHiddenChars)
         aRenderViewOptions.SetShowHiddenChar( bVal );     // hidden text
     if (bContainsHiddenFields)
@@ -3974,11 +3975,11 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
     }
 
     if (bContainsFields)
-        aRenderViewOptions.SetFldName( sal_False );
+        aRenderViewOptions.SetFldName( false );
 
     // we need to set this flag in order to get to see the visible effect of
     // some of the above settings (needed for correct rendering)
-    aRenderViewOptions.SetViewMetaChars( sal_True );
+    aRenderViewOptions.SetViewMetaChars( true );
 
     if (m_aOldViewOptions != aRenderViewOptions)  // check if reformatting is necessary
     {
diff --git a/sw/source/core/uibase/uno/unotxvw.cxx b/sw/source/core/uibase/uno/unotxvw.cxx
index 01feda252a11..62e0bc6a1423 100644
--- a/sw/source/core/uibase/uno/unotxvw.cxx
+++ b/sw/source/core/uibase/uno/unotxvw.cxx
@@ -295,7 +295,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface)
         }
         // sdrObjects handled below
     }
-    sal_Bool bRet(sal_False);
+    bool bRet(false);
     if (sdrObjects.size())
     {
 
@@ -312,7 +312,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface)
             if (pPV && pSdrObject->GetPage() == pPV->GetPage())
             {
                 pDrawView->MarkObj(pSdrObject, pPV);
-                bRet = sal_True;
+                bRet = true;
             }
         }
     }
@@ -522,7 +522,7 @@ uno::Reference< beans::XPropertySet >  SwXTextView::getViewSettings(void) throw(
         if(!pxViewSettings)
         {
             ((SwXTextView*)this)->pxViewSettings = new uno::Reference< beans::XPropertySet > ;
-            *pxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( sal_False, m_pView ) );
+            *pxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( false, m_pView ) );
         }
     }
     else
@@ -635,7 +635,7 @@ void SAL_CALL SwXTextView::setRubyList(
             }
             else if(pProperties[nProp].Name == UNO_NAME_RUBY_IS_ABOVE)
             {
-                sal_Bool bValue = pProperties[nProp].Value.hasValue() ?
+                bool bValue = pProperties[nProp].Value.hasValue() ?
                     *(sal_Bool*)pProperties[nProp].Value.getValue() : sal_True;
                 pEntry->GetRubyAttr().SetPosition(bValue ? 0 : 1);
             }
@@ -744,7 +744,7 @@ void SAL_CALL SwXTextView::setPropertyValue(
             break;
             case WID_IS_CONSTANT_SPELLCHECK :
             {
-                sal_Bool bVal = sal_False;
+                bool bVal = false;
                 const SwViewOption *pOpt = m_pView->GetWrtShell().GetViewOptions();
                 if (!pOpt || !(rValue >>= bVal))
                     throw RuntimeException();
@@ -790,7 +790,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
                 if (nWID == WID_PAGE_COUNT)
                     nCount = m_pView->GetWrtShell().GetPageCount();
                 else // WID_LINE_COUNT
-                    nCount = m_pView->GetWrtShell().GetLineCount( sal_False /*of whole document*/ );
+                    nCount = m_pView->GetWrtShell().GetLineCount( false /*of whole document*/ );
                 aRet <<= nCount;
             }
             break;
@@ -803,7 +803,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
                 if (!pOpt)
                     throw RuntimeException();
                 sal_uInt32 nFlag = VIEWOPT_1_ONLINESPELL;
-                sal_Bool bVal = 0 != (pOpt->GetCoreOptions() & nFlag);
+                bool bVal = 0 != (pOpt->GetCoreOptions() & nFlag);
                 aRet <<= bVal;
             }
             break;
@@ -884,10 +884,10 @@ SwXTextViewCursor::~SwXTextViewCursor()
 // - XTextCursor
 // - XTextRange
 // - XLineCursor
-sal_Bool SwXTextViewCursor::IsTextSelection( sal_Bool bAllowTables ) const
+bool SwXTextViewCursor::IsTextSelection( bool bAllowTables ) const
 {
 
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     OSL_ENSURE(m_pView, "m_pView is NULL ???");
     if(m_pView)
     {
@@ -990,7 +990,7 @@ sal_Bool SwXTextViewCursor::isCollapsed()
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         if (!IsTextSelection())
@@ -1009,14 +1009,14 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand)
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         if (!IsTextSelection())
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
         for( sal_uInt16 i = 0; i < nCount; i++ )
-            bRet = m_pView->GetWrtShell().Left( CRSR_SKIP_CHARS, bExpand, 1, sal_True );
+            bRet = m_pView->GetWrtShell().Left( CRSR_SKIP_CHARS, bExpand, 1, true );
     }
     else
         throw uno::RuntimeException();
@@ -1027,14 +1027,14 @@ sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand)
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         if (!IsTextSelection())
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
         for( sal_uInt16 i = 0; i < nCount; i++ )
-            bRet = m_pView->GetWrtShell().Right( CRSR_SKIP_CHARS, bExpand, 1, sal_True );
+            bRet = m_pView->GetWrtShell().Right( CRSR_SKIP_CHARS, bExpand, 1, true );
     }
     else
         throw uno::RuntimeException();
@@ -1090,7 +1090,7 @@ void SwXTextViewCursor::gotoRange(
                                     SwXParagraph::getUnoTunnelId()));
         }
 
-        const sal_uInt16 nFrmType = rSh.GetFrmType(0,sal_True);
+        const sal_uInt16 nFrmType = rSh.GetFrmType(0,true);
 
         SwStartNodeType eSearchNodeType = SwNormalStartNode;
         if(nFrmType & FRMTYPE_FLY_ANY)
@@ -1218,7 +1218,7 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage()
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
@@ -1228,7 +1228,7 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage()
             rSh.LeaveSelFrmMode();
         }
         rSh.EnterStdMode();
-        bRet = rSh.SttEndDoc(sal_True);
+        bRet = rSh.SttEndDoc(true);
     }
     else
         throw uno::RuntimeException();
@@ -1239,7 +1239,7 @@ sal_Bool SwXTextViewCursor::jumpToLastPage()
     throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         SwWrtShell& rSh = m_pView->GetWrtShell();
@@ -1249,7 +1249,7 @@ sal_Bool SwXTextViewCursor::jumpToLastPage()
             rSh.LeaveSelFrmMode();
         }
         rSh.EnterStdMode();
-        bRet = rSh.SttEndDoc(sal_False);
+        bRet = rSh.SttEndDoc(false);
         rSh.SttPg();
     }
     else
@@ -1260,9 +1260,9 @@ sal_Bool SwXTextViewCursor::jumpToLastPage()
 sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
-        bRet = m_pView->GetWrtShell().GotoPage(nPage, sal_True);
+        bRet = m_pView->GetWrtShell().GotoPage(nPage, true);
     else
         throw uno::RuntimeException();
     return bRet;
@@ -1271,7 +1271,7 @@ sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeExcep
 sal_Bool SwXTextViewCursor::jumpToNextPage(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
         bRet = m_pView->GetWrtShell().SttNxtPg();
     else
@@ -1282,7 +1282,7 @@ sal_Bool SwXTextViewCursor::jumpToNextPage(void) throw( uno::RuntimeException, s
 sal_Bool SwXTextViewCursor::jumpToPreviousPage(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
         bRet = m_pView->GetWrtShell().EndPrvPg();
     else
@@ -1293,7 +1293,7 @@ sal_Bool SwXTextViewCursor::jumpToPreviousPage(void) throw( uno::RuntimeExceptio
 sal_Bool SwXTextViewCursor::jumpToEndOfPage(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
         bRet = m_pView->GetWrtShell().EndPg();
     else
@@ -1304,7 +1304,7 @@ sal_Bool SwXTextViewCursor::jumpToEndOfPage(void) throw( uno::RuntimeException,
 sal_Bool SwXTextViewCursor::jumpToStartOfPage(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
         bRet = m_pView->GetWrtShell().SttPg();
     else
@@ -1332,7 +1332,7 @@ sal_Bool SwXTextViewCursor::screenDown()
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         SfxRequest aReq(FN_PAGEDOWN, SFX_CALLMODE_SLOT, m_pView->GetPool());
@@ -1349,7 +1349,7 @@ sal_Bool SwXTextViewCursor::screenUp()
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         SfxRequest aReq(FN_PAGEUP, SFX_CALLMODE_SLOT, m_pView->GetPool());
@@ -1369,7 +1369,7 @@ uno::Reference< text::XText >  SwXTextViewCursor::getText()
     uno::Reference< text::XText >  xRet;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
         SwWrtShell& rSh = m_pView->GetWrtShell();
@@ -1429,7 +1429,7 @@ OUString SwXTextViewCursor::getString()
     OUString uRet;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
         ShellModes  eSelMode = m_pView->GetShellMode();
@@ -1460,7 +1460,7 @@ void SwXTextViewCursor::setString(const OUString& aString)
     SolarMutexGuard aGuard;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
         ShellModes  eSelMode = m_pView->GetShellMode();
@@ -1623,7 +1623,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         if (!IsTextSelection())
@@ -1641,7 +1641,7 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
         if (!IsTextSelection())
@@ -1659,10 +1659,10 @@ sal_Bool SwXTextViewCursor::isAtStartOfLine()
     throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
         bRet = m_pView->GetWrtShell().IsAtLeftMargin();
@@ -1676,13 +1676,13 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine()
     throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
-        bRet = m_pView->GetWrtShell().IsAtRightMargin(sal_True);
+        bRet = m_pView->GetWrtShell().IsAtRightMargin(true);
     }
     else
         throw uno::RuntimeException();
@@ -1695,10 +1695,10 @@ void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand)
     SolarMutexGuard aGuard;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
-        m_pView->GetWrtShell().RightMargin(bExpand, sal_True);
+        m_pView->GetWrtShell().RightMargin(bExpand, true);
     }
     else
         throw uno::RuntimeException();
@@ -1710,10 +1710,10 @@ void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand)
     SolarMutexGuard aGuard;
     if(m_pView)
     {
-        if (!IsTextSelection( sal_False ))
+        if (!IsTextSelection( false ))
             throw  uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
 
-        m_pView->GetWrtShell().LeftMargin(bExpand, sal_True);
+        m_pView->GetWrtShell().LeftMargin(bExpand, true);
     }
     else
         throw uno::RuntimeException();
@@ -1809,8 +1809,8 @@ uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransfera
     else
     {
         SwTransferable* pTransfer = new SwTransferable( rSh );
-        const sal_Bool bLockedView = rSh.IsViewLocked();
-        rSh.LockView( sal_True );    //lock visible section
+        const bool bLockedView = rSh.IsViewLocked();
+        rSh.LockView( true );    //lock visible section
         pTransfer->PrepareForCopy();
         rSh.LockView( bLockedView );
         return uno::Reference< datatransfer::XTransferable >( pTransfer );
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 1cca1aa77daf..11781347ec90 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -149,7 +149,7 @@ SwContent::SwContent(const SwContentType* pCnt, const OUString& rName, long nYPo
     pParent(pCnt),
     sContentName(rName),
     nYPosition(nYPos),
-    bInvisible(sal_False)
+    bInvisible(false)
 {
 }
 
@@ -162,12 +162,12 @@ SwTypeNumber::~SwTypeNumber()
 {
 }
 
-sal_Bool SwContent::IsProtect() const
+bool SwContent::IsProtect() const
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwPostItContent::IsProtect() const
+bool SwPostItContent::IsProtect() const
 {
     if (mbPostIt)
         return pFld->IsProtect();
@@ -175,7 +175,7 @@ sal_Bool SwPostItContent::IsProtect() const
         return false;
 }
 
-sal_Bool SwURLFieldContent::IsProtect() const
+bool SwURLFieldContent::IsProtect() const
 {
     return pINetAttr->IsProtect();
 }
@@ -208,7 +208,7 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe
 
 // Init
 
-void SwContentType::Init(sal_Bool* pbInvalidateWindow)
+void SwContentType::Init(bool* pbInvalidateWindow)
 {
     // if the MemberCount is changing ...
     sal_uInt16 nOldMemberCount = nMemberCount;
@@ -304,7 +304,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
 
                     SwContent* pCnt = new SwRegionContent(this, rSectionName,
                             nLevel,
-                            pFmt->FindLayoutRect( sal_False, &aNullPt ).Top());
+                            pFmt->FindLayoutRect( false, &aNullPt ).Top());
 
                     SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, 0 );
                     if( !pFmt->GetInfo( aAskItem ) &&
@@ -328,7 +328,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                 pOldMember->DeleteAndDestroyAll();
                 delete pOldMember;
                 if(pbInvalidateWindow && bInvalidate)
-                    *pbInvalidateWindow = sal_True;
+                    *pbInvalidateWindow = true;
             }
         }
         break;
@@ -466,7 +466,7 @@ void    SwContentType::Invalidate()
 
 // Fill the List of contents
 
-void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
+void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
 {
     SwContentArr*   pOldMember = 0;
     int nOldMemberCount = -1;
@@ -476,7 +476,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
         pOldMember = pMember;
         nOldMemberCount = pOldMember->size();
         pMember = new SwContentArr;
-        *pbLevelOrVisibilityChanged = sal_False;
+        *pbLevelOrVisibilityChanged = false;
     }
     else if(!pMember)
         pMember = new SwContentArr;
@@ -508,7 +508,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                     // cast for Win16
                     if(nOldMemberCount > (int)nPos &&
                         ((SwOutlineContent*)(*pOldMember)[nPos])->GetOutlineLevel() != nLevel)
-                        *pbLevelOrVisibilityChanged = sal_True;
+                        *pbLevelOrVisibilityChanged = true;
 
                     nPos++;
                 }
@@ -529,7 +529,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                 const OUString sTblName( rTblFmt.GetName() );
 
                 SwContent* pCnt = new SwContent(this, sTblName,
-                        rTblFmt.FindLayoutRect(sal_False, &aNullPt).Top() );
+                        rTblFmt.FindLayoutRect(false, &aNullPt).Top() );
                 if( !rTblFmt.GetInfo( aAskItem ) &&
                     !aAskItem.pObject )     // not visible
                     pCnt->SetInvisible();
@@ -538,7 +538,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
 
                 if(nOldMemberCount > (int)i &&
                     (*pOldMember)[i]->IsInvisible() != pCnt->IsInvisible())
-                        *pbLevelOrVisibilityChanged = sal_True;
+                        *pbLevelOrVisibilityChanged = true;
             }
         }
         break;
@@ -569,12 +569,12 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                                 INetURLObject::decode( sLink, '%',
                                            INetURLObject::DECODE_UNAMBIGUOUS,
                                         RTL_TEXTENCODING_UTF8 ),
-                                pFrmFmt->FindLayoutRect(sal_False, &aNullPt).Top());
+                                pFrmFmt->FindLayoutRect(false, &aNullPt).Top());
                 }
                 else
                 {
                     pCnt = new SwContent(this, sFrmName,
-                            pFrmFmt->FindLayoutRect(sal_False, &aNullPt).Top() );
+                            pFrmFmt->FindLayoutRect(false, &aNullPt).Top() );
                 }
                 if( !pFrmFmt->GetInfo( aAskItem ) &&
                     !aAskItem.pObject )     // not visible
@@ -582,7 +582,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                 pMember->insert(pCnt);
                 if(nOldMemberCount > (int)i &&
                     (*pOldMember)[i]->IsInvisible() != pCnt->IsInvisible())
-                        *pbLevelOrVisibilityChanged = sal_True;
+                        *pbLevelOrVisibilityChanged = true;
             }
         }
         break;
@@ -627,7 +627,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
 
                     SwContent* pCnt = new SwRegionContent(this, sSectionName,
                             nLevel,
-                            pFmt->FindLayoutRect( sal_False, &aNullPt ).Top());
+                            pFmt->FindLayoutRect( false, &aNullPt ).Top());
                     if( !pFmt->GetInfo( aAskItem ) &&
                         !aAskItem.pObject )     // not visible
                         pCnt->SetInvisible();
@@ -637,7 +637,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                     if(nOldMemberCount > nPos &&
                         (*pOldMember)[nPos]->IsInvisible()
                                 != pCnt->IsInvisible())
-                            *pbLevelOrVisibilityChanged = sal_True;
+                            *pbLevelOrVisibilityChanged = true;
                 }
             }
             nMemberCount = pMember->size();
@@ -698,7 +698,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                 if(nOldMemberCount > nPos &&
                     (*pOldMember)[nPos]->IsInvisible()
                             != pCnt->IsInvisible())
-                        *pbLevelOrVisibilityChanged = sal_True;
+                        *pbLevelOrVisibilityChanged = true;
             }
         }
         break;
@@ -759,7 +759,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                         long nYPos = 0;
                         const Point aNullPt;
                         if(pContact && pContact->GetFmt())
-                            nYPos = pContact->GetFmt()->FindLayoutRect(sal_False, &aNullPt).Top();
+                            nYPos = pContact->GetFmt()->FindLayoutRect(false, &aNullPt).Top();
                         SwContent* pCnt = new SwContent(
                                             this,
                                             pTemp->GetName(),
@@ -770,7 +770,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibilityChanged)
                         nMemberCount++;
                         if(nOldMemberCount > (int)i &&
                             (*pOldMember)[i]->IsInvisible() != pCnt->IsInvisible() )
-                                *pbLevelOrVisibilityChanged = sal_True;
+                                *pbLevelOrVisibilityChanged = true;
                     }
                 }
             }
@@ -819,7 +819,7 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) :
         bIsInternalDrag(false),
         bIsRoot(false),
         bIsIdleClear(false),
-        bIsLastReadOnly(sal_False),
+        bIsLastReadOnly(false),
         bIsOutlineMoveable(true),
         bViewHasChanged(false),
         bIsImageListInitialized(false),
@@ -1187,9 +1187,9 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
     {
         const SwContentType* pContType = ((SwContent*)pEntry->GetUserData())->GetParent();
         const sal_uInt16 nContentType = pContType->GetType();
-        sal_Bool bReadonly = pActiveShell->GetView().GetDocShell()->IsReadOnly();
+        bool bReadonly = pActiveShell->GetView().GetDocShell()->IsReadOnly();
         bool bVisible = !((SwContent*)pEntry->GetUserData())->IsInvisible();
-        sal_Bool bProtected = ((SwContent*)pEntry->GetUserData())->IsProtect();
+        bool bProtected = ((SwContent*)pEntry->GetUserData())->IsProtect();
         bool bEditable = pContType->IsEditable() &&
             ((bVisible && !bProtected) ||CONTENT_TYPE_REGION == nContentType);
         bool bDeletable = pContType->IsDeletable() &&
@@ -1225,9 +1225,9 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
                 bSubPop4 = true;
                 pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
                 pSubPop4->InsertItem(404, sUnprotTbl);
-                sal_Bool bFull = sal_False;
+                bool bFull = false;
                 OUString sTblName = ((SwContent*)pEntry->GetUserData())->GetName();
-                sal_Bool bProt =pActiveShell->HasTblAnyProtection( &sTblName, &bFull );
+                bool bProt = pActiveShell->HasTblAnyProtection( &sTblName, &bFull );
                 pSubPop4->EnableItem(403, !bFull );
                 pSubPop4->EnableItem(404, bProt );
                 pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
@@ -1383,7 +1383,7 @@ void  SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
                             SdrPageView* pPV = pDrawView->/*GetPageViewPvNum*/GetSdrPageView(/*0*/);
                             if( pPV )
                             {
-                                sal_Bool Marked = pDrawView->IsObjMarked(pObj);
+                                bool Marked = pDrawView->IsObjMarked(pObj);
                                 if(Marked)
                                 {
                                     //sEntry += String::CreateFromAscii(" *");
@@ -1435,7 +1435,7 @@ SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
 
 // Expand - Remember the state for content types.
 
-sal_Bool  SwContentTree::Expand( SvTreeListEntry* pParent )
+bool  SwContentTree::Expand( SvTreeListEntry* pParent )
 {
     if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) ||
             (nRootType == CONTENT_TYPE_OUTLINE))
@@ -1456,7 +1456,7 @@ sal_Bool  SwContentTree::Expand( SvTreeListEntry* pParent )
                 std::map< void*, bool > mCurrOutLineNodeMap;
 
                 SwWrtShell* pShell = GetWrtShell();
-                sal_Bool bBool = SvTreeListBox::Expand(pParent);
+                bool bBool = SvTreeListBox::Expand(pParent);
                 SvTreeListEntry* pChild = Next(pParent);
                 while(pChild && lcl_IsContent(pChild) && pParent->HasChildren())
                 {
@@ -1492,16 +1492,16 @@ sal_Bool  SwContentTree::Expand( SvTreeListEntry* pParent )
 
 // Collapse - Remember the state for content types.
 
-sal_Bool  SwContentTree::Collapse( SvTreeListEntry* pParent )
+bool  SwContentTree::Collapse( SvTreeListEntry* pParent )
 {
-    sal_Bool bRet;
+    bool bRet;
     if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) ||
             (nRootType == CONTENT_TYPE_OUTLINE))
     {
         if(lcl_IsContentType(pParent))
         {
             if(bIsRoot)
-                return bRet = sal_False;
+                return bRet = false;
             SwContentType* pCntType = (SwContentType*)pParent->GetUserData();
             sal_uInt16 nAnd = 1 << pCntType->GetType();
             nAnd = ~nAnd;
@@ -1606,7 +1606,7 @@ void SwContentTree::Display( bool bActive )
         bIsActive = bActive;
     bIsHidden = !bActive;
     SwWrtShell* pShell = GetWrtShell();
-    sal_Bool bReadOnly = pShell ? pShell->GetView().GetDocShell()->IsReadOnly() : sal_True;
+    bool bReadOnly = pShell ? pShell->GetView().GetDocShell()->IsReadOnly() : sal_True;
     if(bReadOnly != bIsLastReadOnly)
     {
         bIsLastReadOnly = bReadOnly;
@@ -1635,7 +1635,7 @@ void SwContentTree::Display( bool bActive )
                 OUString sEntry = (*ppContentT)->GetName();
                 SvTreeListEntry* pEntry;
                 const Image& rImage = aEntryImages.GetImage(SID_SW_START + nCntType);
-                sal_Bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount();
+                bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount();
                 pEntry = InsertEntry(sEntry, rImage, rImage,
                                 0, bChOnDemand, TREELIST_APPEND, (*ppContentT));
                 if(nCntType == nLastSelType)
@@ -1967,7 +1967,7 @@ bool SwContentTree::HasContentChanged()
 //  no longer checked. Finally, the box is filled again.
 
     bool bRepaint = false;
-    sal_Bool bInvalidate = sal_False;
+    bool bInvalidate = false;
 
     if(!bIsActive && ! bIsConstant)
     {
@@ -2070,7 +2070,7 @@ bool SwContentTree::HasContentChanged()
                 pEntry->SetUserData((void*)pArrType);
                 if(IsExpanded(pEntry))
                 {
-                    sal_Bool bLevelOrVisibiblityChanged = sal_False;
+                    bool bLevelOrVisibiblityChanged = false;
                     // bLevelOrVisibiblityChanged is set if outlines have changed their level
                     // or if the visibility of objects (frames, sections, tables) has changed
                     // i.e. in header/footer
@@ -2079,7 +2079,7 @@ bool SwContentTree::HasContentChanged()
                     if((nType == CONTENT_TYPE_OUTLINE) && bLevelOrVisibiblityChanged)
                         bRepaint = true;
                     if(bLevelOrVisibiblityChanged)
-                        bInvalidate = sal_True;
+                        bInvalidate = true;
 
                     if(nChildCount != pArrType->GetMemberCount())
                         bRepaint = true;
@@ -2104,16 +2104,16 @@ bool SwContentTree::HasContentChanged()
                     // was the entry once opened, then must also the
                     // invisible records be examined.
                     // At least the user data must be updated.
-                    sal_Bool bLevelOrVisibiblityChanged = sal_False;
+                    bool bLevelOrVisibiblityChanged = false;
                     // bLevelOrVisibiblityChanged is set if outlines have changed their level
                     // or if the visibility of objects (frames, sections, tables) has changed
                     // i.e. in header/footer
                     pArrType->FillMemberList(&bLevelOrVisibiblityChanged);
-                    sal_Bool bRemoveChildren = sal_False;
+                    bool bRemoveChildren = false;
                     sal_uInt16 nChildCount = (sal_uInt16)GetChildCount(pEntry);
                     if( nChildCount != pArrType->GetMemberCount() )
                     {
-                        bRemoveChildren = sal_True;
+                        bRemoveChildren = true;
                     }
                     else
                     {
@@ -2125,7 +2125,7 @@ bool SwContentTree::HasContentChanged()
                             OUString sEntryText = GetEntryText(pChild);
                             if( sEntryText != pCnt->GetName() &&
                                 !(sEntryText == sSpace && pCnt->GetName().isEmpty()))
-                                bRemoveChildren = sal_True;
+                                bRemoveChildren = true;
                             pChild = Next(pChild);
                         }
                     }
@@ -2261,7 +2261,7 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh)
 
 // Execute commands of the Navigator
 
-void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
+void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
 {
     bool nMove = false;
     switch( nCmd )
@@ -2386,7 +2386,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
                 }
 
                 pShell->ClearMark();
-                pShell->Pop(sal_False); // Cursor is now back at the current superscription.
+                pShell->Pop(false); // Cursor is now back at the current superscription.
                 pShell->EndAllAction();
                 if(aActiveContentArr[CONTENT_TYPE_OUTLINE])
                     aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
@@ -2681,7 +2681,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                             SdrModel* pDrawModel = pActiveShell->GetDoc()->GetDrawModel();
                             SdrPage* pPage = pDrawModel->GetPage(0);
                             sal_uInt32 nCount = pPage->GetObjCount();
-                            sal_Bool hasObjectMarked = sal_False;
+                            bool hasObjectMarked = false;
 
                             SdrObject* pObject = NULL;
                             pObject = GetDrawingObjectsByContent( pCnt );
@@ -2690,7 +2690,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                                 SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/);
                                 if( pPV )
                                 {
-                                    sal_Bool bUnMark = pDrawView->IsObjMarked(pObject);
+                                    bool bUnMark = pDrawView->IsObjMarked(pObject);
                                     pDrawView->MarkObj( pObject, pPV, bUnMark);
 
                                 }
@@ -2698,7 +2698,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                             for( sal_uInt32 i=0; i< nCount; i++ )
                             {
                                 SdrObject* pTemp = pPage->GetObj(i);
-                                sal_Bool bMark = pDrawView->IsObjMarked(pTemp);
+                                bool bMark = pDrawView->IsObjMarked(pTemp);
                                 switch( pTemp->GetObjIdentifier() )
                                 {
                                     case OBJ_GRUP:
@@ -2722,7 +2722,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                                     case OBJ_CAPTION:
                                     case OBJ_CUSTOMSHAPE:
                                         if( bMark )
-                                            hasObjectMarked = sal_True;
+                                            hasObjectMarked = true;
                                         break;
                                     default:
                                         if ( bMark )
@@ -3011,7 +3011,7 @@ bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect )
 {
     if(!pEntry)
         return false;
-    sal_Bool bEnable = sal_False;
+    bool bEnable = false;
     SvTreeListEntry* pParentEntry = GetParent(pEntry);
     while(pParentEntry && (!lcl_IsContentType(pParentEntry)))
     {
@@ -3020,14 +3020,14 @@ bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect )
     if (!bIsLastReadOnly)
     {
         if (!IsVisible())
-            bEnable = sal_True;
+            bEnable = true;
         else if (pParentEntry)
         {
             if ((bIsRoot && nRootType == CONTENT_TYPE_OUTLINE) ||
                 (lcl_IsContent(pEntry) &&
                     ((SwContentType*)pParentEntry->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE))
             {
-                bEnable = sal_True;
+                bEnable = true;
             }
         }
     }
@@ -3323,8 +3323,8 @@ void SwContentTree::GotoContent(SwContent* pCnt)
             if(pActiveShell->GotoINetAttr(
                             *((SwURLFieldContent*)pCnt)->GetINetAttr() ))
             {
-                pActiveShell->Right( CRSR_SKIP_CHARS, sal_True, 1, sal_False);
-                pActiveShell->SwCrsrShell::SelectTxtAttr( RES_TXTATR_INETFMT, sal_True );
+                pActiveShell->Right( CRSR_SKIP_CHARS, true, 1, false);
+                pActiveShell->SwCrsrShell::SelectTxtAttr( RES_TXTATR_INETFMT, true );
             }
 
         }
@@ -3420,10 +3420,10 @@ void NaviContentBookmark::Copy( TransferDataContainer& rData ) const
     rData.CopyByteString(SOT_FORMATSTR_ID_SONLK, sStrBuf);
 }
 
-sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
+bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
 {
     OUString sStr;
-    sal_Bool bRet = rData.GetString( SOT_FORMATSTR_ID_SONLK, sStr );
+    bool bRet = rData.GetString( SOT_FORMATSTR_ID_SONLK, sStr );
     if( bRet )
     {
         sal_Int32 nPos = 0;
diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx
index 0a94b68e5911..b9ade13ac2f5 100644
--- a/sw/source/core/uibase/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
@@ -451,7 +451,7 @@ sal_uInt16  SwGlobalTree::GetEnableFlags() const
 void     SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
 {
     bool bParent = true;
-    Update(sal_True);
+    Update(true);
     Display(true);
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
@@ -545,7 +545,7 @@ TriState SwGlobalTree::NotifyMoving(   SvTreeListEntry*  pTarget,
 
     if( pActiveShell->MoveGlobalDocContent(
             *pSwGlblDocContents, nSource, nSource + 1, nDest ) &&
-            Update( sal_False ))
+            Update( false ))
         Display();
 
     return TRISTATE_FALSE;
@@ -592,7 +592,7 @@ void  SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt )
 
 void     SwGlobalTree::GetFocus()
 {
-    if(Update( sal_False ))
+    if(Update( false ))
         Display();
     SvTreeListBox::GetFocus();
 }
@@ -652,7 +652,7 @@ void    SwGlobalTree::Display(bool bOnlyUpdateUserData)
         }
         Clear();
         if(!pSwGlblDocContents)
-            Update( sal_False );
+            Update( false );
 
         SvTreeListEntry* pSelEntry = 0;
         for( size_t i = 0; i < nCount; i++)
@@ -757,7 +757,7 @@ void    SwGlobalTree::EditContent(const SwGlblDocContent* pCont )
     if(nSlot)
     {
         pActiveShell->GetView().GetViewFrame()->GetDispatcher()->Execute(nSlot);
-        if(Update( sal_False ))
+        if(Update( false ))
             Display();
     }
 }
@@ -883,7 +883,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
                                                         *pActiveShell,
                                                         0,
                                                         USHRT_MAX,
-                                                        sal_True);
+                                                        true);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
                 if(RET_OK == pDlg->Execute())
                 {
@@ -940,7 +940,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
                     // Due to the update the entries are invalid
                     if(nEntryPos != (sal_uLong)-1)
                     {
-                        Update( sal_False );
+                        Update( false );
                         Display();
                         Select(GetModel()->GetEntryAtAbsPos(nEntryPos));
                         pEntry = FirstSelected();
@@ -990,7 +990,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
         GotoContent(pCont);
     if(nSlot)
         rDispatch.Execute(nSlot);
-    if(Update( sal_False ))
+    if(Update( false ))
         Display();
     if ( bDeleteContentCopy )
         delete pContCopy;
@@ -1000,7 +1000,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
 
 IMPL_LINK_NOARG(SwGlobalTree, Timeout)
 {
-    if(!HasFocus() && Update( sal_False ))
+    if(!HasFocus() && Update( false ))
         Display();
     return 0;
 }
@@ -1075,16 +1075,16 @@ void    SwGlobalTree::ExecCommand(sal_uInt16 nCmd)
             }
             if( bMove && pActiveShell->MoveGlobalDocContent(
                 *pSwGlblDocContents, nSource, nSource + 1, nDest ) &&
-                    Update( sal_False ))
+                    Update( false ))
                 Display();
         }
     }
 }
 
-sal_Bool    SwGlobalTree::Update(sal_Bool bHard)
+bool    SwGlobalTree::Update(bool bHard)
 {
     SwView* pActView = GetParentWindow()->GetCreateView();
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(pActView && pActView->GetWrtShellPtr())
     {
         const SwWrtShell* pOldShell = pActiveShell;
@@ -1097,19 +1097,19 @@ sal_Bool    SwGlobalTree::Update(sal_Bool bHard)
         if(!pSwGlblDocContents)
         {
             pSwGlblDocContents = new SwGlblDocContents;
-            bRet = sal_True;
+            bRet = true;
             pActiveShell->GetGlobalDocContent(*pSwGlblDocContents);
         }
         else
         {
-            sal_Bool bCopy = sal_False;
+            bool bCopy = false;
             SwGlblDocContents* pTempContents  = new SwGlblDocContents;
             pActiveShell->GetGlobalDocContent(*pTempContents);
             if(pTempContents->size() != pSwGlblDocContents->size() ||
                     pTempContents->size() != GetEntryCount())
             {
-                bRet = sal_True;
-                bCopy = sal_True;
+                bRet = true;
+                bCopy = true;
             }
             else
             {
@@ -1132,7 +1132,7 @@ sal_Bool    SwGlobalTree::Update(sal_Bool bHard)
                          )
                        )
                     {
-                        bCopy = bRet = sal_True;
+                        bCopy = bRet = true;
                     }
                 }
             }
@@ -1250,7 +1250,7 @@ void    SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt )
          (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
         aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
-        Update(sal_True);
+        Update(true);
     }
     SvTreeListBox::DataChanged( rDCEvt );
 }
@@ -1337,12 +1337,12 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen
         }
         if ( bMove )
         {
-            Update( sal_False );
+            Update( false );
             rSh.MoveGlobalDocContent(
                 *pSwGlblDocContents, nEntryCount, nEntryCount + nFiles, nEntryCount - nFiles );
         }
         rSh.EndAction();
-        Update( sal_False );
+        Update( false );
         Display();
     }
 }
diff --git a/sw/source/core/uibase/utlui/gloslst.cxx b/sw/source/core/uibase/utlui/gloslst.cxx
index 0e54a573e8c0..a9e1d11aeccd 100644
--- a/sw/source/core/uibase/utlui/gloslst.cxx
+++ b/sw/source/core/uibase/utlui/gloslst.cxx
@@ -102,8 +102,8 @@ SwGlossaryList::~SwGlossaryList()
 // will be filled. Otherwise also rGroupName will be set and
 // on demand asked for the right group.
 
-sal_Bool SwGlossaryList::GetShortName(const OUString& rLongName,
-                                OUString& rShortName, OUString& rGroupName )
+bool SwGlossaryList::GetShortName(const OUString& rLongName,
+                                  OUString& rShortName, OUString& rGroupName )
 {
     if(!bFilled)
         Update();
@@ -133,14 +133,14 @@ sal_Bool SwGlossaryList::GetShortName(const OUString& rLongName,
         }
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     nCount = aTripleStrings.size();
     if(1 == nCount)
     {
         const TripleString& pTriple(aTripleStrings.front());
         rShortName = pTriple.sShort;
         rGroupName = pTriple.sGroup;
-        bRet = sal_True;
+        bRet = true;
     }
     else if(1 < nCount)
     {
@@ -159,10 +159,10 @@ sal_Bool SwGlossaryList::GetShortName(const OUString& rLongName,
             const TripleString& pTriple(aTripleStrings[rLB.GetSelectEntryPos()]);
             rShortName = pTriple.sShort;
             rGroupName = pTriple.sGroup;
-            bRet = sal_True;
+            bRet = true;
         }
         else
-            bRet = sal_False;
+            bRet = false;
     }
     return bRet;
 }
diff --git a/sw/source/core/uibase/utlui/navicfg.cxx b/sw/source/core/uibase/utlui/navicfg.cxx
index 975a08876fb9..ca1cd6504469 100644
--- a/sw/source/core/uibase/utlui/navicfg.cxx
+++ b/sw/source/core/uibase/utlui/navicfg.cxx
@@ -59,8 +59,8 @@ SwNavigationConfig::SwNavigationConfig() :
     nOutlineLevel(MAXLEVEL),
     nRegionMode(REGION_MODE_NONE),
     nActiveBlock(0),
-    bIsSmall(sal_False),
-    bIsGlobalActive(sal_True)
+    bIsSmall(false),
+    bIsGlobalActive(true)
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sw/source/core/uibase/utlui/navipi.cxx b/sw/source/core/uibase/utlui/navipi.cxx
index 0bc04f1193fd..1eec0afb240f 100644
--- a/sw/source/core/uibase/utlui/navipi.cxx
+++ b/sw/source/core/uibase/utlui/navipi.cxx
@@ -92,7 +92,7 @@ void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
         short nMove = nTarget-nSource; //( nDir<0 ) ? 1 : 0 ;
         rSh.GotoOutline(nSource);
         if (bWithChildren)
-            rSh.MakeOutlineSel(nSource, nSource, sal_True);
+            rSh.MakeOutlineSel(nSource, nSource, true);
         // While moving, the selected children does not counting.
         sal_uInt16 nLastOutlinePos = rSh.GetOutlinePos(MAXLEVEL);
         if(bWithChildren && nMove > 1 &&
@@ -208,7 +208,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
 
     // Standard: sublevels are taken
     // do not take sublevels with Ctrl
-    sal_Bool bOutlineWithChildren  = ( KEY_MOD1 != pBox->GetModifier());
+    bool bOutlineWithChildren  = ( KEY_MOD1 != pBox->GetModifier());
     int nFuncId = 0;
     bool bFocusToDoc = false;
     switch (nCurrItemId)
@@ -245,7 +245,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         case FN_SELECT_FOOTER:
         {
             rSh.MoveCrsr();
-            const sal_uInt16 eType = rSh.GetFrmType(0,sal_False);
+            const sal_uInt16 eType = rSh.GetFrmType(0,false);
             if (eType & FRMTYPE_FOOTER)
             {
                 if (rSh.EndPg())
@@ -259,7 +259,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         case FN_SELECT_HEADER:
         {
             rSh.MoveCrsr();
-            const sal_uInt16 eType = rSh.GetFrmType(0,sal_False);
+            const sal_uInt16 eType = rSh.GetFrmType(0,false);
             if (eType & FRMTYPE_HEADER)
             {
                 if (rSh.SttPg())
@@ -273,7 +273,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         case FN_SELECT_FOOTNOTE:
         {
             rSh.MoveCrsr();
-            const sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_False);
+            const sal_uInt16 eFrmType = rSh.GetFrmType(0,false);
                 // Jump from the footnote to the anchor.
             if (eFrmType & FRMTYPE_FOOTNOTE)
             {
@@ -319,7 +319,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         break;
         case FN_GLOBAL_SAVE_CONTENT:
         {
-            sal_Bool bSave = rSh.IsGlblDocSaveLinks();
+            bool bSave = rSh.IsGlblDocSaveLinks();
             rSh.SetGlblDocSaveLinks( !bSave );
             pBox->CheckItem(FN_GLOBAL_SAVE_CONTENT, !bSave );
         }
@@ -467,7 +467,7 @@ IMPL_LINK( SwNavigationPI, EditAction, NumEditAction *, pEdit )
     {
         if(aPageChgTimer.IsActive())
             aPageChgTimer.Stop();
-        pCreateView->GetWrtShell().GotoPage((sal_uInt16)pEdit->GetValue(), sal_True);
+        pCreateView->GetWrtShell().GotoPage((sal_uInt16)pEdit->GetValue(), true);
         pCreateView->GetEditWin().GrabFocus();
         pCreateView->GetViewFrame()->GetBindings().Invalidate(FN_STAT_PAGE);
     }
@@ -489,12 +489,12 @@ IMPL_LINK( SwNavigationPI, EditGetFocus, NumEditAction *, pEdit )
     return 0;
 }
 
-sal_Bool SwNavigationPI::Close()
+bool SwNavigationPI::Close()
 {
     SfxViewFrame* pVFrame = pCreateView->GetViewFrame();
     pVFrame->GetBindings().Invalidate(SID_NAVIGATOR);
     pVFrame->GetDispatcher()->Execute(SID_NAVIGATOR);
-    return sal_True;
+    return true;
 }
 
 // Setting of an automatic mark
@@ -543,7 +543,7 @@ void SwNavigationPI::_ZoomOut()
     if (_IsZoomedIn())
     {
         FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL;
-        bIsZoomedIn = sal_False;
+        bIsZoomedIn = false;
         Size aSz(GetOutputSizePixel());
         aSz.Height() = nZoomOut;
         Size aMinOutSizePixel = ((SfxDockingWindow*)GetParent())->GetMinOutputSizePixel();
@@ -564,7 +564,7 @@ void SwNavigationPI::_ZoomOut()
         SvTreeListEntry* pFirst = aContentTree.FirstSelected();
         if(pFirst)
             aContentTree.Select(pFirst, true); // Enable toolbox
-        pConfig->SetSmall( sal_False );
+        pConfig->SetSmall( false );
         aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX);
     }
 }
@@ -580,7 +580,7 @@ void SwNavigationPI::_ZoomIn()
             aContentTree.HideTree();
             aDocListBox.Hide();
             aGlobalTree.HideTree();
-            bIsZoomedIn = sal_True;
+            bIsZoomedIn = true;
             Size aSz(GetOutputSizePixel());
             if( aSz.Height() > nZoomIn )
                 nZoomOut = ( short ) aSz.Height();
@@ -593,7 +593,7 @@ void SwNavigationPI::_ZoomIn()
             SvTreeListEntry* pFirst = aContentTree.FirstSelected();
             if(pFirst)
                 aContentTree.Select(pFirst, true); // Enable toolbox
-            pConfig->SetSmall( sal_True );
+            pConfig->SetSmall( true );
             aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, false);
         }
     }
@@ -681,10 +681,10 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     nAutoMarkIdx(1),
     nRegionMode(REGION_MODE_NONE),
 
-    bSmallMode(sal_False),
-    bIsZoomedIn(sal_False),
-    bPageCtrlsVisible(sal_False),
-    bGlobalMode(sal_False)
+    bSmallMode(false),
+    bIsZoomedIn(false),
+    bPageCtrlsVisible(false),
+    bGlobalMode(false)
 {
     GetCreateView();
     InitImageList();
@@ -705,7 +705,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     pEdit->SetUpHdl(LINK(this, SwNavigationPI, PageEditModifyHdl));
     pEdit->SetDownHdl(LINK(this, SwNavigationPI, PageEditModifyHdl));
 
-    bPageCtrlsVisible = sal_True;
+    bPageCtrlsVisible = true;
 
     // Double separators are not allowed, so you have to
     // determine the suitable size differently.
@@ -926,7 +926,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
         {
             SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
             aContentTree.SetActiveShell(pWrtShell);
-            sal_Bool bGlobal = IsGlobalDoc();
+            bool bGlobal = IsGlobalDoc();
             aContentToolBox.EnableItem(FN_GLOBAL_SWITCH, bGlobal);
             if( (!bGlobal && IsGlobalMode()) ||
                     (!IsGlobalMode() && pConfig->IsGlobalActive()) )
@@ -1022,7 +1022,7 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
                     aContentTree.SetActiveShell(pWrtShell);
                     if(aGlobalTree.IsVisible())
                     {
-                        if(aGlobalTree.Update( sal_False ))
+                        if(aGlobalTree.Update( false ))
                             aGlobalTree.Display();
                         else
                         // If no update is needed, then paint at least,
@@ -1239,10 +1239,10 @@ void SwNavigationPI::SetRegionDropMode(sal_uInt16 nNewMode)
     aContentToolBox.SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
 }
 
-sal_Bool    SwNavigationPI::ToggleTree()
+bool    SwNavigationPI::ToggleTree()
 {
-    sal_Bool bRet = sal_True;
-    sal_Bool bGlobalDoc = IsGlobalDoc();
+    bool bRet = true;
+    bool bGlobalDoc = IsGlobalDoc();
     if(!IsGlobalMode() && bGlobalDoc)
     {
         SetUpdateMode(false);
@@ -1253,7 +1253,7 @@ sal_Bool    SwNavigationPI::ToggleTree()
         aContentTree.HideTree();
         aContentToolBox.Hide();
         aDocListBox.Hide();
-        SetGlobalMode(sal_True);
+        SetGlobalMode(true);
         SetUpdateMode(true);
     }
     else
@@ -1266,15 +1266,15 @@ sal_Bool    SwNavigationPI::ToggleTree()
             aContentToolBox.Show();
             aDocListBox.Show();
         }
-        bRet = sal_False;
-        SetGlobalMode(sal_False);
+        bRet = false;
+        SetGlobalMode(false);
     }
     return bRet;
 }
 
-sal_Bool    SwNavigationPI::IsGlobalDoc() const
+bool    SwNavigationPI::IsGlobalDoc() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwView *pView = GetCreateView();
     if(pView)
     {
diff --git a/sw/source/core/uibase/utlui/numfmtlb.cxx b/sw/source/core/uibase/utlui/numfmtlb.cxx
index e4b87b21c93b..55ac0d15725d 100644
--- a/sw/source/core/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/core/uibase/utlui/numfmtlb.cxx
@@ -57,12 +57,12 @@ NumFormatListBox::NumFormatListBox(Window* pWin, WinBits nStyle) :
     ListBox             ( pWin, nStyle ),
     nCurrFormatType     (-1),
     nStdEntry           (0),
-    bOneArea            (sal_False),
+    bOneArea            (false),
     nDefFormat          (0),
     pVw                 (0),
     pOwnFormatter       (0),
-    bShowLanguageControl(sal_False),
-    bUseAutomaticLanguage(sal_True)
+    bShowLanguageControl(false),
+    bUseAutomaticLanguage(true)
 {
     Init(NUMBERFORMAT_NUMBER, true);
 }
@@ -86,7 +86,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumFormatListBox(Window *pP
     return pListBox;
 }
 
-void NumFormatListBox::Init(short nFormatType, sal_Bool bUsrFmts)
+void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
 {
     SwView *pView = GetView();
 
@@ -95,7 +95,7 @@ void NumFormatListBox::Init(short nFormatType, sal_Bool bUsrFmts)
     else
         eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType();
 
-    if (bUsrFmts == sal_False)
+    if (bUsrFmts == false)
     {
         pOwnFormatter = new SvNumberFormatter(comphelper::getProcessComponentContext(), eCurLanguage);
     }
diff --git a/sw/source/core/uibase/utlui/uitool.cxx b/sw/source/core/uibase/utlui/uitool.cxx
index 0080d3f32bfe..b3e62598e4f0 100644
--- a/sw/source/core/uibase/utlui/uitool.cxx
+++ b/sw/source/core/uibase/utlui/uitool.cxx
@@ -287,7 +287,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
         {
             // Take over values
             if(!rMaster.GetHeader().IsActive())
-                rMaster.SetFmtAttr(SwFmtHeader(sal_True));
+                rMaster.SetFmtAttr(SwFmtHeader(true));
 
             // Pick out everything and adapt the header format
             SwFmtHeader aHeaderFmt(rMaster.GetHeader());
@@ -302,7 +302,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
             {
                 rPageDesc.ChgFirstShare(((const SfxBoolItem&)
                             rHeaderSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue());
-                nFirstShare = rPageDesc.IsFirstShared();
+                nFirstShare = rPageDesc.IsFirstShared() ? 1 : 0;
             }
         }
         else
@@ -310,8 +310,8 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
             // Disable header
             if(rMaster.GetHeader().IsActive())
             {
-                rMaster.SetFmtAttr(SwFmtHeader(sal_Bool(sal_False)));
-                rPageDesc.ChgHeaderShare(sal_False);
+                rMaster.SetFmtAttr(SwFmtHeader(false));
+                rPageDesc.ChgHeaderShare(false);
             }
         }
     }
@@ -327,7 +327,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
         {
             // Take over values
             if(!rMaster.GetFooter().IsActive())
-                rMaster.SetFmtAttr(SwFmtFooter(sal_True));
+                rMaster.SetFmtAttr(SwFmtFooter(true));
 
             // Pick out everything and adapt the footer format
             SwFmtFooter aFooterFmt(rMaster.GetFooter());
@@ -342,7 +342,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
             {
                 rPageDesc.ChgFirstShare(((const SfxBoolItem&)
                             rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue());
-                nFirstShare = rPageDesc.IsFirstShared();
+                nFirstShare = rPageDesc.IsFirstShared() ? 1 : 0;
             }
         }
         else
@@ -350,8 +350,8 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
             // Disable footer
             if(rMaster.GetFooter().IsActive())
             {
-                rMaster.SetFmtAttr(SwFmtFooter(sal_Bool(sal_False)));
-                rPageDesc.ChgFooterShare(sal_False);
+                rMaster.SetFmtAttr(SwFmtFooter(false));
+                rPageDesc.ChgFooterShare(false);
             }
         }
     }
@@ -369,7 +369,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
     if(SFX_ITEM_SET == rSet.GetItemState(
                             SID_SWREGISTER_MODE, false, &pItem))
     {
-        sal_Bool bSet = ((const SfxBoolItem*)pItem)->GetValue();
+        bool bSet = ((const SfxBoolItem*)pItem)->GetValue();
         if(!bSet)
             rPageDesc.SetRegisterFmtColl(0);
         else if(SFX_ITEM_SET == rSet.GetItemState(
@@ -388,7 +388,7 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc )
                                 (SwTxtFmtColl*)rDoc.GetDfltTxtFmtColl() );
             }
             if( pColl )
-                pColl->SetFmtAttr( SwRegisterItem ( sal_True ));
+                pColl->SetFmtAttr( SwRegisterItem ( true ));
             rPageDesc.SetRegisterFmtColl( pColl );
         }
     }
@@ -587,7 +587,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
             // Delete only, if PageDesc will be enabled!
             rSet.ClearItem( RES_BREAK );
             SwPageDesc* pDesc = ((SwWrtShell&)rShell).FindPageDescByName(
-                                                    rDescName, sal_True );
+                                                    rDescName, true );
             if( pDesc )
                 aPgDesc.RegisterToPageDesc( *pDesc );
         }
@@ -652,14 +652,14 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
 
 // Determine metric
 
-FieldUnit   GetDfltMetric(sal_Bool bWeb)
+FieldUnit   GetDfltMetric(bool bWeb)
 {
     return SW_MOD()->GetUsrPref(bWeb)->GetMetric();
 }
 
 // Determine metric
 
-void    SetDfltMetric( FieldUnit eMetric, sal_Bool bWeb )
+void    SetDfltMetric( FieldUnit eMetric, bool bWeb )
 {
     SW_MOD()->ApplyUserMetric(eMetric, bWeb);
 }
@@ -768,12 +768,12 @@ OUString GetAppLangDateTimeString( const DateTime& rDT )
 
 // Add a new function which can get and set the current "SID_ATTR_APPLYCHARUNIT" value
 
-sal_Bool HasCharUnit( sal_Bool bWeb)
+bool HasCharUnit( bool bWeb)
 {
     return SW_MOD()->GetUsrPref(bWeb)->IsApplyCharUnit();
 }
 
-void SetApplyCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
+void SetApplyCharUnit(bool bApplyChar, bool bWeb)
 {
     SW_MOD()->ApplyUserCharUnit(bApplyChar, bWeb);
 }
diff --git a/sw/source/core/uibase/utlui/unotools.cxx b/sw/source/core/uibase/utlui/unotools.cxx
index ac334a369159..795ff23454a3 100644
--- a/sw/source/core/uibase/utlui/unotools.cxx
+++ b/sw/source/core/uibase/utlui/unotools.cxx
@@ -70,8 +70,8 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
     aMenuRes(SW_RES(RES_FRMEX_MENU)),
     pModuleView(SW_MOD()->GetView()),
     nStyleFlags(nFlags),
-    bIsInitialized(sal_False),
-    bServiceAvailable(sal_False)
+    bIsInitialized(false),
+    bServiceAvailable(false)
 {
     if (pURL && !pURL->isEmpty())
         sArgumentURL = *pURL;
@@ -154,7 +154,7 @@ void SwOneExampleFrame::CreateControl()
         xPrSet->setPropertyValue("ComponentURL", aURL);
 
         aLoadedTimer.Start();
-        bServiceAvailable = sal_True;
+        bServiceAvailable = true;
     }
 }
 
@@ -273,7 +273,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
 
             // set onlinelayout property after setting the zoom
             disableScrollBars(xViewProps, (nStyleFlags&EX_SHOW_ONLINE_LAYOUT) != 0);
-            bIsInitialized = sal_True;
+            bIsInitialized = true;
         }
 
         uno::Reference< text::XTextDocument >  xDoc(_xModel, uno::UNO_QUERY);
@@ -329,7 +329,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
                   else
                   {;}
                 }
-                while(pSh->Right(sal_uInt16(1), sal_uInt16(1), sal_True) == sal_True);
+                while(pSh->Right(sal_uInt16(1), sal_uInt16(1), true));
             }
         }
 
@@ -403,7 +403,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
     return 0;
 }
 
-void SwOneExampleFrame::ClearDocument( sal_Bool bStartUpdateTimer )
+void SwOneExampleFrame::ClearDocument( bool bStartUpdateTimer )
 {
     uno::Reference< lang::XUnoTunnel> xTunnel( _xCursor, uno::UNO_QUERY);
     if( xTunnel.is() )
diff --git a/sw/source/core/uibase/web/wview.cxx b/sw/source/core/uibase/web/wview.cxx
index 8c4eb4cb1108..b215f538c776 100644
--- a/sw/source/core/uibase/web/wview.cxx
+++ b/sw/source/core/uibase/web/wview.cxx
@@ -283,7 +283,7 @@ void SwWebView::SelectShell()
 
     //Opportune time for the communication with OLE objects?
     if ( GetDocShell()->GetDoc()->IsOLEPrtNotifyPending() )
-        GetDocShell()->GetDoc()->PrtOLENotify( sal_False );
+        GetDocShell()->GetDoc()->PrtOLENotify( false );
 
     //now the table update
     if(bUpdateTable)
diff --git a/sw/source/core/uibase/wrtsh/delete.cxx b/sw/source/core/uibase/wrtsh/delete.cxx
index e18c453cfde7..0aba7590bc6c 100644
--- a/sw/source/core/uibase/wrtsh/delete.cxx
+++ b/sw/source/core/uibase/wrtsh/delete.cxx
@@ -96,7 +96,7 @@ long SwWrtShell::DelLine()
     SwCrsrShell::RightMargin();
 
     long nRet = Delete();
-    Pop(sal_False);
+    Pop(false);
     if( nRet )
         UpdateAttr();
     return nRet;
@@ -287,7 +287,7 @@ long SwWrtShell::DelRight()
             }
 
             // restore cursor
-            SwCrsrShell::Pop( sal_False );
+            SwCrsrShell::Pop( false );
 
             if( bDelFull )
             {
@@ -326,14 +326,14 @@ long SwWrtShell::DelRight()
                             have moved to a different cell */
                         if (pSNdOld != pSNdNew)
                         {
-                            SwCrsrShell::Pop( sal_True );
+                            SwCrsrShell::Pop( true );
                             break;
                         }
                     }
                 }
 
                 // restore cursor
-                SwCrsrShell::Pop( sal_False );
+                SwCrsrShell::Pop( false );
             }
         }
 
@@ -405,11 +405,11 @@ long SwWrtShell::DelToEndOfPara()
     SetMark();
     if( !MovePara(fnParaCurr,fnParaEnd))
     {
-        Pop(sal_False);
+        Pop(false);
         return 0;
     }
     long nRet = Delete();
-    Pop(sal_False);
+    Pop(false);
     if( nRet )
         UpdateAttr();
     return nRet;
@@ -423,11 +423,11 @@ long SwWrtShell::DelToStartOfPara()
     SetMark();
     if( !MovePara(fnParaCurr,fnParaStart))
     {
-        Pop(sal_False);
+        Pop(false);
         return 0;
     }
     long nRet = Delete();
-    Pop(sal_False);
+    Pop(false);
     if( nRet )
         UpdateAttr();
     return nRet;
@@ -522,11 +522,11 @@ long SwWrtShell::DelPrvWord()
             {
                 // skip over all spaces
                 short n = 0;
-                while( ' ' == GetChar( sal_False, n ))
+                while( ' ' == GetChar( false, n ))
                     --n;
 
                 if( ++n )
-                    ExtendSelection( sal_False, -n );
+                    ExtendSelection( false, -n );
             }
         }
         else if( IsSttPara())
diff --git a/sw/source/core/uibase/wrtsh/move.cxx b/sw/source/core/uibase/wrtsh/move.cxx
index 2a2b2d0e78ca..64a390e056a5 100644
--- a/sw/source/core/uibase/wrtsh/move.cxx
+++ b/sw/source/core/uibase/wrtsh/move.cxx
@@ -43,10 +43,10 @@ class ShellMoveCrsr
     SwWrtShell* pSh;
     bool bAct;
 public:
-    inline ShellMoveCrsr( SwWrtShell* pWrtSh, sal_Bool bSel )
+    inline ShellMoveCrsr( SwWrtShell* pWrtSh, bool bSel )
     {
-        bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrmType(0,sal_False) & FRMTYPE_FLY_ANY);
-        ( pSh = pWrtSh )->MoveCrsr( sal_Bool(bSel) );
+        bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrmType(0,false) & FRMTYPE_FLY_ANY);
+        ( pSh = pWrtSh )->MoveCrsr( bSel );
         pWrtSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_HYPERLINK_GETLINK);
     }
     inline ~ShellMoveCrsr()
@@ -61,7 +61,7 @@ public:
     }
 };
 
-void SwWrtShell::MoveCrsr( sal_Bool bWithSelect )
+void SwWrtShell::MoveCrsr( bool bWithSelect )
 {
     ResetCursorStack();
     if ( IsGCAttr() )
@@ -74,34 +74,34 @@ void SwWrtShell::MoveCrsr( sal_Bool bWithSelect )
     else
     {
         EndSelect();
-        (this->*fnKillSel)( 0, sal_False );
+        (this->*fnKillSel)( 0, false );
     }
 }
 
-sal_Bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, sal_Bool bSelect )
+bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, bool bSelect )
 {
-    sal_Bool nRet;
+    bool nRet;
     if( bSelect )
     {
         SttCrsrMove();
-        MoveCrsr( sal_True );
+        MoveCrsr( true );
         nRet = (this->*FnSimpleMove)();
         EndCrsrMove();
     }
-    else if( 0 != ( nRet = (this->*FnSimpleMove)() ) )
-        MoveCrsr( sal_False );
+    else if( ( nRet = (this->*FnSimpleMove)() ) )
+        MoveCrsr( false );
     return nRet;
 }
 
-sal_Bool SwWrtShell::Left( sal_uInt16 nMode, sal_Bool bSelect,
-                            sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual )
+bool SwWrtShell::Left( sal_uInt16 nMode, bool bSelect,
+                            sal_uInt16 nCount, bool bBasicCall, bool bVisual )
 {
     if ( !bSelect && !bBasicCall && IsCrsrReadonly()  && !GetViewOptions()->IsSelectionInReadonly())
     {
         Point aTmp( VisArea().Pos() );
         aTmp.X() -= VisArea().Width() * nReadOnlyScrollOfst / 100;
         rView.SetVisArea( aTmp );
-        return sal_True;
+        return true;
     }
     else
     {
@@ -110,8 +110,8 @@ sal_Bool SwWrtShell::Left( sal_uInt16 nMode, sal_Bool bSelect,
     }
 }
 
-sal_Bool SwWrtShell::Right( sal_uInt16 nMode, sal_Bool bSelect,
-                            sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual )
+bool SwWrtShell::Right( sal_uInt16 nMode, bool bSelect,
+                            sal_uInt16 nCount, bool bBasicCall, bool bVisual )
 {
     if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly() )
     {
@@ -119,7 +119,7 @@ sal_Bool SwWrtShell::Right( sal_uInt16 nMode, sal_Bool bSelect,
         aTmp.X() += VisArea().Width() * nReadOnlyScrollOfst / 100;
         aTmp.X() = rView.SetHScrollMax( aTmp.X() );
         rView.SetVisArea( aTmp );
-        return sal_True;
+        return true;
     }
     else
     {
@@ -157,14 +157,14 @@ bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
     return SwCrsrShell::Down( nCount );
 }
 
-sal_Bool SwWrtShell::LeftMargin( sal_Bool bSelect, sal_Bool bBasicCall )
+bool SwWrtShell::LeftMargin( bool bSelect, bool bBasicCall )
 {
     if ( !bSelect && !bBasicCall && IsCrsrReadonly() )
     {
         Point aTmp( VisArea().Pos() );
         aTmp.X() = DOCUMENTBORDER;
         rView.SetVisArea( aTmp );
-        return sal_True;
+        return true;
     }
     else
     {
@@ -173,7 +173,7 @@ sal_Bool SwWrtShell::LeftMargin( sal_Bool bSelect, sal_Bool bBasicCall )
     }
 }
 
-sal_Bool SwWrtShell::RightMargin( sal_Bool bSelect, sal_Bool bBasicCall  )
+bool SwWrtShell::RightMargin( bool bSelect, bool bBasicCall  )
 {
     if ( !bSelect && !bBasicCall && IsCrsrReadonly() )
     {
@@ -182,7 +182,7 @@ sal_Bool SwWrtShell::RightMargin( sal_Bool bSelect, sal_Bool bBasicCall  )
         if( DOCUMENTBORDER > aTmp.X() )
             aTmp.X() = DOCUMENTBORDER;
         rView.SetVisArea( aTmp );
-        return sal_True;
+        return true;
     }
     else
     {
@@ -191,12 +191,12 @@ sal_Bool SwWrtShell::RightMargin( sal_Bool bSelect, sal_Bool bBasicCall  )
     }
 }
 
-sal_Bool SwWrtShell::GoStart( sal_Bool bKeepArea, sal_Bool *pMoveTable,
-                            sal_Bool bSelect, sal_Bool bDontMoveRegion )
+bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable,
+                          bool bSelect, bool bDontMoveRegion )
 {
     if ( IsCrsrInTbl() )
     {
-        const sal_Bool bBoxSelection = HasBoxSelection();
+        const bool bBoxSelection = HasBoxSelection();
         if( !bBlockMode )
         {
             if ( !bSelect )
@@ -209,14 +209,14 @@ sal_Bool SwWrtShell::GoStart( sal_Bool bKeepArea, sal_Bool *pMoveTable,
                 || bDontMoveRegion))
         {
             if ( pMoveTable )
-                *pMoveTable = sal_False;
-            return sal_True;
+                *pMoveTable = false;
+            return true;
         }
         if( MoveTable( fnTableCurr, fnTableStart ) || bDontMoveRegion )
         {
             if ( pMoveTable )
-                *pMoveTable = sal_True;
-            return sal_True;
+                *pMoveTable = true;
+            return true;
         }
         else if( bBoxSelection && pMoveTable )
         {
@@ -225,8 +225,8 @@ sal_Bool SwWrtShell::GoStart( sal_Bool bKeepArea, sal_Bool *pMoveTable,
             //              set in SelAll). Then the table must not
             //              be left, otherwise there is no selection
             //              of the entire table possible!
-            *pMoveTable = sal_True;
-            return sal_True;
+            *pMoveTable = true;
+            return true;
         }
     }
 
@@ -237,27 +237,27 @@ sal_Bool SwWrtShell::GoStart( sal_Bool bKeepArea, sal_Bool *pMoveTable,
         else
             SttSelect();
     }
-    const sal_uInt16 nFrmType = GetFrmType(0,sal_False);
+    const sal_uInt16 nFrmType = GetFrmType(0,false);
     if ( FRMTYPE_FLY_ANY & nFrmType )
     {
         if( MoveSection( fnSectionCurr, fnSectionStart ) )
-            return sal_True;
+            return true;
         else if ( FRMTYPE_FLY_FREE & nFrmType || bDontMoveRegion )
-            return sal_False;
+            return false;
     }
     if(( FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE ) & nFrmType )
     {
         if ( MoveSection( fnSectionCurr, fnSectionStart ) )
-            return sal_True;
+            return true;
         else if ( bKeepArea )
-            return sal_True;
+            return true;
     }
     // Regions ???
     return SwCrsrShell::MoveRegion( fnRegionCurrAndSkip, fnRegionStart ) ||
-           SwCrsrShell::SttEndDoc(sal_True);
+           SwCrsrShell::SttEndDoc(true);
 }
 
-sal_Bool SwWrtShell::GoEnd(sal_Bool bKeepArea, sal_Bool *pMoveTable)
+bool SwWrtShell::GoEnd(bool bKeepArea, bool *pMoveTable)
 {
     if ( pMoveTable && *pMoveTable )
         return MoveTable( fnTableCurr, fnTableEnd );
@@ -266,86 +266,86 @@ sal_Bool SwWrtShell::GoEnd(sal_Bool bKeepArea, sal_Bool *pMoveTable)
     {
         if ( MoveSection( fnSectionCurr, fnSectionEnd ) ||
              MoveTable( fnTableCurr, fnTableEnd ) )
-            return sal_True;
+            return true;
     }
     else
     {
-        const sal_uInt16 nFrmType = GetFrmType(0,sal_False);
+        const sal_uInt16 nFrmType = GetFrmType(0,false);
         if ( FRMTYPE_FLY_ANY & nFrmType )
         {
             if ( MoveSection( fnSectionCurr, fnSectionEnd ) )
-                return sal_True;
+                return true;
             else if ( FRMTYPE_FLY_FREE & nFrmType )
-                return sal_False;
+                return false;
         }
         if(( FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FOOTNOTE ) & nFrmType )
         {
             if ( MoveSection( fnSectionCurr, fnSectionEnd) )
-                return sal_True;
+                return true;
             else if ( bKeepArea )
-                return sal_True;
+                return true;
         }
     }
     // Regions ???
     return SwCrsrShell::MoveRegion( fnRegionCurrAndSkip, fnRegionEnd ) ||
-           SwCrsrShell::SttEndDoc(sal_False);
+           SwCrsrShell::SttEndDoc(false);
 }
 
-sal_Bool SwWrtShell::SttDoc( sal_Bool bSelect )
+bool SwWrtShell::SttDoc( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
-    return GoStart(sal_False, 0, bSelect );
+    return GoStart(false, 0, bSelect );
 }
 
-sal_Bool SwWrtShell::EndDoc( sal_Bool bSelect)
+bool SwWrtShell::EndDoc( bool bSelect)
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return GoEnd();
 }
 
-sal_Bool SwWrtShell::SttNxtPg( sal_Bool bSelect )
+bool SwWrtShell::SttNxtPg( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePage( fnPageNext, fnPageStart );
 }
 
-sal_Bool SwWrtShell::SttPrvPg( sal_Bool bSelect )
+bool SwWrtShell::SttPrvPg( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePage( fnPagePrev, fnPageStart );
 }
 
-sal_Bool SwWrtShell::EndNxtPg( sal_Bool bSelect )
+bool SwWrtShell::EndNxtPg( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePage( fnPageNext, fnPageEnd );
 }
 
-sal_Bool SwWrtShell::EndPrvPg( sal_Bool bSelect )
+bool SwWrtShell::EndPrvPg( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePage( fnPagePrev, fnPageEnd );
 }
 
-sal_Bool SwWrtShell::SttPg( sal_Bool bSelect )
+bool SwWrtShell::SttPg( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePage( fnPageCurr, fnPageStart );
 }
 
-sal_Bool SwWrtShell::EndPg( sal_Bool bSelect )
+bool SwWrtShell::EndPg( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePage( fnPageCurr, fnPageEnd );
 }
 
-sal_Bool SwWrtShell::SttPara( sal_Bool bSelect )
+bool SwWrtShell::SttPara( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePara( fnParaCurr, fnParaStart );
 }
 
-sal_Bool SwWrtShell::EndPara( sal_Bool bSelect )
+bool SwWrtShell::EndPara( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     return MovePara(fnParaCurr,fnParaEnd);
@@ -355,45 +355,45 @@ sal_Bool SwWrtShell::EndPara( sal_Bool bSelect )
 // SSelection with or without
 // returns success or failure
 
-sal_Bool SwWrtShell::StartOfColumn( sal_Bool bSelect )
+bool SwWrtShell::StartOfColumn( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect);
     return MoveColumn(fnColumnCurr, fnColumnStart);
 }
 
-sal_Bool SwWrtShell::EndOfColumn( sal_Bool bSelect )
+bool SwWrtShell::EndOfColumn( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect);
     return MoveColumn(fnColumnCurr, fnColumnEnd);
 }
 
-sal_Bool SwWrtShell::StartOfNextColumn( sal_Bool bSelect )
+bool SwWrtShell::StartOfNextColumn( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect);
     return MoveColumn( fnColumnNext, fnColumnStart);
 }
 
-sal_Bool SwWrtShell::EndOfNextColumn( sal_Bool bSelect )
+bool SwWrtShell::EndOfNextColumn( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect);
     return MoveColumn(fnColumnNext, fnColumnEnd);
 }
 
-sal_Bool SwWrtShell::StartOfPrevColumn( sal_Bool bSelect )
+bool SwWrtShell::StartOfPrevColumn( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect);
     return MoveColumn(fnColumnPrev, fnColumnStart);
 }
 
-sal_Bool SwWrtShell::EndOfPrevColumn( sal_Bool bSelect )
+bool SwWrtShell::EndOfPrevColumn( bool bSelect )
 {
     ShellMoveCrsr aTmp( this, bSelect);
     return MoveColumn(fnColumnPrev, fnColumnEnd);
 }
 
-sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
+bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
 {
-    sal_Bool bDiff = sal_False;
+    bool bDiff = false;
     SwRect aOldRect( GetCharRect() ), aTmpArea( VisArea() );
 
     // bDestOnStack indicates if I could not set the coursor at the current
@@ -415,7 +415,7 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
 
     // If we had a frame selection, it must be removed after the fnSetCrsr
     // and we have to remember the position on the stack to return to it later.
-    sal_Bool bIsFrmSel = sal_False;
+    bool bIsFrmSel = false;
 
     //Target position is now within the viewable region -->
     //Place the cursor at the target position; remember that no target
@@ -446,7 +446,7 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
             CallChgLnk();
         }
 
-        (this->*fnSetCrsr)( &aDest, sal_True );
+        (this->*fnSetCrsr)( &aDest, true );
 
         bDiff = aOldRect != GetCharRect();
 
@@ -468,12 +468,12 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
     return !bDestOnStack && bDiff;
 }
 
-sal_Bool SwWrtShell::PopCrsr(sal_Bool bUpdate, sal_Bool bSelect)
+bool SwWrtShell::PopCrsr(bool bUpdate, bool bSelect)
 {
     if( 0 == pCrsrStack)
-        return sal_False;
+        return false;
 
-    const sal_Bool bValidPos = pCrsrStack->bValidCurPos;
+    const bool bValidPos = pCrsrStack->bValidCurPos;
     if( bUpdate && bValidPos )
     {
             // If a predecessor is on the stack,
@@ -501,7 +501,7 @@ sal_Bool SwWrtShell::PopCrsr(sal_Bool bUpdate, sal_Bool bSelect)
         else
         {
             _ResetCursorStack();
-            return sal_False;
+            return false;
         }
     }
     CrsrStack *pTmp = pCrsrStack;
@@ -539,10 +539,10 @@ void SwWrtShell::_ResetCursorStack()
             transpose cursor
 */
 
-sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect)
+bool SwWrtShell::PageCrsr(SwTwips lOffset, bool bSelect)
 {
     // Do nothing if an offset of 0 was indicated
-    if(!lOffset) return sal_False;
+    if(!lOffset) return false;
         // Was once used to force a reformat of the layout.
         // This has not work that way, because the cursor was not set
         // because this does not happen within a
@@ -555,17 +555,17 @@ sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect)
         // SwViewShell::StartAction();
     PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP;
         // Change of direction and stack present
-    if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( sal_True, bSelect ))
-        return sal_True;
+    if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( true, bSelect ))
+        return true;
 
-    const sal_Bool bRet = PushCrsr(lOffset, bSelect);
+    const bool bRet = PushCrsr(lOffset, bSelect);
     ePageMove = eDir;
     return bRet;
 }
 
-sal_Bool SwWrtShell::GotoPage(sal_uInt16 nPage, sal_Bool bRecord)
+bool SwWrtShell::GotoPage(sal_uInt16 nPage, bool bRecord)
 {
-    ShellMoveCrsr aTmp( this, sal_False);
+    ShellMoveCrsr aTmp( this, false);
     if( SwCrsrShell::GotoPage(nPage) && bRecord)
     {
         if(IsSelFrmMode())
@@ -573,12 +573,12 @@ sal_Bool SwWrtShell::GotoPage(sal_uInt16 nPage, sal_Bool bRecord)
             UnSelectFrm();
             LeaveSelFrmMode();
         }
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart )
+bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, bool bStart )
 {
     ShellMoveCrsr aTmp( this, bSelect );
     SwPosition aPos = *GetCrsr()->GetPoint();
@@ -588,7 +588,7 @@ sal_Bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bS
     return bRet;
 }
 
-sal_Bool SwWrtShell::GotoFly( const OUString& rName, FlyCntType eType, sal_Bool bSelFrame )
+bool SwWrtShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFrame )
 {
     SwPosition aPos = *GetCrsr()->GetPoint();
     bool bRet = SwFEShell::GotoFly(rName, eType, bSelFrame);
@@ -630,7 +630,7 @@ bool SwWrtShell::GotoRegion( const OUString& rName )
     return bRet;
  }
 
-sal_Bool SwWrtShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
+bool SwWrtShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
                                     sal_uInt16 nSeqNo )
 {
     SwPosition aPos = *GetCrsr()->GetPoint();
@@ -640,7 +640,7 @@ sal_Bool SwWrtShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
     return bRet;
 }
 
-sal_Bool SwWrtShell::GotoNextTOXBase( const OUString* pName )
+bool SwWrtShell::GotoNextTOXBase( const OUString* pName )
 {
     SwPosition aPos = *GetCrsr()->GetPoint();
     bool bRet = SwCrsrShell::GotoNextTOXBase(pName);
@@ -658,7 +658,7 @@ bool SwWrtShell::GotoTable( const OUString& rName )
     return bRet;
 }
 
-sal_Bool SwWrtShell::GotoFld( const SwFmtFld& rFld ) {
+bool SwWrtShell::GotoFld( const SwFmtFld& rFld ) {
     SwPosition aPos = *GetCrsr()->GetPoint();
     bool bRet = SwCrsrShell::GotoFld(rFld);
     if (bRet)
@@ -666,7 +666,7 @@ sal_Bool SwWrtShell::GotoFld( const SwFmtFld& rFld ) {
     return bRet;
 }
 
-const SwRangeRedline* SwWrtShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect ) {
+const SwRangeRedline* SwWrtShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect ) {
     SwPosition aPos = *GetCrsr()->GetPoint();
     const SwRangeRedline *pRedline = SwCrsrShell::GotoRedline(nArrPos, bSelect);
     if (pRedline)
@@ -674,13 +674,13 @@ const SwRangeRedline* SwWrtShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSel
     return pRedline;
 }
 
-sal_Bool SwWrtShell::SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr )
+bool SwWrtShell::SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr )
 {
-    sal_Bool bRet;
+    bool bRet;
     {
         SwMvContext aMvContext(this);
         SttSelect();
-        bRet = SwCrsrShell::SelectTxtAttr( nWhich, sal_False, pAttr );
+        bRet = SwCrsrShell::SelectTxtAttr( nWhich, false, pAttr );
     }
     EndSelect();
     return bRet;
diff --git a/sw/source/core/uibase/wrtsh/select.cxx b/sw/source/core/uibase/wrtsh/select.cxx
index 24c4142460c6..9b13bab85f84 100644
--- a/sw/source/core/uibase/wrtsh/select.cxx
+++ b/sw/source/core/uibase/wrtsh/select.cxx
@@ -59,19 +59,19 @@ void SwWrtShell::Invalidate()
         pWrdCnt->UpdateCounts();
 }
 
-sal_Bool SwWrtShell::SelNearestWrd()
+bool SwWrtShell::SelNearestWrd()
 {
     SwMvContext aMvContext(this);
     if( !IsInWrd() && !IsEndWrd() && !IsSttWrd() )
         PrvWrd();
     if( IsEndWrd() )
-        Left(CRSR_SKIP_CELLS, sal_False, 1, sal_False );
+        Left(CRSR_SKIP_CELLS, false, 1, false );
     return SelWrd();
 }
 
-sal_Bool SwWrtShell::SelWrd(const Point *pPt, sal_Bool )
+bool SwWrtShell::SelWrd(const Point *pPt, bool )
 {
-    sal_Bool bRet;
+    bool bRet;
     {
         SwMvContext aMvContext(this);
         SttSelect();
@@ -80,14 +80,14 @@ sal_Bool SwWrtShell::SelWrd(const Point *pPt, sal_Bool )
     EndSelect();
     if( bRet )
     {
-        bSelWrd = sal_True;
+        bSelWrd = true;
         if(pPt)
             aStart = *pPt;
     }
     return bRet;
 }
 
-void SwWrtShell::SelSentence(const Point *pPt, sal_Bool )
+void SwWrtShell::SelSentence(const Point *pPt, bool )
 {
     {
         SwMvContext aMvContext(this);
@@ -99,11 +99,11 @@ void SwWrtShell::SelSentence(const Point *pPt, sal_Bool )
     EndSelect();
     if(pPt)
         aStart = *pPt;
-    bSelLn = sal_True;
-    bSelWrd = sal_False;  // disable SelWord, otherwise no SelLine goes on
+    bSelLn = true;
+    bSelWrd = false;  // disable SelWord, otherwise no SelLine goes on
 }
 
-void SwWrtShell::SelPara(const Point *pPt, sal_Bool )
+void SwWrtShell::SelPara(const Point *pPt, bool )
 {
     {
         SwMvContext aMvContext(this);
@@ -115,19 +115,19 @@ void SwWrtShell::SelPara(const Point *pPt, sal_Bool )
     EndSelect();
     if(pPt)
         aStart = *pPt;
-    bSelLn = sal_False;
-    bSelWrd = sal_False;  // disable SelWord, otherwise no SelLine goes on
+    bSelLn = false;
+    bSelWrd = false;  // disable SelWord, otherwise no SelLine goes on
 }
 
 long SwWrtShell::SelAll()
 {
-    const sal_Bool bLockedView = IsViewLocked();
-    LockView( sal_True );
+    const bool bLockedView = IsViewLocked();
+    LockView( true );
     {
         if(bBlockMode)
             LeaveBlockMode();
         SwMvContext aMvContext(this);
-        sal_Bool bMoveTable = sal_False;
+        bool bMoveTable = false;
         SwPosition *pStartPos = 0;
         SwPosition *pEndPos = 0;
         SwShellCrsr* pTmpCrsr = 0;
@@ -145,16 +145,16 @@ long SwWrtShell::SelAll()
             bool bIsFullSel = !MoveSection( fnSectionCurr, fnSectionStart);
             SwapPam();
             bIsFullSel &= !MoveSection( fnSectionCurr, fnSectionEnd);
-            Pop(sal_False);
-            GoStart(sal_True, &bMoveTable, sal_False, !bIsFullSel);
+            Pop(false);
+            GoStart(true, &bMoveTable, false, !bIsFullSel);
         }
         else
         {
             EnterStdMode();
-            SttEndDoc(sal_True);
+            SttEndDoc(true);
         }
         SttSelect();
-        GoEnd(sal_True, &bMoveTable);
+        GoEnd(true, &bMoveTable);
 
         bool bStartsWithTable = StartsWithTable();
         if (bStartsWithTable)
@@ -185,7 +185,7 @@ long SwWrtShell::SelAll()
                 if( ( *pTmpCrsr->GetPoint() < *pEndPos ||
                     ( *pStartPos == *pTmpCrsr->GetMark() &&
                       *pEndPos == *pTmpCrsr->GetPoint() ) ) && !bStartsWithTable)
-                    SwCrsrShell::SttEndDoc(sal_False);
+                    SwCrsrShell::SttEndDoc(false);
             }
             delete pStartPos;
             delete pEndPos;
@@ -198,14 +198,14 @@ long SwWrtShell::SelAll()
 
 // Desciption: Text search
 
-sal_uLong SwWrtShell::SearchPattern( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes,
+sal_uLong SwWrtShell::SearchPattern( const SearchOptions& rSearchOpt, bool bSearchInNotes,
                                 SwDocPositions eStt, SwDocPositions eEnd,
-                                FindRanges eFlags, int bReplace )
+                                FindRanges eFlags, bool bReplace )
 {
         // no enhancement of existing selections
     if(!(eFlags & FND_IN_SEL))
         ClearMark();
-    sal_Bool bCancel = sal_False;
+    bool bCancel = false;
     sal_uLong nRet = Find( rSearchOpt, bSearchInNotes, eStt, eEnd, bCancel, eFlags, bReplace );
     if(bCancel)
     {
@@ -229,7 +229,7 @@ sal_uLong SwWrtShell::SearchTempl( const OUString &rTempl,
     if( pReplTempl )
         pReplaceColl = GetParaStyle(*pReplTempl, SwWrtShell::GETSTYLE_CREATESOME );
 
-    sal_Bool bCancel = sal_False;
+    bool bCancel = false;
     sal_uLong nRet = Find(pColl? *pColl: GetDfltTxtFmtColl(),
                                eStt,eEnd, bCancel, eFlags, pReplaceColl);
     if(bCancel)
@@ -242,7 +242,7 @@ sal_uLong SwWrtShell::SearchTempl( const OUString &rTempl,
 
 // search for attributes
 
-sal_uLong SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, sal_Bool bNoColls,
+sal_uLong SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, bool bNoColls,
                                 SwDocPositions eStart, SwDocPositions eEnde,
                                 FindRanges eFlags, const SearchOptions* pSearchOpt,
                                 const SfxItemSet* pReplaceSet )
@@ -252,7 +252,7 @@ sal_uLong SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, sal_Bool bNoColls,
         ClearMark();
 
     // Searching
-    sal_Bool bCancel = sal_False;
+    bool bCancel = false;
     sal_uLong nRet = Find( rFindSet, bNoColls, eStart, eEnde, bCancel, eFlags, pSearchOpt, pReplaceSet);
 
     if(bCancel)
@@ -292,7 +292,7 @@ void SwWrtShell::PopMode()
 // eponymous methodes in the CursorShell, the second removes
 // all selections at first.
 
-long SwWrtShell::SetCrsr(const Point *pPt, sal_Bool bTextOnly)
+long SwWrtShell::SetCrsr(const Point *pPt, bool bTextOnly)
 {
         // Remove a possibly present selection at the position
         // of the mouseclick
@@ -304,10 +304,10 @@ long SwWrtShell::SetCrsr(const Point *pPt, sal_Bool bTextOnly)
     return SwCrsrShell::SetCrsr(*pPt, bTextOnly);
 }
 
-long SwWrtShell::SetCrsrKillSel(const Point *pPt, sal_Bool bTextOnly )
+long SwWrtShell::SetCrsrKillSel(const Point *pPt, bool bTextOnly )
 {
     SwActContext aActContext(this);
-    ResetSelect(pPt,sal_False);
+    ResetSelect(pPt,false);
     return SwCrsrShell::SetCrsr(*pPt, bTextOnly);
 }
 
@@ -321,7 +321,7 @@ void SwWrtShell::UnSelectFrm()
 
 // Remove of all selections
 
-long SwWrtShell::ResetSelect(const Point *,sal_Bool)
+long SwWrtShell::ResetSelect(const Point *,bool)
 {
     if(IsSelFrmMode())
     {
@@ -336,7 +336,7 @@ long SwWrtShell::ResetSelect(const Point *,sal_Bool)
         //  after EndAction().
         {
             SwActContext aActContext(this);
-            bSelWrd = bSelLn = sal_False;
+            bSelWrd = bSelLn = false;
             KillPams();
             ClearMark();
             fnKillSel = &SwWrtShell::Ignore;
@@ -354,7 +354,7 @@ long SwWrtShell::ResetSelect(const Point *,sal_Bool)
 
 // Do nothing
 
-long SwWrtShell::Ignore(const Point *, sal_Bool ) {
+long SwWrtShell::Ignore(const Point *, bool ) {
     return 1;
 }
 
@@ -374,7 +374,7 @@ void SwWrtShell::SttSelect()
     }
     fnKillSel = &SwWrtShell::Ignore;
     fnSetCrsr = &SwWrtShell::SetCrsr;
-    bInSelect = sal_True;
+    bInSelect = true;
     Invalidate();
     SwTransferable::CreateSelection( *this );
 }
@@ -385,14 +385,14 @@ void SwWrtShell::EndSelect()
 {
     if(bInSelect && !bExtMode)
     {
-        bInSelect = sal_False;
+        bInSelect = false;
         if (bAddMode)
         {
-            AddLeaveSelect(0, sal_False);
+            AddLeaveSelect(0, false);
         }
         else
         {
-            SttLeaveSelect(0, sal_False);
+            SttLeaveSelect(0, false);
             fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
             fnKillSel = &SwWrtShell::ResetSelect;
         }
@@ -402,7 +402,7 @@ void SwWrtShell::EndSelect()
         pWrdCnt->UpdateCounts();
 }
 
-long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool )
+long SwWrtShell::ExtSelWrd(const Point *pPt, bool )
 {
     SwMvContext aMvContext(this);
     if( IsTableMode() )
@@ -412,7 +412,7 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool )
     // Then destroy the actual an go to prev, this will be expand
     if( !HasMark() && GoPrevCrsr() )
     {
-        sal_Bool bHasMark = HasMark(); // thats wrong!
+        bool bHasMark = HasMark(); // thats wrong!
         GoNextCrsr();
         if( bHasMark )
         {
@@ -422,19 +422,19 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool )
     }
 
     // check the direction of the selection with the new point
-    sal_Bool bRet = sal_False, bMoveCrsr = sal_True, bToTop = sal_False;
+    bool bRet = false, bMoveCrsr = true, bToTop = false;
     SwCrsrShell::SelectWord( &aStart );     // select the startword
     SwCrsrShell::Push();                    // save the cursor
     SwCrsrShell::SetCrsr( *pPt );           // and check the direction
 
     switch( SwCrsrShell::CompareCursor( StackMkCurrPt ))
     {
-    case -1:    bToTop = sal_False;     break;
-    case 1:     bToTop = sal_True;      break;
-    default:    bMoveCrsr = sal_False;  break;
+    case -1:    bToTop = false;     break;
+    case 1:     bToTop = true;      break;
+    default:    bMoveCrsr = false;  break;
     }
 
-    SwCrsrShell::Pop( sal_False );              // retore the saved cursor
+    SwCrsrShell::Pop( false );              // retore the saved cursor
 
     if( bMoveCrsr )
     {
@@ -449,21 +449,21 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool )
             if( bToTop )
                 SwapPam();
             Combine();
-            bRet = sal_True;
+            bRet = true;
         }
         else
         {
-            SwCrsrShell::Pop( sal_False );
+            SwCrsrShell::Pop( false );
             if( bToTop )
                 SwapPam();
         }
     }
     else
-        bRet = sal_True;
-    return bRet;
+        bRet = true;
+    return bRet ? 1 : 0;
 }
 
-long SwWrtShell::ExtSelLn(const Point *pPt, sal_Bool )
+long SwWrtShell::ExtSelLn(const Point *pPt, bool )
 {
     SwMvContext aMvContext(this);
     SwCrsrShell::SetCrsr(*pPt);
@@ -474,7 +474,7 @@ long SwWrtShell::ExtSelLn(const Point *pPt, sal_Bool )
     // Then destroy the actual an go to prev, this will be expand
     if( !HasMark() && GoPrevCrsr() )
     {
-        sal_Bool bHasMark = HasMark(); // thats wrong!
+        bool bHasMark = HasMark(); // thats wrong!
         GoNextCrsr();
         if( bHasMark )
         {
@@ -484,7 +484,7 @@ long SwWrtShell::ExtSelLn(const Point *pPt, sal_Bool )
     }
 
     // if applicable fit the selection to the "Mark"
-    sal_Bool bToTop = !IsCrsrPtAtEnd();
+    bool bToTop = !IsCrsrPtAtEnd();
     SwapPam();
 
     // The "Mark" has to be at the end or the beginning of the line.
@@ -501,7 +501,7 @@ long SwWrtShell::ExtSelLn(const Point *pPt, sal_Bool )
     }
     SwapPam();
 
-    return bToTop ? SwCrsrShell::GoStartSentence() : SwCrsrShell::GoEndSentence();
+    return (bToTop ? SwCrsrShell::GoStartSentence() : SwCrsrShell::GoEndSentence()) ? 1 : 0;
 }
 
 // Back into the standard mode: no mode, no selections.
@@ -512,9 +512,9 @@ void SwWrtShell::EnterStdMode()
         LeaveAddMode();
     if(bBlockMode)
         LeaveBlockMode();
-    bBlockMode = sal_False;
-    bExtMode = sal_False;
-    bInSelect = sal_False;
+    bBlockMode = false;
+    bExtMode = false;
+    bInSelect = false;
     if(IsSelFrmMode())
     {
         UnSelectFrm();
@@ -527,7 +527,7 @@ void SwWrtShell::EnterStdMode()
         // GetChgLnk().Call()
         {
             SwActContext aActContext(this);
-            bSelWrd = bSelLn = sal_False;
+            bSelWrd = bSelLn = false;
             if( !IsRetainSelection() )
                 KillPams();
             ClearMark();
@@ -549,22 +549,22 @@ void SwWrtShell::EnterExtMode()
         KillPams();
         ClearMark();
     }
-    bExtMode = sal_True;
-    bAddMode = sal_False;
-    bBlockMode = sal_False;
+    bExtMode = true;
+    bAddMode = false;
+    bBlockMode = false;
     SttSelect();
 }
 
 void SwWrtShell::LeaveExtMode()
 {
-    bExtMode = sal_False;
+    bExtMode = false;
     EndSelect();
 }
 
 // End of a selection; if the selection is empty,
 // ClearMark().
 
-long SwWrtShell::SttLeaveSelect(const Point *, sal_Bool )
+long SwWrtShell::SttLeaveSelect(const Point *, bool )
 {
     if(SwCrsrShell::HasSelection() && !IsSelTblCells() && bClearMark) {
         return 0;
@@ -575,7 +575,7 @@ long SwWrtShell::SttLeaveSelect(const Point *, sal_Bool )
 
 // Leaving of the selection mode in additional mode
 
-long SwWrtShell::AddLeaveSelect(const Point *, sal_Bool )
+long SwWrtShell::AddLeaveSelect(const Point *, bool )
 {
     if(IsTableMode()) LeaveAddMode();
     else if(SwCrsrShell::HasSelection())
@@ -592,9 +592,9 @@ void SwWrtShell::EnterAddMode()
         LeaveBlockMode();
     fnKillSel = &SwWrtShell::Ignore;
     fnSetCrsr = &SwWrtShell::SetCrsr;
-    bAddMode = sal_True;
-    bBlockMode = sal_False;
-    bExtMode = sal_False;
+    bAddMode = true;
+    bBlockMode = false;
+    bExtMode = false;
     if(SwCrsrShell::HasSelection())
         CreateCrsr();
     Invalidate();
@@ -604,7 +604,7 @@ void SwWrtShell::LeaveAddMode()
 {
     fnKillSel = &SwWrtShell::ResetSelect;
     fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
-    bAddMode = sal_False;
+    bAddMode = false;
     Invalidate();
 }
 
@@ -612,16 +612,16 @@ void SwWrtShell::LeaveAddMode()
 
 void SwWrtShell::EnterBlockMode()
 {
-    bBlockMode = sal_False;
+    bBlockMode = false;
     EnterStdMode();
-    bBlockMode = sal_True;
+    bBlockMode = true;
     CrsrToBlockCrsr();
     Invalidate();
 }
 
 void SwWrtShell::LeaveBlockMode()
 {
-    bBlockMode = sal_False;
+    bBlockMode = false;
     BlockCrsrToCrsr();
     EndSelect();
     Invalidate();
@@ -629,7 +629,7 @@ void SwWrtShell::LeaveBlockMode()
 
 // Insert mode
 
-void SwWrtShell::SetInsMode( sal_Bool bOn )
+void SwWrtShell::SetInsMode( bool bOn )
 {
     bIns = bOn;
     SwCrsrShell::SetOverwriteCrsr( !bIns );
@@ -649,16 +649,16 @@ void SwWrtShell::SetRedlineModeAndCheckInsMode( sal_uInt16 eMode )
 
 // Edit frame
 
-long SwWrtShell::BeginFrmDrag(const Point *pPt, sal_Bool)
+long SwWrtShell::BeginFrmDrag(const Point *pPt, bool)
 {
     fnDrag = &SwFEShell::Drag;
     if(bStartDrag)
     {
         Point aTmp( nStartDragX, nStartDragY );
-        SwFEShell::BeginDrag( &aTmp, sal_False );
+        SwFEShell::BeginDrag( &aTmp, false );
     }
     else
-        SwFEShell::BeginDrag( pPt, sal_False );
+        SwFEShell::BeginDrag( pPt, false );
     return 1;
 }
 
@@ -670,7 +670,7 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos)
         nStartDragY = pPos->Y();
         bStartDrag = true;
     }
-    bLayoutMode = sal_True;
+    bLayoutMode = true;
     HideCrsr();
 
         // equal call of BeginDrag in the SwFEShell
@@ -683,8 +683,8 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos)
 void SwWrtShell::LeaveSelFrmMode()
 {
     fnDrag          = &SwWrtShell::BeginDrag;
-    fnEndDrag       = &SwWrtShell::EndDrag;
-    bLayoutMode = sal_False;
+    fnEndDrag       = &SwWrtShell::DefaultEndDrag;
+    bLayoutMode = false;
     bStartDrag = false;
     Edit();
     SwBaseShell::SetFrmMode( FLY_DRAG_END, this );
@@ -703,17 +703,17 @@ IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFmt )
     {
         const SvxMacro &rMac = rFmtMac.GetMacro(SW_EVENT_OBJECT_SELECT);
         if( IsFrmSelected() )
-            bLayoutMode = sal_True;
+            bLayoutMode = true;
         CallChgLnk();
         ExecMacro( rMac );
     }
     return 0;
 }
 
-long SwWrtShell::UpdateLayoutFrm(const Point *pPt, sal_Bool )
+long SwWrtShell::UpdateLayoutFrm(const Point *pPt, bool )
 {
         // still a dummy
-    SwFEShell::EndDrag( pPt, sal_False );
+    SwFEShell::EndDrag( pPt, false );
     fnDrag = &SwWrtShell::BeginFrmDrag;
     return 1;
 }
@@ -743,11 +743,11 @@ bool SwWrtShell::ToggleExtMode()
 
 // Dragging in standard mode (Selecting of content)
 
-long SwWrtShell::BeginDrag(const Point * /*pPt*/, sal_Bool )
+long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool )
 {
     if(bSelWrd)
     {
-        bInSelect = sal_True;
+        bInSelect = true;
         if( !IsCrsrPtAtEnd() )
             SwapPam();
 
@@ -756,20 +756,20 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, sal_Bool )
     }
     else if(bSelLn)
     {
-        bInSelect = sal_True;
+        bInSelect = true;
         fnDrag = &SwWrtShell::ExtSelLn;
         fnSetCrsr = &SwWrtShell::Ignore;
     }
     else
     {
-        fnDrag = &SwWrtShell::Drag;
+        fnDrag = &SwWrtShell::DefaultDrag;
         SttSelect();
     }
 
     return 1;
 }
 
-long SwWrtShell::Drag(const Point *, sal_Bool )
+long SwWrtShell::DefaultDrag(const Point *, bool )
 {
     if( IsSelTblCells() )
         aSelTblLink.Call(this);
@@ -777,7 +777,7 @@ long SwWrtShell::Drag(const Point *, sal_Bool )
     return 1;
 }
 
-long SwWrtShell::EndDrag(const Point * /*pPt*/, sal_Bool )
+long SwWrtShell::DefaultEndDrag(const Point * /*pPt*/, bool )
 {
     fnDrag = &SwWrtShell::BeginDrag;
     if( IsExtSel() )
@@ -790,7 +790,7 @@ long SwWrtShell::EndDrag(const Point * /*pPt*/, sal_Bool )
 }
 
 // #i32329# Enhanced table selection
-sal_Bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag )
+bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag )
 {
     SwMvContext aMvContext(this);
     SttSelect();
@@ -798,44 +798,44 @@ sal_Bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, boo
     {
         fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         fnKillSel = &SwWrtShell::ResetSelect;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // Description: Selection of a table line or column
 
-sal_Bool SwWrtShell::SelectTableRow()
+bool SwWrtShell::SelectTableRow()
 {
     if ( SelTblRow() )
     {
         fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         fnKillSel = &SwWrtShell::ResetSelect;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwWrtShell::SelectTableCol()
+bool SwWrtShell::SelectTableCol()
 {
     if ( SelTblCol() )
     {
         fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         fnKillSel = &SwWrtShell::ResetSelect;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwWrtShell::SelectTableCell()
+bool SwWrtShell::SelectTableCell()
 {
     if ( SelTblBox() )
     {
         fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
         fnKillSel = &SwWrtShell::ResetSelect;
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // Description: Check if a word selection is present.
@@ -843,7 +843,7 @@ sal_Bool SwWrtShell::SelectTableCell()
 //              surrounding spaces are cut out.
 // Return:      Delivers the type of the word selection.
 
-int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut)
+int SwWrtShell::IntelligentCut(int nSelection, bool bCut)
 {
         // On multiple selection no intelligent drag and drop
         // there are multiple cursors, since a second was placed
@@ -856,15 +856,15 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut)
 
         // If the first character is no word character,
         // no word selected.
-    sal_Unicode cPrev = GetChar(sal_False);
-    sal_Unicode cNext = GetChar(sal_True, -1);
+    sal_Unicode cPrev = GetChar(false);
+    sal_Unicode cNext = GetChar(true, -1);
     if( !cPrev || !cNext ||
         !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) ||
         !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) )
         return NO_WORD;
 
-    cPrev = GetChar(sal_False, -1);
-    cNext = GetChar(sal_True);
+    cPrev = GetChar(false, -1);
+    cNext = GetChar(true);
 
     int cWord = NO_WORD;
         // is a word seleced?
@@ -888,7 +888,7 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut)
             SetMark();
             SwCrsrShell::Left(1,CRSR_SKIP_CHARS);
             SwFEShell::Delete();
-            Pop( sal_False );
+            Pop( false );
         }
     }
     else if(cWord == WORD_NO_SPACE && cNext == ' ')
@@ -902,7 +902,7 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut)
             SetMark();
             SwCrsrShell::Right(1,CRSR_SKIP_CHARS);
             SwFEShell::Delete();
-            Pop( sal_False );
+            Pop( false );
         }
     }
     return cWord;
@@ -919,9 +919,9 @@ bool SwWrtShell::SelectNextPrevHyperlink( bool bNext )
         // will we have this feature?
         EnterStdMode();
         if( bNext )
-            SttEndDoc(sal_True);
+            SttEndDoc(true);
         else
-            SttEndDoc(sal_False);
+            SttEndDoc(false);
         bRet = SwCrsrShell::SelectNxtPrvHyperlink( bNext );
     }
     EndAction();
diff --git a/sw/source/core/uibase/wrtsh/wrtsh1.cxx b/sw/source/core/uibase/wrtsh/wrtsh1.cxx
index e34a91d7ce4a..b1893be9f54c 100644
--- a/sw/source/core/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh1.cxx
@@ -109,7 +109,7 @@ using namespace com::sun::star;
 #define COMMON_INI_LIST \
         fnDrag(&SwWrtShell::BeginDrag),\
         fnSetCrsr(&SwWrtShell::SetCrsr),\
-        fnEndDrag(&SwWrtShell::EndDrag),\
+        fnEndDrag(&SwWrtShell::DefaultEndDrag),\
         fnKillSel(&SwWrtShell::Ignore),\
         pModeStack(0), \
         ePageMove(MV_NO),\
@@ -120,7 +120,7 @@ using namespace com::sun::star;
 
 #define BITFLD_INI_LIST \
         bClearMark = \
-        bIns = sal_True;\
+        bIns = true;\
         bAddMode = \
         bBlockMode = \
         bExtMode = \
@@ -129,7 +129,7 @@ using namespace com::sun::star;
         bLayoutMode = \
         bSelWrd = \
         bSelLn = \
-        mbRetainSelection = sal_False; \
+        mbRetainSelection = false; \
         bIsInClickToEdit = false;
 
 static SvxAutoCorrect* lcl_IsAutoCorr()
@@ -156,11 +156,11 @@ void SwWrtShell::Edit()
     }
 }
 
-sal_Bool SwWrtShell::IsEndWrd()
+bool SwWrtShell::IsEndWrd()
 {
     SwMvContext aMvContext(this);
     if(IsEndPara() && !IsSttPara())
-        return sal_True;
+        return true;
 
     return IsEndWord();
 }
@@ -170,11 +170,11 @@ void SwWrtShell::InsertByWord( const OUString & rStr)
 {
     if( !rStr.isEmpty() )
     {
-        sal_Bool bDelim = GetAppCharClass().isLetterNumeric( rStr, 0 );
+        bool bDelim = GetAppCharClass().isLetterNumeric( rStr, 0 );
         sal_Int32 nPos = 0, nStt = 0;
         for( ; nPos < rStr.getLength(); nPos++ )
            {
-            sal_Bool bTmpDelim = GetAppCharClass().isLetterNumeric( rStr, nPos );
+            bool bTmpDelim = GetAppCharClass().isLetterNumeric( rStr, nPos );
             if( bTmpDelim != bDelim )
             {
                 Insert( rStr.copy( nStt, nPos - nStt ));
@@ -193,8 +193,8 @@ void SwWrtShell::Insert( const OUString &rStr )
         return;
 
     bool bStarted = false;
-    sal_Bool bHasSel = HasSelection(),
-        bCallIns = bIns /*|| bHasSel*/;
+    bool bHasSel = HasSelection(),
+         bCallIns = bIns /*|| bHasSel*/;
     bool bDeleted = false;
 
     if( bHasSel || ( !bIns && SelectHiddenRange() ) )
@@ -237,7 +237,7 @@ void SwWrtShell::Insert( const OUString &rStr )
 
 void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter,
                          const Graphic &rGrf, SwFlyFrmAttrMgr *pFrmMgr,
-                         sal_Bool bRule )
+                         bool bRule )
 {
     ResetCursorStack();
     if ( !CanInsert() )
@@ -264,7 +264,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter,
     if ( !pFrmMgr )
     {
         bOwnMgr = true;
-        pFrmMgr = new SwFlyFrmAttrMgr( sal_True, this, FRMMGR_TYPE_GRF );
+        pFrmMgr = new SwFlyFrmAttrMgr( true, this, FRMMGR_TYPE_GRF );
 
         // CAUTION
         // GetAttrSet makes an adjustment
@@ -331,7 +331,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter,
 // if no object is transfered, then one will be created.
 
 void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName *pName,
-                            sal_Bool bActivate, sal_uInt16 nSlotId )
+                               bool bActivate, sal_uInt16 nSlotId )
 {
     ResetCursorStack();
     if( !CanInsert() )
@@ -342,7 +342,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
         // temporary storage
         svt::EmbeddedObjectRef xObj;
         uno::Reference < embed::XStorage > xStor = comphelper::OStorageHelper::GetTemporaryStorage();
-        sal_Bool bDoVerb = sal_True;
+        bool bDoVerb = true;
         if ( pName )
         {
             comphelper::EmbeddedObjectContainer aCnt( xStor );
@@ -403,7 +403,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
                 if ( !pClient )
                 {
                     pClient = new SwOleClient( &GetView(), &GetView().GetEditWin(), xObj );
-                    SetCheckForOLEInCaption( sal_True );
+                    SetCheckForOLEInCaption( true );
                 }
 
                 if ( xObj.GetViewAspect() == embed::Aspects::MSOLE_ICON )
@@ -438,7 +438,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
 // Insert object into the Core.
 // From ClipBoard or Insert
 
-sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFmt **pFlyFrmFmt )
+bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFmt **pFlyFrmFmt )
 {
     ResetCursorStack();
     StartAllAction();
@@ -454,7 +454,7 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF
     //3. If an selection is passed to a StarMath object, this object should
     //   not be activated. sal_False should be returned then.
     bool bStarMath = true;
-    sal_Bool bActivate = sal_True;
+    bool bActivate = true;
 
     // set parent to get correct VisArea(in case of object needing parent printer)
     uno::Reference < container::XChild > xChild( xRef.GetObject(), uno::UNO_QUERY );
@@ -478,7 +478,7 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF
                     try
                     {
                         xSet->setPropertyValue("Formula", uno::makeAny( OUString( aMathData ) ) );
-                        bActivate = sal_False;
+                        bActivate = false;
                     }
                     catch (const uno::Exception&)
                     {
@@ -490,11 +490,11 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF
     }
 
     if ( !bStarMath )
-        SwFEShell::SplitNode( sal_False, sal_False );
+        SwFEShell::SplitNode( false, false );
 
     EnterSelFrmMode();
 
-    SwFlyFrmAttrMgr aFrmMgr( sal_True, this, FRMMGR_TYPE_OLE );
+    SwFlyFrmAttrMgr aFrmMgr( true, this, FRMMGR_TYPE_OLE );
     aFrmMgr.SetHeightSizeType(ATT_FIX_SIZE);
 
     SwRect aBound;
@@ -579,12 +579,12 @@ void SwWrtShell::LaunchOLEObj( long nVerb )
         if ( !pCli )
             pCli = new SwOleClient( &GetView(), &GetView().GetEditWin(), xRef );
 
-        ((SwOleClient*)pCli)->SetInDoVerb( sal_True );
+        ((SwOleClient*)pCli)->SetInDoVerb( true );
 
         CalcAndSetScale( xRef );
         pCli->DoVerb( nVerb );
 
-        ((SwOleClient*)pCli)->SetInDoVerb( sal_False );
+        ((SwOleClient*)pCli)->SetInDoVerb( false );
         CalcAndSetScale( xRef );
     }
 }
@@ -841,7 +841,7 @@ void SwWrtShell::InsertPageBreak(const OUString *pPageDesc, ::boost::optional<sa
         }
 
         const SwPageDesc *pDesc = pPageDesc
-                                ? FindPageDescByName( *pPageDesc, sal_True ) : 0;
+                                ? FindPageDescByName( *pPageDesc, true ) : 0;
         if( pDesc )
         {
             SwFmtPageDesc aDesc( pDesc );
@@ -889,7 +889,7 @@ void SwWrtShell::InsertColumnBreak()
         {
             if(HasSelection())
                 DelRight();
-            SwFEShell::SplitNode( sal_False, sal_False );
+            SwFEShell::SplitNode( false, false );
         }
         SetAttrItem(SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK));
 
@@ -900,7 +900,7 @@ void SwWrtShell::InsertColumnBreak()
 // Insert footnote
 // rStr - optional footnote mark
 
-void SwWrtShell::InsertFootnote(const OUString &rStr, sal_Bool bEndNote, sal_Bool bEdit )
+void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit )
 {
     ResetCursorStack();
     if( CanInsert() )
@@ -922,7 +922,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, sal_Bool bEndNote, sal_Boo
         if( bEdit )
         {
             // For editing the footnote text.
-            Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+            Left(CRSR_SKIP_CHARS, false, 1, false );
             GotoFtnTxt();
         }
         aNavigationMgr.addEntry(aPos);
@@ -933,7 +933,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, sal_Bool bEndNote, sal_Boo
 //                  - of deleting selected content;
 //                  - of reset of the Cursorstack if necessary.
 
-void SwWrtShell::SplitNode( sal_Bool bAutoFmt, sal_Bool bCheckTableStart )
+void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart )
 {
     ResetCursorStack();
     if( CanInsert() )
@@ -941,7 +941,7 @@ void SwWrtShell::SplitNode( sal_Bool bAutoFmt, sal_Bool bCheckTableStart )
         SwActContext aActContext(this);
 
         rView.GetEditWin().FlushInBuffer();
-        sal_Bool bHasSel = HasSelection();
+        bool bHasSel = HasSelection();
         if( bHasSel )
         {
             StartUndo( UNDO_INSERT );
@@ -968,7 +968,7 @@ void SwWrtShell::SplitNode( sal_Bool bAutoFmt, sal_Bool bCheckTableStart )
 // - <SwEditShell::HasBullet()> is sal_False, if <bNum> is sal_False
 // Behavior of method is determined by the current situation at the current
 // cursor position in the document.
-void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
+void SwWrtShell::NumOrBulletOn(bool bNum)
 {
     // determine numbering rule found at current cursor position in the document.
     const SwNumRule* pCurRule = GetNumRuleAtCurrCrsrPos();
@@ -997,7 +997,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
         if ( pCollRule && pCollRule == GetDoc()->GetOutlineNumRule() )
         {
             const SwNumRule* pDirectCollRule =
-                    mpDoc->FindNumRulePtr(pColl->GetNumRule( sal_False ).GetValue());
+                    mpDoc->FindNumRulePtr(pColl->GetNumRule( false ).GetValue());
             if ( !pDirectCollRule )
             {
                 pCollRule = 0;
@@ -1277,7 +1277,7 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum)
 
 void SwWrtShell::NumOn()
 {
-    NumOrBulletOn(sal_True);
+    NumOrBulletOn(true);
 }
 
 void SwWrtShell::NumOrBulletOff()
@@ -1328,7 +1328,7 @@ void SwWrtShell::NumOrBulletOff()
 
 void SwWrtShell::BulletOn()
 {
-    NumOrBulletOn(sal_False);
+    NumOrBulletOn(false);
 }
 
 SelectionType SwWrtShell::GetSelectionType() const
@@ -1479,7 +1479,7 @@ void SwWrtShell::SetPageStyle(const OUString &rCollName)
 {
     if( !SwCrsrShell::HasSelection() && !IsSelFrmMode() && !IsObjSelected() )
     {
-        SwPageDesc* pDesc = FindPageDescByName( rCollName, sal_True );
+        SwPageDesc* pDesc = FindPageDescByName( rCollName, true );
         if( pDesc )
             ChgCurPageDesc( *pDesc );
     }
@@ -1487,7 +1487,7 @@ void SwWrtShell::SetPageStyle(const OUString &rCollName)
 
 // Access templates
 
-OUString SwWrtShell::GetCurPageStyle( const sal_Bool bCalcFrm ) const
+OUString SwWrtShell::GetCurPageStyle( const bool bCalcFrm ) const
 {
     return GetPageDesc(GetCurPageDesc( bCalcFrm )).GetName();
 }
@@ -1625,14 +1625,14 @@ SwWrtShell::~SwWrtShell()
     SET_CURR_SHELL( this );
     while(IsModePushed())
         PopMode();
-    while(PopCrsr(sal_False))
+    while(PopCrsr(false))
         ;
     SwTransferable::ClearSelection( *this );
 }
 
-sal_Bool SwWrtShell::Pop( sal_Bool bOldCrsr )
+bool SwWrtShell::Pop( bool bOldCrsr )
 {
-    sal_Bool bRet = SwCrsrShell::Pop( bOldCrsr );
+    bool bRet = SwCrsrShell::Pop( bOldCrsr );
     if( bRet && IsSelection() )
     {
         fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
@@ -1712,7 +1712,7 @@ void SwWrtShell::ApplyViewOptions( const SwViewOption &rOpt )
     GetView().GetViewFrame()->GetBindings().Invalidate( FN_VIEW_META_CHARS );
 }
 
-void SwWrtShell::SetReadonlyOption(sal_Bool bSet)
+void SwWrtShell::SetReadonlyOption(bool bSet)
 {
     GetView().GetEditWin().GetFrameControlsManager().SetReadonlyControls( bSet );
     SwViewShell::SetReadonlyOption( bSet );
@@ -1722,13 +1722,13 @@ void SwWrtShell::SetReadonlyOption(sal_Bool bSet)
 // given all styles are changed
 
 void SwWrtShell::ChangeHeaderOrFooter(
-    const OUString& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning)
+    const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning)
 {
     addCurrentPosition();
     StartAllAction();
     StartUndo( UNDO_HEADER_FOOTER ); // #i7983#
     bool bExecute = true;
-    sal_Bool bCrsrSet = sal_False;
+    bool bCrsrSet = false;
     for( sal_uInt16 nFrom = 0, nTo = GetPageDescCnt();
             nFrom < nTo; ++nFrom )
     {
@@ -1741,7 +1741,7 @@ void SwWrtShell::ChangeHeaderOrFooter(
                 ( (bHeader && aDesc.GetMaster().GetHeader().IsActive()) ||
                   (!bHeader && aDesc.GetMaster().GetFooter().IsActive()) ) )
             {
-                bShowWarning = sal_False;
+                bShowWarning = false;
                 //Actions have to be closed while the dialog is showing
                 EndAllAction();
 
diff --git a/sw/source/core/uibase/wrtsh/wrtsh2.cxx b/sw/source/core/uibase/wrtsh/wrtsh2.cxx
index 4149b48bf7d7..ae1d19091d7d 100644
--- a/sw/source/core/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh2.cxx
@@ -96,7 +96,7 @@ void SwWrtShell::Insert(SwField &rFld)
             }
             else
             {
-                NormalizePam( sal_False );
+                NormalizePam( false );
                 const SwPaM& rCurrPaM = GetCurrentShellCursor();
                 pAnnotationTextRange = new SwPaM( *rCurrPaM.GetPoint(), *rCurrPaM.GetMark() );
                 ClearMark();
@@ -138,16 +138,16 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst )
     {
         pTmp->PushCrsr();
 
-        sal_Bool bCancel = sal_False;
+        bool bCancel = false;
         OString aDlgPos;
         for( sal_uInt16 i = 0; i < nCnt && !bCancel; ++i )
         {
             pTmp->GotoFieldPos( i );
             SwField* pField = pTmp->GetField( i );
             if(pField->GetTyp()->Which() == RES_DROPDOWN)
-                bCancel = StartDropDownFldDlg( pField, sal_True, &aDlgPos );
+                bCancel = StartDropDownFldDlg( pField, true, &aDlgPos );
             else
-                bCancel = StartInputFldDlg( pField, sal_True, 0, &aDlgPos);
+                bCancel = StartInputFldDlg( pField, true, 0, &aDlgPos);
 
             if (!bCancel)
             {
@@ -186,8 +186,8 @@ class FieldDeletionModify : public SwModify
 
 // Start input dialog for a specific field
 
-sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
-                                    Window* pParentWin, OString* pWindowState )
+bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton,
+                                   Window* pParentWin, OString* pWindowState )
 {
 
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -201,7 +201,7 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
     FieldDeletionModify aModify(pDlg);
     GetDoc()->GetUnoCallBack()->Add(&aModify);
 
-    sal_Bool bRet = RET_CANCEL == pDlg->Execute();
+    bool bRet = RET_CANCEL == pDlg->Execute();
 
     // Dialog closed, remove modification listener
     GetDoc()->GetUnoCallBack()->Remove(&aModify);
@@ -214,7 +214,7 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
     return bRet;
 }
 
-sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, OString* pWindowState)
+bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, bool bNextButton, OString* pWindowState)
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -227,7 +227,7 @@ sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, OS
     if(pWindowState)
         *pWindowState = pDlg->GetWindowState();
     delete pDlg;
-    sal_Bool bRet = RET_CANCEL == nRet;
+    bool bRet = RET_CANCEL == nRet;
     GetWin()->Update();
     if(RET_YES == nRet)
     {
@@ -251,9 +251,9 @@ void SwWrtShell::InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
 
 // Update directory - remove selection
 
-sal_Bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
+bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
 {
-    sal_Bool bResult = sal_False;
+    bool bResult = false;
 
     if(CanInsert())
     {
@@ -350,17 +350,17 @@ void SwWrtShell::ClickToField( const SwField& rFld )
             const SwInputField* pInputField = dynamic_cast<const SwInputField*>(&rFld);
             if ( pInputField == NULL )
             {
-                StartInputFldDlg( (SwField*)&rFld, sal_False );
+                StartInputFldDlg( (SwField*)&rFld, false );
             }
         }
         break;
 
     case RES_SETEXPFLD:
         if( ((SwSetExpField&)rFld).GetInputFlag() )
-            StartInputFldDlg( (SwField*)&rFld, sal_False );
+            StartInputFldDlg( (SwField*)&rFld, false );
         break;
     case RES_DROPDOWN :
-        StartDropDownFldDlg( (SwField*)&rFld, sal_False );
+        StartDropDownFldDlg( (SwField*)&rFld, false );
     break;
     default:
         SAL_WARN_IF(rFld.IsClickable(), "sw", "unhandled clickable field!");
@@ -524,7 +524,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
             // the update of content from linked section at time delete
             // the undostack. Then the change of the section dont create
             // any undoobject. -  BUG 69145
-            sal_Bool bDoesUndo = DoesUndo();
+            bool bDoesUndo = DoesUndo();
             SwUndoId nLastUndoId(UNDO_EMPTY);
             if (GetLastUndoInfo(0, & nLastUndoId))
             {
diff --git a/sw/source/core/uibase/wrtsh/wrtsh3.cxx b/sw/source/core/uibase/wrtsh/wrtsh3.cxx
index bc35ef16b8e3..a5a1bb4a6119 100644
--- a/sw/source/core/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh3.cxx
@@ -40,12 +40,12 @@ using namespace ::com::sun::star;
 
 extern bool bNoInterrupt;       // in mainwn.cxx
 
-sal_Bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark)
+bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark)
 {
     addCurrentPosition();
-    (this->*fnKillSel)( 0, sal_False );
+    (this->*fnKillSel)( 0, false );
 
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     switch(eFuncId)
     {
         case BOOKMARK_INDEX:bRet = SwCrsrShell::GotoMark( pMark );break;
@@ -67,11 +67,11 @@ sal_Bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark
     return bRet;
 }
 
-sal_Bool SwWrtShell::GotoField( const SwFmtFld& rFld )
+bool SwWrtShell::GotoField( const SwFmtFld& rFld )
 {
-    (this->*fnKillSel)( 0, sal_False );
+    (this->*fnKillSel)( 0, false );
 
-    sal_Bool bRet = SwCrsrShell::GotoFld( rFld );
+    bool bRet = SwCrsrShell::GotoFld( rFld );
     if( bRet && IsSelFrmMode() )
     {
         UnSelectFrm();
@@ -89,7 +89,7 @@ sal_Bool SwWrtShell::GotoField( const SwFmtFld& rFld )
 
 bool SwWrtShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark)
 {
-    (this->*fnKillSel)( 0, sal_False );
+    (this->*fnKillSel)( 0, false );
     bool bRet = SwCrsrShell::GotoFieldmark(pMark);
     if( bRet && IsSelFrmMode() )
     {
@@ -127,24 +127,24 @@ void SwWrtShell::DrawSelChanged( )
     bNoInterrupt = bOldVal;
 }
 
-sal_Bool SwWrtShell::GotoMark( const OUString& rName )
+bool SwWrtShell::GotoMark( const OUString& rName )
 {
     IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()->findMark( rName );
     if(ppMark == getIDocumentMarkAccess()->getAllMarksEnd()) return false;
     return MoveBookMark( BOOKMARK_INDEX, ppMark->get() );
 }
 
-sal_Bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark )
+bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark )
 {
     return MoveBookMark( BOOKMARK_INDEX, pMark );
 }
 
-sal_Bool SwWrtShell::GoNextBookmark()
+bool SwWrtShell::GoNextBookmark()
 {
     return MoveBookMark( BOOKMARK_NEXT );
 }
 
-sal_Bool SwWrtShell::GoPrevBookmark()
+bool SwWrtShell::GoPrevBookmark()
 {
     return MoveBookMark( BOOKMARK_PREV );
 }
diff --git a/sw/source/core/uibase/wrtsh/wrtsh4.cxx b/sw/source/core/uibase/wrtsh/wrtsh4.cxx
index 6966e45c4fda..40c92d15343c 100644
--- a/sw/source/core/uibase/wrtsh/wrtsh4.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh4.cxx
@@ -65,14 +65,14 @@ bool SwWrtShell::_EndWrd()
     return true;
 }
 
-sal_Bool SwWrtShell::_NxtWrd()
+bool SwWrtShell::_NxtWrd()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     while( IsEndPara() )               // If already at the end, then the next???
     {
         if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS))  // Document - end ??
         {
-            Pop( sal_False );
+            Pop( false );
             return bRet;
         }
         bRet = IsStartWord();
@@ -89,21 +89,21 @@ sal_Bool SwWrtShell::_NxtWrd()
             bRet = IsStartWord();
         }
         else
-            bRet = sal_True;
+            bRet = true;
     }
     ClearMark();
     Combine();
     return bRet;
 }
 
-sal_Bool SwWrtShell::_PrvWrd()
+bool SwWrtShell::_PrvWrd()
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     while( IsSttPara() )
     {                            // if already at the beginning, then the next???
         if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS))
         {                        // Document - beginning ??
-            Pop( sal_False );
+            Pop( false );
             return bRet;
         }
         bRet = IsStartWord();
@@ -120,7 +120,7 @@ sal_Bool SwWrtShell::_PrvWrd()
             bRet = IsStartWord();
         }
         else
-            bRet = sal_True;
+            bRet = true;
     }
     ClearMark();
     Combine();
@@ -129,16 +129,16 @@ sal_Bool SwWrtShell::_PrvWrd()
 
 // #i92468#
 // method code of <SwWrtShell::_NxtWrd()> before fix for issue i72162
-sal_Bool SwWrtShell::_NxtWrdForDelete()
+bool SwWrtShell::_NxtWrdForDelete()
 {
     if ( IsEndPara() )
     {
         if ( !SwCrsrShell::Right(1,CRSR_SKIP_CHARS) )
         {
-            Pop( sal_False );
-            return sal_False;
+            Pop( false );
+            return false;
         }
-        return sal_True;
+        return true;
     }
     Push();
     ClearMark();
@@ -148,20 +148,20 @@ sal_Bool SwWrtShell::_NxtWrdForDelete()
     }
     ClearMark();
     Combine();
-    return sal_True;
+    return true;
 }
 
 // method code of <SwWrtShell::_PrvWrd()> before fix for issue i72162
-sal_Bool SwWrtShell::_PrvWrdForDelete()
+bool SwWrtShell::_PrvWrdForDelete()
 {
     if ( IsSttPara() )
     {
         if ( !SwCrsrShell::Left(1,CRSR_SKIP_CHARS) )
         {
-            Pop( sal_False );
-            return sal_False;
+            Pop( false );
+            return false;
         }
-        return sal_True;
+        return true;
     }
     Push();
     ClearMark();
@@ -171,60 +171,60 @@ sal_Bool SwWrtShell::_PrvWrdForDelete()
     }
     ClearMark();
     Combine();
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwWrtShell::_FwdSentence()
+bool SwWrtShell::_FwdSentence()
 {
     Push();
     ClearMark();
     if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS))
     {
-        Pop(sal_False);
-        return 0;
+        Pop(false);
+        return false;
     }
     if( !GoNextSentence() && !IsEndPara() )
         SwCrsrShell::MovePara(fnParaCurr, fnParaEnd);
 
     ClearMark();
     Combine();
-    return 1;
+    return true;
 }
 
-sal_Bool SwWrtShell::_BwdSentence()
+bool SwWrtShell::_BwdSentence()
 {
     Push();
     ClearMark();
     if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS))
     {
-        Pop(sal_False);
-        return 0;
+        Pop(false);
+        return false;
     }
     if( !GoStartSentence()  && !IsSttPara() )
             // not found --> go to the beginning of the paragraph
         SwCrsrShell::MovePara( fnParaCurr, fnParaStart );
     ClearMark();
     Combine();
-    return 1;
+    return true;
 }
 
-sal_Bool SwWrtShell::_FwdPara()
+bool SwWrtShell::_FwdPara()
 {
     Push();
     ClearMark();
-    sal_Bool bRet = SwCrsrShell::MovePara(fnParaNext, fnParaStart);
+    bool bRet = SwCrsrShell::MovePara(fnParaNext, fnParaStart);
 
     ClearMark();
     Combine();
     return bRet;
 }
 
-sal_Bool SwWrtShell::_BwdPara()
+bool SwWrtShell::_BwdPara()
 {
     Push();
     ClearMark();
 
-    sal_Bool bRet = SwCrsrShell::MovePara(fnParaPrev, fnParaStart);
+    bool bRet = SwCrsrShell::MovePara(fnParaPrev, fnParaStart);
     if ( !bRet && !IsSttOfPara() )
     {
         SttPara();
diff --git a/sw/source/core/uibase/wrtsh/wrtundo.cxx b/sw/source/core/uibase/wrtsh/wrtundo.cxx
index 6290b5e7f5ce..e8851d119f5a 100644
--- a/sw/source/core/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtundo.cxx
@@ -35,19 +35,19 @@
 void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt )
 {
     // #105332# save current state of DoesUndo()
-    sal_Bool bSaveDoesUndo = DoesUndo();
+    bool bSaveDoesUndo = DoesUndo();
 
     StartAllAction();
     switch (eDoType)
     {
         case UNDO:
-            DoUndo(sal_False); // #i21739#
+            DoUndo(false); // #i21739#
             // Reset modes
             EnterStdMode();
             SwEditShell::Undo(nCnt);
             break;
         case REDO:
-            DoUndo(sal_False); // #i21739#
+            DoUndo(false); // #i21739#
             // Reset modes
             EnterStdMode();
             SwEditShell::Redo( nCnt );
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index b92ee374e000..738df46bb7d8 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -57,7 +57,7 @@ SwPosition SwUndoField::GetPosition()
 SwUndoFieldFromDoc::SwUndoFieldFromDoc(const SwPosition & rPos,
                          const SwField & rOldField,
                          const SwField & rNewField,
-                         SwMsgPoolItem * _pHnt, sal_Bool _bUpdate, SwUndoId _nId)
+                         SwMsgPoolItem * _pHnt, bool _bUpdate, SwUndoId _nId)
     : SwUndoField(rPos,_nId)
     , pOldField(rOldField.CopyField())
     , pNewField(rNewField.CopyField())
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index 50e01a08d43f..96cbde736cc1 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -34,7 +34,7 @@
 SwUndoFmtCreate::SwUndoFmtCreate
 (SwUndoId nUndoId, SwFmt * _pNew, SwFmt * _pDerivedFrom, SwDoc * _pDoc)
     : SwUndo(nUndoId), pNew(_pNew),
-      pDoc(_pDoc), pNewSet(NULL), nId(0), bAuto(sal_False)
+      pDoc(_pDoc), pNewSet(NULL), nId(0), bAuto(false)
 {
     if (_pDerivedFrom)
         sDerivedFrom = _pDerivedFrom->GetName();
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 3831247ec220..8e9294313f47 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -439,7 +439,7 @@ public:
     {
         if (m_bSaveCursor)
         {
-            m_rShell.Pop( sal_False );
+            m_rShell.Pop( false );
         }
     }
 private:
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 1ff07ebee59f..20fa77bfa5ac 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -431,7 +431,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( SwTxtFtn* pTxtFtn, sal_uLong nNodePo
     // keep pointer to StartNode of FtnSection and reset its attribute for now
     // (as a result, its/all Frms will be deleted automatically)
     SwNodeIndex aSttIdx( *pTxtFtn->GetStartNode() );
-    pTxtFtn->SetStartNode( 0, sal_False );
+    pTxtFtn->SetStartNode( 0, false );
 
     m_pUndo->SaveSection( pDoc, aSttIdx );
     m_nNodeIndex = pSaveNd->GetIndex();
@@ -1083,7 +1083,7 @@ void SwHistory::Add( SwFlyFrmFmt& rFmt, sal_uInt16& rSetPos )
         m_SwpHstry.push_back( pHint );
 
         const SwFmtChain* pChainItem;
-        if( SFX_ITEM_SET == rFmt.GetItemState( RES_CHAIN, sal_False,
+        if( SFX_ITEM_SET == rFmt.GetItemState( RES_CHAIN, false,
             (const SfxPoolItem**)&pChainItem ))
         {
             if( pChainItem->GetNext() || pChainItem->GetPrev() )
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 84ba271d71e2..e716b35b5ecc 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -587,7 +587,7 @@ SwUndoFmtResetAttr::SwUndoFmtResetAttr( SwFmt& rChangedFormat,
     , m_pOldItem( 0 )
 {
     const SfxPoolItem* pItem = 0;
-    if (rChangedFormat.GetItemState( nWhichId, sal_False, &pItem ) == SFX_ITEM_SET)
+    if (rChangedFormat.GetItemState( nWhichId, false, &pItem ) == SFX_ITEM_SET)
     {
         m_pOldItem.reset( pItem->Clone() );
     }
@@ -768,7 +768,7 @@ SwUndoAttr::~SwUndoAttr()
 {
 }
 
-void SwUndoAttr::SaveRedlineData( const SwPaM& rPam, sal_Bool bIsCntnt )
+void SwUndoAttr::SaveRedlineData( const SwPaM& rPam, bool bIsCntnt )
 {
     SwDoc* pDoc = rPam.GetDoc();
     if ( pDoc->IsRedlineOn() )
@@ -1011,7 +1011,7 @@ void SwUndoDefaultAttr::RedoImpl(::sw::UndoRedoContext & rContext)
 }
 
 SwUndoMoveLeftMargin::SwUndoMoveLeftMargin(
-            const SwPaM& rPam, sal_Bool bFlag, bool bMod )
+            const SwPaM& rPam, bool bFlag, bool bMod )
     : SwUndo( bFlag ? UNDO_INC_LEFTMARGIN : UNDO_DEC_LEFTMARGIN )
     , SwUndRng( rPam )
     , m_pHistory( new SwHistory )
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 92ae81962a3a..bd2a5593e00d 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -95,8 +95,8 @@ static void lcl_MakeAutoFrms( const SwFrmFmts& rSpzArr, sal_uLong nMovedIndex )
 //    move the paragraph into this section and to record this in nSectDiff.
 SwUndoDelete::SwUndoDelete(
     SwPaM& rPam,
-    sal_Bool bFullPara,
-    sal_Bool bCalledByTblCpy )
+    bool bFullPara,
+    bool bCalledByTblCpy )
     : SwUndo(UNDO_DELETE),
     SwUndRng( rPam ),
     pMvStt( 0 ),
@@ -109,13 +109,13 @@ SwUndoDelete::SwUndoDelete(
     nSectDiff(0),
     nReplaceDummy(0),
     nSetPos(0),
-    bGroup( sal_False ),
-    bBackSp( sal_False ),
-    bJoinNext( sal_False ),
-    bTblDelLastNd( sal_False ),
+    bGroup( false ),
+    bBackSp( false ),
+    bJoinNext( false ),
+    bTblDelLastNd( false ),
     bDelFullPara( bFullPara ),
-    bResetPgDesc( sal_False ),
-    bResetPgBrk( sal_False ),
+    bResetPgDesc( false ),
+    bResetPgBrk( false ),
     bFromTableCopy( bCalledByTblCpy )
 {
     // bFullPara is set e.g. if an empty paragraph before a table is deleted
@@ -251,7 +251,7 @@ SwUndoDelete::SwUndoDelete(
                     SwPosition aSplitPos( *pEndTxtNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->SplitNode( aSplitPos, false );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, sal_True );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, true );
                     aRg.aEnd--;
                 }
                 else
@@ -275,7 +275,7 @@ SwUndoDelete::SwUndoDelete(
                     SwPosition aSplitPos( *pSttTxtNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->SplitNode( aSplitPos, false );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, sal_True );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, true );
                     aRg.aStart--;
                 }
             }
@@ -313,12 +313,12 @@ SwUndoDelete::SwUndoDelete(
                 if( bJoinNext )
                 {
                     SwNodeRange aMvRg( *pEndTxtNd, 0, *pEndTxtNd, 1 );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, sal_True );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, true );
                 }
                 else
                 {
                     SwNodeRange aMvRg( *pSttTxtNd, 0, *pSttTxtNd, 1 );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, sal_True );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, true );
                 }
             }
         }
@@ -352,7 +352,7 @@ SwUndoDelete::SwUndoDelete(
         DELETEZ( pHistory );
 }
 
-sal_Bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
+bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
                     SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd )
 {
     sal_uLong nNdIdx = pStt->nNode.GetIndex();
@@ -393,7 +393,7 @@ sal_Bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd
         }
 
         if( bOneNode )
-            return sal_False;           // stop moving more nodes
+            return false;           // stop moving more nodes
     }
 
     // 2 - copy end into End-String
@@ -429,20 +429,20 @@ sal_Bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd
 
     // if there are only two Nodes than we're done
     if( ( pSttTxtNd || pEndTxtNd ) && nSttNode + 1 == nEndNode )
-        return sal_False;           // do not move any Node
+        return false;           // do not move any Node
 
-    return sal_True;                // move Nodes lying in between
+    return true;                // move Nodes lying in between
 }
 
-sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
+bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
 {
     // Is Undo greater than one Node (that is Start and EndString)?
     if( pSttStr ? pSttStr->isEmpty() || pEndStr : sal_True )
-        return sal_False;
+        return false;
 
     // only the deletion of single char's can be condensed
     if( nSttNode != nEndNode || ( !bGroup && nSttCntnt+1 != nEndCntnt ))
-        return sal_False;
+        return false;
 
     const SwPosition *pStt = rDelPam.Start(),
                     *pEnd = rDelPam.GetPoint() == pStt
@@ -452,26 +452,26 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
     if( pStt->nNode != pEnd->nNode ||
         pStt->nContent.GetIndex()+1 != pEnd->nContent.GetIndex() ||
         pEnd->nNode != nSttNode )
-        return sal_False;
+        return false;
 
     // Distinguish between BackSpace and Delete because the Undo array needs to
     // be constructed differently!
     if( pEnd->nContent == nSttCntnt )
     {
-        if( bGroup && !bBackSp ) return sal_False;
-        bBackSp = sal_True;
+        if( bGroup && !bBackSp ) return false;
+        bBackSp = true;
     }
     else if( pStt->nContent == nSttCntnt )
     {
-        if( bGroup && bBackSp ) return sal_False;
-        bBackSp = sal_False;
+        if( bGroup && bBackSp ) return false;
+        bBackSp = false;
     }
     else
-        return sal_False;
+        return false;
 
     // are both Nodes (Node/Undo array) TextNodes at all?
     SwTxtNode * pDelTxtNd = pStt->nNode.GetNode().GetTxtNode();
-    if( !pDelTxtNd ) return sal_False;
+    if( !pDelTxtNd ) return false;
 
     sal_Int32 nUChrPos = bBackSp ? 0 : pSttStr->getLength()-1;
     sal_Unicode cDelChar = pDelTxtNd->GetTxt()[ pStt->nContent.GetIndex() ];
@@ -479,7 +479,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
     if( ( CH_TXTATR_BREAKWORD == cDelChar || CH_TXTATR_INWORD == cDelChar ) ||
         rCC.isLetterNumeric( OUString( cDelChar ), 0 ) !=
         rCC.isLetterNumeric( *pSttStr, nUChrPos ) )
-        return sal_False;
+        return false;
 
     {
         SwRedlineSaveDatas aTmpSav;
@@ -490,7 +490,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
                 SwUndo::CanRedlineGroup( *pRedlSaveData, aTmpSav, bBackSp ));
         // aTmpSav.DeleteAndDestroyAll();
         if( !bOk )
-            return sal_False;
+            return false;
 
         pDoc->DeleteRedline( rDelPam, false, USHRT_MAX );
     }
@@ -506,8 +506,8 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
     (*pSttStr) = pSttStr->replaceAt( nUChrPos, 0, OUString(cDelChar) );
     pDelTxtNd->EraseText( pStt->nContent, 1 );
 
-    bGroup = sal_True;
-    return sal_True;
+    bGroup = true;
+    return true;
 }
 
 SwUndoDelete::~SwUndoDelete()
@@ -845,7 +845,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
             aPos.nNode--;
             if( !bJoinNext )
                 pMovedNode = &aPos.nNode.GetNode();
-            pDoc->GetNodes()._MoveNodes( aRg, pDoc->GetNodes(), aMvIdx, sal_True );
+            pDoc->GetNodes()._MoveNodes( aRg, pDoc->GetNodes(), aMvIdx, true );
             aPos.nNode++;
         }
 
@@ -871,7 +871,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
                 SwNodeIndex aMvIdx( pDoc->GetNodes(), nMoveIndex );
                 SwNodeRange aRg( aPos.nNode, 0, aPos.nNode, 1 );
                 pMovedNode = &aPos.nNode.GetNode();
-                pDoc->GetNodes()._MoveNodes( aRg, pDoc->GetNodes(), aMvIdx, sal_True );
+                pDoc->GetNodes()._MoveNodes( aRg, pDoc->GetNodes(), aMvIdx, true );
                 pDoc->GetNodes().Delete( aMvIdx, 1 );
             }
         }
@@ -1033,11 +1033,11 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
 
                 const SfxPoolItem *pItem;
                 if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_PAGEDESC,
-                    sal_False, &pItem ) )
+                    false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
 
                 if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_BREAK,
-                    sal_False, &pItem ) )
+                    false, &pItem ) )
                     pNextNd->SetAttr( *pItem );
             }
             pTblNd->DelFrms();
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index e22fe5226175..78697dcf1a80 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -47,7 +47,7 @@ public:
         const SwPosition& rSttPos,
         const SwPosition& rEndPos,
         SwRangeRedline& rRedl,
-        sal_Bool bCopyNext );
+        bool bCopyNext );
 
     ~SwRedlineSaveData();
 
@@ -136,7 +136,7 @@ void SwUndo::RemoveIdxFromSection( SwDoc& rDoc, sal_uLong nSttIdx,
     SwNodeIndex aEndIdx( rDoc.GetNodes(), pEndIdx ? *pEndIdx
                                     : aIdx.GetNode().EndOfSectionIndex() );
     SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
-    rDoc.CorrAbs( aIdx, aEndIdx, aPos, sal_True );
+    rDoc.CorrAbs( aIdx, aEndIdx, aPos, true );
 }
 
 void SwUndo::RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext )
@@ -160,10 +160,10 @@ void SwUndo::RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext )
             }
         }
 
-        rPam.GetDoc()->CorrAbs( aStt, aEnd, *rPam.GetPoint(), sal_True );
+        rPam.GetDoc()->CorrAbs( aStt, aEnd, *rPam.GetPoint(), true );
     }
     else
-        rPam.GetDoc()->CorrAbs( rPam, *pEnd, sal_True );
+        rPam.GetDoc()->CorrAbs( rPam, *pEnd, true );
 }
 
 void SwUndo::RemoveIdxRel( sal_uLong nIdx, const SwPosition& rPos )
@@ -348,7 +348,7 @@ void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx,
     if( pCpyNd || pEndNdIdx )
     {
         SwNodeRange aRg( pStt->nNode, 0, pEnd->nNode, 1 );
-        rDoc.GetNodes()._MoveNodes( aRg, rNds, aPos.nNode, sal_False );
+        rDoc.GetNodes()._MoveNodes( aRg, rNds, aPos.nNode, false );
         aPos.nContent = 0;
         aPos.nNode--;
     }
@@ -845,7 +845,7 @@ void SwUndoSaveSection::SaveSection(
         SwNodeIndex aSttIdx( aPam.Start()->nNode.GetNode() );
         SwNodeIndex aEndIdx( aPam.End()->nNode.GetNode() );
         SwNodeIndex aMvStt( aEndIdx, 1 );
-        pDoc->CorrAbs( aSttIdx, aEndIdx, SwPosition( aMvStt ), sal_True );
+        pDoc->CorrAbs( aSttIdx, aEndIdx, SwPosition( aMvStt ), true );
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
@@ -915,7 +915,7 @@ SwRedlineSaveData::SwRedlineSaveData(
     const SwPosition& rSttPos,
     const SwPosition& rEndPos,
     SwRangeRedline& rRedl,
-    sal_Bool bCopyNext )
+    bool bCopyNext )
     : SwUndRng( rRedl )
     , SwRedlineData( rRedl.GetRedlineData(), bCopyNext )
 {
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 6a17befa5f48..ce25ce71fa81 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -275,7 +275,7 @@ void SwUndoInsLayFmt::UndoImpl(::sw::UndoRedoContext & rContext)
                         aIdx.GetNode().EndOfSectionIndex() );
                 SwIndex aIndex( pNode, mnCrsrSaveIndexPos );
                 SwPosition aPos( *pNode, aIndex );
-                rDoc.CorrAbs( aIdx, aEndIdx, aPos, sal_True );
+                rDoc.CorrAbs( aIdx, aEndIdx, aPos, true );
                 bRemoveIdx = false;
             }
         }
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 187c3ceb13b5..f58ef57457c7 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -187,7 +187,7 @@ static void lcl_RestoreAnchor( SwFrmFmt* pFmt, sal_uLong& rNodePos )
 }
 
 SwUndoDrawGroup::SwUndoDrawGroup( sal_uInt16 nCnt )
-    : SwUndo( UNDO_DRAWGROUP ), nSize( nCnt + 1 ), bDelFmt( sal_True )
+    : SwUndo( UNDO_DRAWGROUP ), nSize( nCnt + 1 ), bDelFmt( true )
 {
     pObjArr = new SwUndoGroupObjImpl[ nSize ];
 }
@@ -208,7 +208,7 @@ SwUndoDrawGroup::~SwUndoDrawGroup()
 
 void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &)
 {
-    bDelFmt = sal_False;
+    bDelFmt = false;
 
     // save group object
     SwDrawFrmFmt* pFmt = pObjArr->pFmt;
@@ -255,7 +255,7 @@ void SwUndoDrawGroup::UndoImpl(::sw::UndoRedoContext &)
 
 void SwUndoDrawGroup::RedoImpl(::sw::UndoRedoContext &)
 {
-    bDelFmt = sal_True;
+    bDelFmt = true;
 
     // remove from array
     SwDoc* pDoc = pObjArr->pFmt->GetDoc();
@@ -322,7 +322,7 @@ void SwUndoDrawGroup::SetGroupFmt( SwDrawFrmFmt* pFmt )
 }
 
 SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj )
-    : SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( sal_False )
+    : SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( false )
 {
     nSize = (sal_uInt16)pObj->GetSubList()->GetObjCount() + 1;
     pObjArr = new SwUndoGroupObjImpl[ nSize ];
@@ -363,7 +363,7 @@ SwUndoDrawUnGroup::~SwUndoDrawUnGroup()
 
 void SwUndoDrawUnGroup::UndoImpl(::sw::UndoRedoContext & rContext)
 {
-    bDelFmt = sal_True;
+    bDelFmt = true;
 
     SwDoc *const pDoc = & rContext.GetDoc();
     SwFrmFmts& rFlyFmts = *(SwFrmFmts*)pDoc->GetSpzFrmFmts();
@@ -400,7 +400,7 @@ void SwUndoDrawUnGroup::UndoImpl(::sw::UndoRedoContext & rContext)
 
 void SwUndoDrawUnGroup::RedoImpl(::sw::UndoRedoContext &)
 {
-    bDelFmt = sal_False;
+    bDelFmt = false;
 
     // save group object
     SwDrawFrmFmt* pFmt = pObjArr->pFmt;
@@ -496,7 +496,7 @@ void SwUndoDrawUnGroupConnectToLayout::AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
 }
 
 SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt )
-    : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( sal_True )
+    : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( true )
 {
     pObjArr = new SwUndoGroupObjImpl[ nSize ];
     pMarkLst = new SdrMarkList();
@@ -516,7 +516,7 @@ SwUndoDrawDelete::~SwUndoDrawDelete()
 
 void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext)
 {
-    bDelFmt = sal_False;
+    bDelFmt = false;
     SwFrmFmts & rFlyFmts = *rContext.GetDoc().GetSpzFrmFmts();
     for( sal_uInt16 n = 0; n < pMarkLst->GetMarkCount(); ++n )
     {
@@ -541,7 +541,7 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext)
 
 void SwUndoDrawDelete::RedoImpl(::sw::UndoRedoContext & rContext)
 {
-    bDelFmt = sal_True;
+    bDelFmt = true;
     SwFrmFmts & rFlyFmts = *rContext.GetDoc().GetSpzFrmFmts();
     for( sal_uInt16 n = 0; n < pMarkLst->GetMarkCount(); ++n )
     {
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 6a1de08e6176..1fb2110e78c7 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -106,10 +106,10 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd)
 SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
             sal_Int32 nL,
             const IDocumentContentOperations::InsertFlags nInsertFlags,
-            sal_Bool bWDelim )
+            bool bWDelim )
     : SwUndo(UNDO_TYPING), pTxt( 0 ), pRedlData( 0 ),
         nNode( rNd.GetIndex() ), nCntnt(nCnt), nLen(nL),
-        bIsWordDelim( bWDelim ), bIsAppend( sal_False )
+        bIsWordDelim( bWDelim ), bIsAppend( false )
     , m_bWithRsid(false)
     , m_nInsertFlags(nInsertFlags)
 {
@@ -120,7 +120,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
 SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
     : SwUndo(UNDO_SPLITNODE), pTxt( 0 ),
         pRedlData( 0 ), nNode( rNd.GetIndex() ), nCntnt(0), nLen(1),
-        bIsWordDelim( false ), bIsAppend( sal_True )
+        bIsWordDelim( false ), bIsAppend( true )
     , m_bWithRsid(false)
     , m_nInsertFlags(IDocumentContentOperations::INS_EMPTYEXPAND)
 {
@@ -131,7 +131,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
 // change the length and InsPos. As a result, SwDoc::Inser will not add a
 // new object into the Undo list.
 
-sal_Bool SwUndoInsert::CanGrouping( sal_Unicode cIns )
+bool SwUndoInsert::CanGrouping( sal_Unicode cIns )
 {
     if( !bIsAppend && bIsWordDelim ==
         !GetAppCharClass().isLetterNumeric( OUString( cIns )) )
@@ -142,14 +142,14 @@ sal_Bool SwUndoInsert::CanGrouping( sal_Unicode cIns )
         if (pUndoTxt)
             (*pUndoTxt) += OUString(cIns);
 
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
+bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( nNode == rPos.nNode.GetIndex() &&
         nCntnt == rPos.nContent.GetIndex() )
     {
@@ -158,7 +158,7 @@ sal_Bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
         if( ( ~nsRedlineMode_t::REDLINE_SHOW_MASK & rDoc.GetRedlineMode() ) ==
             ( ~nsRedlineMode_t::REDLINE_SHOW_MASK & GetRedlineMode() ) )
         {
-            bRet = sal_True;
+            bRet = true;
 
             // than there is or was still an active Redline:
             // Check if there is another Redline at the InsPosition. If the
@@ -178,7 +178,7 @@ sal_Bool SwUndoInsert::CanGrouping( const SwPosition& rPos )
                         if( !pRedl->HasMark() || !pRedlData ||
                             *pRedl != *pRedlData || *pRedl != aRData )
                         {
-                            bRet = sal_False;
+                            bRet = false;
                             break;
                         }
                     }
@@ -863,10 +863,10 @@ SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType eTyp,
                                       const OUString &rTxt,
                                       const OUString& rSeparator,
                                       const OUString& rNumberSeparator,
-                                      const sal_Bool bBef,
+                                      const bool bBef,
                                       const sal_uInt16 nInitId,
                                       const OUString& rCharacterStyle,
-                                      const sal_Bool bCpyBorder )
+                                      const bool bCpyBorder )
     : SwUndo( UNDO_INSERTLABEL ),
       sText( rTxt ),
       sSeparator( rSeparator ),
@@ -878,7 +878,7 @@ SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType eTyp,
       bBefore( bBef ),
       bCpyBrd( bCpyBorder )
 {
-    bUndoKeep = sal_False;
+    bUndoKeep = false;
     OBJECT.pUndoFly = 0;
     OBJECT.pUndoAttr = 0;
 }
@@ -929,7 +929,7 @@ void SwUndoInsertLabel::UndoImpl(::sw::UndoRedoContext & rContext)
         aPam.GetPoint()->nNode = NODE.nNode;
         aPam.SetMark();
         aPam.GetPoint()->nNode = NODE.nNode + 1;
-        NODE.pUndoInsNd = new SwUndoDelete( aPam, sal_True );
+        NODE.pUndoInsNd = new SwUndoDelete( aPam, true );
     }
 }
 
diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx
index 1ec0e5a8fa50..52f90df2562b 100644
--- a/sw/source/core/undo/unmove.cxx
+++ b/sw/source/core/undo/unmove.cxx
@@ -102,8 +102,8 @@ SwUndoMove::SwUndoMove( SwDoc* pDoc, const SwNodeRange& rRg,
     , nMvDestNode(rMvPos.GetIndex())
     , bMoveRedlines(false)
 {
-    bMoveRange = sal_True;
-    bJoinNext = bJoinPrev = sal_False;
+    bMoveRange = true;
+    bJoinNext = bJoinPrev = false;
 
     nSttCntnt = nEndCntnt = nMvDestCntnt = COMPLETE_STRING;
 
@@ -137,7 +137,7 @@ SwUndoMove::SwUndoMove( SwDoc* pDoc, const SwNodeRange& rRg,
 
 void SwUndoMove::SetDestRange( const SwPaM& rRange,
                                 const SwPosition& rInsPos,
-                                sal_Bool bJoin, sal_Bool bCorrPam )
+                                bool bJoin, bool bCorrPam )
 {
     const SwPosition *pStt = rRange.Start(),
                     *pEnd = rRange.GetPoint() == pStt
@@ -300,7 +300,7 @@ void SwUndoMove::RedoImpl(::sw::UndoRedoContext & rContext)
         RemoveIdxFromRange( aPam, false );
 
         aIdx = aPam.Start()->nNode;
-        sal_Bool bJoinTxt = aIdx.GetNode().IsTxtNode();
+        bool bJoinTxt = aIdx.GetNode().IsTxtNode();
 
         aIdx--;
         rDoc.MoveRange( aPam, aMvPos,
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index c192b559517a..cb7e6f6f3986 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -203,7 +203,7 @@ void SwUndoDelNum::RepeatImpl(::sw::RepeatContext & rContext)
     rContext.GetDoc().DelNumRules(rContext.GetRepeatPaM());
 }
 
-void SwUndoDelNum::AddNode( const SwTxtNode& rNd, sal_Bool )
+void SwUndoDelNum::AddNode( const SwTxtNode& rNd, bool )
 {
     if( rNd.GetNumRule() )
     {
@@ -286,8 +286,8 @@ void SwUndoNumUpDown::RepeatImpl(::sw::RepeatContext & rContext)
 }
 
 // #115901#
-SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bOldNum,
-                                    sal_Bool bNewNum)
+SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool bOldNum,
+                                    bool bNewNum)
     : SwUndo( UNDO_NUMORNONUM ), nIdx( rIdx.GetIndex() ), mbNewNum(bNewNum),
       mbOldNum(bOldNum)
 {
@@ -331,10 +331,10 @@ void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext & rContext)
     }
 }
 
-SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bFlg )
+SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, bool bFlg )
     : SwUndo( UNDO_SETNUMRULESTART ),
     nIdx( rPos.nNode.GetIndex() ), nOldStt( USHRT_MAX ),
-    nNewStt( USHRT_MAX ), bSetSttValue( sal_False ), bFlag( bFlg )
+    nNewStt( USHRT_MAX ), bSetSttValue( false ), bFlag( bFlg )
 {
 }
 
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 336fc329bd69..cf36e15d65ca 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::uno;
 SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
                                     sal_Unicode cIns )
     : SwUndo(UNDO_OVERWRITE),
-      pRedlSaveData( 0 ), bGroup( sal_False )
+      pRedlSaveData( 0 ), bGroup( false )
 {
     if( !pDoc->IsIgnoreRedline() && !pDoc->GetRedlineTbl().empty() )
     {
@@ -59,7 +59,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
     SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
     OSL_ENSURE( pTxtNd, "Overwrite not in a TextNode?" );
 
-    bInsChar = sal_True;
+    bInsChar = true;
     sal_Int32 nTxtNdLen = pTxtNd->GetTxt().getLength();
     if( nSttCntnt < nTxtNdLen )     // no pure insert?
     {
@@ -70,7 +70,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
         pHistory->CopyAttr( pTxtNd->GetpSwpHints(), nSttNode, 0,
                             nTxtNdLen, false );
         rPos.nContent++;
-        bInsChar = sal_False;
+        bInsChar = false;
     }
 
     bool bOldExpFlg = pTxtNd->IsIgnoreDontExpand();
@@ -95,7 +95,7 @@ SwUndoOverwrite::~SwUndoOverwrite()
     delete pRedlSaveData;
 }
 
-sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
+bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
                                     sal_Unicode cIns )
 {
 // What is with only inserted characters?
@@ -103,14 +103,14 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
     // Only deletion of single chars can be combined.
     if( rPos.nNode != nSttNode || aInsStr.isEmpty()  ||
         ( !bGroup && aInsStr.getLength() != 1 ))
-        return sal_False;
+        return false;
 
     // Is the node a TextNode at all?
     SwTxtNode * pDelTxtNd = rPos.nNode.GetNode().GetTxtNode();
     if( !pDelTxtNd ||
         (pDelTxtNd->GetTxt().getLength() != rPos.nContent.GetIndex() &&
             rPos.nContent.GetIndex() != ( nSttCntnt + aInsStr.getLength() )))
-        return sal_False;
+        return false;
 
     CharClass& rCC = GetAppCharClass();
 
@@ -118,7 +118,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
     if (( CH_TXTATR_BREAKWORD == cIns || CH_TXTATR_INWORD == cIns ) ||
         rCC.isLetterNumeric( OUString( cIns ), 0 ) !=
         rCC.isLetterNumeric( aInsStr, aInsStr.getLength()-1 ) )
-        return sal_False;
+        return false;
 
     {
         SwRedlineSaveDatas aTmpSav;
@@ -133,7 +133,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
                             nSttCntnt > rPos.nContent.GetIndex() ));
         // aTmpSav.DeleteAndDestroyAll();
         if( !bOk )
-            return sal_False;
+            return false;
 
         pDoc->DeleteRedline( aPam, false, USHRT_MAX );
     }
@@ -147,7 +147,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
             rPos.nContent++;
         }
         else
-            bInsChar = sal_True;
+            bInsChar = true;
     }
 
     bool bOldExpFlg = pDelTxtNd->IsIgnoreDontExpand();
@@ -166,8 +166,8 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
     }
     pDelTxtNd->SetIgnoreDontExpand( bOldExpFlg );
 
-    bGroup = sal_True;
-    return sal_True;
+    bGroup = true;
+    return true;
 }
 
 void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 96f7bc2dd618..283bf307cb91 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -31,13 +31,13 @@
 #include <docary.hxx>
 #include <sortopt.hxx>
 
-extern void sw_JoinText( SwPaM& rPam, sal_Bool bJoinPrev );
-extern void sw_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev );
+extern void sw_JoinText( SwPaM& rPam, bool bJoinPrev );
+extern void sw_GetJoinFlags( SwPaM& rPam, bool& rJoinTxt, bool& rJoinPrev );
 
 SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
     : SwUndo( UNDO_REDLINE ), SwUndRng( rRange ),
     mpRedlData( 0 ), mpRedlSaveData( 0 ), mnUserId( nUsrId ),
-    mbHiddenRedlines( sal_False )
+    mbHiddenRedlines( false )
 {
     // consider Redline
     SwDoc& rDoc = *rRange.GetDoc();
@@ -141,7 +141,7 @@ void SwUndoRedline::RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
 
 SwUndoRedlineDelete::SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUsrId )
     : SwUndoRedline( nUsrId ? nUsrId : UNDO_DELETE, rRange ),
-    bCanGroup( sal_False ), bIsDelim( sal_False ), bIsBackspace( sal_False )
+    bCanGroup( false ), bIsDelim( false ), bIsBackspace( false )
 {
     const SwTxtNode* pTNd;
     if( UNDO_DELETE == mnUserId &&
@@ -151,7 +151,7 @@ SwUndoRedlineDelete::SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUsrId )
         sal_Unicode const cCh = pTNd->GetTxt()[nSttCntnt];
         if( CH_TXTATR_BREAKWORD != cCh && CH_TXTATR_INWORD != cCh )
         {
-            bCanGroup = sal_True;
+            bCanGroup = true;
             bIsDelim = !GetAppCharClass().isLetterNumeric( pTNd->GetTxt(),
                                                             nSttCntnt );
             bIsBackspace = nSttCntnt == rRange.GetPoint()->nContent.GetIndex();
@@ -174,9 +174,9 @@ void SwUndoRedlineDelete::RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam)
     }
 }
 
-sal_Bool SwUndoRedlineDelete::CanGrouping( const SwUndoRedlineDelete& rNext )
+bool SwUndoRedlineDelete::CanGrouping( const SwUndoRedlineDelete& rNext )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( UNDO_DELETE == mnUserId && mnUserId == rNext.mnUserId &&
         bCanGroup == rNext.bCanGroup &&
         bIsDelim == rNext.bIsDelim &&
@@ -202,7 +202,7 @@ sal_Bool SwUndoRedlineDelete::CanGrouping( const SwUndoRedlineDelete& rNext )
                 nEndCntnt = rNext.nEndCntnt;
             else
                 nSttCntnt = rNext.nSttCntnt;
-            bRet = sal_True;
+            bRet = true;
         }
     }
     return bRet;
@@ -352,7 +352,7 @@ void SwUndoRejectRedline::RepeatImpl(::sw::RepeatContext & rContext)
     rContext.GetDoc().RejectRedline(rContext.GetRepeatPaM(), true);
 }
 
-SwUndoCompDoc::SwUndoCompDoc( const SwPaM& rRg, sal_Bool bIns )
+SwUndoCompDoc::SwUndoCompDoc( const SwPaM& rRg, bool bIns )
     : SwUndo( UNDO_COMPAREDOC ), SwUndRng( rRg ), pRedlData( 0 ),
     pUnDel( 0 ), pUnDel2( 0 ), pRedlSaveData( 0 ), bInsert( bIns )
 {
@@ -417,10 +417,10 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext)
         if( !nSttCntnt && !nEndCntnt )
             pPam->Exchange();
 
-        sal_Bool bJoinTxt, bJoinPrev;
+        bool bJoinTxt, bJoinPrev;
         sw_GetJoinFlags( *pPam, bJoinTxt, bJoinPrev );
 
-        pUnDel = new SwUndoDelete( *pPam, sal_False );
+        pUnDel = new SwUndoDelete( *pPam, false );
 
         if( bJoinTxt )
             sw_JoinText( *pPam, bJoinPrev );
@@ -439,7 +439,7 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext)
                     pPam->GetPoint()->nNode++;
                     pPam->GetBound( true ).nContent.Assign( 0, 0 );
                     pPam->GetBound( false ).nContent.Assign( 0, 0 );
-                    pUnDel2 = new SwUndoDelete( *pPam, sal_True );
+                    pUnDel2 = new SwUndoDelete( *pPam, true );
                 }
             }
         }
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 29fbef35a386..a81fa6f311f1 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -434,7 +434,7 @@ void SwUndoUpdateSection::UndoImpl(::sw::UndoRedoContext & rContext)
         // The Content and Protect items must persist
         const SfxPoolItem* pItem;
         m_pAttrSet->Put( pFmt->GetFmtAttr( RES_CNTNT ));
-        if( SFX_ITEM_SET == pFmt->GetItemState( RES_PROTECT, sal_True, &pItem ))
+        if( SFX_ITEM_SET == pFmt->GetItemState( RES_PROTECT, true, &pItem ))
         {
             m_pAttrSet->Put( *pItem );
         }
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index 54e895efda96..53dd57ba49a9 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -35,10 +35,10 @@
 // SPLITNODE
 
 SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
-                                    sal_Bool bChkTable )
+                                    bool bChkTable )
     : SwUndo( UNDO_SPLITNODE ), pHistory( 0 ), pRedlData( 0 ), nNode( rPos.nNode.GetIndex() ),
         nCntnt( rPos.nContent.GetIndex() ),
-        bTblFlag( sal_False ), bChkTblStt( bChkTable )
+        bTblFlag( false ), bChkTblStt( bChkTable )
 {
     SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
     OSL_ENSURE( pTxtNd, "only for TextNode" );
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 4c0567240cdc..9fd3331ee533 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -273,11 +273,11 @@ void SwUndoInsTbl::UndoImpl(::sw::UndoRedoContext & rContext)
         const SfxPoolItem *pItem;
 
         if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_PAGEDESC,
-            sal_False, &pItem ) )
+            false, &pItem ) )
             pNextNd->SetAttr( *pItem );
 
         if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_BREAK,
-            sal_False, &pItem ) )
+            false, &pItem ) )
             pNextNd->SetAttr( *pItem );
     }
 
@@ -473,7 +473,7 @@ void SwUndoTblToTxt::UndoImpl(::sw::UndoRedoContext & rContext)
         SwDDEFieldType* pNewType = (SwDDEFieldType*)rDoc.InsertFldType(
                                                             *pDDEFldType);
         SwDDETable* pDDETbl = new SwDDETable( pTblNd->GetTable(), pNewType );
-        pTblNd->SetNewTable( pDDETbl, sal_False );
+        pTblNd->SetNewTable( pDDETbl, false );
         delete pDDEFldType, pDDEFldType = 0;
     }
 
@@ -482,7 +482,7 @@ void SwUndoTblToTxt::UndoImpl(::sw::UndoRedoContext & rContext)
         SwTableSortBoxes& rBxs = pTblNd->GetTable().GetTabSortBoxes();
         for (size_t nBoxes = rBxs.size(); nBoxes; )
         {
-            rDoc.ChkBoxNumFmt( *rBxs[ --nBoxes ], sal_False );
+            rDoc.ChkBoxNumFmt( *rBxs[ --nBoxes ], false );
         }
     }
 
@@ -935,7 +935,7 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, bool bMdfyBox )
     if( pFmt->IsInCache() )
     {
         SwFrm::GetCache().Delete( pFmt );
-        pFmt->SetInCache( sal_False );
+        pFmt->SetInCache( false );
     }
 
     // for safety, invalidate all TableFrames
@@ -994,7 +994,7 @@ void _SaveTable::CreateNew( SwTable& rTbl, bool bCreateFrms,
     if( pFmt->IsInCache() )
     {
         SwFrm::GetCache().Delete( pFmt );
-        pFmt->SetInCache( sal_False );
+        pFmt->SetInCache( false );
     }
 
     // SwTableBox must have a format
@@ -1101,7 +1101,7 @@ void _SaveTable::NewFrmFmt( const SwTableLine* pTblLn, const SwTableBox* pTblBx,
             pLast->ReinitializeFrmSizeAttrFlags();
             if ( !pTblLn )
             {
-                ((SwCellFrm*)pLast)->SetDerivedVert( sal_False );
+                ((SwCellFrm*)pLast)->SetDerivedVert( false );
                 ((SwCellFrm*)pLast)->CheckDirChange();
             }
         }
@@ -1366,7 +1366,7 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl
 }
 
 // UndoObject for attribute changes on table
-SwUndoAttrTbl::SwUndoAttrTbl( const SwTableNode& rTblNd, sal_Bool bClearTabCols )
+SwUndoAttrTbl::SwUndoAttrTbl( const SwTableNode& rTblNd, bool bClearTabCols )
     : SwUndo( UNDO_TABLE_ATTR ),
     nSttNode( rTblNd.GetIndex() )
 {
@@ -1407,7 +1407,7 @@ SwUndoTblAutoFmt::SwUndoTblAutoFmt( const SwTableNode& rTblNd,
                                     const SwTableAutoFmt& rAFmt )
     : SwUndo( UNDO_TABLE_AUTOFMT ),
     nSttNode( rTblNd.GetIndex() ),
-    bSaveCntntAttr( sal_False )
+    bSaveCntntAttr( false )
     , m_nRepeatHeading(rTblNd.GetTable().GetRowsToRepeat())
 {
     pSaveTbl = new _SaveTable( rTblNd.GetTable() );
@@ -1417,7 +1417,7 @@ SwUndoTblAutoFmt::SwUndoTblAutoFmt( const SwTableNode& rTblNd,
         // than also go over the ContentNodes of the EndBoxes and collect
         // all paragraph attributes
         pSaveTbl->SaveCntntAttrs( (SwDoc*)rTblNd.GetDoc() );
-        bSaveCntntAttr = sal_True;
+        bSaveCntntAttr = true;
     }
 }
 
@@ -1475,7 +1475,7 @@ SwUndoTblNdsChg::SwUndoTblNdsChg( SwUndoId nAction,
                                     const SwSelBoxes& rBoxes,
                                     const SwTableNode& rTblNd,
                                     long nMn, long nMx,
-                                    sal_uInt16 nCnt, sal_Bool bFlg, sal_Bool bSmHght )
+                                    sal_uInt16 nCnt, bool bFlg, bool bSmHght )
     : SwUndo( nAction ),
     nMin( nMn ), nMax( nMx ),
     nSttNode( rTblNd.GetIndex() ), nCurrBox( 0 ),
@@ -1499,8 +1499,8 @@ SwUndoTblNdsChg::SwUndoTblNdsChg( SwUndoId nAction,
     nSttNode( rTblNd.GetIndex() ), nCurrBox( 0 ),
     nCount( 0 ), nRelDiff( 0 ), nAbsDiff( 0 ),
     nSetColType( USHRT_MAX ),
-    bFlag( sal_False ),
-    bSameHeight( sal_False )
+    bFlag( false ),
+    bSameHeight( false )
 {
     const SwTable& rTbl = rTblNd.GetTable();
     pSaveTbl = new _SaveTable( rTbl );
@@ -1648,7 +1648,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
             // then pBox received nodes from elsewhere.
             // If bNodesMoved is set for pBox the undo must move the
             // boxes back, otherwise it must delete them.
-            sal_Bool bNodesMoved = pSourceBox &&
+            bool bNodesMoved = pSourceBox &&
                 ( nNodes != ( pSourceBox->GetSttNd()->EndOfSectionIndex() -
                               pSourceBox->GetSttIdx() ) )
                 && ( nNodes - 1 > nLineDiff );
@@ -1747,7 +1747,7 @@ void SwUndoTblNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
                 // first delete box
                 delete pBox;
                 // than move nodes
-                rDoc.GetNodes()._MoveNodes( aRg, rDoc.GetNodes(), aInsPos, sal_False );
+                rDoc.GetNodes()._MoveNodes( aRg, rDoc.GetNodes(), aInsPos, false );
             }
             else
             {   // first disconnect box from node, otherwise ~SwTableBox would
@@ -2039,7 +2039,7 @@ CHECKTABLE(pTblNd->GetTable())
                 SwNodeIndex aTmpIdx( *pBox->GetSttNd() );
                 rDoc.CorrAbs( SwNodeIndex( aTmpIdx, 1 ),
                             SwNodeIndex( *aTmpIdx.GetNode().EndOfSectionNode() ),
-                            SwPosition( aTmpIdx, SwIndex( 0, 0 )), sal_True );
+                            SwPosition( aTmpIdx, SwIndex( 0, 0 )), true );
             }
 
             delete pBox;
@@ -2132,9 +2132,9 @@ SwUndoTblNumFmt::SwUndoTblNumFmt( const SwTableBox& rBox,
     , nNewFmtIdx(0)
     , fNum(0.0)
     , fNewNum(0.0)
-    , bNewFmt(sal_False)
-    , bNewFml(sal_False)
-    , bNewValue(sal_False)
+    , bNewFmt(false)
+    , bNewFml(false)
+    , bNewValue(false)
 {
     nNode = rBox.GetSttIdx();
 
@@ -2169,19 +2169,19 @@ SwUndoTblNumFmt::SwUndoTblNumFmt( const SwTableBox& rBox,
         if( SFX_ITEM_SET == pNewSet->GetItemState( RES_BOXATR_FORMAT,
                 false, &pItem ))
         {
-            bNewFmt = sal_True;
+            bNewFmt = true;
             nNewFmtIdx = ((SwTblBoxNumFormat*)pItem)->GetValue();
         }
         if( SFX_ITEM_SET == pNewSet->GetItemState( RES_BOXATR_FORMULA,
                 false, &pItem ))
         {
-            bNewFml = sal_True;
+            bNewFml = true;
             aNewFml = ((SwTblBoxFormula*)pItem)->GetFormula();
         }
         if( SFX_ITEM_SET == pNewSet->GetItemState( RES_BOXATR_VALUE,
                 false, &pItem ))
         {
-            bNewValue = sal_True;
+            bNewValue = true;
             fNewNum = ((SwTblBoxValue*)pItem)->GetValue();
         }
     }
@@ -2504,7 +2504,7 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
                 else
                     *aPam.GetPoint() = SwPosition( aTmpIdx );
             }
-            pUndo = new SwUndoDelete( aPam, bDeleteCompleteParagraph, sal_True );
+            pUndo = new SwUndoDelete( aPam, bDeleteCompleteParagraph, true );
         }
         else
         {
@@ -2581,7 +2581,7 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
         // b62341295: Redline for copying tables - Start.
         rDoc.GetNodes().MakeTxtNode( aInsIdx, (SwTxtFmtColl*)rDoc.GetDfltTxtFmtColl() );
         SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode());
-        SwUndo* pUndo = IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ? 0 : new SwUndoDelete( aPam, sal_True );
+        SwUndo* pUndo = IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ? 0 : new SwUndoDelete( aPam, true );
         if( pEntry->pUndo )
         {
             pEntry->pUndo->UndoImpl(rContext);
@@ -2658,7 +2658,7 @@ void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt )
         SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode() );
 
         if( !pDoc->IsRedlineOn() )
-            pEntry->pUndo = new SwUndoDelete( aPam, sal_True );
+            pEntry->pUndo = new SwUndoDelete( aPam, true );
     }
 
     pEntry->pBoxNumAttr = new SfxItemSet( pDoc->GetAttrPool(),
@@ -2755,7 +2755,7 @@ SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
         aCellEnd = SwPosition(
             SwNodeIndex( *rBox.GetSttNd()->EndOfSectionNode() ));
         SwPaM aTmpPam( aDeleteStart, aCellEnd );
-        pUndo = new SwUndoDelete( aTmpPam, sal_True );
+        pUndo = new SwUndoDelete( aTmpPam, true );
     }
     SwPosition aCellStart( SwNodeIndex( *rBox.GetSttNd(), 2 ) );
     pTxt = aCellStart.nNode.GetNode().GetTxtNode();
@@ -2778,7 +2778,7 @@ bool SwUndoTblCpyTbl::InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes,
                                 GetSttNd()->FindTableNode();
 
     pInsRowUndo = new SwUndoTblNdsChg( UNDO_TABLE_INSROW, rBoxes, *pTblNd,
-                                       0, 0, nCnt, sal_True, sal_False );
+                                       0, 0, nCnt, true, false );
     SwTableSortBoxes aTmpLst( rTbl.GetTabSortBoxes() );
 
     bool bRet = rTbl.InsertRow( rTbl.GetFrmFmt()->GetDoc(), rBoxes, nCnt, true );
@@ -2789,7 +2789,7 @@ bool SwUndoTblCpyTbl::InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes,
     return bRet;
 }
 
-sal_Bool SwUndoTblCpyTbl::IsEmpty() const
+bool SwUndoTblCpyTbl::IsEmpty() const
 {
     return !pInsRowUndo && pArr->empty();
 }
@@ -2817,16 +2817,16 @@ void SwUndoCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext)
         const SfxPoolItem *pItem;
 
         if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_PAGEDESC,
-            sal_False, &pItem ) )
+            false, &pItem ) )
             pNextNd->SetAttr( *pItem );
 
         if( SFX_ITEM_SET == pTableFmt->GetItemState( RES_BREAK,
-            sal_False, &pItem ) )
+            false, &pItem ) )
             pNextNd->SetAttr( *pItem );
     }
 
     SwPaM aPam( *pTNd, *pTNd->EndOfSectionNode(), 0 , 1 );
-    pDel = new SwUndoDelete( aPam, sal_True );
+    pDel = new SwUndoDelete( aPam, true );
 }
 
 void SwUndoCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
@@ -2836,7 +2836,7 @@ void SwUndoCpyTbl::RedoImpl(::sw::UndoRedoContext & rContext)
 }
 
 SwUndoSplitTbl::SwUndoSplitTbl( const SwTableNode& rTblNd,
-    SwSaveRowSpan* pRowSp, sal_uInt16 eMode, sal_Bool bNewSize )
+    SwSaveRowSpan* pRowSp, sal_uInt16 eMode, bool bNewSize )
     : SwUndo( UNDO_SPLIT_TABLE ),
     nTblNode( rTblNd.GetIndex() ), nOffset( 0 ), mpSaveRowSpan( pRowSp ), pSavTbl( 0 ),
     pHistory( 0 ), nMode( eMode ), nFmlEnd( 0 ), bCalcNewSize( bNewSize )
@@ -2956,7 +2956,7 @@ void SwUndoSplitTbl::SaveFormula( SwHistory& rHistory )
 
 SwUndoMergeTbl::SwUndoMergeTbl( const SwTableNode& rTblNd,
                                 const SwTableNode& rDelTblNd,
-                                sal_Bool bWithPrv, sal_uInt16 nMd )
+                                bool bWithPrv, sal_uInt16 nMd )
     : SwUndo( UNDO_MERGE_TABLE ), pSavTbl( 0 ),
     pHistory( 0 ), nMode( nMd ), bWithPrev( bWithPrv )
 {
@@ -3001,7 +3001,7 @@ void SwUndoMergeTbl::UndoImpl(::sw::UndoRedoContext & rContext)
     aFndBox.DelFrms( *pTbl );
     // ? TL_CHART2: notification or locking of controller required ?
 
-    SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx, sal_True, sal_False );
+    SwTableNode* pNew = pDoc->GetNodes().SplitTable( rIdx, true, false );
 
     // update layout
     aFndBox.MakeFrms( *pTbl );
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 5993bbdb2ae2..c203d73222d3 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -54,9 +54,9 @@ sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal )
 }
 
 // methods for UCB actions
-sal_Bool UCB_DeleteFile( const OUString& rURL )
+bool UCB_DeleteFile( const OUString& rURL )
 {
-    sal_Bool bRemoved;
+    bool bRemoved;
     try
     {
         ucbhelper::Content aTempContent( rURL,
@@ -64,19 +64,19 @@ sal_Bool UCB_DeleteFile( const OUString& rURL )
                                 comphelper::getProcessComponentContext() );
         aTempContent.executeCommand(OUString("delete"),
                         ::com::sun::star::uno::makeAny( sal_True ) );
-        bRemoved = sal_True;
+        bRemoved = true;
     }
     catch( ::com::sun::star::uno::Exception& )
     {
-        bRemoved = sal_False;
+        bRemoved = false;
         OSL_FAIL( "Exeception from executeCommand( delete )" );
     }
     return bRemoved;
 }
 
-sal_Bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, sal_Bool bCopyIsMove )
+bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, bool bCopyIsMove )
 {
-    sal_Bool bCopyCompleted = sal_True;
+    bool bCopyCompleted = true;
     try
     {
         INetURLObject aURL( rNewURL );
@@ -101,14 +101,14 @@ sal_Bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, sal_Bool b
     catch( ::com::sun::star::uno::Exception& )
     {
         OSL_FAIL( "Exeception from executeCommand( transfer )" );
-        bCopyCompleted = sal_False;
+        bCopyCompleted = false;
     }
     return bCopyCompleted;
 }
 
-sal_Bool UCB_IsCaseSensitiveFileName( const OUString& rURL )
+bool UCB_IsCaseSensitiveFileName( const OUString& rURL )
 {
-    sal_Bool bCaseSensitive;
+    bool bCaseSensitive;
     try
     {
         INetURLObject aTempObj( rURL );
@@ -128,15 +128,15 @@ sal_Bool UCB_IsCaseSensitiveFileName( const OUString& rURL )
     }
     catch( ::com::sun::star::uno::Exception& )
     {
-        bCaseSensitive = sal_False;
+        bCaseSensitive = false;
         OSL_FAIL( "Exeception from compareContentIds()" );
     }
     return bCaseSensitive;
 }
 
-sal_Bool UCB_IsReadOnlyFileName( const OUString& rURL )
+bool UCB_IsReadOnlyFileName( const OUString& rURL )
 {
-    sal_Bool bIsReadOnly = sal_False;
+    bool bIsReadOnly = false;
     try
     {
         ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
@@ -147,14 +147,14 @@ sal_Bool UCB_IsReadOnlyFileName( const OUString& rURL )
     }
     catch( ::com::sun::star::uno::Exception& )
     {
-        bIsReadOnly = sal_False;
+        bIsReadOnly = false;
     }
     return bIsReadOnly;
 }
 
-sal_Bool UCB_IsFile( const OUString& rURL )
+bool UCB_IsFile( const OUString& rURL )
 {
-    sal_Bool bExists = sal_False;
+    bool bExists = false;
     try
     {
         ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
@@ -166,9 +166,9 @@ sal_Bool UCB_IsFile( const OUString& rURL )
     return bExists;
 }
 
-sal_Bool UCB_IsDirectory( const OUString& rURL )
+bool UCB_IsDirectory( const OUString& rURL )
 {
-    sal_Bool bExists = sal_False;
+    bool bExists = false;
     try
     {
         ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index ef14881b5a9c..9b08e0e72e02 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -675,7 +675,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     if ( PropertyName == "Checked" )
     {
         ::sw::mark::ICheckboxFieldmark* pCheckboxFm = getCheckboxFieldmark();
-        sal_Bool bChecked( sal_False );
+        bool bChecked( false );
         if ( pCheckboxFm && ( rValue >>= bChecked ) )
             pCheckboxFm->SetChecked( bChecked );
         else
diff --git a/sw/source/core/unocore/unobrushitemhelper.cxx b/sw/source/core/unocore/unobrushitemhelper.cxx
index d28c40e1543d..fe1a4962b62d 100644
--- a/sw/source/core/unocore/unobrushitemhelper.cxx
+++ b/sw/source/core/unocore/unobrushitemhelper.cxx
@@ -145,7 +145,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI
 }
 
 //UUUU
-sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, sal_Bool bSearchInParents)
+sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents)
 {
     sal_uInt16 nFillTransparence(static_cast< const XFillTransparenceItem& >(rSourceSet.Get(XATTR_FILLTRANSPARENCE, bSearchInParents)).GetValue());
     const SfxPoolItem* pGradientItem = 0;
@@ -165,7 +165,7 @@ sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, sal_Bool
 }
 
 //UUUU
-SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, sal_Bool bSearchInParents)
+SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchInParents)
 {
     Color aFillColor(static_cast< const XFillColorItem& >(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents)).GetColorValue());
 
@@ -182,7 +182,7 @@ SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, sal_Bool bSea
 }
 
 //UUUU
-SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_Bool bSearchInParents)
+SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, bool bSearchInParents)
 {
     const XFillStyleItem* pXFillStyleItem(static_cast< const XFillStyleItem*  >(rSourceSet.GetItem(XATTR_FILLSTYLE, bSearchInParents)));
 
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 55b9c1c6bd52..734ab916ac17 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -119,7 +119,7 @@ void SwChartLockController_Helper::Disconnect()
     pDoc = 0;
 }
 
-void SwChartLockController_Helper::LockUnlockAllCharts( sal_Bool bLock )
+void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock )
 {
     if (!pDoc)
         return;
@@ -273,7 +273,7 @@ static OUString GetCellRangeName( SwFrmFmt &rTblFmt, SwUnoCrsr &rTblCrsr )
 
 static OUString GetRangeRepFromTableAndCells( const OUString &rTableName,
         const OUString &rStartCell, const OUString &rEndCell,
-        sal_Bool bForceEndCellName )
+        bool bForceEndCellName )
 {
     OSL_ENSURE( !rTableName.isEmpty(), "table name missing" );
     OSL_ENSURE( !rStartCell.isEmpty(), "cell name missing" );
@@ -419,7 +419,7 @@ static void GetFormatAndCreateCursorFromRangeRep(
                 // set cursor to top left box of range
                 SwUnoCrsr* pUnoCrsr = pTblFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
-                pUnoCrsr->SetRemainInSection( sal_False );
+                pUnoCrsr->SetRemainInSection( false );
                 // #i80314#
                 // perform validation check. Thus, pass <true> as 2nd parameter to <SwTable::GetTblBox(..)>
                 const SwTableBox* pBRBox = pTable->GetTblBox( aEndCell, true );
@@ -473,7 +473,7 @@ static bool GetSubranges( const OUString &rRangeRepresentation,
                 {
                     sw_NormalizeRange( aStartCell, aEndCell );
                     pRanges[nCnt] = GetRangeRepFromTableAndCells( aTableName,
-                                    aStartCell, aEndCell, sal_True );
+                                    aStartCell, aEndCell, true );
                 }
 
                 // make sure to use only a single table
@@ -492,7 +492,7 @@ static bool GetSubranges( const OUString &rRangeRepresentation,
     return bRes;
 }
 
-static void SortSubranges( uno::Sequence< OUString > &rSubRanges, sal_Bool bCmpByColumn )
+static void SortSubranges( uno::Sequence< OUString > &rSubRanges, bool bCmpByColumn )
 {
     sal_Int32 nLen = rSubRanges.getLength();
     OUString *pSubRanges = rSubRanges.getArray();
@@ -542,7 +542,7 @@ SwChartDataProvider::SwChartDataProvider( const SwDoc* pSwDoc ) :
     aEvtListeners( GetChartMutex() ),
     pDoc( pSwDoc )
 {
-    bDisposed = sal_False;
+    bDisposed = false;
 }
 
 SwChartDataProvider::~SwChartDataProvider()
@@ -550,7 +550,7 @@ SwChartDataProvider::~SwChartDataProvider()
 }
 
 uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createDataSource(
-        const uno::Sequence< beans::PropertyValue >& rArguments, sal_Bool bTestOnly )
+        const uno::Sequence< beans::PropertyValue >& rArguments, bool bTestOnly )
     throw (lang::IllegalArgumentException, uno::RuntimeException,
            std::exception)
 {
@@ -566,8 +566,8 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
     // get arguments
     OUString aRangeRepresentation;
     uno::Sequence< sal_Int32 > aSequenceMapping;
-    sal_Bool bFirstIsLabel      = sal_False;
-    sal_Bool bDtaSrcIsColumns   = sal_True; // true : DataSource will be sequence of columns
+    bool bFirstIsLabel      = false;
+    bool bDtaSrcIsColumns   = true; // true : DataSource will be sequence of columns
                                             // false: DataSource will be sequence of rows
     OUString aChartOleObjectName;//work around wrong writer ranges ( see Issue 58464 )
     sal_Int32 nArgs = rArguments.getLength();
@@ -613,7 +613,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
 
     uno::Sequence< OUString > aSubRanges;
     // get sub-ranges and check that they all are from the very same table
-    sal_Bool bOk = GetSubranges( aRangeRepresentation, aSubRanges, true );
+    bool bOk = GetSubranges( aRangeRepresentation, aSubRanges, true );
 
     if (!bOk && pDoc && !aChartOleObjectName.isEmpty() )
     {
@@ -657,7 +657,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
             OUString aNewStartCell( sw_GetCellName( aDesc.nLeft, aDesc.nTop ) );
             OUString aNewEndCell( sw_GetCellName( aDesc.nRight, aDesc.nBottom ) );
             aRangeRepresentation = GetRangeRepFromTableAndCells(
-                        aChartTableName, aNewStartCell, aNewEndCell, sal_True );
+                        aChartTableName, aNewStartCell, aNewEndCell, true );
             bOk = GetSubranges( aRangeRepresentation, aSubRanges, true );
         }
     }
@@ -972,14 +972,14 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSourcePossible(
 {
     SolarMutexGuard aGuard;
 
-    sal_Bool bPossible = sal_True;
+    bool bPossible = true;
     try
     {
-        Impl_createDataSource( rArguments, sal_True );
+        Impl_createDataSource( rArguments, true );
     }
     catch (lang::IllegalArgumentException &)
     {
-        bPossible = sal_False;
+        bPossible = false;
     }
 
     return bPossible;
@@ -1025,7 +1025,7 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport(
         aEndCell   = sw_GetCellName( nEndCol, nEndRow );
 
         aRes = GetRangeRepFromTableAndCells( aTblName,
-                aStartCell, aEndCell, sal_False );
+                aStartCell, aEndCell, false );
     }
 
     return aRes;
@@ -1339,9 +1339,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
 
     OSL_ENSURE(nLabelSeqLen >= 0 || nLabelSeqLen == -2 /*not used*/,
             "unexpected value for 'nLabelSeqLen'" );
-    sal_Bool bFirstCellIsLabel = sal_False;     // default value if 'nLabelSeqLen' could not properly determined
+    bool bFirstCellIsLabel = false;     // default value if 'nLabelSeqLen' could not properly determined
     if (nLabelSeqLen > 0) // == 0 means no label sequence in use
-        bFirstCellIsLabel = sal_True;
+        bFirstCellIsLabel = true;
 
     OSL_ENSURE( !aSortedCellRanges.isEmpty(), "CellRangeRepresentation missing" );
     OUString aBrokenCellRangeForExport( GetBrokenCellRangeForExport( aSortedCellRanges ) );
@@ -1376,7 +1376,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
 }
 
 uno::Reference< chart2::data::XDataSequence > SwChartDataProvider::Impl_createDataSequenceByRangeRepresentation(
-        const OUString& rRangeRepresentation, sal_Bool bTestOnly )
+        const OUString& rRangeRepresentation, bool bTestOnly )
     throw (lang::IllegalArgumentException, uno::RuntimeException,
            std::exception)
 {
@@ -1411,14 +1411,14 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentationPo
 {
     SolarMutexGuard aGuard;
 
-    sal_Bool bPossible = sal_True;
+    bool bPossible = true;
     try
     {
-        Impl_createDataSequenceByRangeRepresentation( rRangeRepresentation, sal_True );
+        Impl_createDataSequenceByRangeRepresentation( rRangeRepresentation, true );
     }
     catch (lang::IllegalArgumentException &)
     {
-        bPossible = sal_False;
+        bPossible = false;
     }
 
     return bPossible;
@@ -1447,7 +1447,7 @@ void SAL_CALL SwChartDataProvider::dispose(  )
         osl::MutexGuard  aGuard( GetChartMutex() );
         bMustDispose = !bDisposed;
         if (!bDisposed)
-            bDisposed = sal_True;
+            bDisposed = true;
     }
     if (bMustDispose)
     {
@@ -1546,9 +1546,9 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable )
     }
 }
 
-sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox &rBox )
+bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox &rBox )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     OSL_ENSURE( pTable, "table pointer is NULL" );
     if (pTable)
     {
@@ -1564,8 +1564,8 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox
         while (aIt != aEndIt)
         {
             SwChartDataSequence *pDataSeq = 0;
-            sal_Bool bNowEmpty = sal_False;
-            sal_Bool bSeqDisposed = sal_False;
+            bool bNowEmpty = false;
+            bool bSeqDisposed = false;
 
             // check if weak reference is still valid...
             uno::Reference< chart2::data::XDataSequence > xTemp(*aIt);  // temporary needed for g++ 3.3.5
@@ -1582,8 +1582,8 @@ sal_Bool SwChartDataProvider::DeleteBox( const SwTable *pTable, const SwTableBox
                     }
                     catch (const lang::DisposedException&)
                     {
-                        bNowEmpty = sal_True;
-                        bSeqDisposed = sal_True;
+                        bNowEmpty = true;
+                        bSeqDisposed = true;
                     }
 
                     if (bNowEmpty)
@@ -1655,7 +1655,7 @@ void SwChartDataProvider::DisposeAllDataSequences( const SwTable *pTable )
 void SwChartDataProvider::AddRowCols(
         const SwTable &rTable,
         const SwSelBoxes& rBoxes,
-        sal_uInt16 nLines, sal_Bool bBehind )
+        sal_uInt16 nLines, bool bBehind )
 {
     if (rTable.IsTblComplex())
         return;
@@ -1908,7 +1908,7 @@ SwChartDataSequence::SwChartDataSequence(
     aCursorDepend( this, pTableCursor ),
     _pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_CHART2_DATA_SEQUENCE ) )
 {
-    bDisposed = sal_False;
+    bDisposed = false;
 
     acquire();
     try
@@ -1956,7 +1956,7 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     aCursorDepend( this, pTblCrsr ),
     _pPropSet( rObj._pPropSet )
 {
-    bDisposed = sal_False;
+    bDisposed = false;
 
     acquire();
     try
@@ -2236,7 +2236,7 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData()
 
                 // get numerical values and make an effort to return the
                 // numerical value for text formatted cells
-                aRange.GetDataSequence( 0, 0, &aRes, sal_True );
+                aRange.GetDataSequence( 0, 0, &aRes, true );
             }
         }
     }
@@ -2427,11 +2427,11 @@ void SAL_CALL SwChartDataSequence::dispose(  )
         osl::MutexGuard  aGuard( GetChartMutex() );
         bMustDispose = !bDisposed;
         if (!bDisposed)
-            bDisposed = sal_True;
+            bDisposed = true;
     }
     if (bMustDispose)
     {
-        bDisposed = sal_True;
+        bDisposed = true;
         if (pDataProvider)
         {
             const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
@@ -2493,7 +2493,7 @@ void SAL_CALL SwChartDataSequence::removeEventListener(
         aEvtListeners.removeInterface( rxListener );
 }
 
-sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
+bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
 {
     if (bDisposed)
         throw lang::DisposedException();
@@ -2503,7 +2503,7 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
 #endif
 
     // to be set if the last box of the data-sequence was removed here
-    sal_Bool bNowEmpty = sal_False;
+    bool bNowEmpty = false;
 
     // if the implementation cursor gets affected (i.e. thew box where it is located
     // in gets removed) we need to move it before that... (otherwise it does not need to change)
@@ -2513,7 +2513,7 @@ sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
 
     if (!pTblCrsr->HasMark() || (pPointStartNode == rBox.GetSttNd()  &&  pMarkStartNode == rBox.GetSttNd()))
     {
-        bNowEmpty = sal_True;
+        bNowEmpty = true;
     }
     else if (pPointStartNode == rBox.GetSttNd()  ||  pMarkStartNode == rBox.GetSttNd())
     {
@@ -2727,7 +2727,7 @@ SwChartLabeledDataSequence::SwChartLabeledDataSequence() :
     aEvtListeners( GetChartMutex() ),
     aModifyListeners( GetChartMutex() )
 {
-    bDisposed = sal_False;
+    bDisposed = false;
 }
 
 SwChartLabeledDataSequence::~SwChartLabeledDataSequence()
@@ -2910,11 +2910,11 @@ void SAL_CALL SwChartLabeledDataSequence::dispose(  )
         osl::MutexGuard  aGuard( GetChartMutex() );
         bMustDispose = !bDisposed;
         if (!bDisposed)
-            bDisposed = sal_True;
+            bDisposed = true;
     }
     if (bMustDispose)
     {
-        bDisposed = sal_True;
+        bDisposed = true;
 
         // require listeners to release references to this object
         lang::EventObject aEvtObj( dynamic_cast< chart2::data::XLabeledDataSequence * >(this) );
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 12b561459ced..9ee4087ce328 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -934,7 +934,7 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName)
     throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet= sal_False;
+    bool bRet= false;
     if(IsValid())
     {
         sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(true);
@@ -943,7 +943,7 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName)
             SwFrmFmt& rFmt = GetDoc()->GetTblFrmFmt(i, true);
             if (rName == rFmt.GetName())
             {
-                bRet = sal_True;
+                bRet = true;
                 break;
             }
         }
@@ -1525,7 +1525,7 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName)
     throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(IsValid())
     {
         SwSectionFmts& rFmts = GetDoc()->GetSections();
@@ -1534,7 +1534,7 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName)
             const SwSectionFmt* pFmt = rFmts[i];
             if (rName == pFmt->GetSection()->GetSectionName())
             {
-                bRet = sal_True;
+                bRet = true;
                 break;
             }
         }
@@ -1799,7 +1799,7 @@ Sequence< OUString > SwXFootnotes::getSupportedServiceNames(void) throw( Runtime
     return aRet;
 }
 
-SwXFootnotes::SwXFootnotes(sal_Bool bEnd, SwDoc* _pDoc)
+SwXFootnotes::SwXFootnotes(bool bEnd, SwDoc* _pDoc)
     : SwUnoCollection(_pDoc)
     , m_bEndnote(bEnd)
 {
@@ -2006,7 +2006,7 @@ SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark*
 
 void SwUnoCollection::Invalidate()
 {
-    bObjectValid = sal_False;
+    bObjectValid = false;
     pDoc = 0;
 }
 
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 02a671a4310a..ac0a415b846c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -72,7 +72,7 @@ class SwShapeDescriptor_Impl
     SwFmtSurround*      pSurround;
     SvxULSpaceItem*     pULSpace;
     SvxLRSpaceItem*     pLRSpace;
-    sal_Bool            bOpaque;
+    bool            bOpaque;
     uno::Reference< text::XTextRange > xTextRange;
     // #i26791#
     SwFmtFollowTextFlow* mpFollowTextFlow;
@@ -94,9 +94,9 @@ public:
      pSurround(0),
      pULSpace(0),
      pLRSpace(0),
-     bOpaque(sal_False),
+     bOpaque(false),
      // #i26791#
-     mpFollowTextFlow( new SwFmtFollowTextFlow( sal_False ) ),
+     mpFollowTextFlow( new SwFmtFollowTextFlow( false ) ),
      // #i28701# #i35017#
      pWrapInfluenceOnObjPos( new SwFmtWrapInfluenceOnObjPos(
                             text::WrapInfluenceOnPosition::ONCE_CONCURRENT ) ),
@@ -167,11 +167,11 @@ public:
     {
         return xTextRange;
     }
-    sal_Bool    IsOpaque() const
+    bool    IsOpaque() const
         {
             return bOpaque;
         }
-    const sal_Bool&    GetOpaque() const
+    const bool&    GetOpaque() const
         {
             return bOpaque;
         }
@@ -181,13 +181,13 @@ public:
     void RemoveSurround(){DELETEZ(pSurround);}
     void RemoveULSpace(){DELETEZ(pULSpace);}
     void RemoveLRSpace(){DELETEZ(pLRSpace);}
-    void SetOpaque(sal_Bool bSet){bOpaque = bSet;}
+    void SetOpaque(bool bSet){bOpaque = bSet;}
 
     // #i26791#
     SwFmtFollowTextFlow* GetFollowTextFlow( bool _bCreate = false )
     {
         if ( _bCreate && !mpFollowTextFlow )
-            mpFollowTextFlow = new SwFmtFollowTextFlow( sal_False );
+            mpFollowTextFlow = new SwFmtFollowTextFlow( false );
         return mpFollowTextFlow;
     }
     void RemoveFollowTextFlow()
@@ -597,7 +597,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     SfxItemSet aSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
                                         RES_FRMATR_END-1 );
     SwFmtAnchor aAnchor( FLY_AS_CHAR );
-    sal_Bool bOpaque = sal_False;
+    bool bOpaque = false;
     if( pDesc )
     {
         if(pDesc->GetSurround())
@@ -712,7 +712,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
     if(pFmt)
         pFmt->Add(pShape);
-    pShape->m_bDescriptor = sal_False;
+    pShape->m_bDescriptor = false;
 
     delete pPam;
     delete pInternalPam;
@@ -885,7 +885,7 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_SHAPE)),
     m_pPropertyMapEntries(aSwMapProvider.GetPropertyMapEntries(PROPERTY_MAP_TEXT_SHAPE)),
     pImpl(new SwShapeDescriptor_Impl()),
-    m_bDescriptor(sal_True)
+    m_bDescriptor(true)
 {
     if(xShape.is())  // default Ctor
     {
@@ -950,7 +950,7 @@ void SwXShape::AddExistingShapeToFmt( SdrObject& _rObj )
                 SwFrmFmt* pFmt = ::FindFrmFmt( const_cast< SdrObject* >( pCurrent ) );
                 if ( pFmt )
                     pFmt->Add( pSwShape );
-                pSwShape->m_bDescriptor = sal_False;
+                pSwShape->m_bDescriptor = false;
             }
 
             if ( !pSwShape->pImpl->bInitializedPropertyNotifier )
@@ -1841,7 +1841,7 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
                     case  RES_LR_SPACE:     pImpl->RemoveLRSpace(); break;
                     case  RES_UL_SPACE:     pImpl->RemoveULSpace(); break;
                     case  RES_SURROUND:     pImpl->RemoveSurround();break;
-                    case RES_OPAQUE :       pImpl->SetOpaque(sal_False);  break;
+                    case RES_OPAQUE :       pImpl->SetOpaque(false);  break;
                     case FN_TEXT_RANGE :
                     break;
                     // #i26791#
@@ -2749,7 +2749,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru
                     }
                 }
             }
-            pSwShape->m_bDescriptor = sal_False;
+            pSwShape->m_bDescriptor = false;
             //add the group member to the format of the group
             SwFrmFmt* pShapeFmt = ::FindFrmFmt( pSvxShape->GetSdrObject() );
             if(pShapeFmt)
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 8b4a0dc1cfd3..b26fa1ddb6cb 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -408,7 +408,7 @@ public:
     OUString        m_sParam6;  // -    /DataBaseResource
     double          m_fParam1;  // Value / -
     sal_Int8        m_nParam1;  // ChapterNumberingLevel
-    sal_Bool        m_bParam1;  // IsExpression
+    bool        m_bParam1;  // IsExpression
     sal_Int32       m_nParam2;
 
     Impl(SwXFieldMaster & rThis, SwModify *const pModify,
@@ -421,7 +421,7 @@ public:
         , m_nResTypeId(nResId)
         , m_fParam1(0.0)
         , m_nParam1(-1)
-        , m_bParam1(sal_False)
+        , m_bParam1(false)
         , m_nParam2(0)
     { }
 
@@ -1046,7 +1046,7 @@ OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rD
 OUString SwXFieldMaster::LocalizeFormula(
     const SwSetExpField& rFld,
     const OUString& rFormula,
-    sal_Bool bQuery)
+    bool bQuery)
 {
     const OUString sTypeName(rFld.GetTyp()->GetName());
     OUString sProgName = SwStyleNameMapper::GetProgName(sTypeName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -1099,10 +1099,10 @@ struct SwFieldProperties_Impl
     sal_Int16       nSHORT1;
     sal_Int8        nByte1;
     bool            bFormatIsDefault;
-    sal_Bool        bBool1;
-    sal_Bool        bBool2;
-    sal_Bool        bBool3;
-    sal_Bool        bBool4;
+    bool        bBool1;
+    bool        bBool2;
+    bool        bBool3;
+    bool        bBool4;
 
     SwFieldProperties_Impl():
         aDate( Date::EMPTY ),
@@ -1115,10 +1115,10 @@ struct SwFieldProperties_Impl
         nSHORT1(0),
         nByte1(0),
         bFormatIsDefault(true),
-        bBool1(sal_False),
-        bBool2(sal_False),
-        bBool3(sal_False),
-        bBool4(sal_True) //Automatic language
+        bBool1(false),
+        bBool2(false),
+        bBool3(false),
+        bBool4(true) //Automatic language
         {}
     ~SwFieldProperties_Impl()
         {delete pDateTime;}
@@ -1209,11 +1209,11 @@ SwXTextField::SwXTextField(
          || SW_SERVICE_FIELDTYPE_DATABASE == nServiceId
          || SW_SERVICE_FIELDTYPE_DATABASE_NAME == nServiceId )
     {
-        m_pImpl->m_pProps->bBool2 = sal_True;
+        m_pImpl->m_pProps->bBool2 = true;
     }
     else if(SW_SERVICE_FIELDTYPE_TABLE_FORMULA == nServiceId)
     {
-        m_pImpl->m_pProps->bBool1 = sal_True;
+        m_pImpl->m_pProps->bBool1 = true;
     }
     if(SW_SERVICE_FIELDTYPE_SET_EXP == nServiceId)
     {
@@ -2175,7 +2175,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     }
     else if (m_pImpl->m_pProps)
     {
-        sal_Bool* pBool = 0;
+        bool* pBool = 0;
         switch(pEntry->nWID)
         {
         case FIELD_PROP_PAR1:
@@ -2306,8 +2306,8 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             if (FIELD_PROP_IS_FIELD_USED      == pEntry->nWID ||
                 FIELD_PROP_IS_FIELD_DISPLAYED == pEntry->nWID)
             {
-                sal_Bool bIsFieldUsed       = sal_False;
-                sal_Bool bIsFieldDisplayed  = sal_False;
+                bool bIsFieldUsed       = false;
+                bool bIsFieldDisplayed  = false;
 
                 // in order to have the information about fields
                 // correctly evaluated the document needs a layout
@@ -2335,8 +2335,8 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                 // e.g. fields in undo or redo array
                 if (rTxtNode.GetNodes().IsDocNodes())
                 {
-                    sal_Bool bFrame = 0 != rTxtNode.FindLayoutRect().Width(); // oder so
-                    sal_Bool bHidden = rTxtNode.IsHidden();
+                    bool bFrame = 0 != rTxtNode.FindLayoutRect().Width(); // oder so
+                    bool bHidden = rTxtNode.IsHidden();
                     if ( !bHidden )
                     {
                         sal_Int32 nHiddenStart;
@@ -2727,7 +2727,7 @@ uno::Any SwXTextFieldMasters::getByName(const OUString& rName)
     return uno::makeAny(xRet);
 }
 
-sal_Bool SwXTextFieldMasters::getInstanceName(
+bool SwXTextFieldMasters::getInstanceName(
     const SwFieldType& rFldType, OUString& rName)
 {
     OUString sField;
@@ -2754,11 +2754,11 @@ sal_Bool SwXTextFieldMasters::getInstanceName(
         break;
 
     default:
-        return sal_False;
+        return false;
     }
 
     rName += COM_TEXT_FLDMASTER_CC + sField;
-    return sal_True;
+    return true;
 }
 
 uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void)
@@ -2801,7 +2801,7 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti
 
     OUString sName(rName), sTypeName;
     sal_uInt16 nResId = lcl_GetIdByName( sName, sTypeName );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( USHRT_MAX != nResId )
     {
         sName = sName.copy(std::min(sTypeName.getLength()+1, sName.getLength()));
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index c23ce7a7a43b..cb2279edc629 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -339,14 +339,14 @@ SwXFlatParagraph::getSomething(
     return sw::UnoTunnelImpl(rId, this);
 }
 
-SwXFlatParagraphIterator::SwXFlatParagraphIterator( SwDoc& rDoc, sal_Int32 nType, sal_Bool bAutomatic )
+SwXFlatParagraphIterator::SwXFlatParagraphIterator( SwDoc& rDoc, sal_Int32 nType, bool bAutomatic )
     : mpDoc( &rDoc ),
       mnType( nType ),
       mbAutomatic( bAutomatic ),
       mnCurrentNode( 0 ),
       mnStartNode( 0 ),
       mnEndNode( rDoc.GetNodes().Count() ),
-      mbWrapped( sal_False )
+      mbWrapped( false )
 {
     //mnStartNode = mnCurrentNode = get node from current cursor TODO!
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 1bc89b4af597..8d60f0111e22 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -137,7 +137,7 @@
 #include <svx/xfltrit.hxx>
 
 // from fefly1.cxx
-extern sal_Bool sw_ChkAndSetNewAnchor( SwEditShell& rEditShell, const SwFlyFrm& rFly, SfxItemSet& rSet );
+extern bool sw_ChkAndSetNewAnchor( SwEditShell& rEditShell, const SwFlyFrm& rFly, SfxItemSet& rSet );
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 8ae85cef1259..cc634733aa48 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -85,10 +85,10 @@ lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException)
     return nRet;
 }
 
-static sal_Bool
+static bool
 lcl_AnyToBool(uno::Any const& rVal) throw (lang::IllegalArgumentException)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(!(rVal >>= bRet))
     {
         throw lang::IllegalArgumentException();
@@ -110,7 +110,7 @@ static void
 lcl_BitMaskToAny(uno::Any & o_rValue,
         const sal_uInt16 nBitMask, const sal_uInt16 nBit)
 {
-    const sal_Bool bRet = 0 != (nBitMask & nBit);
+    const bool bRet = 0 != (nBitMask & nBit);
     o_rValue <<= bRet;
 }
 
@@ -688,7 +688,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
         break;
         case WID_PROTECTED:
         {
-            sal_Bool bSet = lcl_AnyToBool(rValue);
+            bool bSet = lcl_AnyToBool(rValue);
             rTOXBase.SetProtected(bSet);
             if (pSectionFmt)
             {
@@ -929,7 +929,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                 {
                     SwSections aSectArr;
                     pSectionFmt->GetChildSections(aSectArr,
-                            SORTSECT_NOT, sal_False);
+                            SORTSECT_NOT, false);
                     for(sal_uInt16 i = 0; i < aSectArr.size(); i++)
                     {
                         SwSection* pSect = aSectArr[i];
@@ -993,19 +993,19 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_CREATE_FROM_CHAPTER:
             {
-                const sal_Bool bRet = pTOXBase->IsFromChapter();
+                const bool bRet = pTOXBase->IsFromChapter();
                 aRet <<= bRet;
             }
             break;
             case WID_CREATE_FROM_LABELS:
             {
-                const sal_Bool bRet = ! pTOXBase->IsFromObjectNames();
+                const bool bRet = ! pTOXBase->IsFromObjectNames();
                 aRet <<= bRet;
             }
             break;
             case WID_PROTECTED:
             {
-                const sal_Bool bRet = pTOXBase->IsProtected();
+                const bool bRet = pTOXBase->IsProtected();
                 aRet <<= bRet;
             }
             break;
@@ -1037,7 +1037,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_IS_COMMA_SEPARATED:
             {
-                const sal_Bool bRet = rForm.IsCommaSeparated();
+                const bool bRet = rForm.IsCommaSeparated();
                 aRet <<= bRet;
             }
             break;
@@ -1071,7 +1071,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_USE_LEVEL_FROM_SOURCE:
             {
-                const sal_Bool bRet = pTOXBase->IsLevelFromChapter();
+                const bool bRet = pTOXBase->IsLevelFromChapter();
                 aRet <<= bRet;
             }
             break;
@@ -1185,7 +1185,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_IS_RELATIVE_TABSTOPS:
             {
-                const sal_Bool bRet = rForm.IsRelTabPos();
+                const bool bRet = rForm.IsRelTabPos();
                 aRet <<= bRet;
             }
             break;
@@ -1548,7 +1548,7 @@ public:
     const SwTOXMark *           m_pTOXMark;
     SwDoc *                     m_pDoc;
 
-    sal_Bool                    m_bMainEntry;
+    bool                    m_bMainEntry;
     sal_uInt16                  m_nLevel;
     OUString                    m_aBookmarkName;
     OUString                    m_aEntryTypeName;
@@ -1578,7 +1578,7 @@ public:
         , m_TypeDepend(this, pType)
         , m_pTOXMark(pMark)
         , m_pDoc(pDoc)
-        , m_bMainEntry(sal_False)
+        , m_bMainEntry(false)
         , m_nLevel(0)
     {
     }
@@ -2330,7 +2330,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_MAIN_ENTRY:
             {
-                const sal_Bool bTemp = m_pImpl->m_pTOXMark->IsMainEntry();
+                const bool bTemp = m_pImpl->m_pTOXMark->IsMainEntry();
                 aRet <<= bTemp;
             }
             break;
@@ -2371,9 +2371,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                 aRet <<= m_pImpl->m_sUserIndexName;
             break;
             case WID_MAIN_ENTRY:
-            {
-                aRet <<= static_cast<sal_Bool>(m_pImpl->m_bMainEntry);
-            }
+                aRet <<= m_pImpl->m_bMainEntry;
             break;
         }
     }
@@ -2862,7 +2860,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
             }
             else if ( pProperties[j].Name == "TabStopRightAligned" )
             {
-                const sal_Bool bRight = lcl_AnyToBool(pProperties[j].Value);
+                const bool bRight = lcl_AnyToBool(pProperties[j].Value);
                 aToken.eTabAlign = bRight ?
                                     SVX_TAB_ADJUST_END : SVX_TAB_ADJUST_LEFT;
             }
@@ -3129,7 +3127,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
                 pArr[3].Value <<= aProgCharStyle;
                 // #i21237#
                 pArr[4].Name = "WithTab";
-                pArr[4].Value <<= static_cast<sal_Bool>(aToken.bWithTab);
+                pArr[4].Value <<= aToken.bWithTab;
             }
             break;
             case TOKEN_TEXT:
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 229b17ded4d1..32c1c7aca76c 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -176,15 +176,15 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
     if( xWrt.Is() )
     {
         SwWriter aWriter( aStream, rPam );
-        xWrt->bASCII_NoLastLineEnd = sal_True;
-        xWrt->bExportPargraphNumbering = sal_False;
+        xWrt->bASCII_NoLastLineEnd = true;
+        xWrt->bExportPargraphNumbering = false;
         SwAsciiOptions aOpt = xWrt->GetAsciiOptions();
         aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE );
         xWrt->SetAsciiOptions( aOpt );
-        xWrt->bUCS2_WithStartChar = sal_False;
+        xWrt->bUCS2_WithStartChar = false;
         // #i68522#
-        const sal_Bool bOldShowProgress = xWrt->bShowProgress;
-        xWrt->bShowProgress = sal_False;
+        const bool bOldShowProgress = xWrt->bShowProgress;
+        xWrt->bShowProgress = false;
 
         long lLen;
         if( !IsError( aWriter.Write( xWrt ) ) &&
@@ -547,7 +547,7 @@ throw (lang::IllegalArgumentException)
             }
             else if (FN_UNO_IS_NUMBER == rEntry.nWID)
             {
-                sal_Bool bIsNumber(sal_False);
+                bool bIsNumber(false);
                 if (rValue >>= bIsNumber)
                 {
                     if (!bIsNumber)
@@ -561,7 +561,7 @@ throw (lang::IllegalArgumentException)
         break;
         case FN_NUMBER_NEWSTART:
         {
-            sal_Bool bVal = sal_False;
+            bool bVal = false;
             if (!(rValue >>= bVal))
             {
                 throw lang::IllegalArgumentException();
@@ -809,7 +809,7 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
 
                 SwUnoCursorHelper::SelectPam(*pUnoCrsr, true);
                 pCurrent->Left(rText.getLength(),
-                        CRSR_SKIP_CHARS, sal_False, sal_False);
+                        CRSR_SKIP_CHARS, false, false);
             }
             pCurrent = static_cast<SwCursor *>(pCurrent->GetNext());
         } while (pCurrent != pUnoCrsr);
@@ -819,12 +819,12 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
 
 enum ForceIntoMetaMode { META_CHECK_BOTH, META_INIT_START, META_INIT_END };
 
-static sal_Bool
+static bool
 lcl_ForceIntoMeta(SwPaM & rCursor,
         uno::Reference<text::XText> const & xParentText,
         const enum ForceIntoMetaMode eMode)
 {
-    sal_Bool bRet( sal_True ); // means not forced in META_CHECK_BOTH
+    bool bRet( true ); // means not forced in META_CHECK_BOTH
     SwXMeta const * const pXMeta( dynamic_cast<SwXMeta*>(xParentText.get()) );
     OSL_ENSURE(pXMeta, "no parent?");
     if (!pXMeta)
@@ -851,12 +851,12 @@ lcl_ForceIntoMeta(SwPaM & rCursor,
             if (*rCursor.Start() < start)
             {
                 *rCursor.Start() = start;
-                bRet = sal_False;
+                bRet = false;
             }
             if (*rCursor.End() > end)
             {
                 *rCursor.End() = end;
-                bRet = sal_False;
+                bRet = false;
             }
             break;
     }
@@ -980,7 +980,7 @@ sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException, std
 {
     SolarMutexGuard aGuard;
 
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     SwUnoCrsr *const pUnoCrsr = m_pImpl->GetCursor();
     if(pUnoCrsr && pUnoCrsr->GetMark())
     {
@@ -998,7 +998,7 @@ throw (uno::RuntimeException, std::exception)
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    sal_Bool bRet = rUnoCursor.Left( nCount, CRSR_SKIP_CHARS, sal_False, sal_False);
+    bool bRet = rUnoCursor.Left( nCount, CRSR_SKIP_CHARS, false, false);
     if (CURSOR_META == m_pImpl->m_eType)
     {
         bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText,
@@ -1017,7 +1017,7 @@ throw (uno::RuntimeException, std::exception)
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    sal_Bool bRet = rUnoCursor.Right(nCount, CRSR_SKIP_CHARS, sal_False, sal_False);
+    bool bRet = rUnoCursor.Right(nCount, CRSR_SKIP_CHARS, false, false);
     if (CURSOR_META == m_pImpl->m_eType)
     {
         bRet = lcl_ForceIntoMeta(rUnoCursor, m_pImpl->m_xParentText,
@@ -1262,7 +1262,7 @@ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException, s
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    const sal_Bool bRet =
+    const bool bRet =
         rUnoCursor.IsStartWordWT( i18n::WordType::DICTIONARY_WORD );
     return bRet;
 }
@@ -1273,7 +1273,7 @@ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException, std
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    const sal_Bool bRet =
+    const bool bRet =
         rUnoCursor.IsEndWordWT( i18n::WordType::DICTIONARY_WORD );
     return bRet;
 }
@@ -1286,7 +1286,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // problems arise when a paragraph starts with something other than a word
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     // remember old position to check if cursor has moved
     // since the called functions are sometimes a bit unreliable
     // in specific cases...
@@ -1299,7 +1299,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
     if (rUnoCursor.GetCntntNode() &&
             (pPoint->nContent == rUnoCursor.GetCntntNode()->Len()))
     {
-        rUnoCursor.Right(1, CRSR_SKIP_CHARS, sal_False, sal_False);
+        rUnoCursor.Right(1, CRSR_SKIP_CHARS, false, false);
     }
     else
     {
@@ -1333,7 +1333,7 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // white spaces create problems on the paragraph start
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwPosition  *const pPoint     = rUnoCursor.GetPoint();
     SwNode      *const pOldNode   = &pPoint->nNode.GetNode();
     sal_Int32 const nOldIndex  = pPoint->nContent.GetIndex();
@@ -1342,14 +1342,14 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s
     // start of paragraph?
     if (pPoint->nContent == 0)
     {
-        rUnoCursor.Left(1, CRSR_SKIP_CHARS, sal_False, sal_False);
+        rUnoCursor.Left(1, CRSR_SKIP_CHARS, false, false);
     }
     else
     {
         rUnoCursor.GoPrevWordWT( i18n::WordType::DICTIONARY_WORD );
         if (pPoint->nContent == 0)
         {
-            rUnoCursor.Left(1, CRSR_SKIP_CHARS, sal_False, sal_False);
+            rUnoCursor.Left(1, CRSR_SKIP_CHARS, false, false);
         }
     }
 
@@ -1372,7 +1372,7 @@ SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException, std:
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwPosition  *const pPoint     = rUnoCursor.GetPoint();
     SwNode      &      rOldNode   = pPoint->nNode.GetNode();
     sal_Int32 const nOldIndex  = pPoint->nContent.GetIndex();
@@ -1408,7 +1408,7 @@ SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException, st
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwPosition  *const pPoint     = rUnoCursor.GetPoint();
     SwNode      &      rOldNode   = pPoint->nNode.GetNode();
     sal_Int32 const nOldIndex  = pPoint->nContent.GetIndex();
@@ -1445,7 +1445,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception)
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // start of paragraph?
-    sal_Bool bRet = rUnoCursor.GetPoint()->nContent == 0;
+    bool bRet = rUnoCursor.GetPoint()->nContent == 0;
     // with mark ->no sentence start
     // (check if cursor is no selection, i.e. it does not have
     // a mark or else point and mark are identical)
@@ -1468,7 +1468,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // end of paragraph?
-    sal_Bool bRet = rUnoCursor.GetCntntNode() &&
+    bool bRet = rUnoCursor.GetCntntNode() &&
         (rUnoCursor.GetPoint()->nContent == rUnoCursor.GetCntntNode()->Len());
     // with mark->no sentence end
     // (check if cursor is no selection, i.e. it does not have
@@ -1493,7 +1493,7 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, s
 
     const bool bWasEOS = isEndOfSentence();
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    sal_Bool bRet = rUnoCursor.GoSentence(SwCursor::NEXT_SENT);
+    bool bRet = rUnoCursor.GoSentence(SwCursor::NEXT_SENT);
     if (!bRet)
     {
         bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart);
@@ -1507,7 +1507,7 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, s
         const bool bNextWord = rUnoCursor.GoNextWord();
         if (bWasEOS && !bNextWord)
         {
-            bRet = sal_False;
+            bRet = false;
         }
     }
     if (CURSOR_META == m_pImpl->m_eType)
@@ -1528,7 +1528,7 @@ throw (uno::RuntimeException, std::exception)
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    sal_Bool bRet = rUnoCursor.GoSentence(SwCursor::PREV_SENT);
+    bool bRet = rUnoCursor.GoSentence(SwCursor::PREV_SENT);
     if (!bRet)
     {
         bRet = rUnoCursor.MovePara(fnParaPrev, fnParaStart);
@@ -1560,7 +1560,7 @@ throw (uno::RuntimeException, std::exception)
     // if we're at the para start then we wont move
     // but bRet is also true if GoSentence failed but
     // the start of the sentence is reached
-    sal_Bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor)
+    bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor)
         || rUnoCursor.GoSentence(SwCursor::START_SENT)
         || SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
     if (CURSOR_META == m_pImpl->m_eType)
@@ -1583,8 +1583,8 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException,
     // bRet is true if GoSentence() succeeded or if the
     // MovePara() succeeded while the end of the para is
     // not reached already
-    sal_Bool bAlreadyParaEnd = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
-    sal_Bool bRet = !bAlreadyParaEnd
+    bool bAlreadyParaEnd = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
+    bool bRet = !bAlreadyParaEnd
             &&  (rUnoCursor.GoSentence(SwCursor::END_SENT)
                  || rUnoCursor.MovePara(fnParaCurr, fnParaEnd));
     if (CURSOR_META == m_pImpl->m_eType)
@@ -1603,7 +1603,7 @@ SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException, std::exception
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    const sal_Bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
+    const bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
     return bRet;
 }
 
@@ -1614,7 +1614,7 @@ SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException, std::exception)
 
     SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
-    const sal_Bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
+    const bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
     return bRet;
 }
 
@@ -1631,7 +1631,7 @@ throw (uno::RuntimeException, std::exception)
         return sal_False;
     }
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    sal_Bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
+    bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
     if (!bRet)
     {
         bRet = rUnoCursor.MovePara(fnParaCurr, fnParaStart);
@@ -1656,7 +1656,7 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException,
         return sal_False;
     }
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    sal_Bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
+    bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
     if (!bRet)
     {
         bRet = rUnoCursor.MovePara(fnParaCurr, fnParaEnd);
@@ -1681,7 +1681,7 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException,
         return sal_False;
     }
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    const sal_Bool bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart);
+    const bool bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart);
     return bRet;
 }
 
@@ -1698,7 +1698,7 @@ throw (uno::RuntimeException, std::exception)
         return sal_False;
     }
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
-    const sal_Bool bRet = rUnoCursor.MovePara(fnParaPrev, fnParaStart);
+    const bool bRet = rUnoCursor.MovePara(fnParaPrev, fnParaStart);
     return bRet;
 }
 
@@ -2186,7 +2186,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
     if (rPropertyName == UNO_NAME_IS_SKIP_HIDDEN_TEXT)
     {
-        sal_Bool bSet(sal_False);
+        bool bSet(false);
         if (!(rValue >>= bSet))
         {
             throw lang::IllegalArgumentException();
@@ -2195,7 +2195,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     }
     else if (rPropertyName == UNO_NAME_IS_SKIP_PROTECTED_TEXT)
     {
-        sal_Bool bSet(sal_False);
+        bool bSet(false);
         if (!(rValue >>= bSet))
         {
             throw lang::IllegalArgumentException();
@@ -2221,12 +2221,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     uno::Any aAny;
     if (rPropertyName == UNO_NAME_IS_SKIP_HIDDEN_TEXT)
     {
-        const sal_Bool bSet = rUnoCursor.IsSkipOverHiddenSections();
+        const bool bSet = rUnoCursor.IsSkipOverHiddenSections();
         aAny <<= bSet;
     }
     else if (rPropertyName == UNO_NAME_IS_SKIP_PROTECTED_TEXT)
     {
-        const sal_Bool bSet = rUnoCursor.IsSkipOverProtectSections();
+        const bool bSet = rUnoCursor.IsSkipOverProtectSections();
         aAny <<= bSet;
     }
     else
@@ -2638,7 +2638,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable)
     pArray[1] = beans::PropertyValue("Delimiter", -1, aVal,
                     beans::PropertyState_DIRECT_VALUE);
 
-    aVal <<= (sal_Bool) sal_False;
+    aVal <<= false;
     pArray[2] = beans::PropertyValue("IsSortColumns", -1, aVal,
                     beans::PropertyState_DIRECT_VALUE);
 
@@ -2702,11 +2702,11 @@ SwXTextCursor::createSortDescriptor() throw (uno::RuntimeException, std::excepti
     return SwUnoCursorHelper::CreateSortDescriptor(false);
 }
 
-sal_Bool SwUnoCursorHelper::ConvertSortProperties(
+bool SwUnoCursorHelper::ConvertSortProperties(
     const uno::Sequence< beans::PropertyValue >& rDescriptor,
     SwSortOptions& rSortOpt)
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     const beans::PropertyValue* pProperties = rDescriptor.getConstArray();
 
     rSortOpt.bTable = false;
@@ -2729,8 +2729,8 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
     pKey3->eSortOrder = SRT_ASCENDING;
     SwSortKey* aKeys[3] = {pKey1, pKey2, pKey3};
 
-    sal_Bool bOldSortdescriptor(sal_False);
-    sal_Bool bNewSortdescriptor(sal_False);
+    bool bOldSortdescriptor(false);
+    bool bNewSortdescriptor(false);
 
     for (sal_Int32 n = 0; n < rDescriptor.getLength(); ++n)
     {
@@ -2747,7 +2747,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if ( rPropName == "Delimiter" )
@@ -2759,39 +2759,39 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         // old sortdescriptor
         else if ( rPropName == "SortColumns" )
         {
-            bOldSortdescriptor = sal_True;
-            sal_Bool bTemp(sal_False);
+            bOldSortdescriptor = true;
+            bool bTemp(false);
             if (aValue >>= bTemp)
             {
                 rSortOpt.eDirection = bTemp ? SRT_COLUMNS : SRT_ROWS;
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if ( rPropName == "IsCaseSensitive" )
         {
-            bOldSortdescriptor = sal_True;
-            sal_Bool bTemp(sal_False);
+            bOldSortdescriptor = true;
+            bool bTemp(false);
             if (aValue >>= bTemp)
             {
                 rSortOpt.bIgnoreCase = !bTemp;
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if ( rPropName == "CollatorLocale" )
         {
-            bOldSortdescriptor = sal_True;
+            bOldSortdescriptor = true;
             lang::Locale aLocale;
             if (aValue >>= aLocale)
             {
@@ -2799,14 +2799,14 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if (rPropName.startsWith("CollatorAlgorithm") &&
             rPropName.getLength() == 18 &&
             (rPropName[17] >= '0' && rPropName[17] <= '9'))
         {
-            bOldSortdescriptor = sal_True;
+            bOldSortdescriptor = true;
             sal_uInt16 nIndex = rPropName[17];
             nIndex -= '0';
             OUString aTxt;
@@ -2816,14 +2816,14 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if (rPropName.startsWith("SortRowOrColumnNo") &&
             rPropName.getLength() == 18 &&
             (rPropName[17] >= '0' && rPropName[17] <= '9'))
         {
-            bOldSortdescriptor = sal_True;
+            bOldSortdescriptor = true;
             sal_uInt16 nIndex = rPropName[17];
             nIndex -= '0';
             sal_Int16 nCol = -1;
@@ -2838,61 +2838,61 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if (rPropName.startsWith("IsSortNumeric") &&
             rPropName.getLength() == 14 &&
             (rPropName[13] >= '0' && rPropName[13] <= '9'))
         {
-            bOldSortdescriptor = sal_True;
+            bOldSortdescriptor = true;
             sal_uInt16 nIndex = rPropName[13];
             nIndex = nIndex - '0';
             if (aValue.getValueType() == ::getBooleanCppuType() && nIndex < 3)
             {
-                sal_Bool bTemp = *(sal_Bool*)aValue.getValue();
+                bool bTemp = *(sal_Bool*)aValue.getValue();
                 aKeys[nIndex]->bIsNumeric = bTemp;
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if (rPropName.startsWith("IsSortAscending") &&
             rPropName.getLength() == 16 &&
             (rPropName[15] >= '0' && rPropName[15] <= '9'))
         {
-            bOldSortdescriptor = sal_True;
+            bOldSortdescriptor = true;
             sal_uInt16 nIndex = rPropName[15];
             nIndex -= '0';
             if (aValue.getValueType() == ::getBooleanCppuType() && nIndex < 3)
             {
-                sal_Bool bTemp = *(sal_Bool*)aValue.getValue();
+                bool bTemp = *(sal_Bool*)aValue.getValue();
                 aKeys[nIndex]->eSortOrder = (bTemp)
                     ? SRT_ASCENDING : SRT_DESCENDING;
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         // new sortdescriptor
         else if ( rPropName == "IsSortColumns" )
         {
-            bNewSortdescriptor = sal_True;
+            bNewSortdescriptor = true;
             if (aValue.getValueType() == ::getBooleanCppuType())
             {
-                sal_Bool bTemp = *(sal_Bool*)aValue.getValue();
+                bool bTemp = *(sal_Bool*)aValue.getValue();
                 rSortOpt.eDirection = bTemp ? SRT_COLUMNS : SRT_ROWS;
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
         else if ( rPropName == "SortFields" )
         {
-            bNewSortdescriptor = sal_True;
+            bNewSortdescriptor = true;
             uno::Sequence < table::TableSortField > aFields;
             if (aValue >>= aFields)
             {
@@ -2916,12 +2916,12 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
                 }
                 else
                 {
-                    bRet = sal_False;
+                    bRet = false;
                 }
             }
             else
             {
-                bRet = sal_False;
+                bRet = false;
             }
         }
     }
@@ -2930,7 +2930,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
     {
         OSL_FAIL("someone tried to set the old deprecated and "
             "the new sortdescriptor");
-        bRet = sal_False;
+        bRet = false;
     }
 
     if (pKey1->nColumnId != USHRT_MAX)
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index ebd46a2851fe..cc43ec69e6b3 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -591,7 +591,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
         if ((CURSOR_TBLTEXT != m_eCursorType) &&
             (CURSOR_SELECTION_IN_TABLE != m_eCursorType))
         {
-            aNewCrsr->SetRemainInSection( sal_False );
+            aNewCrsr->SetRemainInSection( false );
         }
 
         // os 2005-01-14: This part is only necessary to detect movements out
@@ -616,7 +616,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
     bool bInTable = false;
     if (!m_bFirstParagraph)
     {
-        pUnoCrsr->SetRemainInSection( sal_False );
+        pUnoCrsr->SetRemainInSection( false );
         // what to do if already in a table?
         SwTableNode * pTblNode = pUnoCrsr->GetNode()->FindTableNode();
         pTblNode = lcl_FindTopLevelTable( pTblNode, m_pOwnTable );
@@ -843,7 +843,7 @@ throw (uno::RuntimeException)
                     m_pImpl->m_rDoc, aCursor, rText, bForceExpandHints);
 
             SwUnoCursorHelper::SelectPam(aCursor, true);
-            aCursor.Left(rText.getLength(), CRSR_SKIP_CHARS, sal_False, sal_False);
+            aCursor.Left(rText.getLength(), CRSR_SKIP_CHARS, false, false);
         }
         SetPositions(aCursor);
         m_pImpl->m_rDoc.GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
@@ -1677,7 +1677,7 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
         OSL_ENSURE( bSuccess, "DocInsertStringSplitCR" );
         (void) bSuccess;
         SwUnoCursorHelper::SelectPam(rCursor, true);
-        rCursor.Left(rString.getLength(), CRSR_SKIP_CHARS, sal_False, sal_False);
+        rCursor.Left(rString.getLength(), CRSR_SKIP_CHARS, false, false);
     }
     pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
 }
@@ -1738,13 +1738,13 @@ void SwXParaFrameEnumeration::Impl::Modify( const SfxPoolItem *pOld, const SfxPo
     }
 }
 
-static sal_Bool
+static bool
 lcl_CreateNextObject(SwUnoCrsr& i_rUnoCrsr,
         uno::Reference<text::XTextContent> & o_rNextObject,
         FrameDependList_t & i_rFrames)
 {
     if (!i_rFrames.size())
-        return sal_False;
+        return false;
 
     SwFrmFmt *const pFormat = static_cast<SwFrmFmt*>(const_cast<SwModify*>(
                 i_rFrames.front()->GetRegisteredIn()));
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 748bce80a0fe..e5f9207d49ea 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -90,7 +90,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
                             const SwTxtNode& rTxtNode,
                             const SwAttrSet** ppSet,
                             const SfxItemPropertySimpleEntry& rEntry,
-                            sal_Bool &rAttrSetFetched )
+                            bool &rAttrSetFetched )
     throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception);
 
 class SwXParagraph::Impl
@@ -694,7 +694,7 @@ throw (uno::RuntimeException)
             {
                 // get property state
                 // (compare to SwXParagraph::getPropertyState)
-                sal_Bool bAttrSetFetched = sal_True;
+                bool bAttrSetFetched = true;
                 beans::PropertyState eState = lcl_SwXParagraph_getPropertyState(
                             rTxtNode, &pAttrSet, *pEntry, bAttrSetFetched );
                 rResult.State  = eState;
@@ -843,7 +843,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
                             const SwTxtNode& rTxtNode,
                             const SwAttrSet** ppSet,
                             const SfxItemPropertySimpleEntry& rEntry,
-                            sal_Bool &rAttrSetFetched )
+                            bool &rAttrSetFetched )
     throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE;
@@ -851,7 +851,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
     if(!(*ppSet) && !rAttrSetFetched )
     {
         (*ppSet) = rTxtNode.GetpSwAttrSet();
-        rAttrSetFetched = sal_True;
+        rAttrSetFetched = true;
     }
     SwPosition aPos( rTxtNode );
     SwPaM aPam( aPos );
@@ -915,7 +915,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
                 + rPropertyName,
             static_cast<cppu::OWeakObject *>(this));
     }
-    sal_Bool bDummy = sal_False;
+    bool bDummy = false;
     const beans::PropertyState eRet =
         lcl_SwXParagraph_getPropertyState(rTxtNode, &pSet, *pEntry, bDummy);
     return eRet;
@@ -935,7 +935,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
     beans::PropertyState* pStates = aRet.getArray();
     const SfxItemPropertyMap &rMap = m_pImpl->m_rPropSet.getPropertyMap();
     const SwAttrSet* pSet = 0;
-    sal_Bool bAttrSetFetched = sal_False;
+    bool bAttrSetFetched = false;
 
     for (sal_Int32 i = 0, nEnd = PropertyNames.getLength(); i < nEnd;
             ++i, ++pStates, ++pNames)
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index f6e7d57a6ba2..3246577a3dc3 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -118,7 +118,7 @@ SwXTextPortion::SwXTextPortion(
     const SwUnoCrsr* pPortionCrsr,
     SwTxtRuby const& rAttr,
     uno::Reference< text::XText > const& xParent,
-    sal_Bool bIsEnd )
+    bool bIsEnd )
     : m_pImpl(new Impl)
     , m_pPropSet(aSwMapProvider.GetPropertySet(
                     PROPERTY_MAP_TEXTPORTION_EXTENSIONS))
@@ -346,7 +346,7 @@ void SwXTextPortion::GetPropertyValue(
             break;
             case FN_UNO_IS_START:
             {
-                sal_Bool bStart = sal_True, bPut = sal_True;
+                bool bStart = true, bPut = true;
                 switch (m_ePortionType)
                 {
                     case PORTION_REFMARK_START:
@@ -363,10 +363,10 @@ void SwXTextPortion::GetPropertyValue(
                     case PORTION_REDLINE_END:
                     case PORTION_RUBY_END:
                     case PORTION_FIELD_END:
-                        bStart = sal_False;
+                        bStart = false;
                     break;
                     default:
-                        bPut = sal_False;
+                        bPut = false;
                 }
                 if(bPut)
                     rVal.setValue(&bStart, ::getBooleanCppuType());
@@ -605,7 +605,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPr
     SolarMutexGuard aGuard;
 
     uno::Sequence< beans::GetDirectPropertyTolerantResult > aTmpRes(
-            GetPropertyValuesTolerant_Impl( rPropertyNames, sal_False ) );
+            GetPropertyValuesTolerant_Impl( rPropertyNames, false ) );
     const beans::GetDirectPropertyTolerantResult *pTmpRes = aTmpRes.getConstArray();
 
     // copy temporary result to final result type
@@ -622,12 +622,12 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    return GetPropertyValuesTolerant_Impl( rPropertyNames, sal_True );
+    return GetPropertyValuesTolerant_Impl( rPropertyNames, true );
 }
 
 uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPropertyValuesTolerant_Impl(
         const uno::Sequence< OUString >& rPropertyNames,
-        sal_Bool bDirectValuesOnly )
+        bool bDirectValuesOnly )
     throw (uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 10db734ba2fe..bc6cf31c13bd 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -415,7 +415,7 @@ lcl_ExportFieldMark(
     OSL_ENSURE(pUnoCrsr->End()->nContent.GetIndex() == start,
                "hmm --- why is this different");
 
-    pUnoCrsr->Right(1, CRSR_SKIP_CHARS, sal_False, sal_False);
+    pUnoCrsr->Right(1, CRSR_SKIP_CHARS, false, false);
     if ( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
     {
         OSL_FAIL("cannot move cursor?");
@@ -508,7 +508,7 @@ lcl_InsertRubyPortion(
     TextRangeList_t & rPortions,
     Reference<XText> const& xParent,
     const SwUnoCrsr * const pUnoCrsr,
-    const SwTxtAttr & rAttr, const sal_Bool bEnd)
+    const SwTxtAttr & rAttr, const bool bEnd)
 {
     SwXTextPortion* pPortion = new SwXTextPortion(pUnoCrsr,
             static_cast<const SwTxtRuby&>(rAttr), xParent, bEnd);
@@ -728,10 +728,10 @@ lcl_ExportHints(
                         if( *pAttr->GetEnd() == *pAttr->GetStart())
                         {
                             lcl_InsertRubyPortion( *rPortionStack.top().first,
-                                    xParent, pUnoCrsr, *pAttr, sal_False);
+                                    xParent, pUnoCrsr, *pAttr, false);
                         }
                         lcl_InsertRubyPortion( *rPortionStack.top().first,
-                                xParent, pUnoCrsr, *pAttr, sal_True);
+                                xParent, pUnoCrsr, *pAttr, true);
                     break;
                     case RES_TXTATR_META:
                     case RES_TXTATR_METAFIELD:
@@ -792,7 +792,7 @@ lcl_ExportHints(
                 case RES_TXTATR_FIELD:
                    if(!bRightMoveForbidden)
                     {
-                        pUnoCrsr->Right(1,CRSR_SKIP_CHARS,sal_False,sal_False);
+                        pUnoCrsr->Right(1,CRSR_SKIP_CHARS,false,false);
                         if( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
                             break;
                         SwXTextPortion* pPortion;
@@ -808,7 +808,7 @@ lcl_ExportHints(
                 case RES_TXTATR_ANNOTATION:
                     if(!bRightMoveForbidden)
                     {
-                        pUnoCrsr->Right(1,CRSR_SKIP_CHARS,sal_False,sal_False);
+                        pUnoCrsr->Right(1,CRSR_SKIP_CHARS,false,false);
                         if( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
                             break;
 
@@ -838,8 +838,8 @@ lcl_ExportHints(
                         pUnoCrsr->Right(
                             pAttr->GetFmtFld().GetField()->ExpandField( true ).getLength() + 2,
                             CRSR_SKIP_CHARS,
-                            sal_False,
-                            sal_False );
+                            false,
+                            false );
                         if( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
                             break;
                         SwXTextPortion* pPortion =
@@ -854,7 +854,7 @@ lcl_ExportHints(
                 case RES_TXTATR_FLYCNT:
                     if(!bRightMoveForbidden)
                     {
-                        pUnoCrsr->Right(1,CRSR_SKIP_CHARS,sal_False,sal_False);
+                        pUnoCrsr->Right(1,CRSR_SKIP_CHARS,false,false);
                         if( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
                             break; // Robust #i81708 content in covered cells
                         pUnoCrsr->Exchange();
@@ -866,7 +866,7 @@ lcl_ExportHints(
                     {
                         if(!bRightMoveForbidden)
                         {
-                            pUnoCrsr->Right(1,CRSR_SKIP_CHARS,sal_False,sal_False);
+                            pUnoCrsr->Right(1,CRSR_SKIP_CHARS,false,false);
                             if( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
                                 break;
                             SwXTextPortion* pPortion;
@@ -887,7 +887,7 @@ lcl_ExportHints(
                     {
                         if (bIsPoint)
                         {
-                            pUnoCrsr->Right(1,CRSR_SKIP_CHARS,sal_False,sal_False);
+                            pUnoCrsr->Right(1,CRSR_SKIP_CHARS,false,false);
                         }
                         Reference<XTextRange> xTmp =
                                 (RES_TXTATR_REFMARK == nAttrWhich)
@@ -913,7 +913,7 @@ lcl_ExportHints(
                     if(pAttr->GetEnd() && (*pAttr->GetEnd() != *pAttr->GetStart()))
                     {
                         lcl_InsertRubyPortion( *rPortionStack.top().first,
-                            xParent, pUnoCrsr, *pAttr, sal_False);
+                            xParent, pUnoCrsr, *pAttr, false);
                     }
                 break;
                 case RES_TXTATR_META:
@@ -922,7 +922,7 @@ lcl_ExportHints(
                     {
                         if (!bRightMoveForbidden)
                         {
-                            pUnoCrsr->Right(1,CRSR_SKIP_CHARS,sal_False,sal_False);
+                            pUnoCrsr->Right(1,CRSR_SKIP_CHARS,false,false);
                             o_rbCursorMoved = true;
                             // only if the end is included in selection!
                             if ((i_nEndPos < 0) ||
@@ -1212,7 +1212,7 @@ static void lcl_CreatePortions(
                         GetTxt().getLength()), "Incorrect start position" );
         // ??? should this be i_nStartPos - current position ?
         pUnoCrsr->Right(static_cast<sal_Int32>(i_nStartPos),
-                CRSR_SKIP_CHARS, sal_False, sal_False);
+                CRSR_SKIP_CHARS, false, false);
     }
 
     SwDoc * const pDoc = pUnoCrsr->GetDoc();
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 84f1a718992d..f2d1948e0529 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -330,7 +330,7 @@ uno::Any  SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, co
 }
 
 uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties(
-    const SwRangeRedline& rRedline, sal_Bool bIsStart ) throw()
+    const SwRangeRedline& rRedline, bool bIsStart ) throw()
 {
     uno::Sequence< beans::PropertyValue > aRet(11);
     const SwRedlineData* pNext = rRedline.GetRedlineData().Next();
@@ -447,7 +447,7 @@ uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
     if(!pDoc)
         throw uno::RuntimeException();
     uno::Any aRet;
-    sal_Bool bStart = rPropertyName == UNO_NAME_REDLINE_START;
+    bool bStart = rPropertyName == UNO_NAME_REDLINE_START;
     if(bStart ||
         rPropertyName == UNO_NAME_REDLINE_END)
     {
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 887a8b0773d3..7da430f72f89 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -248,7 +248,7 @@ SwXTextSection::getChildSections() throw (uno::RuntimeException, std::exception)
     SwSectionFmt & rSectionFmt( m_pImpl->GetSectionFmtOrThrow() );
 
     SwSections aChildren;
-    rSectionFmt.GetChildSections(aChildren, SORTSECT_NOT, sal_False);
+    rSectionFmt.GetChildSections(aChildren, SORTSECT_NOT, false);
     uno::Sequence<uno::Reference<text::XTextSection> > aSeq(aChildren.size());
     uno::Reference< text::XTextSection > * pArray = aSeq.getArray();
     for (sal_uInt16 i = 0; i < aChildren.size(); i++)
@@ -573,7 +573,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
     ::std::auto_ptr<SfxItemSet> pItemSet;
     SAL_WNODEPRECATED_DECLARATIONS_POP
     bool bLinkModeChanged = false;
-    sal_Bool bLinkMode = sal_False;
+    bool bLinkMode = false;
 
     for (sal_Int32 nProperty = 0; nProperty < rPropertyNames.getLength();
          nProperty++)
@@ -648,7 +648,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             break;
             case WID_SECT_DDE_AUTOUPDATE:
             {
-                sal_Bool bVal(sal_False);
+                bool bVal(false);
                 if (!(pValues[nProperty] >>= bVal))
                 {
                     throw lang::IllegalArgumentException();
@@ -740,7 +740,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             break;
             case WID_SECT_VISIBLE:
             {
-                sal_Bool bVal(sal_False);
+                bool bVal(false);
                 if (!(pValues[nProperty] >>= bVal))
                 {
                     throw lang::IllegalArgumentException();
@@ -757,7 +757,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             break;
             case WID_SECT_CURRENTLY_VISIBLE:
             {
-                sal_Bool bVal(sal_False);
+                bool bVal(false);
                 if (!(pValues[nProperty] >>= bVal))
                 {
                     throw lang::IllegalArgumentException();
@@ -777,7 +777,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             break;
             case WID_SECT_PROTECTED:
             {
-                sal_Bool bVal(sal_False);
+                bool bVal(false);
                 if (!(pValues[nProperty] >>= bVal))
                 {
                     throw lang::IllegalArgumentException();
@@ -794,7 +794,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             break;
             case WID_SECT_EDIT_IN_READONLY:
             {
-                sal_Bool bVal(sal_False);
+                bool bVal(false);
                 if (!(pValues[nProperty] >>= bVal))
                 {
                     throw lang::IllegalArgumentException();
@@ -884,7 +884,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                         if (!m_pProps->m_pNoBalanceItem.get())
                         {
                             m_pProps->m_pNoBalanceItem.reset(
-                                new SwFmtNoBalancedColumns(RES_COLUMNBALANCE));
+                                new SwFmtNoBalancedColumns(true));
                         }
                         pPutItem = m_pProps->m_pNoBalanceItem.get();
                     }
@@ -1026,7 +1026,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                 // GetUpdateType() returns .._ALWAYS or .._ONCALL
                 if (pSect && pSect->IsLinkType() && pSect->IsConnected())  // #i73247#
                 {
-                    const sal_Bool bTemp =
+                    const bool bTemp =
                         (pSect->GetUpdateType() == sfx2::LINKUPDATE_ALWAYS);
                     pRet[nProperty] <<= bTemp;
                 }
@@ -1072,28 +1072,28 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_SECT_VISIBLE   :
             {
-                const sal_Bool bTemp = (m_bIsDescriptor)
+                const bool bTemp = (m_bIsDescriptor)
                     ? !m_pProps->m_bHidden : !pSect->IsHidden();
                 pRet[nProperty] <<= bTemp;
             }
             break;
             case WID_SECT_CURRENTLY_VISIBLE:
             {
-                const sal_Bool bTemp = (m_bIsDescriptor)
+                const bool bTemp = (m_bIsDescriptor)
                     ? !m_pProps->m_bCondHidden : !pSect->IsCondHidden();
                 pRet[nProperty] <<= bTemp;
             }
             break;
             case WID_SECT_PROTECTED:
             {
-                const sal_Bool bTemp = (m_bIsDescriptor)
+                const bool bTemp = (m_bIsDescriptor)
                     ? m_pProps->m_bProtect : pSect->IsProtect();
                 pRet[nProperty] <<= bTemp;
             }
             break;
             case WID_SECT_EDIT_IN_READONLY:
             {
-                const sal_Bool bTemp = (m_bIsDescriptor)
+                const bool bTemp = (m_bIsDescriptor)
                     ? m_pProps->m_bEditInReadonly : pSect->IsEditInReadonly();
                 pRet[nProperty] <<= bTemp;
             }
@@ -1131,8 +1131,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             break;
             case WID_SECT_IS_GLOBAL_DOC_SECTION:
             {
-                const sal_Bool bRet = (NULL == pFmt) ? sal_False :
-                    static_cast<sal_Bool>(NULL != pFmt->GetGlobalDocSection());
+                const bool bRet = pFmt && (NULL != pFmt->GetGlobalDocSection());
                 pRet[nProperty] <<= bRet;
             }
             break;
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index d1b85147f42e..7abf06178c8a 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -410,7 +410,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
                 break;
                 case WID_POSITION_END_OF_DOC:
                 {
-                    sal_Bool bVal = *(sal_Bool*)aValue.getValue();
+                    bool bVal = *(sal_Bool*)aValue.getValue();
                     aFtnInfo.ePos = bVal ? FTNPOS_CHAPTER : FTNPOS_PAGE;
                 }
                 break;
@@ -865,7 +865,7 @@ void SwXLineNumberingProperties::setPropertyValue(
             {
                 case WID_NUM_ON:
                 {
-                    sal_Bool bVal = *(sal_Bool*)aValue.getValue();
+                    bool bVal = *(sal_Bool*)aValue.getValue();
                     aInfo.SetPaintLineNumbers(bVal);
                 }
                 break;
@@ -941,19 +941,19 @@ void SwXLineNumberingProperties::setPropertyValue(
                 break;
                 case WID_COUNT_EMPTY_LINES :
                 {
-                    sal_Bool bVal = *(sal_Bool*)aValue.getValue();
+                    bool bVal = *(sal_Bool*)aValue.getValue();
                     aInfo.SetCountBlankLines(bVal);
                 }
                 break;
                 case WID_COUNT_LINES_IN_FRAMES :
                 {
-                    sal_Bool bVal = *(sal_Bool*)aValue.getValue();
+                    bool bVal = *(sal_Bool*)aValue.getValue();
                     aInfo.SetCountInFlys(bVal);
                 }
                 break;
                 case WID_RESTART_AT_EACH_PAGE :
                 {
-                    sal_Bool bVal = *(sal_Bool*)aValue.getValue();
+                    bool bVal = *(sal_Bool*)aValue.getValue();
                     aInfo.SetRestartEachPage(bVal);
                 }
                 break;
@@ -1144,7 +1144,7 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) :
     pDocShell(0),
     pNumRule(new SwNumRule(rRule)),
     m_pPropertySet(GetNumberingRulesSet()),
-    bOwnNumRuleCreated(sal_True)
+    bOwnNumRuleCreated(true)
 {
     sal_uInt16 i;
 
@@ -1174,7 +1174,7 @@ SwXNumberingRules::SwXNumberingRules(SwDocShell& rDocSh) :
     pDocShell(&rDocSh),
     pNumRule(0),
     m_pPropertySet(GetNumberingRulesSet()),
-    bOwnNumRuleCreated(sal_False)
+    bOwnNumRuleCreated(false)
 {
     pDocShell->GetDoc()->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
 }
@@ -1184,7 +1184,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) :
     pDocShell(0),
     pNumRule(0),
     m_pPropertySet(GetNumberingRulesSet()),
-    bOwnNumRuleCreated(sal_False)
+    bOwnNumRuleCreated(false)
 {
     rDoc.GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
     m_sCreatedNumRuleName = rDoc.GetUniqueNumRuleName();
@@ -2149,13 +2149,13 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A
 
     if(rPropertyName == UNO_NAME_IS_AUTOMATIC)
     {
-        sal_Bool bVal = *(sal_Bool*)rValue.getValue();
+        bool bVal = *(sal_Bool*)rValue.getValue();
         if(!pCreatedRule)
             pDocRule ? pDocRule->SetAutoRule(bVal) : pNumRule->SetAutoRule(bVal);
     }
     else if(rPropertyName == UNO_NAME_IS_CONTINUOUS_NUMBERING)
     {
-        sal_Bool bVal = *(sal_Bool*)rValue.getValue();
+        bool bVal = *(sal_Bool*)rValue.getValue();
         pDocRule ? pDocRule->SetContinusNum(bVal) :
             pCreatedRule ? pCreatedRule->SetContinusNum(bVal) : pNumRule->SetContinusNum(bVal);
     }
@@ -2166,13 +2166,13 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A
     }
     else if(rPropertyName == UNO_NAME_IS_ABSOLUTE_MARGINS)
     {
-        sal_Bool bVal = *(sal_Bool*)rValue.getValue();
+        bool bVal = *(sal_Bool*)rValue.getValue();
         pDocRule ? pDocRule->SetAbsSpaces(bVal) :
             pCreatedRule ? pCreatedRule->SetAbsSpaces(bVal) : pNumRule->SetAbsSpaces(bVal);
     }
     else if(rPropertyName == UNO_NAME_NUMBERING_IS_OUTLINE)
     {
-        sal_Bool bVal = *(sal_Bool*)rValue.getValue();
+        bool bVal = *(sal_Bool*)rValue.getValue();
         SwNumRuleType eNumRuleType = bVal ? OUTLINE_RULE : NUM_RULE;
         pDocRule ? pDocRule->SetRuleType(eNumRuleType) :
             pCreatedRule ? pCreatedRule->SetRuleType(eNumRuleType) : pNumRule->SetRuleType(eNumRuleType);
@@ -2350,14 +2350,14 @@ Sequence< OUString > SwXTextColumns::getSupportedServiceNames(void) throw( Runti
 
 SwXTextColumns::SwXTextColumns(sal_uInt16 nColCount) :
     nReference(0),
-    bIsAutomaticWidth(sal_True),
+    bIsAutomaticWidth(true),
     nAutoDistance(0),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_COLUMS)),
     nSepLineWidth(0),
     nSepLineColor(0), //black
     nSepLineHeightRelative(100),//full height
     nSepLineVertAlign(style::VerticalAlignment_MIDDLE),
-    bSepLineIsOn(sal_False),
+    bSepLineIsOn(false),
     nSepLineStyle(API_COL_LINE_NONE) // None
 {
     if(nColCount)
@@ -2433,7 +2433,7 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeExcep
     SolarMutexGuard aGuard;
     if(nColumns <= 0)
         throw uno::RuntimeException();
-    bIsAutomaticWidth = sal_True;
+    bIsAutomaticWidth = true;
     aTextColumns.realloc(nColumns);
      TextColumn* pCols = aTextColumns.getArray();
     nReference = USHRT_MAX;
@@ -2465,7 +2465,7 @@ void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns)
     {
         nReferenceTemp += prCols[i].Width;
     }
-    bIsAutomaticWidth = sal_False;
+    bIsAutomaticWidth = false;
     nReference = !nReferenceTemp ? USHRT_MAX : nReferenceTemp;
     aTextColumns = rColumns;
 }
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index fb3fdc3e2b48..d466f4a049f4 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -49,8 +49,8 @@ public:
         throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException );
     const uno::Sequence< beans::PropertyValue > GetProperties() const;
 
-    void    FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSearch) const;
-    sal_Bool    HasAttributes() const;
+    void    FillItemSet(SfxItemSet& rSet, bool bIsValueSearch) const;
+    bool    HasAttributes() const;
 };
 
 SwSearchProperties_Impl::SwSearchProperties_Impl() :
@@ -120,7 +120,7 @@ const uno::Sequence< beans::PropertyValue > SwSearchProperties_Impl::GetProperti
     return aRet;
 }
 
-void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSearch) const
+void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, bool bIsValueSearch) const
 {
 
     SfxPoolItem* pBoxItem = 0,
@@ -466,30 +466,30 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSea
     delete pShadowItem;
 }
 
-sal_Bool    SwSearchProperties_Impl::HasAttributes() const
+bool    SwSearchProperties_Impl::HasAttributes() const
 {
     for(sal_uInt32 i = 0; i < nArrLen; i++)
         if(pValueArr[i])
-            return sal_True;
-    return sal_False;
+            return true;
+    return false;
 }
 
 SwXTextSearch::SwXTextSearch() :
     pSearchProperties( new SwSearchProperties_Impl),
     pReplaceProperties( new SwSearchProperties_Impl),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_SEARCH)),
-    bAll(sal_False),
-    bWord(sal_False),
-    bBack(sal_False),
-    bExpr(sal_False),
-    bCase(sal_False),
-    bStyles(sal_False),
-    bSimilarity(sal_False),
-    bLevRelax(sal_False),
+    bAll(false),
+    bWord(false),
+    bBack(false),
+    bExpr(false),
+    bCase(false),
+    bStyles(false),
+    bSimilarity(false),
+    bLevRelax(false),
     nLevExchange(2),
     nLevAdd(2),
     nLevRemove(2),
-    bIsValueSearch(sal_True)
+    bIsValueSearch(true)
 {
 }
 
@@ -562,7 +562,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
     {
         if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
             throw beans::PropertyVetoException ("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-        sal_Bool bVal = sal_False;
+        bool bVal = false;
         if(aValue.getValueType() == ::getBooleanCppuType())
             bVal = *(sal_Bool*)aValue.getValue();
         switch(pEntry->nWID)
@@ -687,12 +687,12 @@ void    SwXTextSearch::FillReplaceItemSet(SfxItemSet& rSet) const
     pReplaceProperties->FillItemSet(rSet, bIsValueSearch);
 }
 
-sal_Bool    SwXTextSearch::HasSearchAttributes() const
+bool    SwXTextSearch::HasSearchAttributes() const
 {
     return pSearchProperties->HasAttributes();
 }
 
-sal_Bool    SwXTextSearch::HasReplaceAttributes() const
+bool    SwXTextSearch::HasReplaceAttributes() const
 {
     return pReplaceProperties->HasAttributes();
 }
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index b3304e310600..cef2bb0ec8c5 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -186,7 +186,7 @@ class SwAutoStylesEnumImpl
     IStyleAccess::SwAutoStyleFamily eFamily;
 public:
     SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAutoStyleFamily eFam );
-    sal_Bool hasMoreElements() { return aIter != mAutoStyles.end(); }
+    bool hasMoreElements() { return aIter != mAutoStyles.end(); }
     SfxItemSet_Pointer_t nextElement() { return *(aIter++); }
     IStyleAccess::SwAutoStyleFamily getFamily() const { return eFamily; }
     SwDoc* getDoc() const { return pDoc; }
@@ -375,11 +375,11 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
            std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool    bLoadStyleText = sal_True;
-    sal_Bool    bLoadStylePage = sal_True;
-    sal_Bool    bLoadStyleOverwrite = sal_True;
-    sal_Bool    bLoadStyleNumbering = sal_True;
-    sal_Bool    bLoadStyleFrame = sal_True;
+    bool    bLoadStyleText = true;
+    bool    bLoadStylePage = true;
+    bool    bLoadStyleOverwrite = true;
+    bool    bLoadStyleNumbering = true;
+    bool    bLoadStyleFrame = true;
     if(IsValid() && !rURL.isEmpty())
     {
         const uno::Any* pVal;
@@ -390,7 +390,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
                     ::getBooleanCppuType() )
             {
                 const OUString sName = pArray[i].Name;
-                sal_Bool bVal = *(sal_Bool*)pVal->getValue();
+                bool bVal = *(sal_Bool*)pVal->getValue();
                 if( sName == UNO_NAME_OVERWRITE_STYLES )
                     bLoadStyleOverwrite = bVal;
                 else if( sName == UNO_NAME_LOAD_NUMBERING_STYLES )
@@ -410,7 +410,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
         aOpt.SetNumRules( bLoadStyleNumbering );
         aOpt.SetMerge( !bLoadStyleOverwrite );
 
-        sal_uLong nErr = pDocShell->LoadStylesFromFile( rURL, aOpt, sal_True );
+        sal_uLong nErr = pDocShell->LoadStylesFromFile( rURL, aOpt, true );
         if( nErr )
             throw io::IOException();
     }
@@ -809,7 +809,7 @@ uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::Runt
 sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(pBasePool)
     {
         OUString sStyleName;
@@ -1058,9 +1058,9 @@ public:
     SwStyleProperties_Impl(const SfxItemPropertyMap& rMap);
     ~SwStyleProperties_Impl();
 
-    sal_Bool    SetProperty(const OUString& rName, uno::Any aVal);
-    sal_Bool    GetProperty(const OUString& rName, uno::Any*& rpAny);
-    sal_Bool    ClearProperty( const OUString& rPropertyName );
+    bool    SetProperty(const OUString& rName, uno::Any aVal);
+    bool    GetProperty(const OUString& rName, uno::Any*& rpAny);
+    bool    ClearProperty( const OUString& rPropertyName );
     void    ClearAllProperties( );
     void        GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny );
 
@@ -1086,10 +1086,10 @@ SwStyleProperties_Impl::~SwStyleProperties_Impl()
     delete[] pAnyArr;
 }
 
-sal_Bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVal)
+bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVal)
 {
     sal_uInt16 nPos = 0;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     PropertyEntryVector_t::const_iterator aIt = aPropertyEntries.begin();
     while( aIt != aPropertyEntries.end() )
     {
@@ -1097,7 +1097,7 @@ sal_Bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVa
         {
             delete pAnyArr[nPos];
             pAnyArr[nPos] = new uno::Any ( aVal );
-            bRet = sal_True;
+            bRet = true;
             break;
         }
         ++nPos;
@@ -1106,9 +1106,9 @@ sal_Bool SwStyleProperties_Impl::SetProperty(const OUString& rName, uno::Any aVa
     return bRet;
 }
 
-sal_Bool SwStyleProperties_Impl::ClearProperty( const OUString& rName )
+bool SwStyleProperties_Impl::ClearProperty( const OUString& rName )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt16 nPos = 0;
     PropertyEntryVector_t::const_iterator aIt = aPropertyEntries.begin();
     while( aIt != aPropertyEntries.end() )
@@ -1117,7 +1117,7 @@ sal_Bool SwStyleProperties_Impl::ClearProperty( const OUString& rName )
         {
             delete pAnyArr[nPos];
             pAnyArr[ nPos ] = 0;
-            bRet = sal_True;
+            bRet = true;
             break;
         }
         ++nPos;
@@ -1135,9 +1135,9 @@ void SwStyleProperties_Impl::ClearAllProperties( )
     }
 }
 
-sal_Bool SwStyleProperties_Impl::GetProperty(const OUString& rName, uno::Any*& rpAny )
+bool SwStyleProperties_Impl::GetProperty(const OUString& rName, uno::Any*& rpAny )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt16 nPos = 0;
     PropertyEntryVector_t::const_iterator aIt = aPropertyEntries.begin();
     while( aIt != aPropertyEntries.end() )
@@ -1145,7 +1145,7 @@ sal_Bool SwStyleProperties_Impl::GetProperty(const OUString& rName, uno::Any*& r
         if( rName == aIt->sName )
         {
             rpAny = pAnyArr[nPos];
-            bRet = sal_True;
+            bRet = true;
             break;
         }
         ++nPos;
@@ -1237,11 +1237,11 @@ uno::Sequence< OUString > SwXStyle::getSupportedServiceNames(void) throw( uno::R
     return aRet;
 }
 
-SwXStyle::SwXStyle( SwDoc *pDoc, SfxStyleFamily eFam, sal_Bool bConditional) :
+SwXStyle::SwXStyle( SwDoc *pDoc, SfxStyleFamily eFam, bool bConditional) :
     m_pDoc( pDoc ),
     pBasePool(0),
     eFamily(eFam),
-    bIsDescriptor(sal_True),
+    bIsDescriptor(true),
     bIsConditional(bConditional)
 {
     // Register ourselves as a listener to the document (via the page descriptor)
@@ -1309,8 +1309,8 @@ SwXStyle::SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
     m_sStyleName(rStyleName),
     pBasePool(&rPool),
     eFamily(eFam),
-    bIsDescriptor(sal_False),
-    bIsConditional(sal_False),
+    bIsDescriptor(false),
+    bIsConditional(false),
     pPropImpl(0)
 {
     StartListening(rPool);
@@ -1391,7 +1391,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std:
 sal_Bool SwXStyle::isUserDefined(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(pBasePool)
     {
         pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
@@ -1408,7 +1408,7 @@ sal_Bool SwXStyle::isUserDefined(void) throw( uno::RuntimeException, std::except
 sal_Bool SwXStyle::isInUse(void) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(pBasePool)
     {
         pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_USED);
@@ -1488,7 +1488,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle)
         throw uno::RuntimeException();
 }
 
-static uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyleFamily eFamily, sal_Bool bIsConditional )
+static uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyleFamily eFamily, bool bIsConditional )
 {
     uno::Reference< beans::XPropertySetInfo >  xRet;
     switch( eFamily )
@@ -1562,7 +1562,7 @@ uno::Reference< beans::XPropertySetInfo >  SwXStyle::getPropertySetInfo(void)
 
 void    SwXStyle::ApplyDescriptorProperties()
 {
-    bIsDescriptor = sal_False;
+    bIsDescriptor = false;
     mxStyleData.clear();
     mxStyleFamily.clear();
 
@@ -1598,7 +1598,7 @@ struct SwStyleBase_Impl
 
     ~SwStyleBase_Impl(){ delete pItemSet; }
 
-    sal_Bool HasItemSet() {return mxNewBase.is();}
+    bool HasItemSet() {return mxNewBase.is();}
     SfxItemSet& GetItemSet()
         {
             OSL_ENSURE(mxNewBase.is(), "no SwDocStyleSheet available");
@@ -1694,7 +1694,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
     {
         case FN_UNO_HIDDEN:
         {
-            sal_Bool bHidden = sal_False;
+            bool bHidden = false;
             if ( rValue >>= bHidden )
             {
                 //make it a 'real' style - necessary for pooled styles
@@ -1948,14 +1948,14 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             SwStyleNameMapper::FillUIName(uDescName, sDescName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
             if(!pNewDesc->GetPageDesc() || pNewDesc->GetPageDesc()->GetName() != sDescName)
             {
-                sal_Bool bPut = sal_False;
+                bool bPut = false;
                 if (!sDescName.isEmpty())
                 {
                     SwPageDesc* pPageDesc = SwPageDesc::GetByName(*pDoc, sDescName);
                     if(pPageDesc)
                     {
                         pNewDesc->RegisterToPageDesc( *pPageDesc );
-                        bPut = sal_True;
+                        bPut = true;
                     }
                     else
                     {
@@ -1977,7 +1977,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
         }
         case FN_UNO_IS_AUTO_UPDATE:
         {
-            sal_Bool bAuto = *(sal_Bool*)aValue.getValue();
+            bool bAuto = *(sal_Bool*)aValue.getValue();
             if(SFX_STYLE_FAMILY_PARA == eFamily)
                 rBase.mxNewBase->GetCollection()->SetAutoUpdateFmt(bAuto);
             else if(SFX_STYLE_FAMILY_FRAME == eFamily)
@@ -1997,7 +1997,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             const beans::NamedValue *pSeq = aSeq.getConstArray();
             sal_Int32 nLen = aSeq.getLength();
 
-            sal_Bool bFailed = sal_False;
+            bool bFailed = false;
             SwCondCollItem aCondItem;
             for(sal_uInt16 i = 0; i < nLen; i++)
             {
@@ -2014,25 +2014,25 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                     sal_Int16 nIdx = GetCommandContextIndex( pSeq[i].Name );
 
                     pBasePool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
-                    sal_Bool bStyleFound = sal_False;
+                    bool bStyleFound = false;
                     const SfxStyleSheetBase* pBase = pBasePool->First();
                     while (pBase && !bStyleFound)
                     {
                         if(pBase->GetName() == aStyleName)
-                            bStyleFound = sal_True;
+                            bStyleFound = true;
                         pBase = pBasePool->Next();
                     }
 
                     if (nIdx == -1 || !bStyleFound)
                     {
-                        bFailed = sal_True;
+                        bFailed = true;
                         break;
                     }
 
                     aCondItem.SetStyle(&aStyleName, nIdx);
                 }
                 else
-                    bFailed = sal_True;
+                    bFailed = true;
             }
             if (bFailed)
                 throw lang::IllegalArgumentException();
@@ -2849,7 +2849,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates(
                         (sPropName.startsWith("Header") || sPropName.startsWith("Footer")))
                 {
                     sal_uInt16 nResId = lcl_ConvertFNToRES(pEntry->nWID);
-                    sal_Bool bFooter = sPropName.startsWith("Footer");
+                    bool bFooter = sPropName.startsWith("Footer");
                     const SvxSetItem* pSetItem;
                     if(SFX_ITEM_SET == aSet.GetItemState(
                             bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
@@ -3375,7 +3375,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
                     }
                     else if(SID_ATTR_PAGE_ON == nRes )
                     {
-                        sal_Bool bVal = *(sal_Bool*)pValues[nProp].getValue();
+                        bool bVal = *(sal_Bool*)pValues[nProp].getValue();
                         if(bVal)
                         {
                             SfxItemSet aTempSet(*aBaseImpl.GetItemSet().GetPool(),
@@ -3406,7 +3406,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
                 {
                     const SfxPoolItem& rItem = aBaseImpl.GetItemSet().Get(FN_PARAM_FTN_INFO);
                     SfxPoolItem* pNewFtnItem = rItem.Clone();
-                    sal_Bool bPut = pNewFtnItem->PutValue(pValues[nProp], pEntry->nMemberId);
+                    bool bPut = pNewFtnItem->PutValue(pValues[nProp], pEntry->nMemberId);
                     aBaseImpl.GetItemSet().Put(*pNewFtnItem);
                     delete pNewFtnItem;
                     if(!bPut)
@@ -3756,7 +3756,7 @@ void SwXPageStyle::setPropertyValue(const OUString& rPropertyName, const uno::An
 }
 
 SwXFrameStyle::SwXFrameStyle ( SwDoc *pDoc )
-: SwXStyle ( pDoc, SFX_STYLE_FAMILY_FRAME, sal_False)
+: SwXStyle ( pDoc, SFX_STYLE_FAMILY_FRAME, false)
 {
 }
 
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 0d60435b3e16..6d9d51875719 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -160,7 +160,7 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
                 UnoActionContext aAction(pFmt->GetDoc());
                 if( pEntry->nWID == FN_TABLE_HEADLINE_REPEAT)
                 {
-                    sal_Bool bVal = *(sal_Bool*)aValue.getValue();
+                    bool bVal = *(sal_Bool*)aValue.getValue();
                     pFmt->GetDoc()->SetRowsToRepeat( *pTable, bVal ? 1 : 0 );
                 }
                 else
@@ -195,7 +195,7 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt,
             }
             else if(FN_TABLE_IS_RELATIVE_WIDTH == pEntry->nWID)
             {
-                sal_Bool bPercent = *(sal_Bool*)aValue.getValue();
+                bool bPercent = *(sal_Bool*)aValue.getValue();
                 if(!bPercent)
                     aSz.SetWidthPercent(0);
                 else
@@ -323,7 +323,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimp
                 {
                     const SwNode* pStartOfRedline = SwNodeIndex(*pRedPointNode) <= SwNodeIndex(*pRedMarkNode) ?
                         pRedPointNode : pRedMarkNode;
-                    sal_Bool bIsStart = pStartOfRedline == pTblNode;
+                    bool bIsStart = pStartOfRedline == pTblNode;
                     aRet <<= SwXRedlinePortion::CreateRedlineProperties(*pRedline, bIsStart);
                     break;
                 }
@@ -455,7 +455,7 @@ int sw_CompareCellsByColFirst( const OUString &rCellName1, const OUString &rCell
 int sw_CompareCellRanges(
         const OUString &rRange1StartCell, const OUString &rRange1EndCell,
         const OUString &rRange2StartCell, const OUString &rRange2EndCell,
-        sal_Bool bCmpColsFirst )
+        bool bCmpColsFirst )
 {
     int (*pCompareCells)( const OUString &, const OUString & ) =
             bCmpColsFirst ? &sw_CompareCellsByColFirst : &sw_CompareCellsByRowFirst;
@@ -621,7 +621,7 @@ static void lcl_FormatTable(SwFrmFmt* pTblFmt)
     }
 }
 
-static void lcl_CrsrSelect(SwPaM* pCrsr, sal_Bool bExpand)
+static void lcl_CrsrSelect(SwPaM* pCrsr, bool bExpand)
 {
     if(bExpand)
     {
@@ -633,7 +633,7 @@ static void lcl_CrsrSelect(SwPaM* pCrsr, sal_Bool bExpand)
 
 }
 
-static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, sal_Bool bRow)
+static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow)
 {
     SwTabCols aCols;
     aCols.SetLeftMin ( 0 );
@@ -641,7 +641,7 @@ static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pB
     aCols.SetRight   ( UNO_TABLE_COLUMN_SUM );
     aCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
 
-    pTable->GetTabCols( aCols, pBox, sal_False, bRow );
+    pTable->GetTabCols( aCols, pBox, false, bRow );
 
     const size_t nSepCount = aCols.Count();
     uno::Sequence< text::TableColumnSeparator> aColSeq(nSepCount);
@@ -662,7 +662,7 @@ static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pB
 
 }
 
-static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBox, sal_Bool bRow, SwDoc* pDoc)
+static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBox, bool bRow, SwDoc* pDoc)
 {
     SwTabCols aOldCols;
 
@@ -671,7 +671,7 @@ static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableB
     aOldCols.SetRight   ( UNO_TABLE_COLUMN_SUM );
     aOldCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
 
-    pTable->GetTabCols( aOldCols, pBox, sal_False, bRow );
+    pTable->GetTabCols( aOldCols, pBox, false, bRow );
     const size_t nOldCount = aOldCols.Count();
     // there is no use in setting tab cols if there is only one column
     if( !nOldCount )
@@ -682,19 +682,19 @@ static void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableB
     if(pSepSeq && static_cast<size_t>(pSepSeq->getLength()) == nOldCount)
     {
         SwTabCols aCols(aOldCols);
-        sal_Bool bError = sal_False;
+        bool bError = false;
         const text::TableColumnSeparator* pArray = pSepSeq->getConstArray();
         long nLastValue = 0;
         //sal_Int32 nTblWidth = aCols.GetRight() - aCols.GetLeft();
         for(size_t i = 0; i < nOldCount; ++i)
         {
             aCols[i] = pArray[i].Position;
-            if(pArray[i].IsVisible == aCols.IsHidden(i) ||
+            if(pArray[i].IsVisible == (aCols.IsHidden(i) ? 1 : 0) ||
                 (!bRow && aCols.IsHidden(i)) ||
                 aCols[i] < nLastValue ||
                 UNO_TABLE_COLUMN_SUM < aCols[i] )
             {
-                bError = sal_True;
+                bError = true;
                 break;
             }
             nLastValue = aCols[i];
@@ -714,7 +714,7 @@ static inline OUString lcl_getString( SwXCell &rCell )
 
 /* non UNO function call to set string in SwXCell */
 void sw_setString( SwXCell &rCell, const OUString &rTxt,
-        sal_Bool bKeepNumberFmt = sal_False )
+        bool bKeepNumberFmt = false )
 {
     if(rCell.IsValid())
     {
@@ -746,9 +746,9 @@ void sw_setValue( SwXCell &rCell, double nVal )
     if(rCell.IsValid())
     {
         // first this text (maybe) needs to be deleted
-        sal_uLong nNdPos = rCell.pBox->IsValidNumTxtNd( sal_True );
+        sal_uLong nNdPos = rCell.pBox->IsValidNumTxtNd( true );
         if(ULONG_MAX != nNdPos)
-            sw_setString( rCell, OUString(), sal_True );   // sal_True == keep number format
+            sw_setString( rCell, OUString(), true );   // sal_True == keep number format
         SwDoc* pDoc = rCell.GetDoc();
         UnoActionContext aAction(pDoc);
         SwFrmFmt* pBoxFmt = rCell.pBox->ClaimFrmFmt();
@@ -929,9 +929,9 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException,
     if(IsValid())
     {
         // first this text (maybe) needs to be deleted
-        sal_uInt32 nNdPos = pBox->IsValidNumTxtNd( sal_True );
+        sal_uInt32 nNdPos = pBox->IsValidNumTxtNd( true );
         if(USHRT_MAX == nNdPos)
-            sw_setString( *this, OUString(), sal_True );
+            sw_setString( *this, OUString(), true );
         OUString sFml(comphelper::string::stripStart(rFormula, ' '));
         if( !sFml.isEmpty() && '=' == sFml[0] )
                     sFml = sFml.copy( 1 );
@@ -1410,7 +1410,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
                         SwFmtFrmSize aFrmSize(pLn->GetFrmFmt()->GetFrmSize());
                         if(FN_UNO_ROW_AUTO_HEIGHT== pEntry->nWID)
                         {
-                            sal_Bool bSet = *(sal_Bool*)aValue.getValue();
+                            bool bSet = *(sal_Bool*)aValue.getValue();
                             aFrmSize.SetHeightSizeType(bSet ? ATT_VAR_SIZE : ATT_FIX_SIZE);
                         }
                         else
@@ -1429,7 +1429,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
                     {
                         UnoActionContext aContext(pDoc);
                         SwTable* pTable2 = SwTable::FindTable( pFmt );
-                        lcl_SetTblSeparators(aValue, pTable2, pLine->GetTabBoxes()[0], sal_True, pDoc);
+                        lcl_SetTblSeparators(aValue, pTable2, pLine->GetTabBoxes()[0], true, pDoc);
                     }
                     break;
 
@@ -1480,7 +1480,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
 
                 case FN_UNO_TABLE_COLUMN_SEPARATORS:
                 {
-                    lcl_GetTblSeparators(aRet, pTable, pLine->GetTabBoxes()[0], sal_True);
+                    lcl_GetTblSeparators(aRet, pTable, pLine->GetTabBoxes()[0], true);
                 }
                 break;
 
@@ -1650,7 +1650,7 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& CellName, sal_Bool E
     throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
@@ -1665,13 +1665,13 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& CellName, sal_Bool E
 sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
         SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
         lcl_CrsrSelect( pTblCrsr, Expand );
-        bRet = pTblCrsr->Left( Count,CRSR_SKIP_CHARS, sal_False, sal_False);
+        bRet = pTblCrsr->Left( Count,CRSR_SKIP_CHARS, false, false);
     }
     return bRet;
 }
@@ -1679,13 +1679,13 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno
 sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
         SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
         lcl_CrsrSelect( pTblCrsr, Expand );
-        bRet = pTblCrsr->Right( Count, CRSR_SKIP_CHARS, sal_False, sal_False);
+        bRet = pTblCrsr->Right( Count, CRSR_SKIP_CHARS, false, false);
     }
     return bRet;
 }
@@ -1693,7 +1693,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un
 sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
@@ -1707,7 +1707,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::
 sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
@@ -1746,7 +1746,7 @@ sal_Bool SwXTextTableCursor::mergeRange()
     throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
@@ -1780,7 +1780,7 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
     SolarMutexGuard aGuard;
     if (Count <= 0)
         throw uno::RuntimeException("Illegal first argument: needs to be > 0", static_cast < cppu::OWeakObject * > ( this ) );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwUnoCrsr* pUnoCrsr = GetCrsr();
     if(pUnoCrsr)
     {
@@ -1983,7 +1983,7 @@ public:
     ~SwTableProperties_Impl();
 
     void        SetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any& aVal);
-    sal_Bool    GetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any*& rpAny);
+    bool    GetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any*& rpAny);
 
     void        ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc);
 };
@@ -2001,7 +2001,7 @@ void SwTableProperties_Impl::SetProperty(sal_uInt16 nWhichId, sal_uInt16 nMember
     aAnyMap.SetValue( nWhichId, nMemberId, rVal );
 }
 
-sal_Bool SwTableProperties_Impl::GetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any*& rpAny )
+bool SwTableProperties_Impl::GetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any*& rpAny )
 {
     return aAnyMap.FillValue( nWhichId, nMemberId, rpAny );
 }
@@ -2023,7 +2023,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
     const SwFrmFmt &rFrmFmt = *rTbl.GetFrmFmt();
     if(GetProperty(FN_TABLE_HEADLINE_REPEAT, 0xff, pRepHead ))
     {
-        sal_Bool bVal = *(sal_Bool*)pRepHead->getValue();
+        bool bVal = *(sal_Bool*)pRepHead->getValue();
         ((SwTable&)rTbl).SetRowsToRepeat( bVal ? 1 : 0 );  // TODO MULTIHEADER
     }
 
@@ -2124,7 +2124,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
         ((SfxPoolItem&)aSz).PutValue(*pWidth, MID_FRMSIZE_WIDTH);
         bPutSize = true;
     }
-    sal_Bool bTemp = pSzRel ? *(sal_Bool*)pSzRel->getValue() : sal_False;
+    bool bTemp = pSzRel ? *(sal_Bool*)pSzRel->getValue() : sal_False;
     if(pSzRel && bTemp && pRelWidth)
     {
         ((SfxPoolItem&)aSz).PutValue(*pRelWidth, MID_FRMSIZE_REL_WIDTH|CONVERT_TWIPS);
@@ -2165,7 +2165,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
     const::uno::Any* pSplit;
     if(GetProperty(RES_LAYOUT_SPLIT, 0, pSplit ))
     {
-        sal_Bool bTmp = *(sal_Bool*)pSplit->getValue();
+        bool bTmp = *(sal_Bool*)pSplit->getValue();
         SwFmtLayoutSplit aSp(bTmp);
         aSet.Put(aSp);
     }
@@ -2205,11 +2205,11 @@ SwXTextTable::SwXTextTable()
     ,
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE)),
     pTableProps(new SwTableProperties_Impl),
-    bIsDescriptor(sal_True),
+    bIsDescriptor(true),
     nRows(2),
     nColumns(2),
-    bFirstRowAsLabel(sal_False),
-    bFirstColumnAsLabel(sal_False)
+    bFirstRowAsLabel(false),
+    bFirstColumnAsLabel(false)
 {
 }
 
@@ -2219,11 +2219,11 @@ SwXTextTable::SwXTextTable(SwFrmFmt& rFrmFmt)
     ,
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE)),
     pTableProps(0),
-    bIsDescriptor(sal_False),
+    bIsDescriptor(false),
     nRows(0),
     nColumns(0),
-    bFirstRowAsLabel(sal_False),
-    bFirstColumnAsLabel(sal_False)
+    bFirstRowAsLabel(false),
+    bFirstColumnAsLabel(false)
 {
 }
 
@@ -2396,7 +2396,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
                     sal_uInt16 nIndex = 1;
                     const OUString sTmpName(m_sTableName);
                     OUString sTmpNameIndex(sTmpName);
-                    while(pDoc->FindTblFmtByName( sTmpNameIndex, sal_True ) && nIndex < USHRT_MAX)
+                    while(pDoc->FindTblFmtByName( sTmpNameIndex, true ) && nIndex < USHRT_MAX)
                     {
                         sTmpNameIndex = sTmpName + OUString::number(nIndex++);
                     }
@@ -2410,7 +2410,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
                     (*pName) >>= sTmp;
                     setName(sTmp);
                 }
-                bIsDescriptor = sal_False;
+                bIsDescriptor = false;
                 DELETEZ(pTableProps);
             }
             pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
@@ -2509,7 +2509,7 @@ uno::Reference< table::XCellRange >  SwXTextTable::GetRangeByName(SwFrmFmt* pFmt
         // set cursor to the upper-left cell of the range
         SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true);
         pUnoCrsr->Move( fnMoveForward, fnGoNode );
-        pUnoCrsr->SetRemainInSection( sal_False );
+        pUnoCrsr->SetRemainInSection( false );
         const SwTableBox* pBRBox = pTable->GetTblBox( sBRName );
         if(pBRBox)
         {
@@ -2637,7 +2637,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
                 {
                     // check if table box value item is set
                     SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-                    bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET;
+                    bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, false ) == SFX_ITEM_SET;
                     if(!bIsNum)
                         pColArray[nCol] <<= lcl_getString(*pXCell);
                     else
@@ -2711,7 +2711,7 @@ void SAL_CALL SwXTextTable::setDataArray(
                         if( (rAny >>= d) )
                             sw_setValue( *pXCell, d );
                         else
-                            sw_setString( *pXCell, OUString(), sal_True );
+                            sw_setString( *pXCell, OUString(), true );
 
                     }
                 }
@@ -2944,7 +2944,7 @@ void SwXTextTable::setColumnDescriptions(const uno::Sequence< OUString >& rColum
     if(pFmt)
     {
         const OUString* pArray = rColumnDesc.getConstArray();
-        if(bFirstRowAsLabel && rColumnDesc.getLength() >= nColCount - bFirstColumnAsLabel ? 1 : 0)
+        if(bFirstRowAsLabel && rColumnDesc.getLength() >= nColCount - (bFirstColumnAsLabel ? 1 : 0))
         {
             sal_uInt16 nStart = bFirstColumnAsLabel ? 1 : 0;
             for(sal_uInt16 i = nStart; i < nColCount; i++)
@@ -3106,7 +3106,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
 
                 case FN_UNO_RANGE_ROW_LABEL:
                 {
-                    sal_Bool bTmp = *(sal_Bool*)aValue.getValue();
+                    bool bTmp = *(sal_Bool*)aValue.getValue();
                     if(bFirstRowAsLabel != bTmp)
                     {
                         lcl_SendChartEvent(*this, m_pImpl->m_Listeners);
@@ -3117,7 +3117,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
 
                 case FN_UNO_RANGE_COL_LABEL:
                 {
-                    sal_Bool bTmp = *(sal_Bool*)aValue.getValue();
+                    bool bTmp = *(sal_Bool*)aValue.getValue();
                     if(bFirstColumnAsLabel != bTmp)
                     {
                         lcl_SendChartEvent(*this, m_pImpl->m_Listeners);
@@ -3198,7 +3198,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                     // set cursor to top left cell
                     SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
                     pUnoCrsr->Move( fnMoveForward, fnGoNode );
-                    pUnoCrsr->SetRemainInSection( sal_False );
+                    pUnoCrsr->SetRemainInSection( false );
 
                     const SwTableBox* pBRBox = lcl_FindCornerTableBox(rLines, false);
                     pUnoCrsr->SetMark();
@@ -3299,7 +3299,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                 {
                     UnoActionContext aContext(pFmt->GetDoc());
                     SwTable* pTable = SwTable::FindTable( pFmt );
-                    lcl_SetTblSeparators(aValue, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False, pFmt->GetDoc());
+                    lcl_SetTblSeparators(aValue, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], false, pFmt->GetDoc());
                 }
                 break;
 
@@ -3396,7 +3396,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
                     // set cursor to top left cell
                     SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
                     pUnoCrsr->Move( fnMoveForward, fnGoNode );
-                    pUnoCrsr->SetRemainInSection( sal_False );
+                    pUnoCrsr->SetRemainInSection( false );
 
                     const SwTableBox* pBRBox = lcl_FindCornerTableBox(rLines, false);
                     pUnoCrsr->SetMark();
@@ -3526,7 +3526,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
                 case FN_UNO_TABLE_COLUMN_SEPARATORS:
                 {
                     SwTable* pTable = SwTable::FindTable( pFmt );
-                    lcl_GetTblSeparators(aRet, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False);
+                    lcl_GetTblSeparators(aRet, pTable, pTable->GetTabLines()[0]->GetTabBoxes()[0], false);
                 }
                 break;
 
@@ -3787,8 +3787,8 @@ SwXCellRange::SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt,
     aRgDesc(rDesc),
     m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_RANGE)),
     pTblCrsr(pCrsr),
-    bFirstRowAsLabel(sal_False),
-    bFirstColumnAsLabel(sal_False)
+    bFirstRowAsLabel(false),
+    bFirstColumnAsLabel(false)
 {
     aRgDesc.Normalize();
 }
@@ -3854,7 +3854,7 @@ uno::Reference< table::XCellRange >  SwXCellRange::getCellRangeByPosition(
                 // set cursor in the upper-left cell of the range
                 SwUnoCrsr* pUnoCrsr = pFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
-                pUnoCrsr->SetRemainInSection( sal_False );
+                pUnoCrsr->SetRemainInSection( false );
                 const SwTableBox* pBRBox = pTable->GetTblBox( sBRName );
                 if(pBRBox)
                 {
@@ -3981,7 +3981,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
                 break;
                 case FN_UNO_RANGE_ROW_LABEL:
                 {
-                    sal_Bool bTmp = *(sal_Bool*)aValue.getValue();
+                    bool bTmp = *(sal_Bool*)aValue.getValue();
                     if(bFirstRowAsLabel != bTmp)
                     {
                         lcl_SendChartEvent(*this, m_ChartListeners);
@@ -3991,7 +3991,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
                 break;
                 case FN_UNO_RANGE_COL_LABEL:
                 {
-                    sal_Bool bTmp = *(sal_Bool*)aValue.getValue();
+                    bool bTmp = *(sal_Bool*)aValue.getValue();
                     if(bFirstColumnAsLabel != bTmp)
                     {
                         lcl_SendChartEvent(*this, m_ChartListeners);
@@ -4127,7 +4127,7 @@ void SwXCellRange::GetDataSequence(
         uno::Sequence< uno::Any >   *pAnySeq,   //-> first pointer != 0 is used
         uno::Sequence< OUString >   *pTxtSeq,   //-> as output sequence
         uno::Sequence< double >     *pDblSeq,   //-> (previous data gets overwritten)
-        sal_Bool bForceNumberResults )          //-> when 'true' requires to make an
+        bool bForceNumberResults )              //-> when 'true' requires to make an
                                                 // extra effort to return a value different
                                                 // from 0 even if the cell is formatted to text
     throw (uno::RuntimeException)
@@ -4190,7 +4190,7 @@ void SwXCellRange::GetDataSequence(
                     if (pAnyData)
                     {
                         // check if table box value item is set
-                        bool bIsNum = pBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET;
+                        bool bIsNum = pBox->GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, false ) == SFX_ITEM_SET;
                         if (!bIsNum)
                             pAnyData[nDtaCnt++] <<= lcl_getString(*pXCell);
                         else
@@ -4308,7 +4308,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray()
                 {
                     // check if table box value item is set
                     SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
-                    bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, sal_False ) == SFX_ITEM_SET;
+                    bool bIsNum = pBoxFmt->GetItemState( RES_BOXATR_VALUE, false ) == SFX_ITEM_SET;
                     if(!bIsNum)
                         pColArray[nCol] <<= lcl_getString(*pXCell);
                     else
@@ -4378,7 +4378,7 @@ void SAL_CALL SwXCellRange::setDataArray(
                         if( (rAny >>= d) )
                             sw_setValue( *pXCell, d );
                         else
-                            sw_setString( *pXCell, OUString(), sal_True );
+                            sw_setString( *pXCell, OUString(), true );
                     }
                 }
             }
@@ -4518,7 +4518,7 @@ void SwXCellRange::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc)
     if(pFmt)
     {
         sal_Int16 nRowCount = getRowCount();
-        if(!nRowCount || rRowDesc.getLength() < bFirstRowAsLabel ? nRowCount - 1 : nRowCount)
+        if(!nRowCount || rRowDesc.getLength() < (bFirstRowAsLabel ? nRowCount - 1 : nRowCount))
         {
             throw uno::RuntimeException();
         }
@@ -4595,7 +4595,7 @@ void SwXCellRange::setColumnDescriptions(const uno::Sequence< OUString >& Column
     if(pFmt)
     {
         const OUString* pArray = ColumnDesc.getConstArray();
-        if(bFirstRowAsLabel && ColumnDesc.getLength() >= nColCount - bFirstColumnAsLabel ? 1 : 0)
+        if(bFirstRowAsLabel && ColumnDesc.getLength() >= nColCount - (bFirstColumnAsLabel ? 1 : 0))
         {
             sal_uInt16 nStart = bFirstColumnAsLabel ? 1 : 0;
             for(sal_uInt16 i = nStart; i < nColCount; i++)
@@ -4889,7 +4889,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
                 // set cursor to the upper-left cell of the range
                 SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
-                pUnoCrsr->SetRemainInSection( sal_False );
+                pUnoCrsr->SetRemainInSection( false );
                 OUString sBLName = sw_GetCellName(0, nIndex + nCount - 1);
                 const SwTableBox* pBLBox = pTable->GetTblBox( sBLName );
                 if(pBLBox)
@@ -5101,7 +5101,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
                 // set cursor to the upper-left cell of the range
                 SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, true);
                 pUnoCrsr->Move( fnMoveForward, fnGoNode );
-                pUnoCrsr->SetRemainInSection( sal_False );
+                pUnoCrsr->SetRemainInSection( false );
                 OUString sTRName = sw_GetCellName(nIndex + nCount - 1, 0);
                 const SwTableBox* pTRBox = pTable->GetTblBox( sTRName );
                 if(pTRBox)
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 7b7b9af2cc96..f364a2856d90 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -474,7 +474,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 
         SwCursor aCrsr(*aTmp.GetPoint(),0,false);
         SwUnoCursorHelper::SelectPam(aCrsr, true);
-        aCrsr.Left(1, CRSR_SKIP_CHARS, sal_False, sal_False);
+        aCrsr.Left(1, CRSR_SKIP_CHARS, false, false);
         //hier muss der uebergebene PaM umgesetzt werden:
         if (pRange)
         {
@@ -638,7 +638,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         throw lang::IllegalArgumentException();
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const uno::Reference<lang::XUnoTunnel> xSuccTunnel(xSuccessor,
             uno::UNO_QUERY);
     SwXTextSection *const pXSection =
@@ -704,7 +704,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     SwXTextTable *const pXTable =
             ::sw::UnoTunnelGetImplementation<SwXTextTable>(xPredTunnel);
     SwFrmFmt *const pTableFmt = (pXTable) ? pXTable->GetFrmFmt() : 0;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwTxtNode * pTxtNode = 0;
     if(pTableFmt && pTableFmt->GetDoc() == GetDoc())
     {
@@ -747,7 +747,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         throw aRuntime;
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const uno::Reference<lang::XUnoTunnel> xSuccTunnel(xSuccessor,
             uno::UNO_QUERY);
     SwXTextSection *const pXSection =
@@ -800,7 +800,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
         throw aRuntime;
     }
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const uno::Reference<lang::XUnoTunnel> xPredTunnel(xPredecessor,
             uno::UNO_QUERY);
     SwXTextSection *const pXSection =
@@ -1169,7 +1169,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
                     if (nOwnIndex == nRedNode.GetIndex())
                     {
                         aRet <<= SwXRedlinePortion::CreateRedlineProperties(
-                                *pRedline, sal_True);
+                                *pRedline, true);
                         break;
                     }
                 }
@@ -2057,7 +2057,7 @@ lcl_ApplyCellProperties(
         {
             // determine left border position
             // add the cell to a queue of merged cells
-            sal_Bool bMerge = sal_False;
+            bool bMerge = false;
             rValue >>= bMerge;
             sal_Int32 nLeftPos = -1;
             if (!nCell)
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 9bf1a45964fd..b6df6d6983ab 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -56,7 +56,7 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt,
     //!! Otherwise the grammar checker might process it and crash if we later on
     //!! simply delete this document while he is still at it.
     SwViewOption  aViewOpt( *pViewOpt );
-    aViewOpt.SetOnlineSpell( sal_False );
+    aViewOpt.SetOnlineSpell( false );
 
     m_pPostItShell.reset(new SwViewShell(*new SwDoc, 0, &aViewOpt, pOutDev));
 }
@@ -126,7 +126,7 @@ void SwRenderData::MakeSwPrtOptions(
 
     // get default print options
     const TypeId aSwWebDocShellTypeId = TYPE(SwWebDocShell);
-    sal_Bool bWeb = pDocShell->IsA( aSwWebDocShellTypeId );
+    bool bWeb = pDocShell->IsA( aSwWebDocShellTypeId );
     ::sw::InitPrintOptionsFromApplication(rOptions, bWeb);
 
     // get print options to use from provided properties
@@ -299,7 +299,7 @@ SwPrintUIOptions::SwPrintUIOptions(
     aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1";
     aWidgetIds[1] = "printpages";
     aChoices[2] = aLocalizedStrings.GetString( 29 );
-    aChoicesDisabled[2] = sal_Bool(! bHasSelection);
+    aChoicesDisabled[2] = ! bHasSelection;
     aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2";
     aWidgetIds[2] = "printselection";
     m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index a04021b0d85d..99519e81ad6a 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -167,10 +167,10 @@ bool SwViewImp::IsDragPossible( const Point &rPoint )
     SdrObject *pO = rMrkList.GetMark(rMrkList.GetMarkCount()-1)->GetMarkedSdrObj();
 
     SwRect aRect;
-    if( pO && ::CalcClipRect( pO, aRect, sal_False ) )
+    if( pO && ::CalcClipRect( pO, aRect, false ) )
     {
         SwRect aTmp;
-        ::CalcClipRect( pO, aTmp, sal_True );
+        ::CalcClipRect( pO, aTmp, true );
         aRect.Union( aTmp );
     }
     else
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b46d07108f2f..83c1437d02f8 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -77,7 +77,7 @@
 #include <vcl/sysdata.hxx>
 #endif
 
-sal_Bool SwViewShell::mbLstAct = sal_False;
+bool SwViewShell::mbLstAct = false;
 ShellResource *SwViewShell::mpShellRes = 0;
 Window *SwViewShell::mpCareWindow = 0;
 BitmapEx* SwViewShell::mpErrorBmp = NULL;
@@ -202,26 +202,26 @@ void SwViewShell::DLPostPaint2(bool bPaintFormLayer)
 }
 // end of Pre/PostPaints
 
-void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
+void SwViewShell::ImplEndAction( const bool bIdleEnd )
 {
     // Nothing to do for the printer?
     if ( !GetWin() || IsPreview() )
     {
-        mbPaintWorks = sal_True;
+        mbPaintWorks = true;
         UISizeNotify();
         return;
     }
 
-    mbInEndAction = sal_True;
+    mbInEndAction = true;
     //will this put the EndAction of the last shell in the sequence?
 
-    SwViewShell::mbLstAct = sal_True;
+    SwViewShell::mbLstAct = true;
     SwViewShell *pSh = (SwViewShell*)this->GetNext();
     while ( pSh != this )
     {
         if ( pSh->ActionPend() )
         {
-            SwViewShell::mbLstAct = sal_False;
+            SwViewShell::mbLstAct = false;
             pSh = this;
         }
         else
@@ -242,9 +242,9 @@ void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
     if ( !bIdleEnd )
     {
         SwLayAction aAction( GetLayout(), Imp() );
-        aAction.SetComplete( sal_False );
+        aAction.SetComplete( false );
         if ( mnLockPaint )
-            aAction.SetPaint( sal_False );
+            aAction.SetPaint( false );
         aAction.SetInputType( VCL_INPUT_KEYBOARD );
         aAction.Action();
     }
@@ -262,7 +262,7 @@ void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
         {
             SolarMutexGuard aGuard;
 
-            sal_Bool bPaintsFromSystem = maInvalidRect.HasArea();
+            bool bPaintsFromSystem = maInvalidRect.HasArea();
             GetWin()->Update();
             if ( maInvalidRect.HasArea() )
             {
@@ -270,9 +270,9 @@ void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
                     Imp()->AddPaintRect( maInvalidRect );
 
                 ResetInvalidRect();
-                bPaintsFromSystem = sal_True;
+                bPaintsFromSystem = true;
             }
-            mbPaintWorks = sal_True;
+            mbPaintWorks = true;
 
             SwRegionRects *pRegion = Imp()->GetRegion();
 
@@ -311,7 +311,7 @@ void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
                         MapMode aMapMode( GetOut()->GetMapMode() );
                         pVout->SetMapMode( aMapMode );
 
-                        sal_Bool bSizeOK = sal_True;
+                        bool bSizeOK = true;
 
                         Rectangle aTmp1( aRect.SVRect() );
                         aTmp1 = GetOut()->LogicToPixel( aTmp1 );
@@ -387,19 +387,19 @@ void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
                 Imp()->DelRegion();
             }
             if( bShowCrsr )
-                ((SwCrsrShell*)this)->ShowCrsrs( sal_True );
+                ((SwCrsrShell*)this)->ShowCrsrs( true );
         }
         else
         {
             Imp()->DelRegion();
-            mbPaintWorks =  sal_True;
+            mbPaintWorks =  true;
         }
     }
     else
-        mbPaintWorks = sal_True;
+        mbPaintWorks = true;
 
-    mbInEndAction = sal_False;
-    SwViewShell::mbLstAct = sal_False;
+    mbInEndAction = false;
+    SwViewShell::mbLstAct = false;
     Imp()->EndAction();
 
     //We artificially end the action here to enable the automatic scrollbars
@@ -416,7 +416,7 @@ void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd )
 
 void SwViewShell::ImplStartAction()
 {
-    mbPaintWorks = sal_False;
+    mbPaintWorks = false;
     Imp()->StartAction();
 }
 
@@ -427,7 +427,7 @@ void SwViewShell::ImplLockPaint()
     Imp()->LockPaint();
 }
 
-void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev )
+void SwViewShell::ImplUnlockPaint( bool bVirDev )
 {
     SET_CURR_SHELL( this );
     if ( GetWin() && GetWin()->IsVisible() )
@@ -484,7 +484,7 @@ void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev )
         Imp()->UnlockPaint();
 }
 
-sal_Bool SwViewShell::AddPaintRect( const SwRect & rRect )
+bool SwViewShell::AddPaintRect( const SwRect & rRect )
 {
     bool bRet = false;
     SwViewShell *pSh = this;
@@ -580,9 +580,9 @@ sal_uInt16 SwViewShell::GetNumPages()
     return GetLayout() ? GetLayout()->GetPageNum() : 0;
 }
 
-sal_Bool SwViewShell::IsDummyPage( sal_uInt16 nPageNum ) const
+bool SwViewShell::IsDummyPage( sal_uInt16 nPageNum ) const
 {
-    return GetLayout() ? GetLayout()->IsDummyPage( nPageNum ) : 0;
+    return GetLayout() && GetLayout()->IsDummyPage( nPageNum );
 }
 
 /**
@@ -591,11 +591,11 @@ sal_Bool SwViewShell::IsDummyPage( sal_uInt16 nPageNum ) const
  * type is sent (???).
  * @param[in] bCloseDB Passed in to GetDoc()->UpdateFlds. [TODO] Purpose???
  */
-void SwViewShell::UpdateFlds(sal_Bool bCloseDB)
+void SwViewShell::UpdateFlds(bool bCloseDB)
 {
     SET_CURR_SHELL( this );
 
-    sal_Bool bCrsr = ISA(SwCrsrShell);
+    bool bCrsr = ISA(SwCrsrShell);
     if ( bCrsr )
         ((SwCrsrShell*)this)->StartAction();
     else
@@ -617,9 +617,9 @@ void SwViewShell::UpdateAllCharts()
     GetDoc()->UpdateAllCharts();
 }
 
-sal_Bool SwViewShell::HasCharts() const
+bool SwViewShell::HasCharts() const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwNodeIndex aIdx( *GetDoc()->GetNodes().GetEndOfAutotext().
                         StartOfSectionNode(), 1 );
     while (aIdx.GetNode().GetStartNode())
@@ -628,7 +628,7 @@ sal_Bool SwViewShell::HasCharts() const
         const SwOLENode *pNd = aIdx.GetNode().GetOLENode();
         if( pNd && !pNd->GetChartTblName().isEmpty() )
         {
-            bRet = sal_True;
+            bRet = true;
             break;
         }
     }
@@ -674,7 +674,7 @@ void SwViewShell::LayoutIdle()
 
 static void lcl_InvalidateAllCntnt( SwViewShell& rSh, sal_uInt8 nInv )
 {
-    sal_Bool bCrsr = rSh.ISA(SwCrsrShell);
+    bool bCrsr = rSh.ISA(SwCrsrShell);
     if ( bCrsr )
         ((SwCrsrShell&)rSh).StartAction();
     else
@@ -904,10 +904,10 @@ void SwViewShell::CalcLayout()
     }
 
     SwLayAction aAction( GetLayout(), Imp() );
-    aAction.SetPaint( sal_False );
-    aAction.SetStatBar( sal_True );
-    aAction.SetCalcLayout( sal_True );
-    aAction.SetReschedule( sal_True );
+    aAction.SetPaint( false );
+    aAction.SetStatBar( true );
+    aAction.SetCalcLayout( true );
+    aAction.SetReschedule( true );
     GetDoc()->LockExpFlds();
     aAction.Action();
     GetDoc()->UnlockExpFlds();
@@ -917,9 +917,9 @@ void SwViewShell::CalcLayout()
     if ( aAction.IsExpFlds() )
     {
         aAction.Reset();
-        aAction.SetPaint( sal_False );
-        aAction.SetStatBar( sal_True );
-        aAction.SetReschedule( sal_True );
+        aAction.SetPaint( false );
+        aAction.SetStatBar( true );
+        aAction.SetReschedule( true );
 
         SwDocPosUpdate aMsgHnt( 0 );
         GetDoc()->UpdatePageFlds( &aMsgHnt );
@@ -949,14 +949,14 @@ void SwViewShell::SetFirstVisPageInvalid()
 void SwViewShell::SizeChgNotify()
 {
     if ( !mpWin )
-        mbDocSizeChgd = sal_True;
+        mbDocSizeChgd = true;
     else if( ActionPend() || Imp()->IsCalcLayoutProgress() || mbPaintInProgress )
     {
-        mbDocSizeChgd = sal_True;
+        mbDocSizeChgd = true;
 
         if ( !Imp()->IsCalcLayoutProgress() && ISA( SwCrsrShell ) )
         {
-            const SwFrm *pCnt = ((SwCrsrShell*)this)->GetCurrFrm( sal_False );
+            const SwFrm *pCnt = ((SwCrsrShell*)this)->GetCurrFrm( false );
             const SwPageFrm *pPage;
             if ( pCnt && 0 != (pPage = pCnt->FindPageFrm()) )
             {
@@ -969,7 +969,7 @@ void SwViewShell::SizeChgNotify()
     }
     else
     {
-        mbDocSizeChgd = sal_False;
+        mbDocSizeChgd = false;
         ::SizeNotify( this, GetDocSize() );
     }
 }
@@ -994,7 +994,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
     const SwFrm *pOldPage = Imp()->GetFirstVisPage();
 
     const SwRect aPrevArea( VisArea() );
-    const sal_Bool bFull = aPrevArea.IsEmpty();
+    const bool bFull = aPrevArea.IsEmpty();
     maVisArea = rRect;
     SetFirstVisPageInvalid();
 
@@ -1144,7 +1144,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
         Imp()->UpdateAccessible();
 }
 
-sal_Bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect )
+bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect )
 {
 #if !defined(MACOSX) && !defined(ANDROID) && !defined(IOS)
     // #i98766# - disable smooth scrolling for Mac
@@ -1237,9 +1237,9 @@ sal_Bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *p
 
                 // SW paint stuff
                 PaintDesktop( aRect );
-                SwViewShell::mbLstAct = sal_True;
+                SwViewShell::mbLstAct = true;
                 GetLayout()->Paint( aRect );
-                SwViewShell::mbLstAct = sal_False;
+                SwViewShell::mbLstAct = false;
 
                 // end paint and destroy ObjectContact again
                 DLPostPaint2(true);
@@ -1362,7 +1362,7 @@ sal_Bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *p
             if ( !Imp()->bStopSmooth )
                 --mnLockPaint;
             SetFirstVisPageInvalid();
-            return sal_True;
+            return true;
         }
         delete pVout;
     }
@@ -1374,7 +1374,7 @@ sal_Bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *p
         GetWin()->Scroll( lXDiff, lYDiff, *pRect, SCROLL_CHILDREN);
     else
         GetWin()->Scroll( lXDiff, lYDiff, SCROLL_CHILDREN);
-    return sal_False;
+    return false;
 }
 
 void SwViewShell::PaintDesktop( const SwRect &rRect )
@@ -1510,20 +1510,20 @@ void SwViewShell::_PaintDesktop( const SwRegionRects &rRegion )
     GetOut()->Pop();
 }
 
-sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
+bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
 {
     if ( !GetWin() )
-        return sal_False;
+        return false;
 
     const SwPageFrm *pPage = Imp()->GetFirstVisPage();
     const SwTwips nBottom = VisArea().Bottom();
     const SwTwips nRight  = VisArea().Right();
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     while ( !bRet && pPage && !((pPage->Frm().Top()  > nBottom) ||
                                    (pPage->Frm().Left() > nRight)))
     {
         if ( pPage->IsInvalid() || pPage->IsInvalidFly() )
-            bRet = sal_True;
+            bRet = true;
         pPage = (SwPageFrm*)pPage->GetNext();
     }
 
@@ -1536,7 +1536,7 @@ sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
              Imp()->DelRegion();
 
         SwLayAction aAction( GetLayout(), Imp() );
-        aAction.SetComplete( sal_False );
+        aAction.SetComplete( false );
         // We increment the action counter to avoid a recursive call of actions
         // e.g. from a SwFEShell::RequestObjectResize(..) in bug 95829.
         // A recursive call of actions is no good idea because the inner action
@@ -1550,11 +1550,11 @@ sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
         if ( pRegion && aAction.IsBrowseActionStop() )
         {
             //only of interest when something has changed in the visible range
-            sal_Bool bStop = sal_True;
+            bool bStop = true;
             for ( sal_uInt16 i = 0; i < pRegion->size(); ++i )
             {
                 const SwRect &rTmp = (*pRegion)[i];
-                if ( sal_False == (bStop = rTmp.IsOver( VisArea() )) )
+                if ( false == (bStop = rTmp.IsOver( VisArea() )) )
                     break;
             }
             if ( bStop )
@@ -1569,7 +1569,7 @@ sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
             //First Invert then Compress, never the other way round!
             pRegion->Invert();
             pRegion->Compress();
-            bRet = sal_False;
+            bRet = false;
             if ( !pRegion->empty() )
             {
                 SwRegionRects aRegion( rRect );
@@ -1580,7 +1580,7 @@ sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
                         InvalidateWindows( rTmp );
                         if ( rTmp.IsOver( VisArea() ) )
                         {   aRegion -= rTmp;
-                            bRet = sal_True;
+                            bRet = true;
                         }
                     }
                 }
@@ -1602,11 +1602,11 @@ sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
                 }
             }
             else
-                bRet = sal_False;
+                bRet = false;
             Imp()->DelRegion();
         }
         else
-            bRet = sal_False;
+            bRet = false;
     }
     return bRet;
 }
@@ -1650,9 +1650,9 @@ void SwViewShell::Paint(const Rectangle &rRect)
                 return;
             }
 
-            mbPaintInProgress = sal_True;
+            mbPaintInProgress = true;
             SET_CURR_SHELL( this );
-            SwRootFrm::SetNoVirDev( sal_True );
+            SwRootFrm::SetNoVirDev( true );
 
             //We don't want to Clip to and fro, we trust that all are limited
             //to the rectangle and only need to calculate the clipping once.
@@ -1667,9 +1667,9 @@ void SwViewShell::Paint(const Rectangle &rRect)
                 //When useful, process or destroy the old InvalidRect.
                 if ( aRect.IsInside( maInvalidRect ) )
                     ResetInvalidRect();
-                SwViewShell::mbLstAct = sal_True;
+                SwViewShell::mbLstAct = true;
                 GetLayout()->Paint( aRect );
-                SwViewShell::mbLstAct = sal_False;
+                SwViewShell::mbLstAct = false;
             }
             else
             {
@@ -1688,17 +1688,17 @@ void SwViewShell::Paint(const Rectangle &rRect)
                     //When useful, process or destroy the old InvalidRect.
                     if ( aRect.IsInside( maInvalidRect ) )
                         ResetInvalidRect();
-                    SwViewShell::mbLstAct = sal_True;
+                    SwViewShell::mbLstAct = true;
                     GetLayout()->Paint( aRect );
-                    SwViewShell::mbLstAct = sal_False;
+                    SwViewShell::mbLstAct = false;
                     // --> OD 2009-08-12 #i101192#
                     // end Pre/PostPaint encapsulation
                     DLPostPaint2(true);
                     // <--
                 }
             }
-            SwRootFrm::SetNoVirDev( sal_False );
-            mbPaintInProgress = sal_False;
+            SwRootFrm::SetNoVirDev( false );
+            mbPaintInProgress = false;
             UISizeNotify();
         }
     }
@@ -1901,7 +1901,7 @@ void SwViewShell::SetBrowseBorder( const Size& rNew )
     {
         maBrowseBorder = rNew;
         if ( maVisArea.HasArea() )
-            CheckBrowseView( sal_False );
+            CheckBrowseView( false );
     }
 }
 
@@ -1924,7 +1924,7 @@ sal_Int32 SwViewShell::GetBrowseWidth() const
         return maVisArea.Width() - 2 * GetOut()->PixelToLogic(maBrowseBorder).Width();
 }
 
-void SwViewShell::CheckBrowseView( sal_Bool bBrowseChgd )
+void SwViewShell::CheckBrowseView( bool bBrowseChgd )
 {
     if ( !bBrowseChgd && !GetViewOptions()->getBrowseMode() )
         return;
@@ -2077,13 +2077,13 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
 
     SET_CURR_SHELL( this );
 
-    sal_Bool bReformat   = sal_False;
+    bool bReformat   = false;
 
     if( mpOpt->IsShowHiddenField() != rOpt.IsShowHiddenField() )
     {
         ((SwHiddenTxtFieldType*)mpDoc->GetSysFldType( RES_HIDDENTXTFLD ))->
                                             SetHiddenFlag( !rOpt.IsShowHiddenField() );
-        bReformat = sal_True;
+        bReformat = true;
     }
     if ( mpOpt->IsShowHiddenPara() != rOpt.IsShowHiddenPara() )
     {
@@ -2094,7 +2094,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
             SwMsgPoolItem aHnt( RES_HIDDENPARA_PRINT );
             pFldType->ModifyNotification( &aHnt, 0);
         }
-        bReformat = sal_True;
+        bReformat = true;
     }
     if ( !bReformat && mpOpt->IsShowHiddenChar() != rOpt.IsShowHiddenChar() )
     {
@@ -2118,17 +2118,17 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
         // if not a reference device (printer) is used for formatting,
         // but the screen, new formatting is needed for zoomfactor changes.
         if( mpOpt->getBrowseMode() )
-            bReformat = sal_True;
+            bReformat = true;
     }
 
     bool bBrowseModeChanged = false;
     if( mpOpt->getBrowseMode() != rOpt.getBrowseMode() )
     {
         bBrowseModeChanged = true;
-        bReformat = sal_True;
+        bReformat = true;
     }
     else if( mpOpt->getBrowseMode() && mpOpt->IsPrtFormat() != rOpt.IsPrtFormat() )
-        bReformat = sal_True;
+        bReformat = true;
 
     if ( HasDrawView() || rOpt.IsGridVisible() )
     {
@@ -2136,13 +2136,13 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
             MakeDrawView();
 
         SwDrawView *pDView = Imp()->GetDrawView();
-        if ( (pDView->IsDragStripes() ? 1 : 0) != rOpt.IsCrossHair() )
+        if ( pDView->IsDragStripes() != rOpt.IsCrossHair() )
             pDView->SetDragStripes( rOpt.IsCrossHair() );
 
-        if ( (pDView->IsGridSnap() ? 1 : 0) != rOpt.IsSnap() )
+        if ( pDView->IsGridSnap() != rOpt.IsSnap() )
             pDView->SetGridSnap( rOpt.IsSnap() );
 
-        if ( (pDView->IsGridVisible() ? 1 : 0) != rOpt.IsGridVisible() )
+        if ( pDView->IsGridVisible() != rOpt.IsGridVisible() )
             pDView->SetGridVisible( rOpt.IsGridVisible() );
 
         const Size &rSz = rOpt.GetSnapSize();
@@ -2172,7 +2172,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
         // #i44963# Good occasion to check if page sizes in
         // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
         mpDoc->CheckDefaultPageFmt();
-        CheckBrowseView( sal_True );
+        CheckBrowseView( true );
     }
 
     pMyWin->Invalidate();
@@ -2188,7 +2188,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
     if( bOnlineSpellChgd )
     {
         SwViewShell *pSh = (SwViewShell*)this->GetNext();
-        sal_Bool bOnlineSpl = rOpt.IsOnlineSpell();
+        bool bOnlineSpl = rOpt.IsOnlineSpell();
         while( pSh != this )
         {   pSh->mpOpt->SetOnlineSpell( bOnlineSpl );
             Window *pTmpWin = pSh->GetWin();
@@ -2206,12 +2206,12 @@ void SwViewShell::SetUIOptions( const SwViewOption &rOpt )
     //the API-Flag of the view options is set but never reset
     //it is required to set scroll bars in readonly documents
     if(rOpt.IsStarOneSetting())
-        mpOpt->SetStarOneSetting(sal_True);
+        mpOpt->SetStarOneSetting(true);
 
     mpOpt->SetSymbolFont(rOpt.GetSymbolFont());
 }
 
-void SwViewShell::SetReadonlyOption(sal_Bool bSet)
+void SwViewShell::SetReadonlyOption(bool bSet)
 {
     //JP 01.02.99: at readonly flag query properly
     //              and if need be format; Bug 61335
@@ -2220,9 +2220,9 @@ void SwViewShell::SetReadonlyOption(sal_Bool bSet)
     if( bSet != mpOpt->IsReadonly() )
     {
         // so that the flags can be queried properly.
-        mpOpt->SetReadonly( sal_False );
+        mpOpt->SetReadonly( false );
 
-        sal_Bool bReformat = mpOpt->IsFldName();
+        bool bReformat = mpOpt->IsFldName();
 
         mpOpt->SetReadonly( bSet );
 
@@ -2241,17 +2241,17 @@ void SwViewShell::SetReadonlyOption(sal_Bool bSet)
     }
 }
 
-void  SwViewShell::SetPDFExportOption(sal_Bool bSet)
+void  SwViewShell::SetPDFExportOption(bool bSet)
 {
     if( bSet != mpOpt->IsPDFExport() )
     {
         if( bSet && mpOpt->getBrowseMode() )
-            mpOpt->SetPrtFormat( sal_True );
+            mpOpt->SetPrtFormat( true );
         mpOpt->SetPDFExport(bSet);
     }
 }
 
-void  SwViewShell::SetReadonlySelectionOption(sal_Bool bSet)
+void  SwViewShell::SetReadonlySelectionOption(bool bSet)
 {
     if( bSet != mpOpt->IsSelectionInReadonly() )
     {
@@ -2259,7 +2259,7 @@ void  SwViewShell::SetReadonlySelectionOption(sal_Bool bSet)
     }
 }
 
-void SwViewShell::SetPrtFormatOption( sal_Bool bSet )
+void SwViewShell::SetPrtFormatOption( bool bSet )
 {
     mpOpt->SetPrtFormat( bSet );
 }
@@ -2268,7 +2268,7 @@ void SwViewShell::UISizeNotify()
 {
     if ( mbDocSizeChgd )
     {
-        mbDocSizeChgd = sal_False;
+        mbDocSizeChgd = false;
         bool bOld = bInSizeNotify;
         bInSizeNotify = true;
         ::SizeNotify( this, GetDocSize() );
@@ -2286,7 +2286,7 @@ sal_uInt16  SwViewShell::GetRestoreActions() const
     return Imp()->GetRestoreActions();
 }
 
-sal_Bool SwViewShell::IsNewLayout() const
+bool SwViewShell::IsNewLayout() const
 {
     return GetLayout()->IsNewLayout();
 }
@@ -2380,9 +2380,9 @@ void SwViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibili
 {
     if(mpOpt->IsPagePreview() && !rAccessibilityOptions.GetIsForPagePreviews())
     {
-        mpAccOptions->SetAlwaysAutoColor(sal_False);
-        mpAccOptions->SetStopAnimatedGraphics(sal_False);
-        mpAccOptions->SetStopAnimatedText(sal_False);
+        mpAccOptions->SetAlwaysAutoColor(false);
+        mpAccOptions->SetStopAnimatedGraphics(false);
+        mpAccOptions->SetStopAnimatedText(false);
     }
     else
     {
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 4f195b137789..f5eab39ee5a7 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -38,7 +38,7 @@
 
 void SwViewShell::Init( const SwViewOption *pNewOpt )
 {
-    mbDocSizeChgd = sal_False;
+    mbDocSizeChgd = false;
 
     // We play it save: Remove old font information whenever the printer
     // resolution or the zoom factor changes. For that, Init() and Reformat()
@@ -74,7 +74,7 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
     //                          one would have to reformat again.
 
     if( pDShell && pDShell->IsReadOnly() )
-        mpOpt->SetReadonly( sal_True );
+        mpOpt->SetReadonly( true );
 
     SAL_INFO( "sw.core", "View::Init - before InitPrt" );
     // --> FME 2007-11-06 #i82967#
@@ -172,8 +172,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, Window *pWindow,
     mbInConstructor = true;
 
     mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView =
-    mbEndActionByVirDev = sal_False;
-    mbPaintWorks = mbEnableSmooth = sal_True;
+    mbEndActionByVirDev = false;
+    mbPaintWorks = mbEnableSmooth = true;
     mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
 
     // --> OD 2005-02-11 #i38810# - Do not reset modified state of document,
@@ -247,9 +247,9 @@ SwViewShell::SwViewShell( SwViewShell& rShell, Window *pWindow,
     // <SwDrawContact::Changed> during contruction of <SwViewShell> instance
     mbInConstructor = true;
 
-    mbPaintWorks = mbEnableSmooth = sal_True;
+    mbPaintWorks = mbEnableSmooth = true;
     mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView =
-    mbEndActionByVirDev = sal_False;
+    mbEndActionByVirDev = false;
     mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
     // OD 12.12.2002 #103492#
     if( nFlags & VSHELLFLAG_SHARELAYOUT )
@@ -258,7 +258,7 @@ SwViewShell::SwViewShell( SwViewShell& rShell, Window *pWindow,
     SET_CURR_SHELL( this );
 
     mpDoc->acquire();
-    sal_Bool bModified = mpDoc->IsModified();
+    bool bModified = mpDoc->IsModified();
 
     pOutput = mpOut;
     Init( rShell.GetViewOptions() ); // might change Outdev (InitPrt())
@@ -292,7 +292,7 @@ SwViewShell::~SwViewShell()
 {
     {
         SET_CURR_SHELL( this );
-        mbPaintWorks = sal_False;
+        mbPaintWorks = false;
 
         // FME 2004-06-21 #i9684# Stopping the animated graphics is not
         // necessary during printing or pdf export, because the animation
@@ -360,9 +360,9 @@ SwViewShell::~SwViewShell()
     delete mpAccOptions;
 }
 
-sal_Bool SwViewShell::HasDrawView() const
+bool SwViewShell::HasDrawView() const
 {
-    return (Imp() && Imp()->HasDrawView()) ? 1 : 0;
+    return Imp() && Imp()->HasDrawView();
 }
 
 void SwViewShell::MakeDrawView()
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 371085bf1fc5..f6a5c69b1236 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -95,7 +95,7 @@ class SwDrawViewSave
 {
     OUString sLayerNm;
     SdrView* pDV;
-    sal_Bool bPrintControls;
+    bool bPrintControls;
 public:
     SwDrawViewSave( SdrView* pSdrView );
     ~SwDrawViewSave();
@@ -222,7 +222,7 @@ void SwViewShell::ChgAllPageOrientation( sal_uInt16 eOri )
     SET_CURR_SHELL( this );
 
     sal_uInt16 nAll = GetDoc()->GetPageDescCnt();
-    sal_Bool bNewOri = Orientation(eOri) == ORIENTATION_PORTRAIT ? sal_False : sal_True;
+    bool bNewOri = Orientation(eOri) == ORIENTATION_PORTRAIT ? sal_False : sal_True;
 
     for( sal_uInt16 i = 0; i < nAll; ++ i )
     {
@@ -273,7 +273,7 @@ void SwViewShell::ChgAllPageSize( Size &rSz )
         }
         SwFrmFmt& rPgFmt = aNew.GetMaster();
         Size aSz( rSz );
-        const sal_Bool bOri = aNew.GetLandscape();
+        const bool bOri = aNew.GetLandscape();
         if( bOri  ? aSz.Height() > aSz.Width()
                   : aSz.Height() < aSz.Width() )
         {
@@ -306,9 +306,9 @@ void SwViewShell::CalcPagesForPrint( sal_uInt16 nMax )
         maVisArea = pPage->Frm();
         Imp()->SetFirstVisPageInvalid();
         aAction.Reset();
-        aAction.SetPaint( sal_False );
-        aAction.SetWaitAllowed( sal_False );
-        aAction.SetReschedule( sal_True );
+        aAction.SetPaint( false );
+        aAction.SetWaitAllowed( false );
+        aAction.SetReschedule( true );
 
         aAction.Action();
 
@@ -439,7 +439,7 @@ sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage)
     return 0;
 }
 
-sal_Bool SwViewShell::PrintOrPDFExport(
+bool SwViewShell::PrintOrPDFExport(
     OutputDevice *pOutDev,
     SwPrintData const& rPrintData,
     sal_Int32 nRenderer     /* the index in the vector of pages to be printed */ )
@@ -449,7 +449,7 @@ sal_Bool SwViewShell::PrintOrPDFExport(
     const sal_Int32 nMaxRenderer = rPrintData.GetRenderData().GetPagesToPrint().size() - 1;
     OSL_ENSURE( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out of bounds");
     if (!pOutDev || nMaxRenderer < 0 || nRenderer < 0 || nRenderer > nMaxRenderer)
-        return sal_False;
+        return false;
 
     // save settings of OutputDevice (should be done always since the
     // output device is now provided by a call from outside the Writer)
@@ -478,7 +478,7 @@ sal_Bool SwViewShell::PrintOrPDFExport(
 
         //JP 01.02.99: Bug 61335 - the ReadOnly flag is never copied
         if( mpOpt->IsReadonly() )
-            pShell->mpOpt->SetReadonly( sal_True );
+            pShell->mpOpt->SetReadonly( true );
 
         // save options at draw view:
         SwDrawViewSave aDrawViewSave( pShell->GetDrawView() );
@@ -498,7 +498,7 @@ sal_Bool SwViewShell::PrintOrPDFExport(
         OSL_ENSURE( pStPage, "failed to get start page" );
         if (!pStPage)
         {
-            return sal_False;
+            return false;
         }
 
         //!! applying view options and formatting the document should now only be done in getRendererCount!
@@ -546,7 +546,7 @@ sal_Bool SwViewShell::PrintOrPDFExport(
         pRecorder->WindStart();
     }
 
-    return sal_True;
+    return true;
 }
 
 void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions,
@@ -563,7 +563,7 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintD
     {
         SET_CURR_SHELL( pSh );
         pSh->PrepareForPrint( rOptions );
-        pSh->SetPrtFormatOption( sal_True );
+        pSh->SetPrtFormatOption( true );
 
         SwRect aSwRect( rRect );
         pSh->maVisArea = aSwRect;
@@ -571,7 +571,7 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintD
         if ( pSh->GetViewOptions()->getBrowseMode() &&
              pSh->GetNext() == pSh )
         {
-            pSh->CheckBrowseView( sal_False );
+            pSh->CheckBrowseView( false );
             pSh->GetLayout()->Lower()->InvalidateSize();
         }
 
@@ -592,7 +592,7 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintD
 }
 
 /// Check if the DocNodesArray contains fields.
-sal_Bool SwViewShell::IsAnyFieldInDoc() const
+bool SwViewShell::IsAnyFieldInDoc() const
 {
     const SfxPoolItem* pItem;
     sal_uInt32 nMaxItems = mpDoc->GetAttrPool().GetItemCount2( RES_TXTATR_FIELD );
@@ -604,7 +604,7 @@ sal_Bool SwViewShell::IsAnyFieldInDoc() const
             const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
             if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
             {
-                return sal_True;
+                return true;
             }
         }
     }
@@ -618,12 +618,12 @@ sal_Bool SwViewShell::IsAnyFieldInDoc() const
             const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
             if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
             {
-                return sal_True;
+                return true;
             }
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 ///  Saves some settings at the draw view
@@ -648,13 +648,13 @@ SwDrawViewSave::~SwDrawViewSave()
 
 // OD 09.01.2003 #i6467# - method also called for page preview
 void SwViewShell::PrepareForPrint( const SwPrintData &rOptions )
-{
-    mpOpt->SetGraphic ( sal_True == rOptions.bPrintGraphic );
-    mpOpt->SetTable   ( sal_True == rOptions.bPrintTable );
-    mpOpt->SetDraw    ( sal_True == rOptions.bPrintDraw  );
-    mpOpt->SetControl ( sal_True == rOptions.bPrintControl );
-    mpOpt->SetPageBack( sal_True == rOptions.bPrintPageBackground );
-    mpOpt->SetBlackFont( sal_True == rOptions.bPrintBlackFont );
+ {
+    mpOpt->SetGraphic  ( rOptions.bPrintGraphic );
+    mpOpt->SetTable    ( rOptions.bPrintTable );
+    mpOpt->SetDraw     ( rOptions.bPrintDraw  );
+    mpOpt->SetControl  ( rOptions.bPrintControl );
+    mpOpt->SetPageBack ( rOptions.bPrintPageBackground );
+    mpOpt->SetBlackFont( rOptions.bPrintBlackFont );
 
     if ( HasDrawView() )
     {
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 3df30abc523c..0d8634775444 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -70,17 +70,17 @@ Reader* GetWW8Reader();
 // ReaderWriterEnum and aFilterDetect in shellio.hxx
 SwReaderWriterEntry aReaderWriter[] =
 {
-    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  sal_True  ),
-    SwReaderWriterEntry( 0,               &::GetASCWriter,  sal_False ),
-    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  sal_True  ),
-    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  sal_True  ),
-    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  sal_True  ),
-    SwReaderWriterEntry( 0,               &::GetHTMLWriter, sal_True  ),
-    SwReaderWriterEntry( 0,               0,                sal_True  ),
-    SwReaderWriterEntry( &::GetWW8Reader, 0,                sal_True  ),
-    SwReaderWriterEntry( 0,               &::GetXMLWriter,  sal_True  ),
-    SwReaderWriterEntry( 0,               &::GetASCWriter,  sal_False ),
-    SwReaderWriterEntry( 0,               &::GetASCWriter,  sal_True  )
+    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  true  ),
+    SwReaderWriterEntry( 0,               &::GetASCWriter,  false ),
+    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  true  ),
+    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  true  ),
+    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  true  ),
+    SwReaderWriterEntry( 0,               &::GetHTMLWriter, true  ),
+    SwReaderWriterEntry( 0,               0,                true  ),
+    SwReaderWriterEntry( &::GetWW8Reader, 0,                true  ),
+    SwReaderWriterEntry( 0,               &::GetXMLWriter,  true  ),
+    SwReaderWriterEntry( 0,               &::GetASCWriter,  false ),
+    SwReaderWriterEntry( 0,               &::GetASCWriter,  true  )
 };
 
 Reader* SwReaderWriterEntry::GetReader()
@@ -200,18 +200,18 @@ SwRead GetReader( const OUString& rFltName )
 
 void Writer::SetVersion( const OUString&, long ) {}
 
-sal_Bool Writer::IsStgWriter() const { return sal_False; }
+bool Writer::IsStgWriter() const { return false; }
 
-sal_Bool StgWriter::IsStgWriter() const { return sal_True; }
+bool StgWriter::IsStgWriter() const { return true; }
 
-sal_Bool SwReader::NeedsPasswd( const Reader& /*rOptions*/ )
+bool SwReader::NeedsPasswd( const Reader& /*rOptions*/ )
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwReader::CheckPasswd( const OUString& /*rPasswd*/, const Reader& /*rOptions*/ )
+bool SwReader::CheckPasswd( const OUString& /*rPasswd*/, const Reader& /*rOptions*/ )
 {
-    return sal_True;
+    return true;
 }
 
 // Read Filter Flags; used by WW8 / W4W / EXCEL / LOTUS
@@ -293,7 +293,7 @@ void StgReader::SetFltName( const OUString& rFltNm )
                 aFltName = rFltNm;
 }
 
-SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNDoc )
+SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, bool bNDoc )
 {
         pNumRuleTbl = new SwNumRuleTbl();
         pNumRuleTbl->reserve(8);
@@ -726,7 +726,7 @@ void GetWW8Writer( const OUString& rFltName, const OUString& rBaseURL, WriterRef
 typedef sal_uLong ( SAL_CALL *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const OUString& );
 typedef sal_uLong ( SAL_CALL *GetSaveWarning )( SfxObjectShell& );
 
-sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const OUString& rStorageName )
+sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, bool bSaveInto, const OUString& rStorageName )
 {
 #ifndef DISABLE_DYNLOADING
     SaveOrDel pFunction = reinterpret_cast<SaveOrDel>( SwGlobals::getFilters().GetMswordLibSymbol( "SaveOrDelMSVBAStorage_ww8" ) );
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index af15200c2224..809b0f1559c9 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -61,7 +61,7 @@ OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const
         sal_uInt16 wIdentGet()  { return SVBT16ToShort(wIdent); }
         sal_uInt16 fFlagsGet()  { return SVBT16ToShort(fFlags); }
         // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format.
-        sal_Bool fComplexGet()  { return static_cast< sal_Bool >((fFlagsGet() >> 2) & 1); }
+        bool fComplexGet()      { return static_cast< bool >((fFlagsGet() >> 2) & 1); }
     };
 
     bool bRet = false;
@@ -81,7 +81,7 @@ OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const
     {
         bRet = (( ((W1_FIB*)pHeader)->wIdentGet() == 0xA59C
                     && ((W1_FIB*)pHeader)->nFibGet() == 0x21)
-                && ((W1_FIB*)pHeader)->fComplexGet() == 0);
+                && ((W1_FIB*)pHeader)->fComplexGet() == false);
     }
     else if ( FILTER_TEXT == sName )
         bRet = SwIoSystem::IsDetectableText(pHeader, nLen_);
@@ -130,9 +130,9 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFmtNm,
     return 0;
 }
 
-sal_Bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter)
+bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     try
     {
         sal_uLong nStgFmtId = SotStorage::GetFormatID( rStg );
@@ -147,14 +147,14 @@ sal_Bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < co
     return bRet;
 }
 
-sal_Bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
+bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
 {
     sal_uLong nStgFmtId = rStg.GetFormat();
     /*#i8409# We cannot trust the clipboard id anymore :-(*/
     if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6)
         nStgFmtId = 0;
 
-    sal_Bool bRet = SVSTREAM_OK == rStg.GetError() &&
+    bool bRet = SVSTREAM_OK == rStg.GetError() &&
         ( !nStgFmtId || rFilter.GetFormat() == nStgFmtId ) &&
         ( rStg.IsContained( SwIoSystem::GetSubStorageName( rFilter )) );
     if( bRet )
@@ -197,9 +197,9 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferL
 
 // Check if the file fits the corresponding format
 // Currently we only support our own filters
-sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName)
+bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     SfxFilterContainer aCntSw( OUString(sSWRITER) );
     SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) );
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 874abfed8018..c505fac3aad2 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -67,10 +67,10 @@ sal_uLong SwReader::Read( const Reader& rOptions )
     if( 0 != (po->pMedium = pMedium ) &&
         !po->SetStrmStgPtr() )
     {
-        po->SetReadUTF8( sal_False );
-        po->SetBlockMode( sal_False );
-        po->SetOrganizerMode( sal_False );
-        po->SetIgnoreHTMLComments( sal_False );
+        po->SetReadUTF8( false );
+        po->SetBlockMode( false );
+        po->SetOrganizerMode( false );
+        po->SetIgnoreHTMLComments( false );
         return ERR_SWG_FILE_FORMAT_ERROR;
     }
 
@@ -104,13 +104,13 @@ sal_uLong SwReader::Read( const Reader& rOptions )
     SwPaM *pEnd = pPam;
     SwUndoInsDoc* pUndo = 0;
 
-    sal_Bool bReadPageDescs = sal_False;
+    bool bReadPageDescs = false;
     bool const bDocUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
     bool bSaveUndo = bDocUndo && pCrsr;
     if( bSaveUndo )
     {
         // the reading of the page template cannot be undone!
-        if( 0 != ( bReadPageDescs = po->aOpt.IsPageDescs() ) )
+        if( ( bReadPageDescs = po->aOpt.IsPageDescs() ) )
         {
             bSaveUndo = false;
             pDoc->GetIDocumentUndoRedo().DelAllUndoObj();
@@ -131,7 +131,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
     // Array of FlyFormats
     SwFrmFmts aFlyFrmArr;
     // only read templates? then ignore multi selection!
-    sal_Bool bFmtsOnly = po->aOpt.IsFmtsOnly();
+    bool bFmtsOnly = po->aOpt.IsFmtsOnly();
 
     while( true )
     {
@@ -192,7 +192,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
                 SwTableBox* pBox = pTblBoxStart->GetTblBox();
                 if ( pBox )
                 {
-                    pDoc->ChkBoxNumFmt( *pBox, sal_True );
+                    pDoc->ChkBoxNumFmt( *pBox, true );
                 }
             }
         }
@@ -378,10 +378,10 @@ sal_uLong SwReader::Read( const Reader& rOptions )
         pDoc->SetModified();
     }
 
-    po->SetReadUTF8( sal_False );
-    po->SetBlockMode( sal_False );
-    po->SetOrganizerMode( sal_False );
-    po->SetIgnoreHTMLComments( sal_False );
+    po->SetReadUTF8( false );
+    po->SetBlockMode( false );
+    po->SetOrganizerMode( false );
+    po->SetIgnoreHTMLComments( false );
 
     return nError;
 }
@@ -420,9 +420,9 @@ Reader::Reader()
     aDStamp( Date::EMPTY ),
     aTStamp( Time::EMPTY ),
     aChkDateTime( DateTime::EMPTY ),
-    pStrm(0), pMedium(0), bInsertMode(0),
-    bTmplBrowseMode(0), bReadUTF8(0), bBlockMode(0), bOrganizerMode(0),
-    bHasAskTemplateName(0), bIgnoreHTMLComments(0)
+    pStrm(0), pMedium(0), bInsertMode(false),
+    bTmplBrowseMode(false), bReadUTF8(false), bBlockMode(false), bOrganizerMode(false),
+    bHasAskTemplateName(false), bIgnoreHTMLComments(false)
 {
 }
 
@@ -442,7 +442,7 @@ SwDoc* Reader::GetTemplateDoc()
     if( !bHasAskTemplateName )
     {
         SetTemplateName( GetTemplateName() );
-        bHasAskTemplateName = sal_True;
+        bHasAskTemplateName = true;
     }
 
     if( aTemplateNm.isEmpty() )
@@ -499,11 +499,11 @@ SwDoc* Reader::GetTemplateDoc()
                         pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode );
                         pTemplate->RemoveAllFmtLanguageDependencies();
 
-                        ReadXML->SetOrganizerMode( sal_True );
+                        ReadXML->SetOrganizerMode( true );
                         SfxMedium aMedium( aFileName, sal_False );
                         SwReader aRdr( aMedium, OUString(), pTemplate );
                         aRdr.Read( *ReadXML );
-                        ReadXML->SetOrganizerMode( sal_False );
+                        ReadXML->SetOrganizerMode( false );
 
                         pTemplate->acquire();
                     }
@@ -517,9 +517,9 @@ SwDoc* Reader::GetTemplateDoc()
     return pTemplate;
 }
 
-sal_Bool Reader::SetTemplate( SwDoc& rDoc )
+bool Reader::SetTemplate( SwDoc& rDoc )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     GetTemplateDoc();
     if( pTemplate )
@@ -527,7 +527,7 @@ sal_Bool Reader::SetTemplate( SwDoc& rDoc )
         rDoc.RemoveAllFmtLanguageDependencies();
         rDoc.ReplaceStyles( *pTemplate );
         rDoc.SetFixFields(false, NULL);
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -635,45 +635,45 @@ size_t Reader::GetSectionList( SfxMedium&, std::vector<OUString*>& ) const
     return 0;
 }
 
-sal_Bool SwReader::HasGlossaries( const Reader& rOptions )
+bool SwReader::HasGlossaries( const Reader& rOptions )
 {
     // copy variables
     Reader* po = (Reader*) &rOptions;
     po->pStrm = pStrm;
     po->pStg  = pStg;
-    po->bInsertMode = sal_False;
+    po->bInsertMode = false;
 
     // if a Medium is selected, get its Stream
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !( 0 != (po->pMedium = pMedium ) && !po->SetStrmStgPtr() ))
         bRet = po->HasGlossaries();
     return bRet;
 }
 
-sal_Bool SwReader::ReadGlossaries( const Reader& rOptions,
-                                SwTextBlocks& rBlocks, sal_Bool bSaveRelFiles )
+bool SwReader::ReadGlossaries( const Reader& rOptions,
+                                SwTextBlocks& rBlocks, bool bSaveRelFiles )
 {
     // copy variables
     Reader* po = (Reader*) &rOptions;
     po->pStrm = pStrm;
     po->pStg  = pStg;
-    po->bInsertMode = sal_False;
+    po->bInsertMode = false;
 
     // if a Medium is selected, get its Stream
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( !( 0 != (po->pMedium = pMedium ) && !po->SetStrmStgPtr() ))
         bRet = po->ReadGlossaries( rBlocks, bSaveRelFiles );
     return bRet;
 }
 
-sal_Bool Reader::HasGlossaries() const
+bool Reader::HasGlossaries() const
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool Reader::ReadGlossaries( SwTextBlocks&, sal_Bool ) const
+bool Reader::ReadGlossaries( SwTextBlocks&, bool ) const
 {
-    return sal_False;
+    return false;
 }
 
 int StgReader::GetReaderType()
@@ -689,7 +689,7 @@ int StgReader::GetReaderType()
  * Constructors, Destructors are inline (inc/shellio.hxx).
  */
 
-SwWriter::SwWriter(SvStream& rStrm, SwCrsrShell &rShell, sal_Bool bInWriteAll)
+SwWriter::SwWriter(SvStream& rStrm, SwCrsrShell &rShell, bool bInWriteAll)
     : pStrm(&rStrm), pMedium(0), pOutPam(0), pShell(&rShell),
     rDoc(*rShell.GetDoc()), bWriteAll(bInWriteAll)
 {
@@ -701,7 +701,7 @@ SwWriter::SwWriter(SvStream& rStrm,SwDoc &rDocument)
 {
 }
 
-SwWriter::SwWriter(SvStream& rStrm, SwPaM& rPam, sal_Bool bInWriteAll)
+SwWriter::SwWriter(SvStream& rStrm, SwPaM& rPam, bool bInWriteAll)
     : pStrm(&rStrm), pMedium(0), pOutPam(&rPam), pShell(0),
     rDoc(*rPam.GetDoc()), bWriteAll(bInWriteAll)
 {
@@ -712,7 +712,7 @@ SwWriter::SwWriter( const uno::Reference < embed::XStorage >& rStg, SwDoc &rDocu
 {
 }
 
-SwWriter::SwWriter(SfxMedium& rMedium, SwCrsrShell &rShell, sal_Bool bInWriteAll)
+SwWriter::SwWriter(SfxMedium& rMedium, SwCrsrShell &rShell, bool bInWriteAll)
     : pStrm(0), pMedium(&rMedium), pOutPam(0), pShell(&rShell),
     rDoc(*rShell.GetDoc()), bWriteAll(bInWriteAll)
 {
@@ -729,14 +729,14 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
     // #i73788#
     SwPauseThreadStarting aPauseThreadStarting;
 
-    sal_Bool bHasMark = sal_False;
+    bool bHasMark = false;
     SwPaM * pPam;
 
     SwDoc *pDoc = 0;
 
     if ( pShell && !bWriteAll && pShell->IsTableMode() )
     {
-        bWriteAll = sal_True;
+        bWriteAll = true;
         pDoc = new SwDoc;
         pDoc->acquire();
 
@@ -779,9 +779,9 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
             if( pShell )
             {
                 pShell->Push();
-                pShell->SttEndDoc(sal_True);
+                pShell->SttEndDoc(true);
                 pShell->SetMark();
-                pShell->SttEndDoc(sal_False);
+                pShell->SttEndDoc(false);
             }
             else
             {
@@ -837,16 +837,16 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
         }
     }
 
-    sal_Bool bLockedView(sal_False);
+    bool bLockedView(false);
     SwEditShell* pESh = pOutDoc->GetEditShell();
     if( pESh )
     {
         bLockedView = pESh->IsViewLocked();
-        pESh->LockView( sal_True );    //lock visible section
+        pESh->LockView( true );    //lock visible section
         pESh->StartAllAction();
     }
 
-    sal_Bool bWasPurgeOle = pOutDoc->get(IDocumentSettingAccess::PURGE_OLE);
+    bool bWasPurgeOle = pOutDoc->get(IDocumentSettingAccess::PURGE_OLE);
     pOutDoc->set(IDocumentSettingAccess::PURGE_OLE, false);
 
     sal_uLong nError = 0;
@@ -873,7 +873,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
         if(!bHasMark)
         {
             if( pShell )
-                pShell->Pop( sal_False );
+                pShell->Pop( false );
             else
                 delete pPam;
         }
@@ -894,19 +894,19 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
     {
         if ( !pDoc->release() )
             delete pDoc;
-        bWriteAll = sal_False;
+        bWriteAll = false;
     }
 
     return nError;
 }
 
-sal_Bool SetHTMLTemplate( SwDoc & rDoc )
+bool SetHTMLTemplate( SwDoc & rDoc )
 {
     // get template name of the Sfx-HTML-Filter !!!
     if( !ReadHTML->GetTemplateDoc() )
         ReadHTML->MakeHTMLDummyTemplateDoc();
 
-    sal_Bool bRet = ReadHTML->SetTemplate( rDoc );
+    bool bRet = ReadHTML->SetTemplate( rDoc );
 
     SwNodes& rNds = rDoc.GetNodes();
     SwNodeIndex aIdx( rNds.GetEndOfExtras(), 1 );
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 6584f1eddc32..b95f544292b9 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -38,7 +38,7 @@ static char const sHTML_O_Object[] = "OBJECT";
 
 }
 
-sal_uInt16 SwApplet_Impl::GetOptionType( const OUString& rName, sal_Bool bApplet )
+sal_uInt16 SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet )
 {
     sal_uInt16 nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG;
 
@@ -120,7 +120,7 @@ SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16
 }
 
 void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
-                                  sal_Bool bMayScript, const OUString& rCodeBase,
+                                  bool bMayScript, const OUString& rCodeBase,
                                   const OUString& rDocumentBaseURL )
 {
     comphelper::EmbeddedObjectContainer aCnt;
@@ -139,7 +139,7 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
     {
         xSet->setPropertyValue("AppletCode", uno::makeAny( rCode ) );
         xSet->setPropertyValue("AppletName", uno::makeAny( rName ) );
-        xSet->setPropertyValue("AppletIsScript", uno::makeAny( sal_Bool(bMayScript) ) );
+        xSet->setPropertyValue("AppletIsScript", uno::makeAny( bMayScript ) );
         xSet->setPropertyValue("AppletDocBase", uno::makeAny( sDocBase ) );
         if ( !rCodeBase.isEmpty() )
             xSet->setPropertyValue("AppletCodeBase", uno::makeAny( rCodeBase ) );
@@ -148,10 +148,10 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
     }
 }
 #if HAVE_FEATURE_JAVA
-sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL )
+bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL )
 {
     OUString aCode, aName, aCodeBase;
-    sal_Bool bMayScript = sal_False;
+    bool bMayScript = false;
 
     size_t nArgCount = aCommandList.size();
     for( size_t i = 0; i < nArgCount; i++ )
@@ -165,13 +165,13 @@ sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL )
         else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_name ) )
             aName = rArg.GetArgument();
         else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_mayscript ) )
-            bMayScript = sal_True;
+            bMayScript = true;
     }
 
     if( aCode.isEmpty() )
-        return sal_False;
+        return false;
     CreateApplet( aCode, aName, bMayScript, aCodeBase, rBaseURL );
-    return sal_True;
+    return true;
 }
 #endif
 
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 1e51c699f537..2a69f95c04b2 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -137,7 +137,7 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
                                         const SvxLRSpaceItem *pLRSpace );
 static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
-                                        sal_Bool bDeep );
+                                        bool bDeep );
 static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
                                  sal_uInt16 nMode );
 static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt );
@@ -145,7 +145,7 @@ static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
                                      sal_uInt16 nMode );
 static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
-                                        sal_Bool bDeep );
+                                        bool bDeep );
 static Writer& OutCSS1_SwFmtLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt );
 
 namespace
@@ -195,7 +195,7 @@ public:
     {
         rWrt.nCSS1OutMode = nMode;
         if( bStartFirst )
-            rWrt.bFirstCSS1Property = sal_True;
+            rWrt.bFirstCSS1Property = true;
         if( pSelector )
             rWrt.aCSS1Selector = *pSelector;
     }
@@ -214,7 +214,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
 
     if( bFirstCSS1Rule && (nCSS1OutMode & CSS1_OUTMODE_RULE_ON)!=0 )
     {
-        bFirstCSS1Rule = sal_False;
+        bFirstCSS1Rule = false;
         OutNewLine();
         sOut.append("<" + OString(OOO_STRING_SVTOOLS_HTML_style) + " " +
                     OString(OOO_STRING_SVTOOLS_HTML_O_type) + "=\"text/css\">");
@@ -252,7 +252,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
             sOut.append(" " + OString(OOO_STRING_SVTOOLS_HTML_O_style) + "=\"");
             break;
         }
-        bFirstCSS1Property = sal_False;
+        bFirstCSS1Property = false;
     }
     else
     {
@@ -450,14 +450,14 @@ void SwHTMLWriter::OutCSS1_UnitProperty( const sal_Char *pProp, long nVal )
 }
 
 void SwHTMLWriter::OutCSS1_PixelProperty( const sal_Char *pProp, long nVal,
-                                          sal_Bool bVert )
+                                          bool bVert )
 {
     OString sOut(OString::number(ToPixel(nVal,bVert)) + sCSS1_UNIT_px);
     OutCSS1_PropertyAscii(pProp, sOut);
 }
 
 void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
-                                       sal_Bool bDeep )
+                                       bool bDeep )
 {
     // print ItemSet, including all attributes
     Out_SfxItemSet( aCSS1AttrFnTab, *this, rItemSet, bDeep );
@@ -518,16 +518,16 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
     }
 }
 
-void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
+void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
 {
-    bFirstCSS1Rule = sal_True;
+    bFirstCSS1Rule = true;
 
 // Feature: PrintExt
     if( IsHTMLMode(HTMLMODE_PRINT_EXT) )
     {
         const SwPageDesc *pFirstPageDesc = 0;
         sal_uInt16 nFirstRefPoolId = RES_POOLPAGE_HTML;
-        bCSS1IgnoreFirstPageDesc = sal_True;
+        bCSS1IgnoreFirstPageDesc = true;
 
         // First we try to guess how the document is constructed.
         // Allowed are only the templates: HTML, 1st page, left page, and right page.
@@ -566,7 +566,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
           OutCSS1_SwPageDesc( *this, *pFollow, pStylePoolAccess, pTemplate,
                                 RES_POOLPAGE_HTML, true );
             nFirstRefPoolId = RES_POOLPAGE_RIGHT;
-            bCSS1IgnoreFirstPageDesc = sal_False;
+            bCSS1IgnoreFirstPageDesc = false;
         }
         // other cases we miss
 
@@ -629,7 +629,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
     }
     else
     {
-        bFirstCSS1Rule = sal_False;
+        bFirstCSS1Rule = false;
     }
 
     nDfltTopMargin = 0;
@@ -649,7 +649,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
     if( pPseudo )
         *pPseudo = "";
 
-    sal_Bool bChrFmt = RES_CHRFMT==pFmt->Which();
+    bool bChrFmt = RES_CHRFMT==pFmt->Which();
 
     // search formats above for the nearest standard or HTML-Tag template
     const SwFmt *pPFmt = pFmt;
@@ -1024,8 +1024,8 @@ bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2
 
 void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet,
                                     const SfxItemSet& rRefItemSet,
-                                    sal_Bool bSetDefaults,
-                                    sal_Bool bClearSame,
+                                    bool bSetDefaults,
+                                    bool bClearSame,
                                      const SfxItemSet *pRefScriptItemSet )
 {
     OSL_ENSURE( bSetDefaults || bClearSame,
@@ -1107,11 +1107,11 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet,
 
 void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
                                     OUString& rNames,
-                                    sal_Unicode cQuote, sal_Bool bGeneric )
+                                    sal_Unicode cQuote, bool bGeneric )
 {
     rNames = aEmptyOUStr;
     const OUString& rName = rFontItem.GetFamilyName();
-    sal_Bool bContainsKeyword = sal_False;
+    bool bContainsKeyword = false;
     if( !rName.isEmpty() )
     {
         sal_Int32 nStrPos = 0;
@@ -1122,7 +1122,7 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
             if( aName.isEmpty() )
                 continue;
 
-            sal_Bool bIsKeyword = sal_False;
+            bool bIsKeyword = false;
             switch( aName[0] )
             {
             case 'c':
@@ -1183,8 +1183,8 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
     }
 }
 
-sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
-                                                 sal_Bool bCheckDropCap )
+bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
+                                                 bool bCheckDropCap )
 {
     static const sal_uInt16 aWhichIds[] =
     {
@@ -1222,7 +1222,7 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
         // If some of the items are set, but not all, we need script dependent
         // styles
         if( nItemCount > 0 && nItemCount < 3 )
-            return sal_True;
+            return true;
 
         if( 3 == nItemCount )
         {
@@ -1234,14 +1234,14 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
                 if( !swhtml_css1atr_equalFontItems( *pItem, *pItemCJK ) ||
                     !swhtml_css1atr_equalFontItems( *pItem, *pItemCTL ) ||
                     !swhtml_css1atr_equalFontItems( *pItemCJK, *pItemCTL ) )
-                    return sal_True;
+                    return true;
             }
             else
             {
                 if( !( *pItem == *pItemCJK ) ||
                     !( *pItem == *pItemCTL ) ||
                     !( *pItemCJK == *pItemCTL ) )
-                    return sal_True;
+                    return true;
             }
         }
     }
@@ -1267,15 +1267,15 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet,
                 RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT,
                 0 );
             aTstItemSet.Set( pDCCharFmt->GetAttrSet(), true );
-            return HasScriptDependentItems( aTstItemSet, sal_False );
+            return HasScriptDependentItems( aTstItemSet, false );
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
-                    const SfxItemSet& rItemSet, sal_Bool bHasClass,
+                    const SfxItemSet& rItemSet, bool bHasClass,
                      bool bCheckForPseudo  )
 {
     bool bScriptDependent = false;
@@ -1303,7 +1303,7 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_NO_SCRIPT|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &rSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
             }
 
             //sequence of (start, end) property ranges we want to
@@ -1321,21 +1321,21 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &aNewSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, false );
             }
 
             aNewSelector = aSelector + ".cjk" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &aNewSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, false );
             }
 
             aNewSelector = aSelector + ".ctl" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &aNewSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( aScriptItemSet, false );
             }
         }
         else
@@ -1348,21 +1348,21 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_WESTERN|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &aNewSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
             }
 
             aNewSelector = aSelector + "-cjk" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CJK|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &aNewSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
             }
 
             aNewSelector = aSelector + "-ctl" + aPseudo;
             {
                 SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_CTL|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                                      true, &aNewSelector );
-                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, sal_False );
+                rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
             }
         }
     }
@@ -1375,7 +1375,7 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
         SwCSS1OutMode aMode( rHTMLWrt,
                 rHTMLWrt.nCSS1Script|CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                              true, &rSelector );
-        rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, sal_False );
+        rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
     }
 
     return bScriptDependent;
@@ -1383,12 +1383,12 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
 
 static void OutCSS1DropCapRule(
                     SwHTMLWriter& rHTMLWrt, const OUString& rSelector,
-                    const SwFmtDrop& rDrop, sal_Bool bHasClass,
+                    const SwFmtDrop& rDrop, bool bHasClass,
                      bool bHasScriptDependencies  )
 {
     const SwCharFmt *pDCCharFmt = rDrop.GetCharFmt();
     if( (bHasScriptDependencies && bHasClass) ||
-         (pDCCharFmt && SwHTMLWriter::HasScriptDependentItems( pDCCharFmt->GetAttrSet(), sal_False ) ) )
+         (pDCCharFmt && SwHTMLWriter::HasScriptDependentItems( pDCCharFmt->GetAttrSet(), false ) ) )
     {
         OUString aSelector( rSelector );
 
@@ -1534,7 +1534,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
                                        // for script dependent items buts should
                                        // not make a difference for any other
 
-    sal_Bool bSetDefaults = sal_True, bClearSame = sal_True;
+    bool bSetDefaults = true, bClearSame = true;
     const SwFmt *pRefFmt = 0;
     const SwFmt *pRefFmtScript = 0;
     switch( nDeep )
@@ -1545,12 +1545,12 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     case CSS1_FMT_CMPREF:
         pRefFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, pDoc );
         pRefFmtScript = SwHTMLWriter::GetTemplateFmt( nRefPoolId, pTemplate );
-        bClearSame = sal_False;
+        bClearSame = false;
         break;
     default:
         pRefFmt = SwHTMLWriter::GetParentFmt( rFmt, nDeep );
         pRefFmtScript = SwHTMLWriter::GetTemplateFmt( nRefPoolId, pTemplate );
-        bSetDefaults = sal_False;
+        bSetDefaults = false;
         break;
     }
 
@@ -1641,7 +1641,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     }
 
     if( nPoolFmtId==RES_POOLCOLL_TEXT && !rHTMLWrt.bFirstCSS1Property )
-        rHTMLWrt.bPoolCollTextModified = sal_True;
+        rHTMLWrt.bPoolCollTextModified = true;
 
     // export Drop-Caps
     const SfxPoolItem *pItem;
@@ -1689,7 +1689,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
 
     // Size: If the only difference is the Landscape-Flag,
     // only export Portrait oder Landscape. Otherwise export size.
-    sal_Bool bRefLandscape = pRefPageDesc ? pRefPageDesc->GetLandscape() : sal_False;
+    bool bRefLandscape = pRefPageDesc ? pRefPageDesc->GetLandscape() : sal_False;
     Size aRefSz;
     const Size& rSz = rPageDesc.GetMaster().GetFrmSize().GetSize();
     if( pRefPageDesc )
@@ -1738,10 +1738,10 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
     {
         SwHTMLWriter::SubtractItemSet( aItemSet,
                                        pRefPageDesc->GetMaster().GetAttrSet(),
-                                       sal_True );
+                                       true );
     }
 
-    OutCSS1_SvxULSpace_SvxLRSpace( rWrt, aItemSet, sal_False );
+    OutCSS1_SvxULSpace_SvxLRSpace( rWrt, aItemSet, false );
 
     // If for a Pseudo-Selector no Property had been set, we still
     // have to export something, so that the corresponding template is
@@ -1751,7 +1751,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
         rHTMLWrt.OutNewLine();
         OString sTmp(OUStringToOString(aSelector, rHTMLWrt.eDestEnc));
         rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteCharPtr( " {" );
-        rHTMLWrt.bFirstCSS1Property = sal_False;
+        rHTMLWrt.bFirstCSS1Property = false;
     }
 
     if( !rHTMLWrt.bFirstCSS1Property )
@@ -1796,14 +1796,14 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
                         static_cast< sal_uInt16 >(bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE) );
             if( pRefFmt )
                 SwHTMLWriter::SubtractItemSet( aItemSet, pRefFmt->GetAttrSet(),
-                                               sal_True );
+                                               true );
         }
         if( aItemSet.Count() )
         {
             aSelector = (OUString)OOO_STRING_SVTOOLS_HTML_anchor + "." +
                         OStringToOUString( bEndNote ? OOO_STRING_SVTOOLS_HTML_sdendnote_sym
                                             : OOO_STRING_SVTOOLS_HTML_sdfootnote_sym, RTL_TEXTENCODING_ASCII_US );
-            if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, sal_True, false ))
+            if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, true, false ))
                 rHTMLWrt.aScriptTextStyles.insert( pSymCharFmt->GetName() );
         }
     }
@@ -1851,7 +1851,7 @@ Writer& OutCSS1_ParaTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet )
 
     SwCSS1OutMode aMode( rHTMLWrt, rHTMLWrt.nCSS1Script|CSS1_OUTMODE_STYLE_OPT |
                                    CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_PARA );
-    rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, sal_False );
+    rHTMLWrt.OutCSS1_SfxItemSet( rItemSet, false );
 
     return rWrt;
 }
@@ -2065,7 +2065,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                 {
                     if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
                         OutCSS1_PixelProperty( sCSS1_P_width, aTwipSz.Width(),
-                                               sal_False );
+                                               false );
                     else
                         OutCSS1_UnitProperty( sCSS1_P_width, aTwipSz.Width() );
                 }
@@ -2073,7 +2073,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                 {
                     if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
                         OutCSS1_PixelProperty( sCSS1_P_height, aTwipSz.Height(),
-                                               sal_True );
+                                               true );
                     else
                         OutCSS1_UnitProperty( sCSS1_P_height, aTwipSz.Height() );
                 }
@@ -2127,7 +2127,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
         OutCSS1_FrmFmtBackground( rFrmFmt );
 
     if( pItemSet )
-        OutCSS1_SfxItemSet( *pItemSet, sal_False );
+        OutCSS1_SfxItemSet( *pItemSet, false );
 
     if( !bFirstCSS1Property )
         Strm().WriteChar( '\"' );
@@ -2145,7 +2145,7 @@ void SwHTMLWriter::OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt )
         OutCSS1_SvxBrush( *this, *pItem, CSS1_BACKGROUND_TABLE );
 
     if( IsHTMLMode( HTMLMODE_PRINT_EXT ) )
-        OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, sal_False );
+        OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( *this, rItemSet, false );
 
     if( SFX_ITEM_SET==rItemSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem ) )
         OutCSS1_SwFmtLayoutSplit( *this, *pItem );
@@ -2502,7 +2502,7 @@ static Writer& OutCSS1_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
     sal_uInt16 nMode = rHTMLWrt.nCSS1OutMode & CSS1_OUTMODE_ANY_ON;
     sal_Unicode cQuote = nMode == CSS1_OUTMODE_RULE_ON ? '\"' : '\'';
     SwHTMLWriter::PrepareFontList( ((const SvxFontItem&)rHt), sOut, cQuote,
-                                   sal_True );
+                                   true );
 
     rHTMLWrt.OutCSS1_Property( sCSS1_P_font_family, sOut );
 
@@ -2915,7 +2915,7 @@ static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
         else if( nMode & CSS1_FRMSIZE_PIXEL )
         {
             rHTMLWrt.OutCSS1_PixelProperty( sCSS1_P_width,
-                                            rFSItem.GetSize().Width(), sal_False );
+                                            rFSItem.GetSize().Width(), false );
         }
         else
         {
@@ -2955,7 +2955,7 @@ static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
             {
                 rHTMLWrt.OutCSS1_PixelProperty( sCSS1_P_height,
                                                 rFSItem.GetSize().Height(),
-                                                sal_True );
+                                                true );
             }
             else
             {
@@ -3053,7 +3053,7 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
 
 static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
-                                        sal_Bool bDeep )
+                                        bool bDeep )
 {
     const SvxULSpaceItem *pULSpace = 0;
     const SvxLRSpaceItem *pLRSpace = 0;
@@ -3139,7 +3139,7 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
 
 static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
-                                        sal_Bool bDeep )
+                                        bool bDeep )
 {
     SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
     const SfxPoolItem *pItem;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 962e1c634a57..1b5dda1d89a7 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -135,7 +135,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
                 OutNewLine();
             HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, true );
             IncIndentLevel();
-            bLFPossible = sal_True;
+            bLFPossible = true;
         }
     }
     else if( nDefListLvl > nNewLvl )
@@ -146,7 +146,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
             if( bLFPossible )
                 OutNewLine();
             HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, false );
-            bLFPossible = sal_True;
+            bLFPossible = true;
         }
     }
 
@@ -158,7 +158,7 @@ void SwHTMLWriter::ChangeParaToken( sal_uInt16 nNew )
     if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken )
     {
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_preformtxt, false );
-        bLFPossible = sal_True;
+        bLFPossible = true;
     }
     nLastParaToken = nNew;
 }
@@ -203,23 +203,23 @@ struct SwHTMLTxtCollOutputInfo
     OString aToken;        // auszugendens End-Token
     boost::scoped_ptr<SfxItemSet> pItemSet;       // harte Attributierung
 
-    sal_Bool bInNumBulList;         // in einer Aufzaehlungs-Liste;
-    sal_Bool bParaPossible;         // ein </P> darf zusaetzlich ausgegeben werden
-    sal_Bool bOutPara;              // ein </P> soll ausgegeben werden
-    sal_Bool bOutDiv;               // write a </DIV>
+    bool bInNumBulList;         // in einer Aufzaehlungs-Liste;
+    bool bParaPossible;         // ein </P> darf zusaetzlich ausgegeben werden
+    bool bOutPara;              // ein </P> soll ausgegeben werden
+    bool bOutDiv;               // write a </DIV>
 
     SwHTMLTxtCollOutputInfo() :
         pItemSet(NULL),
-        bInNumBulList( sal_False ),
-        bParaPossible( sal_False ),
-        bOutPara( sal_False ),
-        bOutDiv( sal_False )
+        bInNumBulList( false ),
+        bParaPossible( false ),
+        bOutPara( false ),
+        bOutDiv( false )
     {}
 
     ~SwHTMLTxtCollOutputInfo();
 
-    sal_Bool HasParaToken() const { return aToken.getLength()==1 && aToken[0]=='P'; }
-    sal_Bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); }
+    bool HasParaToken() const { return aToken.getLength()==1 && aToken[0]=='P'; }
+    bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); }
 };
 
 SwHTMLTxtCollOutputInfo::~SwHTMLTxtCollOutputInfo()
@@ -227,9 +227,9 @@ SwHTMLTxtCollOutputInfo::~SwHTMLTxtCollOutputInfo()
 }
 
 SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
-                              sal_Bool bOutStyles,
+                              bool bOutStyles,
                               LanguageType eDfltLang,
-                              sal_uInt16 nCSS1Script, sal_Bool bHardDrop )
+                              sal_uInt16 nCSS1Script, bool bHardDrop )
     : pFmt(pF)
     , pRefFmt(0)
     , pItemSet(0)
@@ -249,11 +249,11 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
     OSL_ENSURE( nDeep ? nRefPoolId != 0 : nRefPoolId == 0,
             "Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
 
-    sal_Bool bTxtColl = pFmt->Which() == RES_TXTFMTCOLL ||
+    bool bTxtColl = pFmt->Which() == RES_TXTFMTCOLL ||
                     pFmt->Which() == RES_CONDTXTFMTCOLL;
 
     const SwFmt *pReferenceFmt = 0; // Vergleichs-Format
-    sal_Bool bSetDefaults = sal_True, bClearSame = sal_True;
+    bool bSetDefaults = true, bClearSame = true;
     if( nDeep != 0 )
     {
         // Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
@@ -379,12 +379,12 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
             if( SFX_ITEM_SET==pFmt->GetAttrSet().GetItemState(
                                     RES_PARATR_DROP, true, &pItem ) )
             {
-                sal_Bool bPut = sal_True;
+                bool bPut = true;
                 if( pTemplate )
                 {
                     pReferenceFmt = SwHTMLWriter::GetTemplateFmt( nRefPoolId, pTemplate );
                     const SfxPoolItem *pRefItem;
-                    sal_Bool bRefItemSet =
+                    bool bRefItemSet =
                         SFX_ITEM_SET==pReferenceFmt->GetAttrSet().GetItemState(
                                         RES_PARATR_DROP, true, &pRefItem );
                     bPut = !bRefItemSet || *pItem!=*pRefItem;
@@ -464,16 +464,16 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // Erstmal ein par Flags ...
     sal_uInt16 nNewDefListLvl = 0;
     sal_uInt16 nNumStart = USHRT_MAX;
-    sal_Bool bForceDL = sal_False;
-    sal_Bool bDT = sal_False;
-    rInfo.bInNumBulList = sal_False;    // Wir sind in einer Liste?
-    sal_Bool bNumbered = sal_False;         // Der aktuelle Absatz ist numeriert
-    sal_Bool bPara = sal_False;             // das aktuelle Token ist <P>
-    rInfo.bParaPossible = sal_False;    // ein <P> darf zusaetzlich ausgegeben werden
-    sal_Bool bNoEndTag = sal_False;         // kein End-Tag ausgeben
-
-    rHWrt.bNoAlign = sal_False;         // kein ALIGN=... moeglich
-    sal_Bool bNoStyle = sal_False;          // kein STYLE=... moeglich
+    bool bForceDL = false;
+    bool bDT = false;
+    rInfo.bInNumBulList = false;    // Wir sind in einer Liste?
+    bool bNumbered = false;         // Der aktuelle Absatz ist numeriert
+    bool bPara = false;             // das aktuelle Token ist <P>
+    rInfo.bParaPossible = false;    // ein <P> darf zusaetzlich ausgegeben werden
+    bool bNoEndTag = false;         // kein End-Tag ausgeben
+
+    rHWrt.bNoAlign = false;         // kein ALIGN=... moeglich
+    bool bNoStyle = false;          // kein STYLE=... moeglich
     sal_uInt8 nBulletGrfLvl = 255;      // Die auszugebende Bullet-Grafik
 
     // Sind wir in einer Aufzaehlungs- oder Numerierungliste?
@@ -492,7 +492,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     if( aNumInfo.GetNumRule() )
     {
-        rInfo.bInNumBulList = sal_True;
+        rInfo.bInNumBulList = true;
         nNewDefListLvl = 0;
 
         // ist der aktuelle Absatz numeriert?
@@ -501,7 +501,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
         OSL_ENSURE( pTxtNd->GetActualListLevel() == nLvl,
                 "Gemerkter Num-Level ist falsch" );
-        OSL_ENSURE( bNumbered == static_cast< sal_Bool >(pTxtNd->IsCountedInList()),
+        OSL_ENSURE( bNumbered == pTxtNd->IsCountedInList(),
                 "Gemerkter Numerierungs-Zustand ist falsch" );
 
         if( bNumbered )
@@ -542,7 +542,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     // Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
     sal_uInt16 nToken = 0;          // Token fuer Tag-Wechsel
-    sal_Bool bOutNewLine = sal_False;   // nur ein LF ausgeben?
+    bool bOutNewLine = false;   // nur ein LF ausgeben?
     if( !pFmtInfo->aToken.isEmpty() )
     {
         // Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
@@ -551,37 +551,37 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
         if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_address)
         {
-            rInfo.bParaPossible = sal_True;
-            rHWrt.bNoAlign = sal_True;
+            rInfo.bParaPossible = true;
+            rHWrt.bNoAlign = true;
         }
         else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_blockquote)
         {
-            rInfo.bParaPossible = sal_True;
-            rHWrt.bNoAlign = sal_True;
+            rInfo.bParaPossible = true;
+            rHWrt.bNoAlign = true;
         }
         else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_parabreak)
         {
-            bPara = sal_True;
+            bPara = true;
         }
         else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_preformtxt)
         {
             if (HTML_PREFORMTXT_ON == rHWrt.nLastParaToken)
             {
-                bOutNewLine = sal_True;
+                bOutNewLine = true;
             }
             else
             {
                 nToken = HTML_PREFORMTXT_ON;
-                rHWrt.bNoAlign = sal_True;
-                bNoEndTag = sal_True;
+                rHWrt.bNoAlign = true;
+                bNoEndTag = true;
             }
         }
         else if (rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt || rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dd)
         {
             bDT = rInfo.aToken == OOO_STRING_SVTOOLS_HTML_dt;
             rInfo.bParaPossible = !bDT;
-            rHWrt.bNoAlign = sal_True;
-            bForceDL = sal_True;
+            rHWrt.bNoAlign = true;
+            bForceDL = true;
         }
     }
     else
@@ -590,7 +590,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         // diesem abgeleitet sind, werden als <P> exportiert
 
         rInfo.aToken = OOO_STRING_SVTOOLS_HTML_parabreak;
-        bPara = sal_True;
+        bPara = true;
     }
 
     // Falls noetig, die harte Attributierung der Vorlage uebernehmen
@@ -633,8 +633,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
             }
             rInfo.pItemSet->Put( aULSpaceItem );
         }
-        rHWrt.bOutHeader = sal_False;
-        rHWrt.bOutFooter = sal_False;
+        rHWrt.bOutHeader = false;
+        rHWrt.bOutFooter = false;
     }
 
     if( bOutNewLine )
@@ -660,7 +660,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     // Unteren Absatz-Abstand beachten ? (nie im letzen Absatz von
     // Tabellen)
-    sal_Bool bUseParSpace = !rHWrt.bOutTable ||
+    bool bUseParSpace = !rHWrt.bOutTable ||
                         (rWrt.pCurPam->GetPoint()->nNode.GetIndex() !=
                          rWrt.pCurPam->GetMark()->nNode.GetIndex());
     // Wenn Styles exportiert werden, wird aus eingerueckten Absaetzen
@@ -693,7 +693,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
             nNewDefListLvl = (bForceDL&& !bDT) ? 1 : 0;
         }
 
-        sal_Bool bIsNextTxtNode =
+        bool bIsNextTxtNode =
             rWrt.pDoc->GetNodes()[rWrt.pCurPam->GetPoint()->nNode.GetIndex()+1]
                      ->IsTxtNode();
 
@@ -711,9 +711,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         {
             // Absaetze ohne unteren Abstand als DT exportieren
             nNewDefListLvl = 1;
-            bDT = sal_True;
-            rInfo.bParaPossible = sal_False;
-            rHWrt.bNoAlign = sal_True;
+            bDT = true;
+            rInfo.bParaPossible = false;
+            rHWrt.bNoAlign = true;
         }
     }
 
@@ -729,7 +729,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         if( bNumbered )
         {
             if( !rHWrt.aBulletGrfs[nBulletGrfLvl].isEmpty()  )
-                bNumbered = sal_False;
+                bNumbered = false;
             else
                 nBulletGrfLvl = 255;
         }
@@ -784,12 +784,12 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     if( rHWrt.bLFPossible )
         rHWrt.OutNewLine(); // Absatz-Tag in neue Zeile
-    rInfo.bOutPara = sal_False;
+    rInfo.bOutPara = false;
 
     // das ist jetzt unser neues Token
     rHWrt.ChangeParaToken( nToken );
 
-    sal_Bool bHasParSpace = bUseParSpace && rULSpace.GetLower() > 0;
+    bool bHasParSpace = bUseParSpace && rULSpace.GetLower() > 0;
 
     // ggf ein List-Item aufmachen
     if( rInfo.bInNumBulList && bNumbered )
@@ -816,15 +816,15 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_division);
         rWrt.Strm().WriteOString( sOut );
 
-        rHWrt.bTxtAttr = sal_False;
-        rHWrt.bOutOpts = sal_True;
+        rHWrt.bTxtAttr = false;
+        rHWrt.bOutOpts = true;
         OutHTML_SvxAdjust( rWrt, *pAdjItem );
         rWrt.Strm().WriteChar( '>' );
         pAdjItem = 0;
-        rHWrt.bNoAlign = sal_False;
-        rInfo.bOutDiv = sal_True;
+        rHWrt.bNoAlign = false;
+        rInfo.bOutDiv = true;
         rHWrt.IncIndentLevel();
-        rHWrt.bLFPossible = sal_True;
+        rHWrt.bLFPossible = true;
             rHWrt.OutNewLine();
     }
 
@@ -838,9 +838,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     {
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr() );
         aToken = OOO_STRING_SVTOOLS_HTML_parabreak;
-        bPara = sal_True;
-        rHWrt.bNoAlign = sal_False;
-        bNoStyle = sal_False;
+        bPara = true;
+        rHWrt.bNoAlign = false;
+        bNoStyle = false;
     }
 
     LanguageType eLang = rInfo.pItemSet
@@ -888,8 +888,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         rHWrt.bCfgOutStyles )
     {
         // jetzt werden Optionen ausgegeben
-        rHWrt.bTxtAttr = sal_False;
-        rHWrt.bOutOpts = sal_True;
+        rHWrt.bTxtAttr = false;
+        rHWrt.bOutOpts = true;
 
         OString sOut = "<" + aToken;
 
@@ -1013,7 +1013,7 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
     if( rInfo.ShouldOutputToken() )
     {
         if( rHWrt.bLFPossible )
-            rHWrt.OutNewLine( sal_True );
+            rHWrt.OutNewLine( true );
 
         // fuer BLOCKQUOTE, ADDRESS und DD wird ggf noch ein
         // Absatz-Token ausgegeben, wenn
@@ -1034,7 +1034,7 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
         if( rHWrt.bLFPossible )
             rHWrt.OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
-        rHWrt.bLFPossible = sal_True;
+        rHWrt.bLFPossible = true;
     }
 
     // ggf. eine Aufzaehlung- oder Numerierungsliste beenden
@@ -1106,7 +1106,7 @@ class HTMLEndPosLst
     std::set<OUString>& rScriptTxtStyles;
 
     sal_uLong nHTMLMode;
-    sal_Bool bOutStyles : 1;    // werden Styles exportiert
+    bool bOutStyles : 1;    // werden Styles exportiert
 
     // die Position eines Items in der Start-/Ende-Liste suchen
     sal_uInt16 _FindStartPos( const HTMLSttEndPos *pPos ) const;
@@ -1121,11 +1121,11 @@ class HTMLEndPosLst
     HTMLOnOffState GetHTMLItemState( const SfxPoolItem& rItem );
 
     // Existiert ein bestimmtes On-Tag-Item
-    sal_Bool ExistsOnTagItem( sal_uInt16 nWhich, sal_Int32 nPos );
+    bool ExistsOnTagItem( sal_uInt16 nWhich, sal_Int32 nPos );
 
     // Existiert ein Item zum ausschalten eines Attributs, das genauso
     // exportiert wird wie das uebergebene Item im gleichen Bereich?
-    sal_Bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
+    bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
                                           sal_Int32 nEndPos );
 
     // das Ende eines gesplitteten Items anpassen
@@ -1143,7 +1143,7 @@ class HTMLEndPosLst
     // Insert without taking care of script
     void InsertNoScript( const SfxPoolItem& rItem, sal_Int32 nStart,
                           sal_Int32 nEnd, SwHTMLFmtInfos& rFmtInfos,
-                         sal_Bool bParaAttrs=sal_False );
+                         bool bParaAttrs=false );
 
     const SwHTMLFmtInfo *GetFmtInfo( const SwFmt& rFmt,
                                      SwHTMLFmtInfos& rFmtInfos );
@@ -1151,16 +1151,16 @@ class HTMLEndPosLst
 public:
 
     HTMLEndPosLst( SwDoc *pDoc, SwDoc* pTemplate, const Color* pDfltColor,
-                   sal_Bool bOutStyles, sal_uLong nHTMLMode,
+                   bool bOutStyles, sal_uLong nHTMLMode,
                    const OUString& rText, std::set<OUString>& rStyles );
     ~HTMLEndPosLst();
 
     // Ein Attribut einfuegen
     void Insert( const SfxPoolItem& rItem, sal_Int32 nStart,  sal_Int32 nEnd,
-                 SwHTMLFmtInfos& rFmtInfos, sal_Bool bParaAttrs=sal_False );
+                 SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs=false );
     void Insert( const SfxItemSet& rItemSet, sal_Int32 nStart, sal_Int32 nEnd,
-                 SwHTMLFmtInfos& rFmtInfos, sal_Bool bDeep,
-                 sal_Bool bParaAttrs=sal_False );
+                 SwHTMLFmtInfos& rFmtInfos, bool bDeep,
+                 bool bParaAttrs=false );
     void Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos,
                  SwHTMLFmtInfos& rFmtInfos );
 
@@ -1172,7 +1172,7 @@ public:
     void OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
                       HTMLOutContext *pContext = 0 );
 
-    sal_Bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; }
+    bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; }
 };
 
 sal_uInt16 HTMLEndPosLst::_FindStartPos( const HTMLSttEndPos *pPos ) const
@@ -1378,7 +1378,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
     return eState;
 }
 
-sal_Bool HTMLEndPosLst::ExistsOnTagItem( sal_uInt16 nWhich, sal_Int32 nPos )
+bool HTMLEndPosLst::ExistsOnTagItem( sal_uInt16 nWhich, sal_Int32 nPos )
 {
     for( sal_uInt16 i=0; i<aStartLst.size(); i++ )
     {
@@ -1398,22 +1398,22 @@ sal_Bool HTMLEndPosLst::ExistsOnTagItem( sal_uInt16 nWhich, sal_Int32 nPos )
                 HTML_ON_VALUE == GetHTMLItemState(*pItem) )
             {
                 // ein On-Tag-Attibut wurde gefunden
-                return sal_True;
+                return true;
             }
         }
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool HTMLEndPosLst::ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
+bool HTMLEndPosLst::ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
                                       sal_Int32 nEndPos )
 {
     if( nWhich != RES_CHRATR_CROSSEDOUT &&
         nWhich != RES_CHRATR_UNDERLINE &&
         nWhich != RES_CHRATR_BLINK )
     {
-        return sal_False;
+        return false;
     }
 
     for( sal_uInt16 i=0; i<aStartLst.size(); i++ )
@@ -1439,12 +1439,12 @@ sal_Bool HTMLEndPosLst::ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos
             {
                 // Ein Off-Tag-Attibut wurde gefunden, das genauso
                 // exportiert wird, wie das aktuelle Item
-                return sal_True;
+                return true;
             }
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 void HTMLEndPosLst::FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd,
@@ -1618,7 +1618,7 @@ const SwHTMLFmtInfo *HTMLEndPosLst::GetFmtInfo( const SwFmt& rFmt,
 }
 
 HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
-                              const Color* pDfltCol, sal_Bool bStyles,
+                              const Color* pDfltCol, bool bStyles,
                               sal_uLong nMode, const OUString& rText,
                               std::set<OUString>& rStyles ):
     pDoc( pD ),
@@ -1647,19 +1647,19 @@ HTMLEndPosLst::~HTMLEndPosLst()
 
 void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
                             sal_Int32 nStart, sal_Int32 nEnd,
-                            SwHTMLFmtInfos& rFmtInfos, sal_Bool bParaAttrs )
+                            SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs )
 {
     // kein Bereich ?? dann nicht aufnehmen, wird nie wirksam !!
     if( nStart != nEnd )
     {
-        sal_Bool bSet = sal_False, bSplit = sal_False;
+        bool bSet = false, bSplit = false;
         switch( GetHTMLItemState(rItem) )
         {
         case HTML_ON_VALUE:
             // das Attribut wird ausgegeben, wenn es nicht sowieso
             // schon an ist
             if( !ExistsOnTagItem( rItem.Which(), nStart ) )
-                bSet = sal_True;
+                bSet = true;
             break;
 
         case HTML_OFF_VALUE:
@@ -1668,14 +1668,14 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
             // am ganzen Absatz gesetzt ist, weil es dann ja schon mit dem
             // ABsatz-Tag ausgegeben wurde.
             if( ExistsOnTagItem( rItem.Which(), nStart ) )
-                bSplit = sal_True;
+                bSplit = true;
             bSet = bOutStyles && !bParaAttrs &&
                    !ExistsOffTagItem( rItem.Which(), nStart, nEnd );
             break;
 
         case HTML_REAL_VALUE:
             // das Attribut kann immer ausgegeben werden
-            bSet = sal_True;
+            bSet = true;
             break;
 
         case HTML_STYLE_VALUE:
@@ -1708,7 +1708,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
                 if( pFmtInfo->pItemSet )
                 {
                     Insert( *pFmtInfo->pItemSet, nStart, nEnd,
-                            rFmtInfos, sal_True, bParaAttrs );
+                            rFmtInfos, true, bParaAttrs );
                 }
             }
             break;
@@ -1718,7 +1718,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
                 const SwFmtAutoFmt& rAutoFmt = (const SwFmtAutoFmt&)rItem;
                 const boost::shared_ptr<SfxItemSet> pSet = rAutoFmt.GetStyleHandle();
                 if( pSet.get() )
-                    Insert( *pSet.get(), nStart, nEnd, rFmtInfos, sal_True, bParaAttrs );
+                    Insert( *pSet.get(), nStart, nEnd, rFmtInfos, true, bParaAttrs );
             }
             break;
 
@@ -1749,12 +1749,12 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
                     if( pCharFmt )
                     {
                         Insert( pCharFmt->GetAttrSet(), nStart, nEnd,
-                                rFmtInfos, sal_True, bParaAttrs );
+                                rFmtInfos, true, bParaAttrs );
                     }
                 }
                 else
                 {
-                    bSet = sal_True;
+                    bSet = true;
                 }
             }
             break;
@@ -1771,9 +1771,9 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
 
 void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
                             sal_Int32 nStart, sal_Int32 nEnd,
-                            SwHTMLFmtInfos& rFmtInfos, sal_Bool bParaAttrs )
+                            SwHTMLFmtInfos& rFmtInfos, bool bParaAttrs )
 {
-    sal_Bool bDependsOnScript = sal_False, bDependsOnAnyScript = sal_False;
+    bool bDependsOnScript = false, bDependsOnAnyScript = false;
     sal_uInt16 nScript = i18n::ScriptType::LATIN;
     switch( rItem.Which() )
     {
@@ -1782,7 +1782,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
     case RES_CHRATR_LANGUAGE:
     case RES_CHRATR_POSTURE:
     case RES_CHRATR_WEIGHT:
-        bDependsOnScript = sal_True;
+        bDependsOnScript = true;
         nScript = i18n::ScriptType::LATIN;
         break;
 
@@ -1791,7 +1791,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
     case RES_CHRATR_CJK_LANGUAGE:
     case RES_CHRATR_CJK_POSTURE:
     case RES_CHRATR_CJK_WEIGHT:
-        bDependsOnScript = sal_True;
+        bDependsOnScript = true;
         nScript = i18n::ScriptType::ASIAN;
         break;
 
@@ -1800,7 +1800,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
     case RES_CHRATR_CTL_LANGUAGE:
     case RES_CHRATR_CTL_POSTURE:
     case RES_CHRATR_CTL_WEIGHT:
-        bDependsOnScript = sal_True;
+        bDependsOnScript = true;
         nScript = i18n::ScriptType::COMPLEX;
         break;
     case RES_TXTATR_CHARFMT:
@@ -1810,8 +1810,8 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
             const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
             if( pFmtInfo->bScriptDependent )
             {
-                bDependsOnScript = sal_True;
-                bDependsOnAnyScript = sal_True;
+                bDependsOnScript = true;
+                bDependsOnAnyScript = true;
             }
         }
         break;
@@ -1822,8 +1822,8 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
                 GetFmtInfo( *pDoc->GetCharFmtFromPool(
                      RES_POOLCHR_INET_VISIT), rFmtInfos )->bScriptDependent )
             {
-                bDependsOnScript = sal_True;
-                bDependsOnAnyScript = sal_True;
+                bDependsOnScript = true;
+                bDependsOnAnyScript = true;
             }
         }
         break;
@@ -1869,7 +1869,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem,
 void HTMLEndPosLst::Insert( const SfxItemSet& rItemSet,
                             sal_Int32 nStart, sal_Int32 nEnd,
                             SwHTMLFmtInfos& rFmtInfos,
-                            sal_Bool bDeep, sal_Bool bParaAttrs )
+                            bool bDeep, bool bParaAttrs )
 {
     SfxWhichIter aIter( rItemSet );
 
@@ -1899,10 +1899,10 @@ void HTMLEndPosLst::Insert( const SwDrawFrmFmt& rFmt, sal_Int32 nPos,
         const SfxItemSet& rFmtItemSet = rFmt.GetAttrSet();
         SfxItemSet aItemSet( *rFmtItemSet.GetPool(), RES_CHRATR_BEGIN,
                                                      RES_CHRATR_END );
-        SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj, sal_True );
-        sal_Bool bOutStylesOld = bOutStyles;
-        bOutStyles = sal_False;
-        Insert( aItemSet, nPos, nPos+1, rFmtInfos, sal_False, sal_False );
+        SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj, true );
+        bool bOutStylesOld = bOutStyles;
+        bOutStyles = false;
+        Insert( aItemSet, nPos, nPos+1, rFmtInfos, false, false );
         bOutStyles = bOutStylesOld;
     }
 }
@@ -1930,7 +1930,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( sal_Int32 nPos, sal_uInt16 nWeak )
 void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
                                       HTMLOutContext *pContext  )
 {
-    rHWrt.bTagOn = sal_True;
+    rHWrt.bTagOn = true;
 
     // Character border attribute must be the first which is written out
     // because of border merge.
@@ -1988,7 +1988,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
 void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
                                      HTMLOutContext *pContext )
 {
-    rHWrt.bTagOn = sal_False;
+    rHWrt.bTagOn = false;
 
     // die Attribute in der End-Liste sind aufsteigend sortiert
     sal_uInt16 i=0;
@@ -2072,7 +2072,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
         if( rHTMLWrt.bLFPossible )
             rHTMLWrt.OutNewLine(); // Absatz-Tag in eine neue Zeile
 
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
 
         HtmlWriter aHtml(rWrt.Strm());
         aHtml.start(OOO_STRING_SVTOOLS_HTML_horzrule);
@@ -2168,7 +2168,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
             sal_uLong nNdPos = rWrt.pCurPam->GetPoint()->nNode.GetIndex();
             const SwNode *pNextNd = rWrt.pDoc->GetNodes()[nNdPos+1];
             const SwNode *pPrevNd = rWrt.pDoc->GetNodes()[nNdPos-1];
-            sal_Bool bStdColl = nPoolId == RES_POOLCOLL_STANDARD;
+            bool bStdColl = nPoolId == RES_POOLCOLL_STANDARD;
             if( ( bStdColl && (pNextNd->IsTableNode() || pNextNd->IsSectionNode()) ) ||
                 ( !bStdColl &&
                    pNextNd->IsEndNode() &&
@@ -2181,7 +2181,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
 
                 // Alle an dem Node verankerten Rahmen ausgeben
                 rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY );
-                rHTMLWrt.bLFPossible = sal_False;
+                rHTMLWrt.bLFPossible = false;
 
                 return rWrt;
             }
@@ -2189,12 +2189,12 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     }
 
     // PagePreaks uns PagDescs abfangen
-    sal_Bool bPageBreakBehind = sal_False;
+    bool bPageBreakBehind = false;
     if( rHTMLWrt.bCfgFormFeed &&
         !(rHTMLWrt.bOutTable || rHTMLWrt.bOutFlyFrame) &&
         rHTMLWrt.pStartNdIdx->GetIndex() != rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex() )
     {
-        sal_Bool bPageBreakBefore = sal_False;
+        bool bPageBreakBefore = false;
         const SfxPoolItem* pItem;
         const SfxItemSet* pItemSet = pNd->GetpSwAttrSet();
 
@@ -2203,21 +2203,21 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
             if( SFX_ITEM_SET == pItemSet->GetItemState( RES_PAGEDESC, true, &pItem ) &&
                 ((SwFmtPageDesc *)pItem)->GetPageDesc() )
             {
-                bPageBreakBefore = sal_True;
+                bPageBreakBefore = true;
             }
             else if( SFX_ITEM_SET == pItemSet->GetItemState( RES_BREAK, true, &pItem ) )
             {
                 switch( ((SvxFmtBreakItem *)pItem)->GetBreak() )
                 {
                 case SVX_BREAK_PAGE_BEFORE:
-                    bPageBreakBefore = sal_True;
+                    bPageBreakBefore = true;
                     break;
                 case SVX_BREAK_PAGE_AFTER:
-                    bPageBreakBehind = sal_True;
+                    bPageBreakBehind = true;
                     break;
                 case SVX_BREAK_PAGE_BOTH:
-                    bPageBreakBefore = sal_True;
-                    bPageBreakBehind = sal_True;
+                    bPageBreakBefore = true;
+                    bPageBreakBehind = true;
                     break;
                 default:
                     break;
@@ -2233,7 +2233,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     rHTMLWrt.OutForm();
 
     // An dem Node "verankerte" Seitenegebunde Rahmen ausgeben
-    sal_Bool bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_PREFIX );
+    bool bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_PREFIX );
 
     // An dem Node verankerte Rahmen ausgeben, die vor dem
     // Absatz-Tag geschrieben werden sollen.
@@ -2248,12 +2248,12 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     }
 
     // gibt es harte Attribute, die als Optionen geschrieben werden muessen?
-    rHTMLWrt.bTagOn = sal_True;
+    rHTMLWrt.bTagOn = true;
 
     // jetzt das Tag des Absatzes ausgeben
     const SwFmt& rFmt = pNd->GetAnyFmtColl();
     SwHTMLTxtCollOutputInfo aFmtInfo;
-    sal_Bool bOldLFPossible = rHTMLWrt.bLFPossible;
+    bool bOldLFPossible = rHTMLWrt.bLFPossible;
     OutHTML_SwFmt( rWrt, rFmt, pNd->GetpSwAttrSet(), aFmtInfo );
 
     // Wenn vor dem Absatz-Tag keine neue Zeile aufgemacht wurde, dann
@@ -2263,7 +2263,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
         rHTMLWrt.OutNewLine();
 
     // dann die Bookmarks (inkl. End-Tag)
-    rHTMLWrt.bOutOpts = sal_False;
+    rHTMLWrt.bOutOpts = false;
     rHTMLWrt.OutBookmarks();
 
     // jetzt ist noch mal eine gute Gelegenheit fuer ein LF, sofern es noch
@@ -2273,7 +2273,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     {
         rHTMLWrt.OutNewLine();
     }
-    rHTMLWrt.bLFPossible = sal_False;
+    rHTMLWrt.bLFPossible = false;
 
     // Text, der aus einer Outline-Numerierung kommt ermitteln
     sal_Int32 nOffset = 0;
@@ -2306,7 +2306,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     if( aFmtInfo.pItemSet )
     {
         aEndPosLst.Insert( *aFmtInfo.pItemSet, 0, nEnd + nOffset,
-                           rHTMLWrt.aChrFmtInfos, sal_False, sal_True );
+                           rHTMLWrt.aChrFmtInfos, false, true );
     }
 
     if( !aOutlineTxt.isEmpty() || rHTMLWrt.pFmtFtn )
@@ -2333,7 +2333,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
 
     // erstmal den Start berichtigen. D.h. wird nur ein Teil vom Satz
     // ausgegeben, so muessen auch da die Attribute stimmen!!
-    rHTMLWrt.bTxtAttr = sal_True;
+    rHTMLWrt.bTxtAttr = true;
 
     sal_uInt16 nAttrPos = 0;
     sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex();
@@ -2386,9 +2386,9 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
         aEndPosLst.OutStartAttrs( rHTMLWrt, nStrPos + nOffset );
     }
 
-    sal_Bool bWriteBreak = (HTML_PREFORMTXT_ON != rHTMLWrt.nLastParaToken);
+    bool bWriteBreak = (HTML_PREFORMTXT_ON != rHTMLWrt.nLastParaToken);
     if( bWriteBreak && pNd->GetNumRule()  )
-        bWriteBreak = sal_False;
+        bWriteBreak = false;
 
     {
         HTMLOutContext aContext( rHTMLWrt.eDestEnc );
@@ -2405,7 +2405,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                                                 &aContext );
             }
 
-            sal_Bool bOutChar = sal_True;
+            bool bOutChar = true;
             const SwTxtAttr * pTxtHt = 0;
             if( nAttrPos < nCntAttr && *pHt->GetStart() == nStrPos
                 && nStrPos != nEnd )
@@ -2439,10 +2439,10 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                                 || ( RES_POSTITFLD != (nFldWhich = ((const SwFmtFld&)pHt->GetAttr()).GetField()->Which())
                                      && RES_SCRIPTFLD != nFldWhich ) )
                             {
-                                bWriteBreak = sal_False;
+                                bWriteBreak = false;
                             }
                         }
-                        bOutChar = sal_False;       // keine 255 ausgeben
+                        bOutChar = false;       // keine 255 ausgeben
                     }
                 } while( ++nAttrPos < nCntAttr && nStrPos ==
                     *( pHt = pNd->GetSwpHints()[ nAttrPos ] )->GetStart() );
@@ -2473,7 +2473,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                 HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
                 Out( aHTMLAttrFnTab, pTxtHt->GetAttr(), rHTMLWrt );
                 rHTMLWrt.nCSS1Script = nCSS1Script;
-                rHTMLWrt.bLFPossible = sal_False;
+                rHTMLWrt.bLFPossible = false;
             }
 
             if( bOutChar )
@@ -2512,7 +2512,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                     {
                         HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext );
                         rHTMLWrt.OutNewLine();
-                        bOutChar = sal_False;
+                        bOutChar = false;
                         if( rHTMLWrt.nLastParaToken )
                             nPreSplitPos = nStrPos+1;
                     }
@@ -2555,11 +2555,11 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                                        nEnd, HTML_POS_INSIDE );
     OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
 
-    rHTMLWrt.bTxtAttr = sal_False;
+    rHTMLWrt.bTxtAttr = false;
 
     if( bWriteBreak )
     {
-        sal_Bool bEndOfCell = rHTMLWrt.bOutTable &&
+        bool bEndOfCell = rHTMLWrt.bOutTable &&
                          rWrt.pCurPam->GetPoint()->nNode.GetIndex() ==
                          rWrt.pCurPam->GetMark()->nNode.GetIndex();
 
@@ -2582,7 +2582,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
             {
                 aHtml.single(OOO_STRING_SVTOOLS_HTML_linebreak);
             }
-            rHTMLWrt.bLFPossible = sal_True;
+            rHTMLWrt.bLFPossible = true;
         }
     }
 
@@ -2606,23 +2606,23 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
         aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_clear, pString);
         aHtml.end();
 
-        rHTMLWrt.bClearLeft = sal_False;
-        rHTMLWrt.bClearRight = sal_False;
+        rHTMLWrt.bClearLeft = false;
+        rHTMLWrt.bClearRight = false;
 
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
     }
 
     // wenn ein LF nicht schon erlaubt ist wird es erlaubt, wenn der
     // Absatz mit einem ' ' endet
     if( !rHTMLWrt.bLFPossible && !rHTMLWrt.nLastParaToken &&
         nEnd > 0 && ' ' == rStr[nEnd-1] )
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
 
-    rHTMLWrt.bTagOn = sal_False;
+    rHTMLWrt.bTagOn = false;
     OutHTML_SwFmtOff( rWrt, aFmtInfo );
 
     // eventuell eine Form schliessen
-    rHTMLWrt.OutForm( sal_False );
+    rHTMLWrt.OutForm( false );
 
     if( bPageBreakBehind )
         rWrt.Strm().WriteChar( '\f' );
@@ -2911,13 +2911,13 @@ static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bOn )
+Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, bool bOn )
 {
     SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
 
     OUString aURL( rINetFmt.GetValue() );
     const SvxMacroTableDtor *pMacTable = rINetFmt.GetMacroTbl();
-    sal_Bool bEvents = pMacTable != 0 && !pMacTable->empty();
+    bool bEvents = pMacTable != 0 && !pMacTable->empty();
 
     // Gibt es ueberhaupt etwas auszugeben?
     if( aURL.isEmpty() && !bEvents && rINetFmt.GetName().isEmpty() )
@@ -3045,11 +3045,11 @@ static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
         {
             SwFmtINetFmt *pINetFmt =
                 rHTMLWrt.aINetFmts.back();
-            OutHTML_INetFmt( rWrt, *pINetFmt, sal_False );
+            OutHTML_INetFmt( rWrt, *pINetFmt, false );
         }
 
         // jetzt das neue aufmachen
-        OutHTML_INetFmt( rWrt, rINetFmt, sal_True );
+        OutHTML_INetFmt( rWrt, rINetFmt, true );
 
         // und merken
         SwFmtINetFmt *pINetFmt = new SwFmtINetFmt( rINetFmt );
@@ -3058,7 +3058,7 @@ static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
     else
     {
         // das
-        OutHTML_INetFmt( rWrt, rINetFmt, sal_False );
+        OutHTML_INetFmt( rWrt, rINetFmt, false );
 
         OSL_ENSURE( rHTMLWrt.aINetFmts.size(), "da fehlt doch ein URL-Attribut" );
         if( rHTMLWrt.aINetFmts.size() )
@@ -3074,7 +3074,7 @@ static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
             // es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
             // werden muss
             SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
-            OutHTML_INetFmt( rWrt, *pINetFmt, sal_True );
+            OutHTML_INetFmt( rWrt, *pINetFmt, true );
         }
     }
 
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 83d63c39379f..051ade271925 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -69,16 +69,16 @@ void SwHTMLParser::NewScript()
 
 void SwHTMLParser::EndScript()
 {
-    sal_Bool bInsIntoBasic = sal_False,
-         bInsSrcIntoFld = sal_False;
+    bool bInsIntoBasic = false,
+         bInsSrcIntoFld = false;
 
     switch( eScriptLang )
     {
     case HTML_SL_STARBASIC:
-        bInsIntoBasic = sal_True;
+        bInsIntoBasic = true;
         break;
     default:
-        bInsSrcIntoFld = sal_True;
+        bInsSrcIntoFld = true;
         break;
     }
 
@@ -136,7 +136,7 @@ void SwHTMLParser::EndScript()
                 if( aBasicModule.isEmpty() )
                 {
                     // create module name
-                    sal_Bool bFound = sal_True;
+                    bool bFound = true;
                     while( bFound )
                     {
                         aBasicModule = "Modul";
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 2a1668243558..50519b1a6519 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -99,22 +99,22 @@ void SwCSS1Parser::ChgPageDesc( const SwPageDesc *pPageDesc,
     OSL_ENSURE( i<nPageDescs, "Seitenvorlage nicht gefunden" );
 }
 
-SwCSS1Parser::SwCSS1Parser( SwDoc *pD, sal_uInt32 aFHeights[7], const OUString& rBaseURL, sal_Bool bNewDoc ) :
+SwCSS1Parser::SwCSS1Parser( SwDoc *pD, sal_uInt32 aFHeights[7], const OUString& rBaseURL, bool bNewDoc ) :
     SvxCSS1Parser( pD->GetAttrPool(), rBaseURL, MM50/2,
                    (sal_uInt16*)&aItemIds, sizeof(aItemIds) / sizeof(sal_uInt16) ),
     pDoc( pD ),
     nDropCapCnt( 0 ),
     bIsNewDoc( bNewDoc ),
-    bBodyBGColorSet( sal_False ),
-    bBodyBackgroundSet( sal_False ),
-    bBodyTextSet( sal_False ),
-    bBodyLinkSet( sal_False ),
-    bBodyVLinkSet( sal_False ),
-    bSetFirstPageDesc( sal_False ),
-    bSetRightPageDesc( sal_False ),
-    bTableHeaderTxtCollSet( sal_False ),
-    bTableTxtCollSet( sal_False ),
-    bLinkCharFmtsSet( sal_False )
+    bBodyBGColorSet( false ),
+    bBodyBackgroundSet( false ),
+    bBodyTextSet( false ),
+    bBodyLinkSet( false ),
+    bBodyVLinkSet( false ),
+    bSetFirstPageDesc( false ),
+    bSetRightPageDesc( false ),
+    bTableHeaderTxtCollSet( false ),
+    bTableTxtCollSet( false ),
+    bLinkCharFmtsSet( false )
 {
     aFontHeights[0] = aFHeights[0];
     aFontHeights[1] = aFHeights[1];
@@ -130,29 +130,29 @@ SwCSS1Parser::~SwCSS1Parser()
 }
 
 // Feature: PrintExt
-sal_Bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
+bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
                                 const SvxCSS1PropertyInfo& rPropInfo )
 {
     SvxBreak eBreak = SVX_BREAK_NONE;
-    sal_Bool bKeep = sal_False;
-    sal_Bool bSetKeep = sal_False, bSetBreak = sal_False, bSetPageDesc = sal_False;
+    bool bKeep = false;
+    bool bSetKeep = false, bSetBreak = false, bSetPageDesc = false;
     const SwPageDesc *pPageDesc = 0;
     switch( rPropInfo.ePageBreakBefore )
     {
     case SVX_CSS1_PBREAK_ALWAYS:
         eBreak = SVX_BREAK_PAGE_BEFORE;
-        bSetBreak = sal_True;
+        bSetBreak = true;
         break;
     case SVX_CSS1_PBREAK_LEFT:
-        pPageDesc = GetLeftPageDesc( sal_True );
-        bSetPageDesc = sal_True;
+        pPageDesc = GetLeftPageDesc( true );
+        bSetPageDesc = true;
         break;
     case SVX_CSS1_PBREAK_RIGHT:
-        pPageDesc = GetRightPageDesc( sal_True );
-        bSetPageDesc = sal_True;
+        pPageDesc = GetRightPageDesc( true );
+        bSetPageDesc = true;
         break;
     case SVX_CSS1_PBREAK_AUTO:
-        bSetBreak = bSetPageDesc = sal_True;
+        bSetBreak = bSetPageDesc = true;
         break;
     default:
         ;
@@ -164,13 +164,13 @@ sal_Bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
     case SVX_CSS1_PBREAK_RIGHT:
         // LEFT/RIGHT koennte man auch am Absatz davor setzen
         eBreak = SVX_BREAK_PAGE_AFTER;
-        bSetBreak = sal_True;
+        bSetBreak = true;
         break;
     case SVX_CSS1_PBREAK_AUTO:
-        bSetBreak = bSetKeep = bSetPageDesc = sal_True;
+        bSetBreak = bSetKeep = bSetPageDesc = true;
         break;
     case SVX_CSS1_PBREAK_AVOID:
-        bKeep = bSetKeep = sal_True;
+        bKeep = bSetKeep = true;
         break;
     default:
         ;
@@ -233,7 +233,7 @@ void SwCSS1Parser::SetLinkCharFmts()
     if( pStyleEntry )
     {
         SfxItemSet& rItemSet = pStyleEntry->GetItemSet();
-        sal_Bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
+        bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
                                                               false));
         pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL );
         SetCharFmtAttrs( pUnvisited, rItemSet );
@@ -250,7 +250,7 @@ void SwCSS1Parser::SetLinkCharFmts()
     if( pStyleEntry )
     {
         SfxItemSet& rItemSet = pStyleEntry->GetItemSet();
-        sal_Bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
+        bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
                                                               false));
         if( !pUnvisited )
             pUnvisited = GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL );
@@ -264,7 +264,7 @@ void SwCSS1Parser::SetLinkCharFmts()
     if( pStyleEntry )
     {
         SfxItemSet& rItemSet = pStyleEntry->GetItemSet();
-        sal_Bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
+        bool bColorSet = (SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,
                                                               false));
         if( !pVisited )
             pVisited = GetCharFmtFromPool( RES_POOLCHR_INET_VISIT );
@@ -272,7 +272,7 @@ void SwCSS1Parser::SetLinkCharFmts()
         bBodyVLinkSet |= bColorSet;
     }
 
-    bLinkCharFmtsSet = sal_True;
+    bLinkCharFmtsSet = true;
 }
 
 static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
@@ -341,7 +341,7 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
     pColl->SetFmtAttr( rItemSet );
 }
 
-void SwCSS1Parser::SetTableTxtColl( sal_Bool bHeader )
+void SwCSS1Parser::SetTableTxtColl( bool bHeader )
 {
     OSL_ENSURE( !(bHeader ? bTableHeaderTxtCollSet : bTableTxtCollSet),
             "Aufruf von SetTableTxtColl unnoetig" );
@@ -381,9 +381,9 @@ void SwCSS1Parser::SetTableTxtColl( sal_Bool bHeader )
     }
 
     if( bHeader )
-        bTableHeaderTxtCollSet = sal_True;
+        bTableHeaderTxtCollSet = true;
     else
-        bTableTxtCollSet = sal_True;
+        bTableTxtCollSet = true;
 }
 
 void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
@@ -392,7 +392,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
     SvxBrushItem aBrushItem( RES_BACKGROUND );
     SvxBoxItem aBoxItem( RES_BOX );
     SvxFrameDirectionItem aFrmDirItem(FRMDIR_ENVIRONMENT, RES_FRAMEDIR);
-    sal_Bool bSetBrush = pBrush!=0, bSetBox = sal_False, bSetFrmDir = sal_False;
+    bool bSetBrush = pBrush!=0, bSetBox = false, bSetFrmDir = false;
     if( pBrush )
         aBrushItem = *pBrush;
 
@@ -405,7 +405,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
             // ein Hintergrund wird gesetzt
             aBrushItem = *((const SvxBrushItem *)pItem);
             pItemSet2->ClearItem( RES_BACKGROUND );
-            bSetBrush = sal_True;
+            bSetBrush = true;
         }
 
         if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_BOX, false, &pItem ) )
@@ -413,7 +413,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
             // eine Umrandung wird gesetzt
             aBoxItem = *((const SvxBoxItem *)pItem);
             pItemSet2->ClearItem( RES_BOX );
-            bSetBox = sal_True;
+            bSetBox = true;
         }
 
         if( SFX_ITEM_SET == pItemSet2->GetItemState( RES_FRAMEDIR, false, &pItem ) )
@@ -421,7 +421,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
             // eine Umrandung wird gesetzt
             aFrmDirItem = *static_cast< const SvxFrameDirectionItem *>( pItem );
             pItemSet2->ClearItem( RES_FRAMEDIR );
-            bSetFrmDir = sal_True;
+            bSetFrmDir = true;
         }
     }
 
@@ -431,7 +431,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
                                      RES_POOLPAGE_LEFT, RES_POOLPAGE_RIGHT };
         for( sal_uInt16 i=0; i<4; i++ )
         {
-            const SwPageDesc *pPageDesc = GetPageDesc( aPoolIds[i], sal_False );
+            const SwPageDesc *pPageDesc = GetPageDesc( aPoolIds[i], false );
             if( pPageDesc )
             {
                 SwPageDesc aNewPageDesc( *pPageDesc );
@@ -461,7 +461,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     SwFrmFmt &rMaster = aNewPageDesc.GetMaster();
     const SfxItemSet& rPageItemSet = rMaster.GetAttrSet();
     const SfxPoolItem *pPageItem, *pItem;
-    sal_Bool bChanged = sal_False;
+    bool bChanged = false;
 
     // linker, rechter Rand und Erstzeilen-Einzug
     if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin) &&
@@ -485,7 +485,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
         {
             rMaster.SetFmtAttr( *pItem );
         }
-        bChanged = sal_True;
+        bChanged = true;
     }
 
     // oberer und unterer Rand
@@ -510,7 +510,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
         {
             rMaster.SetFmtAttr( *pItem );
         }
-        bChanged = sal_True;
+        bChanged = true;
     }
 
     // die Groesse
@@ -520,7 +520,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
         {
             rMaster.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth,
                                            rPropInfo.nHeight ) );
-            bChanged = sal_True;
+            bChanged = true;
         }
         else
         {
@@ -529,7 +529,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
             // wird das Landscape-Flag gesetzt und evtl. die Breite/Hoehe
             // vertauscht.
             SwFmtFrmSize aFrmSz( rMaster.GetFrmSize() );
-            sal_Bool bLandscape = aNewPageDesc.GetLandscape();
+            bool bLandscape = aNewPageDesc.GetLandscape();
             if( ( bLandscape &&
                   rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
                 ( !bLandscape &&
@@ -540,7 +540,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
                 aFrmSz.SetWidth( nTmp );
                 rMaster.SetFmtAttr( aFrmSz );
                 aNewPageDesc.SetLandscape( !bLandscape );
-                bChanged = sal_True;
+                bChanged = true;
             }
         }
     }
@@ -551,7 +551,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
         // eine Umrandung wird gesetzt
         rMaster.SetFmtAttr( *pItem );
         rItemSet.ClearItem( RES_BACKGROUND );
-        bChanged = sal_True;
+        bChanged = true;
     }
 
     if( bChanged )
@@ -566,7 +566,7 @@ const SvxBrushItem& SwCSS1Parser::GetPageDescBackground() const
 }
 
 sal_uInt16 SwCSS1Parser::GetScriptFromClass( OUString& rClass,
-                                      sal_Bool bSubClassOnly )
+                                      bool bSubClassOnly )
 {
     sal_uInt16 nScriptFlags = CSS1_SCRIPT_ALL;
     sal_Int32 nLen = rClass.getLength();
@@ -636,7 +636,7 @@ static CSS1SelectorType GetTokenAndClass( const CSS1Selector *pSelector,
             rClass = rToken.copy( nPos+1 );
             rToken = rToken.copy( 0, nPos );
 
-            rScriptFlags = SwCSS1Parser::GetScriptFromClass( rClass, sal_False );
+            rScriptFlags = SwCSS1Parser::GetScriptFromClass( rClass, false );
             if( rClass.isEmpty() )
                 eType = CSS1_SELTYPE_ELEMENT;
         }
@@ -698,12 +698,12 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript,
     }
 }
 
-sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
+bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                                 SfxItemSet& rItemSet,
                                 SvxCSS1PropertyInfo& rPropInfo )
 {
     if( !bIsNewDoc )
-        return sal_True;
+        return true;
 
     CSS1SelectorType eSelType = pSelector->GetType();
     const CSS1Selector *pNext = pSelector->GetNext();
@@ -746,7 +746,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
 
     if( CSS1_SELTYPE_ELEMENT != eSelType &&
         CSS1_SELTYPE_ELEM_CLASS != eSelType)
-        return sal_True;
+        return true;
 
     // Token und Class zu dem Selektor holen
     OUString aToken2;
@@ -768,7 +768,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
             if( !pNext )
             {
                 InsertTag( aToken2, rItemSet, rPropInfo );
-                return sal_False;
+                return false;
             }
             else if( pNext && CSS1_SELTYPE_PSEUDO == eNextType )
             {
@@ -776,19 +776,19 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
 
                 OUString aPseudo( pNext->GetString() );
                 aPseudo = aPseudo.toAsciiLowerCase();
-                sal_Bool bInsert = sal_False;
+                bool bInsert = false;
                 switch( aPseudo[0] )
                 {
                     case 'l':
                         if( aPseudo == "link" )
                         {
-                            bInsert = sal_True;
+                            bInsert = true;
                         }
                         break;
                     case 'v':
                         if( aPseudo == "visited" )
                         {
-                            bInsert = sal_True;
+                            bInsert = true;
                         }
                         break;
                 }
@@ -805,7 +805,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                     {
                         InsertTag( sTmp, rItemSet, rPropInfo );
                     }
-                    return sal_False;
+                    return false;
                 }
             }
             break;
@@ -824,9 +824,9 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
 
                     /// Body has a background color, if it is not "no fill"/"auto fill"
                     if( pBrushItem->GetColor() != COL_TRANSPARENT )
-                        bBodyBGColorSet = sal_True;
+                        bBodyBGColorSet = true;
                     if( GPOS_NONE != pBrushItem->GetGraphicPos() )
-                        bBodyBackgroundSet = sal_True;
+                        bBodyBackgroundSet = true;
                 }
 
                 // Border and Padding
@@ -839,12 +839,12 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 // alle noch uebrigen Optionen koennen an der Standard-Vorlage
                 // gesetzt werden und gelten dann automatisch als defaults
                 if( SFX_ITEM_SET==rItemSet.GetItemState(RES_CHRATR_COLOR,false) )
-                    bBodyTextSet = sal_True;
+                    bBodyTextSet = true;
                 SetTxtCollAttrs(
                     GetTxtCollFromPool( RES_POOLCOLL_STANDARD ),
                     rItemSet, rPropInfo, this );
 
-                return sal_False;
+                return false;
             }
             break;
         }
@@ -871,7 +871,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 SetCharFmtAttrs( GetCharFmtFromPool(nPoolFmtId),
                                  aScriptItemSet);
             }
-            return sal_False;
+            return false;
         }
     }
 
@@ -937,7 +937,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
         if( CSS1_SELTYPE_ELEMENT==eSelType && !pNext )
         {
             InsertTag( aToken2, rItemSet, rPropInfo );
-            return sal_False;
+            return false;
         }
         else if( CSS1_SELTYPE_ELEMENT==eSelType && pNext &&
                  (CSS1_SELTYPE_ELEMENT==eNextType ||
@@ -973,7 +973,7 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                         InsertTag( sTmp, aScriptItemSet, rPropInfo );
                     }
 
-                    return sal_False;
+                    return false;
                 }
             }
         }
@@ -1079,16 +1079,16 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 }
             }
 
-            return sal_False;
+            return false;
         }
 
-        return sal_True;
+        return true;
     }
 
     // Jetzt werden die Selektoten verarbeitet, die zu einer Zechenvorlage
     // gehoehren. Zusammengesetzte gibt es hier allerdings nich nicht.
     if( pNext )
-        return sal_True;
+        return true;
 
     SwCharFmt *pCFmt = GetChrFmt( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
     if( pCFmt )
@@ -1119,10 +1119,10 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                                pParentCFmt ? &pParentCFmt->GetAttrSet() : 0 );
             SetCharFmtAttrs( pCFmt, aScriptItemSet );
         }
-        return sal_False;
+        return false;
     }
 
-    return sal_True;
+    return true;
 }
 
 sal_uInt32 SwCSS1Parser::GetFontHeight( sal_uInt16 nSize ) const
@@ -1198,7 +1198,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass )
     // Wenn es eine Klasse gibt, die Klassen-Vorlage suchen aber nicht
     // neu anlegen.
     OUString aClass( rClass );
-    GetScriptFromClass( aClass, sal_False );
+    GetScriptFromClass( aClass, false );
     if( !aClass.isEmpty() )
     {
         OUString aTmp( pCFmt->GetName() );
@@ -1265,7 +1265,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
     SwTxtFmtColl* pColl = 0;
 
     OUString aClass( rClass );
-    GetScriptFromClass( aClass, sal_False );
+    GetScriptFromClass( aClass, false );
     if( RES_POOLCOLL_TEXT == nTxtColl && aClass.getLength() >= 9 &&
         ('s' == aClass[0] || 'S' == aClass[0] ) )
     {
@@ -1325,7 +1325,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 nTxtColl,
                 SfxItemSet aItemSet( pClass->GetItemSet() );
                 SvxCSS1PropertyInfo aPropInfo( pClass->GetPropertyInfo() );
                 aPropInfo.SetBoxItem( aItemSet, MIN_BORDER_DIST );
-                sal_Bool bPositioned = MayBePositioned( pClass->GetPropertyInfo() );
+                bool bPositioned = MayBePositioned( pClass->GetPropertyInfo() );
                 if( bPositioned )
                     aItemSet.ClearItem( RES_BACKGROUND );
                 SetTxtCollAttrs( pColl, aItemSet, aPropInfo,
@@ -1356,7 +1356,7 @@ static SwPageDesc *FindPageDesc( SwDoc *pDoc, sal_uInt16 nPoolId, sal_uInt16& rP
     return rPage < nPageDescs ? &pDoc->GetPageDesc( rPage ) : 0;
 }
 
-const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreate )
+const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, bool bCreate )
 {
     if( RES_POOLPAGE_HTML == nPoolId )
         return pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML, false );
@@ -1385,7 +1385,7 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat
 
         // Die Vorlagen an ihren neuen Zweck anpassen.
         const SwPageDesc *pFollow = 0;
-        sal_Bool bSetFollowFollow = sal_False;
+        bool bSetFollowFollow = false;
         switch( nPoolId )
         {
         case RES_POOLPAGE_FIRST:
@@ -1400,7 +1400,7 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat
             // Wenn die linke Vorlage schon angelegt ist, passiert hier gar
             // nichts. Sonst wird die linke Vorlage angelegt und sorgt auch
             // fuer die richtige Verkettung mit der rechten Voralge.
-            GetLeftPageDesc( sal_True );
+            GetLeftPageDesc( true );
             break;
 
         case RES_POOLPAGE_LEFT:
@@ -1408,8 +1408,8 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat
             // Es findet aber keine Verkettung statt.
             // Wenn schon eine erste Seitenvorlage existiert, wird die linke
             // Vorlage die Folge-Vorlage der ersten Seite.
-            pFollow = GetRightPageDesc( sal_True );
-            bSetFollowFollow = sal_True;
+            pFollow = GetRightPageDesc( true );
+            bSetFollowFollow = true;
             {
                 const SwPageDesc *pFirstPageDesc = GetFirstPageDesc();
                 if( pFirstPageDesc )
@@ -1441,8 +1441,8 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat
     return pPageDesc;
 }
 
-sal_Bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
-                                    sal_Bool bAutoWidth )
+bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
+                                    bool bAutoWidth )
 {
     // abs-pos
     // left/top none    auto    twip    perc
@@ -1705,7 +1705,7 @@ void SwHTMLParser::EndStyle()
     }
 }
 
-sal_Bool SwHTMLParser::FileDownload( const OUString& rURL,
+bool SwHTMLParser::FileDownload( const OUString& rURL,
                                  OUString& rStr )
 {
     // View wegschmeissen (wegen Reschedule)
@@ -1744,7 +1744,7 @@ sal_Bool SwHTMLParser::FileDownload( const OUString& rURL,
 
 void SwHTMLParser::InsertLink()
 {
-    sal_Bool bFinishDownload = sal_False;
+    bool bFinishDownload = false;
     if( pPendStack )
     {
         OSL_ENSURE( ShouldFinishFileDownload(),
@@ -1755,7 +1755,7 @@ void SwHTMLParser::InsertLink()
         pPendStack = pTmp;
         OSL_ENSURE( !pPendStack, "Wo kommt der Pending-Stack her?" );
 
-        bFinishDownload = sal_True;
+        bFinishDownload = true;
     }
     else
     {
@@ -1791,7 +1791,7 @@ void SwHTMLParser::InsertLink()
                 {
                     // Der Style wurde synchron geladen und wir koennen
                     // es direkt aufrufen.
-                    bFinishDownload = sal_True;
+                    bFinishDownload = true;
                 }
                 else
                 {
@@ -1819,10 +1819,10 @@ void SwHTMLParser::InsertLink()
     }
 }
 
-sal_Bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn )
+bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn )
 {
     if( !SvxCSS1Parser::ParseStyleSheet( rIn ) )
-        return sal_False;
+        return false;
 
     SwPageDesc *pMasterPageDesc =
         pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML, false );
@@ -1850,28 +1850,28 @@ sal_Bool SwCSS1Parser::ParseStyleSheet( const OUString& rIn )
     pPageEntry = GetPage( "first", true );
     if( pPageEntry )
     {
-        SetPageDescAttrs( GetFirstPageDesc(sal_True), pPageEntry->GetItemSet(),
+        SetPageDescAttrs( GetFirstPageDesc(true), pPageEntry->GetItemSet(),
                           pPageEntry->GetPropertyInfo() );
-        bSetFirstPageDesc = sal_True;
+        bSetFirstPageDesc = true;
     }
 
     pPageEntry = GetPage( "right", true );
     if( pPageEntry )
     {
-        SetPageDescAttrs( GetRightPageDesc(sal_True), pPageEntry->GetItemSet(),
+        SetPageDescAttrs( GetRightPageDesc(true), pPageEntry->GetItemSet(),
                           pPageEntry->GetPropertyInfo() );
-        bSetRightPageDesc = sal_True;
+        bSetRightPageDesc = true;
     }
 
     pPageEntry = GetPage( "left", true );
     if( pPageEntry )
-        SetPageDescAttrs( GetLeftPageDesc(sal_True), pPageEntry->GetItemSet(),
+        SetPageDescAttrs( GetLeftPageDesc(true), pPageEntry->GetItemSet(),
                           pPageEntry->GetPropertyInfo() );
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
+bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
                                           const OUString &rId,
                                           const OUString &rClass,
                                           SfxItemSet &rItemSet,
@@ -1879,7 +1879,7 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
                                           const OUString *pLang,
                                           const OUString *pDir )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( !rClass.isEmpty() )
     {
@@ -1890,8 +1890,8 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
         {
             pCSS1Parser->MergeStyles( pClass->GetItemSet(),
                                       pClass->GetPropertyInfo(),
-                                      rItemSet, rPropInfo, sal_False );
-            bRet = sal_True;
+                                      rItemSet, rPropInfo, false );
+            bRet = true;
         }
     }
 
@@ -1903,13 +1903,13 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
                                       pId->GetPropertyInfo(),
                                       rItemSet, rPropInfo, !rClass.isEmpty() );
         rPropInfo.aId = rId;
-        bRet = sal_True;
+        bRet = true;
     }
 
     if( !rStyle.isEmpty() )
     {
         pCSS1Parser->ParseStyleOption( rStyle, rItemSet, rPropInfo );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if( bRet )
@@ -1927,7 +1927,7 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
             aLang.SetWhich( RES_CHRATR_CTL_LANGUAGE );
             rItemSet.Put( aLang );
 
-            bRet = sal_True;
+            bRet = true;
         }
     }
     if( pDir && !pDir->isEmpty() )
@@ -1944,7 +1944,7 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
             SvxFrameDirectionItem aDir( eDir, RES_FRAMEDIR );
             rItemSet.Put( aDir );
 
-            bRet = sal_True;
+            bRet = true;
         }
     }
 
@@ -2137,13 +2137,13 @@ void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet,
 }
 
 _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit,
-                                            sal_Bool bRemove )
+                                            bool bRemove )
 {
     sal_uInt16 nPos = aContexts.size();
     if( nPos <= nContextStMin )
         return 0;
 
-    sal_Bool bFound = 0==nToken;
+    bool bFound = 0==nToken;
     if( nToken )
     {
         // Stack-Eintrag zu dem Token suchen
@@ -2152,7 +2152,7 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit
             sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
             if( nCntxtToken == nToken )
             {
-                bFound = sal_True;
+                bFound = true;
                 break;
             }
             else if( nCntxtToken == nLimit ) // 0 als Token kommt nicht vor
@@ -2177,16 +2177,16 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit
     return pCntxt;
 }
 
-sal_Bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft,
+bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft,
                                           sal_uInt16& nRight,
                                           short& nIndent,
-                                          sal_Bool bIgnoreTopContext ) const
+                                          bool bIgnoreTopContext ) const
 {
     sal_uInt16 nPos = aContexts.size();
     if( bIgnoreTopContext )
     {
         if( !nPos )
-            return sal_False;
+            return false;
         else
             nPos--;
     }
@@ -2197,18 +2197,18 @@ sal_Bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft,
         if( pCntxt->IsLRSpaceChanged() )
         {
             pCntxt->GetMargins( nLeft, nRight, nIndent );
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
+bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
                                                     sal_uInt16& nRight,
                                                     short& nIndent ) const
 {
-    sal_Bool bRet = GetMarginsFromContext( nLeft, nRight, nIndent );
+    bool bRet = GetMarginsFromContext( nLeft, nRight, nIndent );
     const SwHTMLNumRuleInfo& rInfo = ((SwHTMLParser*)this)->GetNumInfo();
     if( rInfo.GetDepth() )
     {
@@ -2255,7 +2255,7 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
     nLower = rULSpace.GetLower();
 }
 
-void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, sal_Bool bRemove )
+void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove )
 {
     _HTMLAttrs &rAttrs = pContext->GetAttrs();
     for( sal_uInt16 i=0; i<rAttrs.size(); i++ )
@@ -2299,7 +2299,7 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet )
             if( RES_PARATR_BEGIN > nWhich )
                 (*ppAttr)->SetLikePara();
             aParaAttrs.push_back( *ppAttr );
-            EndAttr( *ppAttr, 0, sal_False );
+            EndAttr( *ppAttr, 0, false );
         }
 
         pItem = aIter.NextItem();
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index adcd9256d7f1..72ecfbf975b9 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -54,18 +54,18 @@ class _HTMLAttrContext_SaveDoc
                                     // Untergrenze, wenn die Attribute
                                     // nicht beibehalten werden sollen.
 
-    sal_Bool bStripTrailingPara : 1;    // letzen Absatz entfernen?
-    sal_Bool bKeepNumRules : 1;         // Numerierung beibehalten?
-    sal_Bool bFixHeaderDist : 1;
-    sal_Bool bFixFooterDist : 1;
+    bool bStripTrailingPara : 1;    // letzen Absatz entfernen?
+    bool bKeepNumRules : 1;         // Numerierung beibehalten?
+    bool bFixHeaderDist : 1;
+    bool bFixFooterDist : 1;
 
 public:
 
     _HTMLAttrContext_SaveDoc() :
         pPos( 0 ), pAttrTab( 0 ),
         nContextStMin( USHRT_MAX ), nContextStAttrMin( USHRT_MAX ),
-        bStripTrailingPara( sal_False ), bKeepNumRules( sal_False ),
-        bFixHeaderDist( sal_False ), bFixFooterDist( sal_False )
+        bStripTrailingPara( false ), bKeepNumRules( false ),
+        bFixHeaderDist( false ), bFixFooterDist( false )
     {}
 
     ~_HTMLAttrContext_SaveDoc() { delete pPos; delete pAttrTab; }
@@ -78,7 +78,7 @@ public:
     void SetNumInfo( const SwHTMLNumRuleInfo& rInf ) { aNumRuleInfo.Set(rInf); }
     const SwHTMLNumRuleInfo& GetNumInfo() const { return aNumRuleInfo; }
 
-    _HTMLAttrTable *GetAttrTab( sal_Bool bCreate= sal_False );
+    _HTMLAttrTable *GetAttrTab( bool bCreate= false );
 
     void SetContextStMin( sal_uInt16 nMin ) { nContextStMin = nMin; }
     sal_uInt16 GetContextStMin() const { return nContextStMin; }
@@ -86,20 +86,20 @@ public:
     void SetContextStAttrMin( sal_uInt16 nMin ) { nContextStAttrMin = nMin; }
     sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMin; }
 
-    void SetStripTrailingPara( sal_Bool bSet ) { bStripTrailingPara = bSet; }
-    sal_Bool GetStripTrailingPara() const { return bStripTrailingPara; }
+    void SetStripTrailingPara( bool bSet ) { bStripTrailingPara = bSet; }
+    bool GetStripTrailingPara() const { return bStripTrailingPara; }
 
-    void SetKeepNumRules( sal_Bool bSet ) { bKeepNumRules = bSet; }
-    sal_Bool GetKeepNumRules() const { return bKeepNumRules; }
+    void SetKeepNumRules( bool bSet ) { bKeepNumRules = bSet; }
+    bool GetKeepNumRules() const { return bKeepNumRules; }
 
-    void SetFixHeaderDist( sal_Bool bSet ) { bFixHeaderDist = bSet; }
-    sal_Bool GetFixHeaderDist() const { return bFixHeaderDist; }
+    void SetFixHeaderDist( bool bSet ) { bFixHeaderDist = bSet; }
+    bool GetFixHeaderDist() const { return bFixHeaderDist; }
 
-    void SetFixFooterDist( sal_Bool bSet ) { bFixFooterDist = bSet; }
-    sal_Bool GetFixFooterDist() const { return bFixFooterDist; }
+    void SetFixFooterDist( bool bSet ) { bFixFooterDist = bSet; }
+    bool GetFixFooterDist() const { return bFixFooterDist; }
 };
 
-_HTMLAttrTable *_HTMLAttrContext_SaveDoc::GetAttrTab( sal_Bool bCreate )
+_HTMLAttrTable *_HTMLAttrContext_SaveDoc::GetAttrTab( bool bCreate )
 {
     if( !pAttrTab && bCreate )
     {
@@ -109,7 +109,7 @@ _HTMLAttrTable *_HTMLAttrContext_SaveDoc::GetAttrTab( sal_Bool bCreate )
     return pAttrTab;
 }
 
-_HTMLAttrContext_SaveDoc *_HTMLAttrContext::GetSaveDocContext( sal_Bool bCreate )
+_HTMLAttrContext_SaveDoc *_HTMLAttrContext::GetSaveDocContext( bool bCreate )
 {
     if( !pSaveDocContext && bCreate )
         pSaveDocContext = new _HTMLAttrContext_SaveDoc;
@@ -138,7 +138,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
     const SwNodeIndex& rNewSttPara = rNewPos.nNode;
     sal_Int32 nNewSttCnt = rNewPos.nContent.GetIndex();
 
-    sal_Bool bMoveBack = sal_False;
+    bool bMoveBack = false;
 
     // alle noch offenen Attribute beenden und hinter der Tabelle
     // neu aufspannen
@@ -228,7 +228,7 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt,
                                    sal_uInt16 nFlags,
                                    const SwPosition *pNewPos )
 {
-    _HTMLAttrContext_SaveDoc *pSave = pCntxt->GetSaveDocContext( sal_True );
+    _HTMLAttrContext_SaveDoc *pSave = pCntxt->GetSaveDocContext( true );
     pSave->SetStripTrailingPara( (HTML_CNTXT_STRIP_PARA & nFlags) != 0 );
     pSave->SetKeepNumRules( (HTML_CNTXT_KEEP_NUMRULE & nFlags) != 0 );
     pSave->SetFixHeaderDist( (HTML_CNTXT_HEADER_DIST & nFlags) != 0 );
@@ -254,7 +254,7 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt,
         }
         else
         {
-            _HTMLAttrTable *pSaveAttrTab = pSave->GetAttrTab( sal_True );
+            _HTMLAttrTable *pSaveAttrTab = pSave->GetAttrTab( true );
             SaveAttrTab( *pSaveAttrTab );
         }
 
@@ -411,11 +411,11 @@ void SwHTMLParser::ClearContext( _HTMLAttrContext *pContext )
         StartListing();
 }
 
-sal_Bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
+bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
                                   SvxCSS1PropertyInfo &rPropInfo,
                                   _HTMLAttrContext *pContext )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     // Unter folgenden Umstaenden wird jetzt ein Rahmen aufgemacht:
     // - das Tag wird absolut positioniert und left/top sind beide
@@ -446,20 +446,20 @@ sal_Bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
 
         InsertFlyFrame( aFrmItemSet, pContext, rPropInfo.aId,
                         CONTEXT_FLAGS_ABSPOS );
-        pContext->SetPopStack( sal_True );
+        pContext->SetPopStack( true );
         rPropInfo.aId = "";
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
 }
 
-sal_Bool SwHTMLParser::CreateContainer( const OUString& rClass,
+bool SwHTMLParser::CreateContainer( const OUString& rClass,
                                     SfxItemSet &rItemSet,
                                     SvxCSS1PropertyInfo &rPropInfo,
                                     _HTMLAttrContext *pContext )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( rClass.equalsIgnoreAsciiCase( "sd-abs-pos" ) &&
         pCSS1Parser->MayBePositioned( rPropInfo ) )
     {
@@ -471,13 +471,13 @@ sal_Bool SwHTMLParser::CreateContainer( const OUString& rClass,
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE,
                                 rItemSet, rPropInfo, *pFrmItemSet );
         Size aDummy(0,0);
-        SetFixSize( aDummy, aDummy, sal_False, sal_False, rItemSet, rPropInfo,
+        SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
                     *pFrmItemSet );
         SetSpace( aDummy, rItemSet, rPropInfo, *pFrmItemSet );
         SetFrmFmtAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
                         *pFrmItemSet );
 
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -486,7 +486,7 @@ sal_Bool SwHTMLParser::CreateContainer( const OUString& rClass,
 void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                                 SvxCSS1PropertyInfo &rPropInfo,
                                 _HTMLAttrContext *pContext,
-                                sal_Bool bCharLvl )
+                                bool bCharLvl )
 {
     // Ein DropCap-Attribut basteln, wenn auf Zeichen-Ebene vor dem
     // ersten Zeichen ein float: left vorkommt
@@ -542,7 +542,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                 // obersten Kontext, denn den veraendern wir ja gerade) ...
                 sal_uInt16 nOldLeft = 0, nOldRight = 0;
                 short nOldIndent = 0;
-                sal_Bool bIgnoreTop = aContexts.size() > nContextStMin &&
+                bool bIgnoreTop = aContexts.size() > nContextStMin &&
                                   aContexts.back() == pContext;
                 GetMarginsFromContext( nOldLeft, nOldRight, nOldIndent,
                                        bIgnoreTop  );
@@ -592,7 +592,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                 aLRItem.SetTxtLeft( nLeft );
                 aLRItem.SetRight( nRight );
                 NewAttr( &aAttrTab.pLRSpace, aLRItem );
-                EndAttr( aAttrTab.pLRSpace, 0, sal_False );
+                EndAttr( aAttrTab.pLRSpace, 0, false );
             }
             break;
 
@@ -719,15 +719,15 @@ void SwHTMLParser::InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem,
 void SwHTMLParser::SplitPREListingXMP( _HTMLAttrContext *pCntxt )
 {
     // PRE/Listing/XMP soll beim beenden des Kontexts beendet werden.
-    pCntxt->SetFinishPREListingXMP( sal_True );
+    pCntxt->SetFinishPREListingXMP( true );
 
     // Und die jetzt gueltigen Flags sollen wieder gesetzt werden.
     if( IsReadPRE() )
-        pCntxt->SetRestartPRE( sal_True );
+        pCntxt->SetRestartPRE( true );
     if( IsReadXMP() )
-        pCntxt->SetRestartXMP( sal_True );
+        pCntxt->SetRestartXMP( true );
     if( IsReadListing() )
-        pCntxt->SetRestartListing( sal_True );
+        pCntxt->SetRestartListing( true );
 
     // PRE/Listing/XMP wird auuserdem sofort beendet
     FinishPREListingXMP();
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 912d94a717de..ef0fb9bbc229 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -74,7 +74,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
                                      sal_Int16 eHoriOri,
                                      SfxItemSet& rCSS1ItemSet,
                                      SvxCSS1PropertyInfo& rCSS1PropInfo,
-                                     sal_Bool bHidden )
+                                     bool bHidden )
 {
     // always on top of text.
     // but in invisible layer. <ConnectToLayout> will move the object
@@ -108,12 +108,12 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         if( rCSS1PropInfo.bLeftMargin )
         {
             nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft());
-            rCSS1PropInfo.bLeftMargin = sal_False;
+            rCSS1PropInfo.bLeftMargin = false;
         }
         if( rCSS1PropInfo.bRightMargin )
         {
             nRightSpace = static_cast< sal_uInt16 >(aLRItem.GetRight());
-            rCSS1PropInfo.bRightMargin = sal_False;
+            rCSS1PropInfo.bRightMargin = false;
         }
         rCSS1ItemSet.ClearItem( RES_LR_SPACE );
     }
@@ -133,12 +133,12 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         if( rCSS1PropInfo.bTopMargin )
         {
             nUpperSpace = pULItem->GetUpper();
-            rCSS1PropInfo.bTopMargin = sal_False;
+            rCSS1PropInfo.bTopMargin = false;
         }
         if( rCSS1PropInfo.bBottomMargin )
         {
             nLowerSpace = pULItem->GetLower();
-            rCSS1PropInfo.bBottomMargin = sal_False;
+            rCSS1PropInfo.bBottomMargin = false;
         }
 
         rCSS1ItemSet.ClearItem( RES_UL_SPACE );
@@ -255,7 +255,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
     OUString aId, aStyle, aClass;
 
     long nWidth=0, nHeight=0;
-    sal_Bool bPrcWidth = sal_False, bDirection = sal_False, bBGColor = sal_False;
+    bool bPrcWidth = false, bDirection = false, bBGColor = false;
     Size aSpace( 0, 0 );
     sal_Int16 eVertOri = text::VertOrientation::TOP;
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
@@ -289,14 +289,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
 
             case HTML_O_BGCOLOR:
                 rOption.GetColor( aBGColor );
-                bBGColor = sal_True;
+                bBGColor = true;
                 break;
 
             case HTML_O_DIRECTION:
                 eAniDir =
                     (SdrTextAniDirection)rOption.GetEnum( aHTMLMarqDirectionTable,
                                                       static_cast< sal_uInt16 >(eAniDir) );
-                bDirection = sal_True;
+                bDirection = true;
                 break;
 
             case HTML_O_LOOP:
@@ -476,7 +476,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
     {
         aTwipSz.Width() = aPropInfo.nWidth;
         nWidth = 1; // != 0;
-        bPrcWidth = sal_False;
+        bPrcWidth = false;
     }
     if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType )
         aTwipSz.Height() = aPropInfo.nHeight;
@@ -500,7 +500,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
                 // koennen wir die Breite auch anpassen. Keine Breitenangabe
                 // wird wie 100% behandelt.
                 nWidth = 100;
-                bPrcWidth = sal_True;
+                bPrcWidth = true;
             }
             aTwipSz.Width() = MINLAY;
         }
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 39daeb2bb390..49baf6034a7a 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -70,7 +70,7 @@ const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrmFmt& rFmt )
 
 void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
                                          const SdrObject *pObj,
-                                         sal_Bool bSetDefaults )
+                                         bool bSetDefaults )
 {
     // die Edit script::Engine-Attribute aus dem Objekt holen
     SfxItemSet rObjItemSet = pObj->GetMergedItemSet();
@@ -82,7 +82,7 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
     while( nEEWhich )
     {
         const SfxPoolItem *pEEItem;
-        sal_Bool bSet = SFX_ITEM_SET == rObjItemSet.GetItemState( nEEWhich, false,
+        bool bSet = SFX_ITEM_SET == rObjItemSet.GetItemState( nEEWhich, false,
                                                               &pEEItem );
 
         if( bSet || bSetDefaults )
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 69b0fcdb9634..b9bf7140d2df 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -207,8 +207,8 @@ sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType
 
 void SwHTMLParser::NewField()
 {
-    sal_Bool bKnownType = sal_False, bFixed = sal_False,
-         bHasNumFmt = sal_False, bHasNumValue = sal_False;
+    bool bKnownType = false, bFixed = false,
+         bHasNumFmt = false, bHasNumValue = false;
     sal_uInt16 nType = 0;
     OUString aValue, aNumFmt, aNumValue, aName;
     const HTMLOption *pSubOption=0, *pFmtOption=0;
@@ -238,14 +238,14 @@ void SwHTMLParser::NewField()
             break;
         case HTML_O_SDNUM:
             aNumFmt = rOption.GetString();
-            bHasNumFmt = sal_True;
+            bHasNumFmt = true;
             break;
         case HTML_O_SDVAL:
             aNumValue = rOption.GetString();
-            bHasNumValue = sal_True;
+            bHasNumValue = true;
             break;
         case HTML_O_SDFIXED:
-            bFixed = sal_True;
+            bFixed = true;
             break;
         }
     }
@@ -275,7 +275,7 @@ void SwHTMLParser::NewField()
             const OUString& rCreated = xDocProps->getAuthor();
             if( rUser.isEmpty() ||
                 (!rChanged.isEmpty() ? rUser != rChanged : rUser != rCreated) )
-                bFixed = sal_True;
+                bFixed = true;
         }
     }
 
@@ -285,7 +285,7 @@ void SwHTMLParser::NewField()
 
     SwFieldType* pType = pDoc->GetSysFldType( nWhich );
     SwField *pFld = 0;
-    sal_Bool bInsOnEndTag = sal_False;
+    bool bInsOnEndTag = false;
 
     switch( (RES_FIELDS)nType )
     {
@@ -297,7 +297,7 @@ void SwHTMLParser::NewField()
             if( bFixed )
             {
                 nFmt |= AF_FIXED;
-                bInsOnEndTag = sal_True;
+                bInsOnEndTag = true;
             }
             if( pSubOption->GetEnum( nSub, aHTMLExtUsrFldSubTable ) )
                 pFld = new SwExtUserField( (SwExtUserFieldType*)pType,
@@ -313,7 +313,7 @@ void SwHTMLParser::NewField()
             if( bFixed )
             {
                 nFmt |= AF_FIXED;
-                bInsOnEndTag = sal_True;
+                bInsOnEndTag = true;
             }
 
             pFld = new SwAuthorField( (SwAuthorFieldType *)pType, nFmt );
@@ -327,7 +327,7 @@ void SwHTMLParser::NewField()
             sal_Int64 nTime = Time( Time::SYSTEM ).GetTime();
             sal_Int32 nDate = Date( Date::SYSTEM ).GetDate();
             sal_uInt16 nSub = 0;
-            sal_Bool bValidFmt = sal_False;
+            bool bValidFmt = false;
             HTMLNumFmtTblEntry * pFmtTbl;
 
             if( RES_DATEFLD==nType )
@@ -357,7 +357,7 @@ void SwHTMLParser::NewField()
                     {
                         nNumFmt = pFormatter->GetFormatIndex(
                                         pFmtTbl[k].eFmt, LANGUAGE_SYSTEM);
-                        bValidFmt = sal_True;
+                        bValidFmt = true;
                         break;
                     }
                 }
@@ -462,7 +462,7 @@ void SwHTMLParser::NewField()
                     bFixed &= bHasNumValue;
                 }
                 else
-                    bHasNumValue = sal_False;
+                    bHasNumValue = false;
 
                 if( nSub >= DI_INFO1 && nSub <= DI_INFO4 && aName.isEmpty() )
                 {
@@ -475,7 +475,7 @@ void SwHTMLParser::NewField()
                 if( bFixed )
                 {
                     nSub |= DI_SUB_FIXED;
-                    bInsOnEndTag = sal_True;
+                    bInsOnEndTag = true;
                 }
 
                 pFld = new SwDocInfoField( (SwDocInfoFieldType *)pType,
@@ -510,7 +510,7 @@ void SwHTMLParser::NewField()
             if( bFixed )
             {
                 nFmt |= FF_FIXED;
-                bInsOnEndTag = sal_True;
+                bInsOnEndTag = true;
             }
 
             pFld = new SwFileNameField( (SwFileNameFieldType *)pType, nFmt );
@@ -586,7 +586,7 @@ void SwHTMLParser::InsertFieldText()
 
 void SwHTMLParser::InsertCommentText( const sal_Char *pTag )
 {
-    sal_Bool bEmpty = aContents.isEmpty();
+    bool bEmpty = aContents.isEmpty();
     if( !bEmpty )
         aContents += "\n";
 
@@ -613,10 +613,10 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
     // weniger Probleme beim Formatieren (bug #40483#)
     const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
     SwTxtNode *pTxtNd = pPam->GetNode()->GetTxtNode();
-    sal_Bool bMoveFwd = sal_False;
+    bool bMoveFwd = false;
     if (nPos>0 && pTxtNd && (' ' == pTxtNd->GetTxt()[nPos-1]))
     {
-        bMoveFwd = sal_True;
+        bMoveFwd = true;
 
         sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
         const sal_Int32 nIdx = pPam->GetPoint()->nContent.GetIndex();
@@ -630,7 +630,7 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
             if( RES_TXTATR_FIELD == pAttr->pItem->Which() &&
                 RES_SCRIPTFLD == ((const SwFmtFld *)pAttr->pItem)->GetField()->GetTyp()->Which() )
             {
-                bMoveFwd = sal_False;
+                bMoveFwd = false;
                 break;
             }
         }
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 4ecffadfdac8..f97112855185 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -73,10 +73,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                       *pSubStr=0,   // SUBTYPE
                    *pFmtStr=0;  // FORMAT (SW)
     OUString aValue;              // VALUE (SW)
-    sal_Bool bNumFmt=sal_False;         // SDNUM (Number-Formatter-Format)
-    sal_Bool bNumValue=sal_False;       // SDVAL (Number-Formatter-Value)
+    bool bNumFmt=false;         // SDNUM (Number-Formatter-Format)
+    bool bNumValue=false;       // SDVAL (Number-Formatter-Value)
     double dNumValue = 0.0;     // SDVAL (Number-Formatter-Value)
-    sal_Bool bFixed=sal_False;          // SDFIXED
+    bool bFixed=false;          // SDFIXED
     OUString aName;               // NAME (CUSTOM)
 
     switch( nField )
@@ -120,10 +120,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
 
         case RES_DATETIMEFLD:
             pTypeStr = OOO_STRING_SW_HTML_FT_datetime;
-            bNumFmt = sal_True;
+            bNumFmt = true;
             if( ((SwDateTimeField*)pFld)->IsFixed() )
             {
-                bNumValue = sal_True;
+                bNumValue = true;
                 dNumValue = ((SwDateTimeField*)pFld)->GetValue();
             }
             break;
@@ -190,11 +190,11 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                             break;
                         case DI_SUB_TIME:
                             pFmtStr = OOO_STRING_SW_HTML_FF_time;
-                            bNumFmt = sal_True;
+                            bNumFmt = true;
                             break;
                         case DI_SUB_DATE:
                             pFmtStr = OOO_STRING_SW_HTML_FF_date;
-                            bNumFmt = sal_True;
+                            bNumFmt = true;
                             break;
                     }
                 }
@@ -207,13 +207,13 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                         // Fixe Felder ohne Zahlenformate sollte es
                         // eigentlich nicht geben. OSL_ENSURE(ist unten.
                         dNumValue = ((const SwDocInfoField*)pFld)->GetValue();
-                        bNumValue = sal_True;
+                        bNumValue = true;
                     }
                     else if( !nFmt  )
                     {
                         // Nicht fixe Felder muessen kein Zahlenformat haben,
                         // wenn sie aus 4.0-Dokumenten stammen.
-                        bNumFmt = sal_False;
+                        bNumFmt = false;
                     }
                 }
             }
@@ -306,7 +306,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
 
     // Inhalt des Feldes ausgeben
     OUString const sExpand( pFld->ExpandField(true) );
-    sal_Bool bNeedsCJKProcessing = sal_False;
+    bool bNeedsCJKProcessing = false;
     if( !sExpand.isEmpty() )
     {
         sal_uInt16 nScriptType = g_pBreakIt->GetBreakIter()->getScriptType( sExpand, 0 );
@@ -317,7 +317,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
             SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType );
         if( (nPos < sExpand.getLength() && nPos >= 0) || nScript != rHTMLWrt.nCSS1Script )
         {
-            bNeedsCJKProcessing = sal_True;
+            bNeedsCJKProcessing = true;
         }
     }
 
@@ -377,7 +377,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                 case CSS1_OUTMODE_CTL:      pWhichIds = aCTLWhichIds; break;
                 }
 
-                rHTMLWrt.bTagOn = sal_True;
+                rHTMLWrt.bTagOn = true;
 
                 const SfxPoolItem *aItems[5];
                 sal_uInt16 nItems = 0;
@@ -404,7 +404,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                 HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos, nChunkLen ),
                     rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
 
-                rHTMLWrt.bTagOn = sal_False;
+                rHTMLWrt.bTagOn = false;
                 while( nItems )
                     Out( aHTMLAttrFnTab, *aItems[--nItems], rHTMLWrt );
 
@@ -512,9 +512,9 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
     {
         SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
         if( rHTMLWrt.bLFPossible )
-            rHTMLWrt.OutNewLine( sal_True );
+            rHTMLWrt.OutNewLine( true );
 
-        sal_Bool bURL = ((const SwScriptField *)pFld)->IsCodeURL();
+        bool bURL = ((const SwScriptField *)pFld)->IsCodeURL();
         const OUString& rType = pFld->GetPar1();
         OUString aContents, aURL;
         if(bURL)
@@ -528,7 +528,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
                                  aURL, 0, 0, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
 
         if( rHTMLWrt.bLFPossible )
-            rHTMLWrt.OutNewLine( sal_True );
+            rHTMLWrt.OutNewLine( true );
     }
     else
     {
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index e7d5c4d8022c..e4b516512109 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -126,15 +126,15 @@ const sal_uLong HTML_FRMOPTS_CNTNR          =
 
 static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt );
 static Writer& OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFmt,
-                                         sal_Bool bInCntnr );
+                                         bool bInCntnr );
 static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFmt );
 static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
-                                          const SwFrmFmt& rFrmFmt, sal_Bool bSpan );
+                                          const SwFrmFmt& rFrmFmt, bool bSpan );
 static Writer& OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFmt,
-                                      sal_Bool bInCntnr );
+                                      bool bInCntnr );
 
 static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt,
-                                      sal_Bool bInCntnr );
+                                      bool bInCntnr );
 
 static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
                                         const SdrObject& rSdrObj    );
@@ -238,12 +238,12 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
             {
                 const SwTxtNode *pTxtNd = pNd->GetTxtNode();
 
-                sal_Bool bEmpty = sal_False;
+                bool bEmpty = false;
                 if( nStt==nEnd-1 && !pTxtNd->Len() )
                 {
                     // leerer Rahmen? Nur wenn kein Rahmen am
                     // Text- oder Start-Node verankert ist.
-                    bEmpty = sal_True;
+                    bEmpty = true;
                     if( pHTMLPosFlyFrms )
                     {
                         for( sal_uInt16 i=0; i<pHTMLPosFlyFrms->size(); i++ )
@@ -263,7 +263,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
                     /// or its background color is not "no fill"/"auto fill".
                     if( GPOS_NONE != rBrush.GetGraphicPos() ||
                         rBrush.GetColor() != COL_TRANSPARENT )
-                        bEmpty = sal_False;
+                        bEmpty = false;
                 }
                 if( bEmpty )
                 {
@@ -351,18 +351,18 @@ void SwHTMLWriter::CollectFlyFrms()
     }
 }
 
-sal_Bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 nPos,
+bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uInt8 nPos,
                               HTMLOutContext *pContext )
 {
-    sal_Bool bFlysLeft = sal_False; // Noch Flys an aktueller Node-Position da?
+    bool bFlysLeft = false; // Noch Flys an aktueller Node-Position da?
 
     // OutFlyFrm kan rekursiv aufgerufen werden. Deshalb muss man
     // manchmal wieder von vorne anfangen, nachdem ein Fly ausgegeben
     // wurde.
-    sal_Bool bRestart = sal_True;
+    bool bRestart = true;
     while( pHTMLPosFlyFrms && bRestart )
     {
-        bFlysLeft = bRestart = sal_False;
+        bFlysLeft = bRestart = false;
 
         // suche nach dem Anfang der FlyFrames
         sal_uInt16 i;
@@ -387,7 +387,7 @@ sal_Bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uIn
                 {
                     delete pHTMLPosFlyFrms;
                     pHTMLPosFlyFrms = 0;
-                    bRestart = sal_True;    // nicht wirklich, nur raus
+                    bRestart = true;    // nicht wirklich, nur raus
                                         // aus der Schleife
                 }
 
@@ -405,14 +405,14 @@ sal_Bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx, sal_uIn
                 case HTML_OUT_SPAN:
                 case HTML_OUT_MULTICOL:
                 case HTML_OUT_TBLNODE:
-                    bRestart = sal_True; // Hier wird's evtl rekursiv
+                    bRestart = true; // Hier wird's evtl rekursiv
                     break;
                 }
                 delete pPosFly;
             }
             else
             {
-                bFlysLeft = sal_True;
+                bFlysLeft = true;
             }
         }
     }
@@ -456,7 +456,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
         if( HTML_CNTNR_DIV == nCntnrMode )
         {
             IncIndentLevel();
-            bLFPossible = sal_True;
+            bLFPossible = true;
         }
     }
 
@@ -511,7 +511,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
         if( bLFPossible )
             OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
-        bLFPossible = sal_True;
+        bLFPossible = true;
     }
     else if( HTML_CNTNR_SPAN == nCntnrMode )
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
@@ -746,7 +746,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
         sal_Int16 eHoriOri =    rFrmFmt.GetHoriOrient().GetHoriOrient();
         pStr = 0;
         SwSurround eSurround = pSurround->GetSurround();
-        sal_Bool bAnchorOnly = pSurround->IsAnchorOnly();
+        bool bAnchorOnly = pSurround->IsAnchorOnly();
         switch( eHoriOri )
         {
         case text::HoriOrientation::RIGHT:
@@ -760,7 +760,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
                 case SURROUND_LEFT:
                 case SURROUND_PARALLEL:
                     if( bAnchorOnly )
-                        bClearRight = sal_True;
+                        bClearRight = true;
                     break;
                 default:
                     ;
@@ -781,7 +781,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
                 case SURROUND_RIGHT:
                 case SURROUND_PARALLEL:
                     if( bAnchorOnly )
-                        bClearLeft = sal_True;
+                        bClearLeft = true;
                     break;
                 default:
                     ;
@@ -818,7 +818,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
     if( !rHTMLWrt.aINetFmts.empty() )
     {
         SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
-        OutHTML_INetFmt( rWrt, *pINetFmt, sal_False );
+        OutHTML_INetFmt( rWrt, *pINetFmt, false );
     }
 
     const SfxPoolItem* pItem;
@@ -854,17 +854,17 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
         if( aIMapName.isEmpty() )
             aIMapName = aNameBase + OUString::number( rHTMLWrt.nImgMapCnt );
 
-        sal_Bool bFound;
+        bool bFound;
         do
         {
-            bFound = sal_False;
+            bFound = false;
             for(size_t i = 0; i < rHTMLWrt.aImgMapNames.size(); ++i)
             {
                 // TODO: Unicode: Comparison is case insensitive for ASCII
                 // characters only now!
                 if( aIMapName.equalsIgnoreAsciiCase( rHTMLWrt.aImgMapNames[i] ) )
                 {
-                    bFound = sal_True;
+                    bFound = true;
                     break;
                 }
             }
@@ -876,7 +876,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 
         } while( bFound );
 
-        sal_Bool bScale = sal_False;
+        bool bScale = false;
         Fraction aScaleX( 1, 1 );
         Fraction aScaleY( 1, 1 );
 
@@ -896,7 +896,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
             if( rRealSize.Width() != nWidth )
             {
                 aScaleX = Fraction( nWidth, rRealSize.Width() );
-                bScale = sal_True;
+                bScale = true;
             }
         }
         if( !rFrmSize.GetHeightPercent() && rRealSize.Height() )
@@ -912,7 +912,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
             if( rRealSize.Height() != nHeight )
             {
                 aScaleY = Fraction( nHeight, rRealSize.Height() );
-                bScale = sal_True;
+                bScale = true;
             }
         }
 
@@ -923,7 +923,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 
         if( rHTMLWrt.bLFPossible )
         {
-            rHTMLWrt.OutNewLine( sal_True );
+            rHTMLWrt.OutNewLine( true );
             aIndMap = rHTMLWrt.GetIndentString();
             aIndArea = rHTMLWrt.GetIndentString(1);
             pIndArea = aIndArea.getStr();
@@ -954,7 +954,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 
     // wenn meoglich vor der Grafik einen Zeilen-Umbruch ausgeben
     if( rHTMLWrt.bLFPossible )
-        rHTMLWrt.OutNewLine( sal_True );
+        rHTMLWrt.OutNewLine( true );
 
     // Attribute die ausserhelb der Grafik geschreiben werden muessen sammeln
     OStringBuffer sOut;
@@ -980,7 +980,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
             aName = pURLItem->GetName();
             aTarget = pURLItem->GetTargetFrameName();
         }
-        sal_Bool bEvents = pMacItem && !pMacItem->GetMacroTable().empty();
+        bool bEvents = pMacItem && !pMacItem->GetMacroTable().empty();
 
         if( !aMapURL.isEmpty() || !aName.isEmpty() || !aTarget.isEmpty() || bEvents )
         {
@@ -1172,7 +1172,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
         // es ist noch ein Attribut auf dem Stack, das wieder geoeffnet
         // werden muss
         SwFmtINetFmt *pINetFmt = rHTMLWrt.aINetFmts.back();
-        OutHTML_INetFmt( rWrt, *pINetFmt, sal_True );
+        OutHTML_INetFmt( rWrt, *pINetFmt, true );
     }
 
     return rHTMLWrt;
@@ -1226,7 +1226,7 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     sal_uLong nEnd = rHTMLWrt.pDoc->GetNodes()[nStt-1]->EndOfSectionIndex();
 
     OUString aCaption;
-    sal_Bool bTopCaption = sal_False;
+    bool bTopCaption = false;
 
     // Nicht const, weil GetTable spater mal nicht const ist
     SwNode *pNd = rHTMLWrt.pDoc->GetNodes()[ nStt ];
@@ -1235,7 +1235,7 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     if( !pTblNd && pTxtNd )
     {
         // Tabelle mit Ueberschrift
-        bTopCaption = sal_True;
+        bTopCaption = true;
         pTblNd = rHTMLWrt.pDoc->GetNodes()[nStt+1]->GetTableNode();
     }
     OSL_ENSURE( pTblNd, "Rahmen enthaelt keine Tabelle" );
@@ -1256,8 +1256,8 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
     {
         HTMLSaveData aSaveData( rHTMLWrt, pTblNd->GetIndex()+1,
                                 pTblNd->EndOfSectionIndex(),
-                                   sal_True, &rFrmFmt );
-        rHTMLWrt.bOutFlyFrame = sal_True;
+                                   true, &rFrmFmt );
+        rHTMLWrt.bOutFlyFrame = true;
         OutHTML_SwTblNode( rHTMLWrt, *pTblNd, &rFrmFmt, &aCaption,
                            bTopCaption );
     }
@@ -1267,7 +1267,7 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
 
 static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
                                           const SwFrmFmt& rFrmFmt,
-                                          sal_Bool bInCntnr )
+                                          bool bInCntnr )
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
@@ -1294,7 +1294,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
     }
 
     // die Gutter-Breite (Minimalwert) als GUTTER
-    sal_uInt16 nGutter = rFmtCol.GetGutterWidth( sal_True );
+    sal_uInt16 nGutter = rFmtCol.GetGutterWidth( true );
     if( nGutter!=USHRT_MAX )
     {
         if( nGutter && Application::GetDefaultDevice() )
@@ -1320,7 +1320,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
 
     rWrt.Strm().WriteChar( '>' );
 
-    rHTMLWrt.bLFPossible = sal_True;
+    rHTMLWrt.bLFPossible = true;
     rHTMLWrt.IncIndentLevel();  // den Inhalt von Multicol einruecken;
 
     const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
@@ -1333,8 +1333,8 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
         // wieder hergestellt wird.
         HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
                                 pSttNd->EndOfSectionIndex(),
-                                   sal_True, &rFrmFmt );
-        rHTMLWrt.bOutFlyFrame = sal_True;
+                                   true, &rFrmFmt );
+        rHTMLWrt.bOutFlyFrame = true;
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
 
@@ -1342,7 +1342,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine();
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, false );
-    rHTMLWrt.bLFPossible = sal_True;
+    rHTMLWrt.bLFPossible = true;
 
     return rWrt;
 }
@@ -1353,7 +1353,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
 
     // wenn meoglich vor der Grafik einen Zeilen-Umbruch ausgeben
     if( rHTMLWrt.bLFPossible )
-        rHTMLWrt.OutNewLine( sal_True );
+        rHTMLWrt.OutNewLine( true );
 
     OStringBuffer sOut;
     sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ')
@@ -1372,7 +1372,7 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
 }
 
 static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
-                                          const SwFrmFmt& rFrmFmt, sal_Bool bSpan)
+                                          const SwFrmFmt& rFrmFmt, bool bSpan)
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
@@ -1404,7 +1404,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
     rWrt.Strm().WriteChar( '>' );
 
     rHTMLWrt.IncIndentLevel();  // den Inhalt einruecken
-    rHTMLWrt.bLFPossible = sal_True;
+    rHTMLWrt.bLFPossible = true;
 
     const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
     sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
@@ -1420,8 +1420,8 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
         // wieder hergestellt wird.
         HTMLSaveData aSaveData( rHTMLWrt, nStt+1,
                                 pSttNd->EndOfSectionIndex(),
-                                   sal_True, &rFrmFmt );
-        rHTMLWrt.bOutFlyFrame = sal_True;
+                                   true, &rFrmFmt );
+        rHTMLWrt.bOutFlyFrame = true;
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
 
@@ -1437,7 +1437,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
 }
 
 static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
-                                       sal_Bool /*bInCntnr*/ )
+                                       bool /*bInCntnr*/ )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -1455,7 +1455,7 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 }
 
 static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
-                                      sal_Bool bInCntnr )
+                                      bool bInCntnr )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -1490,28 +1490,28 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     const SfxItemSet& rFmtItemSet = rFrmFmt.GetAttrSet();
     SfxItemSet aItemSet( *rFmtItemSet.GetPool(), RES_CHRATR_BEGIN,
                                                  RES_CHRATR_END );
-    SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj, sal_True );
-    sal_Bool bCfgOutStylesOld = rHTMLWrt.bCfgOutStyles;
-    rHTMLWrt.bCfgOutStyles = sal_False;
-    rHTMLWrt.bTxtAttr = sal_True;
-    rHTMLWrt.bTagOn = sal_True;
-    Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, sal_False );
-    rHTMLWrt.bTxtAttr = sal_False;
+    SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj, true );
+    bool bCfgOutStylesOld = rHTMLWrt.bCfgOutStyles;
+    rHTMLWrt.bCfgOutStyles = false;
+    rHTMLWrt.bTxtAttr = true;
+    rHTMLWrt.bTagOn = true;
+    Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
+    rHTMLWrt.bTxtAttr = false;
 
     OutHTML_DrawFrmFmtAsMarquee( rHTMLWrt,
                                  (const SwDrawFrmFmt &)rFrmFmt,
                                  rSdrObj );
-    rHTMLWrt.bTxtAttr = sal_True;
-    rHTMLWrt.bTagOn = sal_False;
-    Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, sal_False );
-    rHTMLWrt.bTxtAttr = sal_False;
+    rHTMLWrt.bTxtAttr = true;
+    rHTMLWrt.bTagOn = false;
+    Out_SfxItemSet( aHTMLAttrFnTab, rWrt, aItemSet, false );
+    rHTMLWrt.bTxtAttr = false;
     rHTMLWrt.bCfgOutStyles = bCfgOutStylesOld;
 
     return rWrt;
 }
 
 Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
-                              sal_Bool bHeader )
+                              bool bHeader )
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
@@ -1567,9 +1567,9 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
                                 pSttNd->EndOfSectionIndex() );
 
         if( bHeader )
-            rHTMLWrt.bOutHeader = sal_True;
+            rHTMLWrt.bOutHeader = true;
         else
-            rHTMLWrt.bOutFooter = sal_True;
+            rHTMLWrt.bOutFooter = true;
 
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
@@ -1598,21 +1598,21 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
     // freshly) or a '%7c' or a '%7C' if the document has been saved and
     // loaded already.
     sal_Int32 nPos = rURL.getLength();
-    sal_Bool bFound = sal_False, bEncoded = sal_False;
+    bool bFound = false, bEncoded = false;
     while( !bFound && nPos > 0 )
     {
         sal_Unicode c = rURL[ --nPos ];
         switch( c )
         {
         case cMarkSeparator:
-            bFound = sal_True;
+            bFound = true;
             break;
         case '%':
             bFound = (rURL.getLength() - nPos) >=3 &&
                      rURL[ nPos+1 ] == '7' &&
                      ((c =rURL[ nPos+2 ]) == 'C' || c == 'c');
             if( bFound )
-                bEncoded = sal_True;
+                bEncoded = true;
         }
     }
     if( !bFound || nPos < 2 ) // mindetsens "#a|..."
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index ba35b9e3763d..b14def5fd23a 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -363,14 +363,14 @@ class SwHTMLImageWatcher :
     uno::Reference< drawing::XShape >       xShape;     // das control
     uno::Reference< XImageProducerSupplier >    xSrc;
     uno::Reference< awt::XImageConsumer >   xThis;      // man selbst
-    sal_Bool                            bSetWidth;
-    sal_Bool                            bSetHeight;
+    bool                            bSetWidth;
+    bool                            bSetHeight;
 
     void clear();
 
 public:
     SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape,
-                        sal_Bool bWidth, sal_Bool bHeight );
+                        bool bWidth, bool bHeight );
     virtual ~SwHTMLImageWatcher();
 
     // startProduction darf nicht im Konstruktor gerufen werden, weil
@@ -408,7 +408,7 @@ public:
 
 SwHTMLImageWatcher::SwHTMLImageWatcher(
         const uno::Reference< drawing::XShape >& rShape,
-        sal_Bool bWidth, sal_Bool bHeight ) :
+        bool bWidth, bool bHeight ) :
     xShape( rShape ),
     bSetWidth( bWidth ), bSetHeight( bHeight )
 {
@@ -525,7 +525,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
                 0 != (pANd = & pAPos->nNode.GetNode()) &&
                 0 != (pTblNd = pANd->FindTableNode()) )
             {
-                const sal_Bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+                const bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
                 SwHTMLTableLayout *pLayout =
                     pTblNd->GetTable().GetHTMLTableLayout();
                 if( pLayout )
@@ -535,7 +535,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
 
                     if ( nBrowseWidth )
                     {
-                        pLayout->Resize( nBrowseWidth, sal_True, sal_True,
+                        pLayout->Resize( nBrowseWidth, true, true,
                                          bLastGrf ? HTMLTABLE_RESIZE_NOW
                                                   : 500 );
                     }
@@ -635,8 +635,8 @@ static void lcl_html_setFixedFontProperty(
 
 void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rShape,
                                    const Size& rTextSz,
-                                   sal_Bool bMinWidth,
-                                   sal_Bool bMinHeight )
+                                   bool bMinWidth,
+                                   bool bMinHeight )
 {
     if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth  && !bMinHeight )
         return;
@@ -870,8 +870,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
         const Size& rSize, sal_Int16 eVertOri, sal_Int16 eHoriOri,
         SfxItemSet& rCSS1ItemSet, SvxCSS1PropertyInfo& rCSS1PropInfo,
         const SvxMacroTableDtor& rMacroTbl, const std::vector<OUString>& rUnoMacroTbl,
-        const std::vector<OUString>& rUnoMacroParamTbl, sal_Bool bSetFCompPropSet,
-        sal_Bool bHidden )
+        const std::vector<OUString>& rUnoMacroParamTbl, bool bSetFCompPropSet,
+        bool bHidden )
 {
     uno::Reference< drawing::XShape >  xShape;
 
@@ -919,12 +919,12 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             if( rCSS1PropInfo.bLeftMargin )
             {
                 nLeftSpace = static_cast< sal_uInt16 >(convertTwipToMm100( aLRItem.GetLeft() ));
-                rCSS1PropInfo.bLeftMargin = sal_False;
+                rCSS1PropInfo.bLeftMargin = false;
             }
             if( rCSS1PropInfo.bRightMargin )
             {
                 nRightSpace = static_cast< sal_uInt16 >(convertTwipToMm100( aLRItem.GetRight() ));
-                rCSS1PropInfo.bRightMargin = sal_False;
+                rCSS1PropInfo.bRightMargin = false;
             }
             rCSS1ItemSet.ClearItem( RES_LR_SPACE );
         }
@@ -949,12 +949,12 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             if( rCSS1PropInfo.bTopMargin )
             {
                 nUpperSpace = convertTwipToMm100( pULItem->GetUpper() );
-                rCSS1PropInfo.bTopMargin = sal_False;
+                rCSS1PropInfo.bTopMargin = false;
             }
             if( rCSS1PropInfo.bBottomMargin )
             {
                 nLowerSpace = convertTwipToMm100( pULItem->GetLower() );
-                rCSS1PropInfo.bBottomMargin = sal_False;
+                rCSS1PropInfo.bBottomMargin = false;
             }
 
             rCSS1ItemSet.ClearItem( RES_UL_SPACE );
@@ -1086,7 +1086,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
 
         uno::Reference< text::XTextRange >  xTxtRg;
         sal_Int16 nAnchorType = text::TextContentAnchorType_AS_CHARACTER;
-        sal_Bool bSetPos = sal_False, bSetSurround = sal_False;
+        bool bSetPos = false, bSetSurround = false;
         sal_Int32 nXPos = 0, nYPos = 0;
         sal_Int16 nSurround = text::WrapTextMode_NONE;
         if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
@@ -1110,10 +1110,10 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             }
             nXPos = convertTwipToMm100( rCSS1PropInfo.nLeft ) + nLeftSpace;
             nYPos = convertTwipToMm100( rCSS1PropInfo.nTop ) + nUpperSpace;
-            bSetPos = sal_True;
+            bSetPos = true;
 
             nSurround = text::WrapTextMode_THROUGHT;
-            bSetSurround = sal_True;
+            bSetSurround = true;
         }
         else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
                  text::HoriOrientation::LEFT == eHoriOri )
@@ -1121,9 +1121,9 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             nAnchorType = text::TextContentAnchorType_AT_PARAGRAPH;
             nXPos = nLeftSpace;
             nYPos = nUpperSpace;
-            bSetPos = sal_True;
+            bSetPos = true;
             nSurround = text::WrapTextMode_RIGHT;
-            bSetSurround = sal_True;
+            bSetSurround = true;
         }
         else if( text::VertOrientation::NONE != eVertOri )
         {
@@ -1241,7 +1241,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
     return xShape;
 }
 
-void SwHTMLParser::NewForm( sal_Bool bAppend )
+void SwHTMLParser::NewForm( bool bAppend )
 {
     // Gibt es schon eine Form?
     if( pFormImpl && pFormImpl->GetFormComps().is() )
@@ -1275,7 +1275,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
         const HTMLOption& rOption = rHTMLOptions[--i];
         ScriptType eScriptType2 = eDfltScriptType;
         sal_uInt16 nEvent = 0;
-        sal_Bool bSetEvent = sal_False;
+        bool bSetEvent = false;
 
         switch( rOption.GetToken() )
         {
@@ -1300,7 +1300,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
             //fallthrough
         case HTML_O_ONSUBMIT:
             nEvent = HTML_ET_ONSUBMITFORM;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONRESET:
@@ -1308,7 +1308,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
             //fallthrough
         case HTML_O_ONRESET:
             nEvent = HTML_ET_ONRESETFORM;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         default:
@@ -1395,7 +1395,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
                             rDfltScriptType );
 }
 
-void SwHTMLParser::EndForm( sal_Bool bAppend )
+void SwHTMLParser::EndForm( bool bAppend )
 {
     if( pFormImpl && pFormImpl->GetFormComps().is() )
     {
@@ -1428,9 +1428,9 @@ void SwHTMLParser::InsertInput()
     sal_Int16 nChecked = TRISTATE_FALSE;
     sal_Int32 nTabIndex = TABINDEX_MAX + 1;
     HTMLInputType eType = HTML_IT_TEXT;
-    sal_Bool bDisabled = sal_False, bValue = sal_False;
-    sal_Bool bSetGrfWidth = sal_False, bSetGrfHeight = sal_False;
-    sal_Bool bHidden = sal_False;
+    bool bDisabled = false, bValue = false;
+    bool bSetGrfWidth = false, bSetGrfHeight = false;
+    bool bHidden = false;
     long nWidth=0, nHeight=0;
     sal_Int16 eVertOri = text::VertOrientation::TOP;
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
@@ -1445,7 +1445,7 @@ void SwHTMLParser::InsertInput()
         const HTMLOption& rOption = rHTMLOptions[--i];
         ScriptType eScriptType2 = eDfltScriptType;
         sal_uInt16 nEvent = 0;
-        sal_Bool bSetEvent = sal_False;
+        bool bSetEvent = false;
 
         switch( rOption.GetToken() )
         {
@@ -1466,13 +1466,13 @@ void SwHTMLParser::InsertInput()
             break;
         case HTML_O_VALUE:
             sText = rOption.GetString();
-            bValue = sal_True;
+            bValue = true;
             break;
         case HTML_O_CHECKED:
             nChecked = TRISTATE_TRUE;
             break;
         case HTML_O_DISABLED:
-            bDisabled = sal_True;
+            bDisabled = true;
             break;
         case HTML_O_MAXLENGTH:
             nMaxLen = (sal_Int16)rOption.GetNumber();
@@ -1507,7 +1507,7 @@ void SwHTMLParser::InsertInput()
             //fallthrough
         case HTML_O_ONFOCUS:
             nEvent = HTML_ET_ONGETFOCUS;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONBLUR:               // eigtl. nur EDIT
@@ -1515,7 +1515,7 @@ void SwHTMLParser::InsertInput()
             //fallthrough
         case HTML_O_ONBLUR:
             nEvent = HTML_ET_ONLOSEFOCUS;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONCLICK:
@@ -1523,7 +1523,7 @@ void SwHTMLParser::InsertInput()
             //fallthrough
         case HTML_O_ONCLICK:
             nEvent = HTML_ET_ONCLICK;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONCHANGE:             // eigtl. nur EDIT
@@ -1531,7 +1531,7 @@ void SwHTMLParser::InsertInput()
             //fallthrough
         case HTML_O_ONCHANGE:
             nEvent = HTML_ET_ONCHANGE;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONSELECT:             // eigtl. nur EDIT
@@ -1539,7 +1539,7 @@ void SwHTMLParser::InsertInput()
             //fallthrough
         case HTML_O_ONSELECT:
             nEvent = HTML_ET_ONSELECT;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         default:
@@ -1580,25 +1580,25 @@ void SwHTMLParser::InsertInput()
 
     // Defaults entsprechen HTML_IT_TEXT
     const sal_Char *pType = "TextField";
-    sal_Bool bKeepCRLFInValue = sal_False;
+    bool bKeepCRLFInValue = false;
     switch( eType )
     {
     case HTML_IT_CHECKBOX:
         pType = "CheckBox";
-        bKeepCRLFInValue = sal_True;
+        bKeepCRLFInValue = true;
         break;
 
     case HTML_IT_RADIO:
         pType = "RadioButton";
-        bKeepCRLFInValue = sal_True;
+        bKeepCRLFInValue = true;
         break;
 
     case HTML_IT_PASSWORD:
-        bKeepCRLFInValue = sal_True;
+        bKeepCRLFInValue = true;
         break;
 
     case HTML_IT_BUTTON:
-        bKeepCRLFInValue = sal_True;
+        bKeepCRLFInValue = true;
     case HTML_IT_SUBMIT:
     case HTML_IT_RESET:
         pType = "CommandButton";
@@ -1614,7 +1614,7 @@ void SwHTMLParser::InsertInput()
 
     case HTML_IT_HIDDEN:
         pType = "HiddenControl";
-        bKeepCRLFInValue = sal_True;
+        bKeepCRLFInValue = true;
         break;
     default:
         ;
@@ -1670,8 +1670,8 @@ void SwHTMLParser::InsertInput()
 
     Size aSz( 0, 0 );       // defaults
     Size aTextSz( 0, 0 );   // Text-Size
-    sal_Bool bMinWidth = sal_False, bMinHeight = sal_False;
-    sal_Bool bUseSize = sal_False;
+    bool bMinWidth = false, bMinHeight = false;
+    bool bUseSize = false;
     switch( eType )
     {
     case HTML_IT_CHECKBOX:
@@ -1702,7 +1702,7 @@ void SwHTMLParser::InsertInput()
                 aMacroTbl.Erase( HTML_ET_ONCLICK );
             }
             // SIZE auszuwerten duerfte hier keinen Sinn machen???
-            bMinWidth = bMinHeight = sal_True;
+            bMinWidth = bMinHeight = true;
         }
         break;
 
@@ -1761,8 +1761,8 @@ void SwHTMLParser::InsertInput()
             xPropSet->setPropertyValue(
                 OUString("ButtonType"), aTmp );
 
-            bMinWidth = bMinHeight = sal_True;
-            bUseSize = sal_True;
+            bMinWidth = bMinHeight = true;
+            bUseSize = true;
         }
         break;
 
@@ -1794,13 +1794,13 @@ void SwHTMLParser::InsertInput()
         if( !nSize )
             nSize = 20;
         aTextSz.Width() = nSize;
-        bMinHeight = sal_True;
+        bMinHeight = true;
         break;
 
     case HTML_IT_HIDDEN:
         xPropSet->setPropertyValue("HiddenValue",
                                     aTmp );
-        bHidden = sal_True;
+        bHidden = true;
         break;
     default:
         ;
@@ -1815,7 +1815,7 @@ void SwHTMLParser::InsertInput()
                         ->PixelToLogic( aNewSz, MapMode( MAP_100TH_MM ) );
             aSz.Width() = aNewSz.Width();
             OSL_ENSURE( !aTextSz.Width(), "Text-Breite ist gegeben" );
-            bMinWidth = sal_False;
+            bMinWidth = false;
         }
     }
 
@@ -1832,13 +1832,13 @@ void SwHTMLParser::InsertInput()
     {
         aSz.Width() = convertTwipToMm100( aCSS1PropInfo.nWidth );
         aTextSz.Width() = 0;
-        bMinWidth = sal_False;
+        bMinWidth = false;
     }
     if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType )
     {
         aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight );
         aTextSz.Height() = 0;
-        bMinHeight = sal_False;
+        bMinHeight = false;
     }
 
     // Beim Image-Button bei nicht gegebern Groesse einen sinnvollen Default
@@ -1848,14 +1848,14 @@ void SwHTMLParser::InsertInput()
         if( !aSz.Width() )
         {
             aSz.Width() = HTML_DFLT_IMG_WIDTH;
-            bSetGrfWidth = sal_True;
+            bSetGrfWidth = true;
             if( pTable != 0 )
                 IncGrfsThatResizeTable();
         }
         if( !aSz.Height() )
         {
             aSz.Height() = HTML_DFLT_IMG_HEIGHT;
-            bSetGrfHeight = sal_True;
+            bSetGrfHeight = true;
         }
     }
     if( aSz.Width() < MINFLY )
@@ -1868,7 +1868,7 @@ void SwHTMLParser::InsertInput()
                                              eVertOri, eHoriOri,
                                              aCSS1ItemSet, aCSS1PropInfo,
                                              aMacroTbl, aUnoMacroTbl,
-                                             aUnoMacroParamTbl, sal_False,
+                                             aUnoMacroParamTbl, false,
                                              bHidden );
     if( aTextSz.Width() || aTextSz.Height() || bMinWidth || bMinHeight )
     {
@@ -1924,7 +1924,7 @@ void SwHTMLParser::NewTextArea()
     std::vector<OUString> aUnoMacroParamTbl;
     sal_uInt16 nRows = 0, nCols = 0;
     sal_uInt16 nWrap = HTML_WM_OFF;
-    sal_Bool bDisabled = sal_False;
+    bool bDisabled = false;
     SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
     ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
     const OUString& rDfltScriptType = GetScriptTypeString( pHeaderAttrs );
@@ -1935,7 +1935,7 @@ void SwHTMLParser::NewTextArea()
         const HTMLOption& rOption = rHTMLOptions[--i];
         ScriptType eScriptType2 = eDfltScriptType;
         sal_uInt16 nEvent = 0;
-        sal_Bool bSetEvent = sal_False;
+        bool bSetEvent = false;
 
         switch( rOption.GetToken() )
         {
@@ -1952,7 +1952,7 @@ void SwHTMLParser::NewTextArea()
             sName = rOption.GetString();
             break;
         case HTML_O_DISABLED:
-            bDisabled = sal_True;
+            bDisabled = true;
             break;
         case HTML_O_ROWS:
             nRows = (sal_uInt16)rOption.GetNumber();
@@ -1973,7 +1973,7 @@ void SwHTMLParser::NewTextArea()
             //fallthrough
         case HTML_O_ONFOCUS:
             nEvent = HTML_ET_ONGETFOCUS;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONBLUR:
@@ -1981,7 +1981,7 @@ void SwHTMLParser::NewTextArea()
             //fallthrough
         case HTML_O_ONBLUR:
             nEvent = HTML_ET_ONLOSEFOCUS;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONCLICK:
@@ -1989,7 +1989,7 @@ void SwHTMLParser::NewTextArea()
             //fallthrough
         case HTML_O_ONCLICK:
             nEvent = HTML_ET_ONCLICK;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONCHANGE:
@@ -1997,7 +1997,7 @@ void SwHTMLParser::NewTextArea()
             //fallthrough
         case HTML_O_ONCHANGE:
             nEvent = HTML_ET_ONCHANGE;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONSELECT:
@@ -2005,7 +2005,7 @@ void SwHTMLParser::NewTextArea()
             //fallthrough
         case HTML_O_ONSELECT:
             nEvent = HTML_ET_ONSELECT;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         default:
@@ -2121,7 +2121,7 @@ void SwHTMLParser::NewTextArea()
                                       aMacroTbl, aUnoMacroTbl,
                                       aUnoMacroParamTbl );
     if( aTextSz.Width() || aTextSz.Height() )
-        SetControlSize( xShape, aTextSz, sal_False, sal_False );
+        SetControlSize( xShape, aTextSz, false, false );
 
     // einen neuen Kontext anlegen
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_TEXTAREA_ON );
@@ -2210,8 +2210,8 @@ void SwHTMLParser::NewSelect()
     SvxMacroTableDtor aMacroTbl;
     std::vector<OUString> aUnoMacroTbl;
     std::vector<OUString> aUnoMacroParamTbl;
-    sal_Bool bMultiple = sal_False;
-    sal_Bool bDisabled = sal_False;
+    bool bMultiple = false;
+    bool bDisabled = false;
     nSelectEntryCnt = 1;
     SvKeyValueIterator *pHeaderAttrs = pFormImpl->GetHeaderAttrs();
     ScriptType eDfltScriptType = GetScriptType( pHeaderAttrs );
@@ -2223,7 +2223,7 @@ void SwHTMLParser::NewSelect()
         const HTMLOption& rOption = rHTMLOptions[--i];
         ScriptType eScriptType2 = eDfltScriptType;
         sal_uInt16 nEvent = 0;
-        sal_Bool bSetEvent = sal_False;
+        bool bSetEvent = false;
 
         switch( rOption.GetToken() )
         {
@@ -2240,10 +2240,10 @@ void SwHTMLParser::NewSelect()
             sName = rOption.GetString();
             break;
         case HTML_O_MULTIPLE:
-            bMultiple = sal_True;
+            bMultiple = true;
             break;
         case HTML_O_DISABLED:
-            bDisabled = sal_True;
+            bDisabled = true;
             break;
         case HTML_O_SIZE:
             nSelectEntryCnt = (sal_uInt16)rOption.GetNumber();
@@ -2257,28 +2257,28 @@ void SwHTMLParser::NewSelect()
             eScriptType2 = STARBASIC;
         case HTML_O_ONFOCUS:
             nEvent = HTML_ET_ONGETFOCUS;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONBLUR:
             eScriptType2 = STARBASIC;
         case HTML_O_ONBLUR:
             nEvent = HTML_ET_ONLOSEFOCUS;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONCLICK:
             eScriptType2 = STARBASIC;
         case HTML_O_ONCLICK:
             nEvent = HTML_ET_ONCLICK;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         case HTML_O_SDONCHANGE:
             eScriptType2 = STARBASIC;
         case HTML_O_ONCHANGE:
             nEvent = HTML_ET_ONCHANGE;
-            bSetEvent = sal_True;
+            bSetEvent = true;
             break;
 
         default:
@@ -2341,7 +2341,7 @@ void SwHTMLParser::NewSelect()
     }
 
     Size aTextSz( 0, 0 );
-    sal_Bool bMinWidth = sal_True, bMinHeight = sal_True;
+    bool bMinWidth = true, bMinHeight = true;
     if( !bMultiple && 1==nSelectEntryCnt )
     {
         sal_Bool bTrue = sal_True;
@@ -2362,7 +2362,7 @@ void SwHTMLParser::NewSelect()
                 OUString("MultiSelection"), aTmp );
         }
         aTextSz.Height() = nSelectEntryCnt;
-        bMinHeight = sal_False;
+        bMinHeight = false;
     }
 
     SfxItemSet aCSS1ItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
@@ -2380,13 +2380,13 @@ void SwHTMLParser::NewSelect()
     {
         aSz.Width() = convertTwipToMm100( aCSS1PropInfo.nWidth );
         bFixSelectWidth = false;
-        bMinWidth = sal_False;
+        bMinWidth = false;
     }
     if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType )
     {
         aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight );
         aTextSz.Height() = sal_False;
-        bMinHeight = sal_False;
+        bMinHeight = false;
     }
     if( aSz.Width() < MINFLY )
         aSz.Width() = MINFLY;
@@ -2486,7 +2486,7 @@ void SwHTMLParser::EndSelect()
     {
         OSL_ENSURE( pFormImpl->GetShape().is(), "Kein Shape gemerkt" );
         Size aTextSz( -1, 0 );
-        SetControlSize( pFormImpl->GetShape(), aTextSz, sal_False, sal_False );
+        SetControlSize( pFormImpl->GetShape(), aTextSz, false, false );
     }
 
     pFormImpl->ReleaseFCompPropSet();
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index f03f6ca6f852..bdd906b92cd8 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -80,7 +80,7 @@ const sal_uInt32 HTML_FRMOPTS_IMG_CONTROL_CSS1 =
 
 static void lcl_html_outEvents( SvStream& rStrm,
                          const uno::Reference< form::XFormComponent > rFormComp,
-                         sal_Bool bCfgStarBasic,
+                         bool bCfgStarBasic,
                          rtl_TextEncoding eDestEnc,
                          OUString *pNonConvertableChars )
 {
@@ -190,9 +190,9 @@ static void lcl_html_outEvents( SvStream& rStrm,
     }
 }
 
-static sal_Bool lcl_html_isHTMLControl( sal_Int16 nClassId )
+static bool lcl_html_isHTMLControl( sal_Int16 nClassId )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     switch( nClassId )
     {
@@ -203,14 +203,14 @@ static sal_Bool lcl_html_isHTMLControl( sal_Int16 nClassId )
     case form::FormComponentType::LISTBOX:
     case form::FormComponentType::IMAGEBUTTON:
     case form::FormComponentType::FILECONTROL:
-        bRet = sal_True;
+        bRet = true;
         break;
     }
 
     return bRet;
 }
 
-sal_Bool SwHTMLWriter::HasControls() const
+bool SwHTMLWriter::HasControls() const
 {
     sal_uInt32 nStartIdx = pCurPam->GetPoint()->nNode.GetIndex();
     sal_uInt16 i;
@@ -223,7 +223,7 @@ sal_Bool SwHTMLWriter::HasControls() const
     return i < aHTMLControls.size() && aHTMLControls[i]->nNdIdx == nStartIdx;
 }
 
-void SwHTMLWriter::OutForm( sal_Bool bTag_On, const SwStartNode *pStartNd )
+void SwHTMLWriter::OutForm( bool bTag_On, const SwStartNode *pStartNd )
 {
     if( bPreserveForm )     // wir sind in einer Tabelle oder einem Bereich
         return;             // ueber dem eine Form aufgespannt wurde
@@ -234,7 +234,7 @@ void SwHTMLWriter::OutForm( sal_Bool bTag_On, const SwStartNode *pStartNd )
         if( pxFormComps && pxFormComps->is() &&
             (*pxFormComps)->getCount() == nFormCntrlCnt )
         {
-            OutForm( sal_False, *pxFormComps );
+            OutForm( false, *pxFormComps );
             (*pxFormComps) = 0;
         }
         return;
@@ -329,7 +329,7 @@ void SwHTMLWriter::OutForm( sal_Bool bTag_On, const SwStartNode *pStartNd )
             // .. es ist aber noch eine Form offen: Das ist in
             // jedem Fall eine Fehler, aber wir schliessen die alte
             // Form trotzdem
-            OutForm( sal_False, *pxFormComps );
+            OutForm( false, *pxFormComps );
 
             //!!!nWarn = 1; // Control wird falscher Form zugeordnet
         }
@@ -338,7 +338,7 @@ void SwHTMLWriter::OutForm( sal_Bool bTag_On, const SwStartNode *pStartNd )
             pxFormComps = new uno::Reference< container::XIndexContainer > ;
         *pxFormComps = xNewFormComps;
 
-        OutForm( sal_True, *pxFormComps );
+        OutForm( true, *pxFormComps );
         uno::Reference< beans::XPropertySet >  xTmp;
         OutHiddenControls( *pxFormComps, xTmp );
     }
@@ -394,7 +394,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm )
         return;
 
     sal_Int32 nCount = xFormComps->getCount();
-    sal_Bool bHiddenOnly = nCount > 0, bHidden = sal_False;
+    bool bHiddenOnly = nCount > 0, bHidden = false;
     for( sal_Int32 i=0; i<nCount; i++ )
     {
         uno::Any aTmp = xFormComps->getByIndex( i );
@@ -422,10 +422,10 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm )
                 {
                     if( form::FormComponentType::HIDDENCONTROL ==
                                                 *(sal_Int16*)aAny2.getValue() )
-                        bHidden = sal_True;
+                        bHidden = true;
                     else if( lcl_html_isHTMLControl(
                                             *(sal_Int16*)aAny2.getValue() ) )
-                        bHiddenOnly = sal_False;
+                        bHiddenOnly = false;
                 }
             }
         }
@@ -433,14 +433,14 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm )
 
     if( bHidden && bHiddenOnly )
     {
-        OutForm( sal_True, xFormComps );
+        OutForm( true, xFormComps );
         uno::Reference< beans::XPropertySet > xTmp;
         OutHiddenControls( xFormComps, xTmp );
-        OutForm( sal_False, xFormComps );
+        OutForm( false, xFormComps );
     }
 }
 
-void SwHTMLWriter::OutForm( sal_Bool bOn,
+void SwHTMLWriter::OutForm( bool bOn,
                 const uno::Reference< container::XIndexContainer > & rFormComps )
 {
     nFormCntrlCnt = 0;
@@ -451,7 +451,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
         if( bLFPossible )
             OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_form, false );
-        bLFPossible = sal_True;
+        bLFPossible = true;
 
         return;
     }
@@ -544,7 +544,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
     Strm().WriteChar( '>' );
 
     IncIndentLevel(); // Inhalt der Form einruecken
-    bLFPossible = sal_True;
+    bLFPossible = true;
 }
 
 void SwHTMLWriter::OutHiddenControls(
@@ -553,7 +553,7 @@ void SwHTMLWriter::OutHiddenControls(
 {
     sal_Int32 nCount = rFormComps->getCount();
     sal_Int32 nPos = 0;
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     if( rPropSet.is() )
     {
         uno::Reference< form::XFormComponent > xFC( rPropSet, uno::UNO_QUERY );
@@ -595,7 +595,7 @@ void SwHTMLWriter::OutHiddenControls(
                                             *(sal_Int16*) aTmp.getValue() )
         {
             if( bLFPossible )
-                OutNewLine( sal_True );
+                OutNewLine( true );
             OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_input) + " " +
                 OString(OOO_STRING_SVTOOLS_HTML_O_type) + "=\"" +
                 OString(OOO_STRING_SVTOOLS_HTML_IT_hidden) + "\"";
@@ -699,7 +699,7 @@ static void GetControlSize( const SdrObject& rSdrObj, Size& rSz,
 Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                                      const SwDrawFrmFmt& rFmt,
                                      const SdrObject& rSdrObject,
-                                     sal_Bool bInCntnr )
+                                     bool bInCntnr )
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
@@ -734,7 +734,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     Type eType = TYPE_NONE;
     OUString sValue;
     OString sOptions;
-    sal_Bool bEmptyValue = sal_False;
+    bool bEmptyValue = false;
     uno::Any aTmp = xPropSet->getPropertyValue(
                     OUString("ClassId") );
     sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue();
@@ -760,7 +760,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         {
             const OUString& rVal = *(OUString*)aTmp.getValue();
             if( rVal.isEmpty() )
-                bEmptyValue = sal_True;
+                bEmptyValue = true;
             else if( rVal.compareToAscii( OOO_STRING_SVTOOLS_HTML_on ) != 0 )
                 sValue = rVal;
         }
@@ -800,7 +800,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
     case form::FormComponentType::LISTBOX:
         if( rHTMLWrt.bLFPossible )
-            rHTMLWrt.OutNewLine( sal_True );
+            rHTMLWrt.OutNewLine( true );
         eTag = TAG_SELECT;
         aTmp = xPropSet->getPropertyValue(
                         OUString("Dropdown") );
@@ -832,7 +832,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
             Size aSz( 0, 0 );
             GetControlSize( rSdrObject, aSz, rWrt.pDoc );
 
-            sal_Bool bMultiLine = sal_False;
+            bool bMultiLine = false;
             OUString sMultiLine("MultiLine");
             if( xPropSetInfo->hasPropertyByName( sMultiLine ) )
             {
@@ -844,7 +844,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
             if( bMultiLine )
             {
                 if( rHTMLWrt.bLFPossible )
-                    rHTMLWrt.OutNewLine( sal_True );
+                    rHTMLWrt.OutNewLine( true );
                 eTag = TAG_TEXTAREA;
 
                 if( aSz.Height() )
@@ -1056,7 +1056,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
     if( rHTMLWrt.bCfgOutStyles )
     {
-        sal_Bool bEdit = TAG_TEXTAREA == eTag || TYPE_FILE == eType ||
+        bool bEdit = TAG_TEXTAREA == eTag || TYPE_FILE == eType ||
                      TYPE_TEXT == eType;
 
         SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN,
@@ -1219,12 +1219,12 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
             for( sal_Int32 i = 0; i < nCnt; i++ )
             {
                 OUString sVal;
-                sal_Bool bSelected = sal_False, bEmptyVal = sal_False;
+                bool bSelected = false, bEmptyVal = false;
                 if( i < nValCnt )
                 {
                     const OUString& rVal = pValues[i];
                     if( rVal.equalsAscii( "$$$empty$$$" ) )
-                        bEmptyVal = sal_True;
+                        bEmptyVal = true;
                     else
                         sVal = rVal;
                 }
@@ -1302,7 +1302,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
 
     // Controls sind nicht absatz-gebunden, deshalb kein LF mehr ausgeben!
-    rHTMLWrt.bLFPossible = sal_False;
+    rHTMLWrt.bLFPossible = false;
 
     if( rHTMLWrt.pxFormComps && rHTMLWrt.pxFormComps->is() )
         rHTMLWrt.OutHiddenControls( *rHTMLWrt.pxFormComps, xPropSet );
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 2ba0cef9e00c..3d0602fbf347 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -38,8 +38,8 @@ struct SwHTMLFootEndNote_Impl
 
     OUString sName;
     OUString sContent;            // Infos fuer die letzte Fussnote
-    sal_Bool bEndNote;
-    sal_Bool bFixed;
+    bool bEndNote;
+    bool bFixed;
 };
 
 sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
@@ -53,7 +53,7 @@ sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
     }
     else
     {
-        sal_Bool bQuoted = sal_False, bDone = sal_False;
+        bool bQuoted = false, bDone = false;
         for( ; nPos < nLen && !bDone; nPos++ )
         {
             sal_Unicode c = rContent[nPos];
@@ -69,13 +69,13 @@ sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
                 if( bQuoted )
                     rPart += OUString( c );
                 else
-                    bDone = sal_True;
-                bQuoted = sal_False;
+                    bDone = true;
+                bQuoted = false;
                 break;
 
             default:
                 rPart += OUString( c );
-                bQuoted = sal_False;
+                bQuoted = false;
                 break;
             }
         }
@@ -86,7 +86,7 @@ sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
 
 sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
                                     const OUString& rContent,
-                                    sal_Bool bEndNote )
+                                    bool bEndNote )
 {
     sal_Int32 nStrPos = 0;
     for( sal_uInt16 nPart = 0; nPart < 4; nPart++ )
@@ -124,7 +124,7 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
 void SwHTMLParser::FillEndNoteInfo( const OUString& rContent )
 {
     SwEndNoteInfo aInfo( pDoc->GetEndNoteInfo() );
-    lcl_html_getEndNoteInfo( aInfo, rContent, sal_True );
+    lcl_html_getEndNoteInfo( aInfo, rContent, true );
     pDoc->SetEndNoteInfo( aInfo );
 }
 
@@ -132,7 +132,7 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
 {
     SwFtnInfo aInfo( pDoc->GetFtnInfo() );
 
-    sal_Int32 nStrPos = lcl_html_getEndNoteInfo( aInfo, rContent, sal_False );
+    sal_Int32 nStrPos = lcl_html_getEndNoteInfo( aInfo, rContent, false );
 
     for( sal_uInt16 nPart = 4; nPart < 8; nPart++ )
     {
@@ -180,8 +180,8 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
     pDoc->SetFtnInfo( aInfo );
 }
 
-void SwHTMLParser::InsertFootEndNote( const OUString& rName, sal_Bool bEndNote,
-                                      sal_Bool bFixed )
+void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote,
+                                      bool bFixed )
 {
     if( !pFootEndNoteImpl )
         pFootEndNoteImpl = new SwHTMLFootEndNote_Impl;
@@ -216,7 +216,7 @@ void SwHTMLParser::FinishFootEndNote()
     }
     pFootEndNoteImpl->sName = aEmptyOUStr;
     pFootEndNoteImpl->sContent = aEmptyOUStr;
-    pFootEndNoteImpl->bFixed = sal_False;
+    pFootEndNoteImpl->bFixed = false;
 }
 
 void SwHTMLParser::InsertFootEndNoteText()
@@ -358,7 +358,7 @@ void SwHTMLWriter::OutFootEndNotes()
         HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters );
         Strm().WriteCharPtr( "\">" );
 
-        bLFPossible = sal_True;
+        bLFPossible = true;
         IncIndentLevel();   // Inhalt von <DIV> einruecken
 
         OSL_ENSURE( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" );
@@ -368,7 +368,7 @@ void SwHTMLWriter::OutFootEndNotes()
         if( pSttNdIdx )
         {
             HTMLSaveData aSaveData( *this, pSttNdIdx->GetIndex()+1,
-                pSttNdIdx->GetNode().EndOfSectionIndex(), sal_False );
+                pSttNdIdx->GetNode().EndOfSectionIndex(), false );
             Out_SwDoc( pCurPam );
         }
 
@@ -376,7 +376,7 @@ void SwHTMLWriter::OutFootEndNotes()
         if( bLFPossible )
             OutNewLine();
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
-        bLFPossible = sal_True;
+        bLFPossible = true;
 
         OSL_ENSURE( !pFmtFtn,
                 "SwHTMLWriter::OutFootEndNotes: Ftn wurde nicht ausgegeben" );
@@ -480,7 +480,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
 
 static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
                                  OUString *pParts,
-                                 sal_Bool bEndNote  )
+                                 bool bEndNote  )
 {
     sal_uInt16 nParts = 0;
     sal_Int16 eFmt = rInfo.aFmt.GetNumberingType();
@@ -552,7 +552,7 @@ void SwHTMLWriter::OutFootEndNoteInfo()
     {
         const SwFtnInfo& rInfo = pDoc->GetFtnInfo();
         OUString aParts[8];
-        sal_uInt16 nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, sal_False );
+        sal_uInt16 nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, false );
         if( rInfo.eNum != FTNNUM_DOC )
         {
             aParts[4] = rInfo.eNum == FTNNUM_CHAPTER ? OUString( "C" ) : OUString( "P" );
@@ -581,7 +581,7 @@ void SwHTMLWriter::OutFootEndNoteInfo()
     {
         const SwEndNoteInfo& rInfo = pDoc->GetEndNoteInfo();
         OUString aParts[4];
-        sal_uInt16 nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, sal_True );
+        sal_uInt16 nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, true );
         if( nParts > 0 )
             lcl_html_outFootEndNoteInfo( *this, aParts, nParts,
                                          OOO_STRING_SVTOOLS_HTML_META_sdendnote );
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 8dfb212dc982..628c6e3aa681 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -170,7 +170,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
         // des Containers uebernommen.
         rFrmItemSet.Put( *pCntnrItemSet );
     }
-    else if( pCSS1Parser->MayBePositioned( rCSS1PropInfo, sal_True ) )
+    else if( pCSS1Parser->MayBePositioned( rCSS1PropInfo, true ) )
     {
         // Wenn die Ausrichtung anhand der CSS1-Optionen gesetzt werden kann
         // werden die benutzt.
@@ -187,9 +187,9 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
 void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                            sal_Int16 eHoriOri,
                                            SfxItemSet& rFrmSet,
-                                           sal_Bool bDontAppend )
+                                           bool bDontAppend )
 {
-    sal_Bool bMoveBackward = sal_False;
+    bool bMoveBackward = false;
     SwFmtAnchor aAnchor( FLY_AS_CHAR );
     sal_Int16 eVertRel = text::RelOrientation::FRAME;
 
@@ -225,7 +225,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
 
         // Einen neuen Absatz aufmachen, wenn der aktuelle
         // absatzgebundene Rahmen ohne Umlauf enthaelt.
-        if( !bDontAppend && HasCurrentParaFlys( sal_True ) )
+        if( !bDontAppend && HasCurrentParaFlys( true ) )
         {
             // Wenn der Absatz nur Grafiken enthaelt, braucht er
             // auch keinen unteren Absatz-Abstand. Da hier auch bei
@@ -233,7 +233,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
             // hier auch geweohnlich attributiert !!!
             sal_uInt16 nUpper=0, nLower=0;
             GetULSpaceFromContext( nUpper, nLower );
-            InsertAttr( SvxULSpaceItem( nUpper, 0, RES_UL_SPACE ), sal_False, sal_True );
+            InsertAttr( SvxULSpaceItem( nUpper, 0, RES_UL_SPACE ), false, true );
 
             AppendTxtNode( AM_NOSPACE );
 
@@ -241,7 +241,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
             {
                 NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, nLower, RES_UL_SPACE ) );
                 aParaAttrs.push_back( aAttrTab.pULSpace );
-                EndAttr( aAttrTab.pULSpace, 0, sal_False );
+                EndAttr( aAttrTab.pULSpace, 0, false );
             }
         }
 
@@ -250,7 +250,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
         if( nCntnt )
         {
             aAnchor.SetType( FLY_AT_CHAR );
-            bMoveBackward = sal_True;
+            bMoveBackward = true;
             eVertOri = text::VertOrientation::CHAR_BOTTOM;
             eVertRel = text::RelOrientation::CHAR;
         }
@@ -316,9 +316,9 @@ void SwHTMLParser::InsertImage()
     long nVSpace=0, nHSpace=0;
 
     sal_uInt16 nBorder = (aAttrTab.pINetFmt ? 1 : 0);
-    sal_Bool bIsMap = sal_False;
-    sal_Bool bPrcWidth = sal_False;
-    sal_Bool bPrcHeight = sal_False;
+    bool bIsMap = false;
+    bool bPrcWidth = false;
+    bool bPrcHeight = false;
     SvxMacroItem aMacroItem(RES_FRMMACRO);
 
     ScriptType eDfltScriptType;
@@ -382,7 +382,7 @@ void SwHTMLParser::InsertImage()
                 nBorder = (sal_uInt16)rOption.GetNumber();
                 break;
             case HTML_O_ISMAP:
-                bIsMap = sal_True;
+                bIsMap = true;
                 break;
             case HTML_O_USEMAP:
                 aMap = rOption.GetString();
@@ -451,7 +451,7 @@ IMAGE_SETEVENT:
             // Rule invalisieren ist noetig, weil zwischem dem einlesen
             // des LI und der Grafik ein EndAction gerufen worden sein kann.
             if( GetNumInfo().GetNumRule() )
-                GetNumInfo().GetNumRule()->SetInvalidRule( sal_True );
+                GetNumInfo().GetNumRule()->SetInvalidRule( true );
 
             // Die Vorlage novh mal setzen. Ist noetig, damit der
             // Erstzeilen-Einzug stimmt.
@@ -534,12 +534,12 @@ IMAGE_SETEVENT:
         case SVX_CSS1_LTYPE_TWIP:
             aTwipSz.Width() = aPropInfo.nWidth;
             nWidth = 1; // != 0
-            bPrcWidth = sal_False;
+            bPrcWidth = false;
             break;
         case SVX_CSS1_LTYPE_PERCENTAGE:
             aTwipSz.Width() = 0;
             nWidth = aPropInfo.nWidth;
-            bPrcWidth = sal_True;
+            bPrcWidth = true;
             break;
         default:
             ;
@@ -549,21 +549,21 @@ IMAGE_SETEVENT:
         case SVX_CSS1_LTYPE_TWIP:
             aTwipSz.Height() = aPropInfo.nHeight;
             nHeight = 1;    // != 0
-            bPrcHeight = sal_False;
+            bPrcHeight = false;
             break;
         case SVX_CSS1_LTYPE_PERCENTAGE:
             aTwipSz.Height() = 0;
             nHeight = aPropInfo.nHeight;
-            bPrcHeight = sal_True;
+            bPrcHeight = true;
             break;
         default:
             ;
     }
 
     Size aGrfSz( 0, 0 );
-    sal_Bool bSetTwipSize = sal_True;       // Twip-Size am Node setzen?
+    bool bSetTwipSize = true;       // Twip-Size am Node setzen?
     bool bChangeFrmSize = false;    // Frame-Format nachtraeglich anpassen?
-    sal_Bool bRequestGrfNow = sal_False;
+    bool bRequestGrfNow = false;
     bool bSetScaleImageMap = false;
     sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
 
@@ -575,7 +575,7 @@ IMAGE_SETEVENT:
         // Tabelle layoutet wird.
         if( pTable!=0 && !nWidth )
         {
-            bRequestGrfNow = sal_True;
+            bRequestGrfNow = true;
             IncGrfsThatResizeTable();
         }
 
@@ -617,7 +617,7 @@ IMAGE_SETEVENT:
     {
         // Breite und Hoehe wurden angegeben und brauchen nicht gesetzt
         // zu werden
-        bSetTwipSize = sal_False;
+        bSetTwipSize = false;
 
         if( bPrcWidth )
             nPrcWidth = (sal_uInt8)nWidth;
@@ -817,8 +817,8 @@ void SwHTMLParser::InsertBodyOptions()
 
     OUString aBackGround, aId, aStyle, aLang, aDir;
     Color aBGColor, aTextColor, aLinkColor, aVLinkColor;
-    sal_Bool bBGColor=sal_False, bTextColor=sal_False;
-    sal_Bool bLinkColor=sal_False, bVLinkColor=sal_False;
+    bool bBGColor=false, bTextColor=false;
+    bool bLinkColor=false, bVLinkColor=false;
 
     ScriptType eDfltScriptType;
     OUString sDfltScriptType;
@@ -830,7 +830,7 @@ void SwHTMLParser::InsertBodyOptions()
         const HTMLOption& rOption = rHTMLOptions[--i];
         ScriptType eScriptType2 = eDfltScriptType;
         OUString aEvent;
-        sal_Bool bSetEvent = sal_False;
+        bool bSetEvent = false;
 
         switch( rOption.GetToken() )
         {
@@ -842,19 +842,19 @@ void SwHTMLParser::InsertBodyOptions()
                 break;
             case HTML_O_BGCOLOR:
                 rOption.GetColor( aBGColor );
-                bBGColor = sal_True;
+                bBGColor = true;
                 break;
             case HTML_O_TEXT:
                 rOption.GetColor( aTextColor );
-                bTextColor = sal_True;
+                bTextColor = true;
                 break;
             case HTML_O_LINK:
                 rOption.GetColor( aLinkColor );
-                bLinkColor = sal_True;
+                bLinkColor = true;
                 break;
             case HTML_O_VLINK:
                 rOption.GetColor( aVLinkColor );
-                bVLinkColor = sal_True;
+                bVLinkColor = true;
                 break;
 
             case HTML_O_SDONLOAD:
@@ -862,7 +862,7 @@ void SwHTMLParser::InsertBodyOptions()
                 //fallthrough
             case HTML_O_ONLOAD:
                 aEvent = GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC );
-                bSetEvent = sal_True;
+                bSetEvent = true;
                 break;
 
             case HTML_O_SDONUNLOAD:
@@ -870,7 +870,7 @@ void SwHTMLParser::InsertBodyOptions()
                 //fallthrough
             case HTML_O_ONUNLOAD:
                 aEvent = GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC );
-                bSetEvent = sal_True;
+                bSetEvent = true;
                 break;
 
             case HTML_O_SDONFOCUS:
@@ -878,7 +878,7 @@ void SwHTMLParser::InsertBodyOptions()
                 //fallthrough
             case HTML_O_ONFOCUS:
                 aEvent = GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC );
-                bSetEvent = sal_True;
+                bSetEvent = true;
                 break;
 
             case HTML_O_SDONBLUR:
@@ -886,7 +886,7 @@ void SwHTMLParser::InsertBodyOptions()
                 //fallthrough
             case HTML_O_ONBLUR:
                 aEvent = GlobalEventConfig::GetEventName( STR_EVENT_DEACTIVATEDOC );
-                bSetEvent = sal_True;
+                bSetEvent = true;
                 break;
 
             case HTML_O_ONERROR:
@@ -894,7 +894,7 @@ void SwHTMLParser::InsertBodyOptions()
 
             case HTML_O_STYLE:
                 aStyle = rOption.GetString();
-                bTextColor = sal_True;
+                bTextColor = true;
                 break;
             case HTML_O_LANG:
                 aLang = rOption.GetString();
@@ -924,7 +924,7 @@ void SwHTMLParser::InsertBodyOptions()
     // Die Item fuer die Seitenvorlage vorbereiten (Hintergrund, Umrandung)
     // Beim BrushItem muessen schon gesetzte werte erhalten bleiben!
     SvxBrushItem aBrushItem( pCSS1Parser->GetPageDescBackground() );
-    sal_Bool bSetBrush = sal_False;
+    bool bSetBrush = false;
 
     if( bBGColor && !pCSS1Parser->IsBodyBGColorSet() )
     {
@@ -941,7 +941,7 @@ void SwHTMLParser::InsertBodyOptions()
             aBrushItem.SetGraphicLink( aLink );
             aBrushItem.SetGraphicPos( ePos );
         }
-        bSetBrush = sal_True;
+        bSetBrush = true;
         pCSS1Parser->SetBodyBGColorSet();
     }
 
@@ -950,7 +950,7 @@ void SwHTMLParser::InsertBodyOptions()
         // Hintergrundgrafik aus "BACKGROUND"
         aBrushItem.SetGraphicLink( INetURLObject::GetAbsURL( sBaseURL, aBackGround ) );
         aBrushItem.SetGraphicPos( GPOS_TILED );
-        bSetBrush = sal_True;
+        bSetBrush = true;
         pCSS1Parser->SetBodyBackgroundSet();
     }
 
@@ -1055,7 +1055,7 @@ void SwHTMLParser::NewAnchor()
     SvxMacroTableDtor aMacroTbl;
     OUString sHRef, aName, sTarget;
     OUString aId, aStyle, aClass, aLang, aDir;
-    sal_Bool bHasHRef = sal_False, bFixed = sal_False;
+    bool bHasHRef = false, bFixed = false;
 
     ScriptType eDfltScriptType;
     OUString sDfltScriptType;
@@ -1075,7 +1075,7 @@ void SwHTMLParser::NewAnchor()
 
             case HTML_O_HREF:
                 sHRef = rOption.GetString();
-                bHasHRef = sal_True;
+                bHasHRef = true;
                 break;
             case HTML_O_TARGET:
                 sTarget = rOption.GetString();
@@ -1091,7 +1091,7 @@ void SwHTMLParser::NewAnchor()
                 aClass = rOption.GetString();
                 break;
             case HTML_O_SDFIXED:
-                bFixed = sal_True;
+                bFixed = true;
                 break;
             case HTML_O_LANG:
                 aLang = rOption.GetString();
@@ -1165,26 +1165,26 @@ ANCHOR_SETEVENT:
     // einen neuen Kontext anlegen
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_ANCHOR_ON );
 
-    sal_Bool bEnAnchor = sal_False, bFtnAnchor = sal_False, bFtnEnSymbol = sal_False;
+    bool bEnAnchor = false, bFtnAnchor = false, bFtnEnSymbol = false;
     OUString aFtnName;
     OUString aStrippedClass( aClass );
-    SwCSS1Parser::GetScriptFromClass( aStrippedClass, sal_False );
+    SwCSS1Parser::GetScriptFromClass( aStrippedClass, false );
     if( aStrippedClass.getLength() >=9  && bHasHRef && sHRef.getLength() > 1 &&
         ('s' == aStrippedClass[0] || 'S' == aStrippedClass[0]) &&
         ('d' == aStrippedClass[1] || 'D' == aStrippedClass[1]) )
     {
         if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote_anc ) )
-            bEnAnchor = sal_True;
+            bEnAnchor = true;
         else if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ) )
-            bFtnAnchor = sal_True;
+            bFtnAnchor = true;
         else if( aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote_sym ) ||
                  aStrippedClass.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ) )
-            bFtnEnSymbol = sal_True;
+            bFtnEnSymbol = true;
         if( bEnAnchor || bFtnAnchor || bFtnEnSymbol )
         {
             aFtnName = sHRef.copy( 1 );
             aClass = aStrippedClass = aName = aEmptyOUStr;
-            bHasHRef = sal_False;
+            bHasHRef = false;
         }
     }
 
@@ -1197,7 +1197,7 @@ ANCHOR_SETEVENT:
         if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
             DoPositioning( aItemSet, aPropInfo, pCntxt );
-            InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+            InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
         }
     }
 
@@ -1267,9 +1267,9 @@ void SwHTMLParser::InsertBookmark( const OUString& rName )
     aSetAttrTab.push_back( pTmp );
 }
 
-sal_Bool SwHTMLParser::HasCurrentParaBookmarks( sal_Bool bIgnoreStack ) const
+bool SwHTMLParser::HasCurrentParaBookmarks( bool bIgnoreStack ) const
 {
-    sal_Bool bHasMarks = sal_False;
+    bool bHasMarks = false;
     sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
 
     // first step: are there still bookmark in the attribute-stack?
@@ -1284,7 +1284,7 @@ sal_Bool SwHTMLParser::HasCurrentParaBookmarks( sal_Bool bIgnoreStack ) const
             if( RES_FLTR_BOOKMARK == pAttr->pItem->Which() )
             {
                 if( pAttr->GetSttParaIdx() == nNodeIdx )
-                    bHasMarks = sal_True;
+                    bHasMarks = true;
                 break;
             }
         }
@@ -1303,7 +1303,7 @@ sal_Bool SwHTMLParser::HasCurrentParaBookmarks( sal_Bool bIgnoreStack ) const
             const sal_uLong nBookNdIdx = pBookmark->GetMarkPos().nNode.GetIndex();
             if( nBookNdIdx==nNodeIdx )
             {
-                bHasMarks = sal_True;
+                bHasMarks = true;
                 break;
             }
             else if( nBookNdIdx > nNodeIdx )
@@ -1318,7 +1318,7 @@ sal_Bool SwHTMLParser::HasCurrentParaBookmarks( sal_Bool bIgnoreStack ) const
 
 void SwHTMLParser::StripTrailingPara()
 {
-    sal_Bool bSetSmallFont = sal_False;
+    bool bSetSmallFont = false;
 
     SwCntntNode* pCNd = pPam->GetCntntNode();
     if( !pPam->GetPoint()->nContent.GetIndex() )
@@ -1343,7 +1343,7 @@ void SwHTMLParser::StripTrailingPara()
                     return;     // den Knoten duerfen wir nicht loeschen
             }
 
-            SetAttr( sal_False );   // die noch offenen Attribute muessen
+            SetAttr( false );   // die noch offenen Attribute muessen
                                 // beendet werden, bevor der Node
                                 // geloescht wird, weil sonst der
                                 // End-Index in die Botanik zeigt
@@ -1402,7 +1402,7 @@ void SwHTMLParser::StripTrailingPara()
             // In leeren Zellen stellen wir einen kleinen Font ein, damit die
             // Zelle nicht hoeher wird als die Grafik bzw. so niedrig wie
             // moeglich bleibt.
-            bSetSmallFont = sal_True;
+            bSetSmallFont = true;
         }
     }
     else if( pCNd && pCNd->IsTxtNode() && pTable &&
@@ -1411,7 +1411,7 @@ void SwHTMLParser::StripTrailingPara()
     {
         // Wenn die Zelle nur zeichengebundene Grafiken/Rahmen enthaelt
         // stellen wir ebenfalls einen kleinen Font ein.
-        bSetSmallFont = sal_True;
+        bSetSmallFont = true;
         SwTxtNode* pTxtNd = pCNd->GetTxtNode();
 
         sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 10d5b8249298..7580afb0b9cb 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -41,7 +41,7 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
     {
         pNumRule = 0;
         nDeep = 0;
-        bNumbered = bRestart = sal_False;
+        bNumbered = bRestart = false;
     }
 }
 
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index b5a97c477a89..e3f826d5850e 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -38,8 +38,8 @@ class SwHTMLNumRuleInfo
     sal_uInt16      aNumStarts[MAXLEVEL];
     SwNumRule   *   pNumRule;       // Aktuelle Numerierung
     sal_uInt16      nDeep;          // aktuelle Num-Tiefe (1, 2, 3, ...)
-    sal_Bool        bRestart : 1;   // Export: Numerierung neu starten
-    sal_Bool        bNumbered : 1;  // Export: Absatz ist numeriert
+    bool        bRestart : 1;   // Export: Numerierung neu starten
+    bool        bNumbered : 1;  // Export: Absatz ist numeriert
 
 public:
 
@@ -48,7 +48,7 @@ public:
 
     SwHTMLNumRuleInfo() :
         pNumRule( 0 ), nDeep( 0 ),
-        bRestart( sal_False ), bNumbered( sal_False )
+        bRestart( false ), bNumbered( false )
     {
         memset( &aNumStarts, 0xff, sizeof( aNumStarts ) );
     }
@@ -75,11 +75,11 @@ public:
     sal_uInt16 DecDepth() { return nDeep==0 ? 0 : --nDeep; }
     inline sal_uInt8 GetLevel() const;
 
-    void SetRestart( sal_Bool bSet ) { bRestart = bSet; }
-    sal_Bool IsRestart() const { return bRestart; }
+    void SetRestart( bool bSet ) { bRestart = bSet; }
+    bool IsRestart() const { return bRestart; }
 
-    void SetNumbered( sal_Bool bSet ) { bNumbered = bSet; }
-    sal_Bool IsNumbered() const { return bNumbered; }
+    void SetNumbered( bool bSet ) { bNumbered = bSet; }
+    bool IsNumbered() const { return bNumbered; }
 
     inline void SetNodeStartValue( sal_uInt8 nLvl, sal_uInt16 nVal=USHRT_MAX );
     sal_uInt16 GetNodeStartValue( sal_uInt8 nLvl ) const { return aNumStarts[nLvl]; }
@@ -105,7 +105,7 @@ inline void SwHTMLNumRuleInfo::Clear()
 {
     pNumRule = 0;
     nDeep = 0;
-    bRestart = bNumbered = sal_False;
+    bRestart = bNumbered = false;
     memset( &aNumStarts, 0xff, sizeof( aNumStarts ) );
 }
 
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 235ed2ef97f2..f56d3b168bdf 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -57,9 +57,9 @@ void SwHTMLParser::NewNumBulList( int nToken )
     SwHTMLNumRuleInfo& rInfo = GetNumInfo();
 
     // Erstmal einen neuen Absatz aufmachen
-    sal_Bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 0;
+    bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 0;
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, sal_False );
+        AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
     else if( bSpace )
         AddParSpace();
 
@@ -77,8 +77,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
 
     // das Format anpassen, falls es fuer den Level noch nicht
     // geschehen ist!
-    sal_Bool bNewNumFmt = rInfo.GetNumRule()->GetNumFmt( nLevel ) == 0;
-    sal_Bool bChangeNumFmt = sal_False;
+    bool bNewNumFmt = rInfo.GetNumRule()->GetNumFmt( nLevel ) == 0;
+    bool bChangeNumFmt = false;
 
     // das default Numerierungsformat erstellen
     SwNumFmt aNumFmt( rInfo.GetNumRule()->Get(nLevel) );
@@ -120,7 +120,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
         aNumFmt.SetFirstLineOffset( nFirstLineIndent );
         aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(nChrFmtPoolId) );
 
-        bChangeNumFmt = sal_True;
+        bChangeNumFmt = true;
     }
     else if( 1 != aNumFmt.GetStart() )
     {
@@ -149,21 +149,21 @@ void SwHTMLParser::NewNumBulList( int nToken )
                 switch( nToken )
                 {
                 case HTML_ORDERLIST_ON:
-                    bChangeNumFmt = sal_True;
+                    bChangeNumFmt = true;
                     switch( rOption.GetString()[0] )
                     {
                     case 'A':   aNumFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
                     case 'a':   aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
                     case 'I':   aNumFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);        break;
                     case 'i':   aNumFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);        break;
-                    default:    bChangeNumFmt = sal_False;
+                    default:    bChangeNumFmt = false;
                     }
                     break;
 
                 case HTML_UNORDERLIST_ON:
                     aNumFmt.SetBulletChar( (sal_Unicode)rOption.GetEnum(
                                     aHTMLULTypeTable,aNumFmt.GetBulletChar() ) );
-                    bChangeNumFmt = sal_True;
+                    bChangeNumFmt = true;
                     break;
                 }
             }
@@ -174,7 +174,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
                 if( bNewNumFmt )
                 {
                     aNumFmt.SetStart( nStart );
-                    bChangeNumFmt = sal_True;
+                    bChangeNumFmt = true;
                 }
                 else
                 {
@@ -244,7 +244,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
         // Und noch die Grafik merken, um sie in den Absaetzen nicht
         // einzufuegen
         aBulletGrfs[nLevel] = aBulletSrc;
-        bChangeNumFmt = sal_True;
+        bChangeNumFmt = true;
     }
     else
         aBulletGrfs[nLevel] = "";
@@ -284,7 +284,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
                         nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.nLeftMargin;
 
                     aNumFmt.SetAbsLSpace( nAbsLSpace );
-                    bChangeNumFmt = sal_True;
+                    bChangeNumFmt = true;
                 }
                 if( aPropInfo.bTextIndent )
                 {
@@ -292,10 +292,10 @@ void SwHTMLParser::NewNumBulList( int nToken )
                         ((const SvxLRSpaceItem &)aItemSet.Get( RES_LR_SPACE ))
                                                         .GetTxtFirstLineOfst();
                     aNumFmt.SetFirstLineOffset( nTextIndent );
-                    bChangeNumFmt = sal_True;
+                    bChangeNumFmt = true;
                 }
             }
-            aPropInfo.bLeftMargin = aPropInfo.bTextIndent = sal_False;
+            aPropInfo.bLeftMargin = aPropInfo.bTextIndent = false;
             if( !aPropInfo.bRightMargin )
                 aItemSet.ClearItem( RES_LR_SPACE );
 
@@ -306,7 +306,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
             {
                 rInfo.GetNumRule()->Set( nLevel, aNumFmt );
                 pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
-                bChangeNumFmt = sal_False;
+                bChangeNumFmt = false;
             }
 
             DoPositioning( aItemSet, aPropInfo, pCntxt );
@@ -335,7 +335,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
     // - der aktuelle nicht leer ist, also Text oder absatzgebundene Objekte
     //   enthaelt.
     // - der aktuelle Absatz numeriert ist.
-    sal_Bool bAppend = pPam->GetPoint()->nContent.GetIndex() > 0;
+    bool bAppend = pPam->GetPoint()->nContent.GetIndex() > 0;
     if( !bAppend )
     {
         SwTxtNode* pTxtNode = pPam->GetNode()->GetTxtNode();
@@ -345,9 +345,9 @@ void SwHTMLParser::EndNumBulList( int nToken )
             HasCurrentParaFlys();
     }
 
-    sal_Bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 1;
+    bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 1;
     if( bAppend )
-        AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, sal_False );
+        AppendTxtNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
     else if( bSpace )
         AddParSpace();
 
@@ -364,7 +364,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
             // Die noch nicht angepassten Formate werden jetzt noch
             // angepasst, damit es sich besser Editieren laesst.
             const SwNumFmt *pRefNumFmt = 0;
-            sal_Bool bChanged = sal_False;
+            bool bChanged = false;
             for( sal_uInt16 i=0; i<MAXLEVEL; i++ )
             {
                 const SwNumFmt *pNumFmt = rInfo.GetNumRule()->GetNumFmt(i);
@@ -390,7 +390,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
                     aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT );
                     aNumFmt.SetCharFmt( pRefNumFmt->GetCharFmt() );
                     rInfo.GetNumRule()->Set( i, aNumFmt );
-                    bChanged = sal_True;
+                    bChanged = true;
                 }
             }
             if( bChanged )
@@ -411,12 +411,12 @@ void SwHTMLParser::EndNumBulList( int nToken )
     }
 
     // und noch Attribute beenden
-    sal_Bool bSetAttrs = sal_False;
+    bool bSetAttrs = false;
     if( pCntxt )
     {
         EndContext( pCntxt );
         delete pCntxt;
-        bSetAttrs = sal_True;
+        bSetAttrs = true;
     }
 
     if( nToken )
@@ -466,7 +466,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
 
     // einen neuen Absatz aufmachen
     if( pPam->GetPoint()->nContent.GetIndex() )
-        AppendTxtNode( AM_NOSPACE, sal_False );
+        AppendTxtNode( AM_NOSPACE, false );
     bNoParSpace = false;    // In <LI> wird kein Abstand eingefuegt!
 
     const bool bCountedInList( HTML_LISTHEADER_ON==nToken ? false : true );
@@ -527,7 +527,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
     }
 
     if( GetNumInfo().GetNumRule() )
-        GetNumInfo().GetNumRule()->SetInvalidRule( sal_True );
+        GetNumInfo().GetNumRule()->SetInvalidRule( true );
 
     // Styles parsen
     if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
@@ -551,8 +551,8 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
     ShowStatline();
 }
 
-void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl,
-                                      sal_Bool /*bLastPara*/ )
+void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
+                                      bool /*bLastPara*/ )
 {
     // einen neuen Absatz aufmachen
     if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
@@ -612,7 +612,7 @@ void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
 
     // NumRule invalidieren, weil sie durch ein EndAction bereits
     // auf valid geschaltet worden sein kann.
-    GetNumInfo().GetNumRule()->SetInvalidRule( sal_False );
+    GetNumInfo().GetNumRule()->SetInvalidRule( false );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 0191dfb783ba..8296f8d971a3 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -97,14 +97,14 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                                  const SwHTMLNumRuleInfo& rInfo )
 {
     SwHTMLNumRuleInfo& rPrevInfo = rWrt.GetNumInfo();
-    sal_Bool bSameRule = rPrevInfo.GetNumRule() == rInfo.GetNumRule();
+    bool bSameRule = rPrevInfo.GetNumRule() == rInfo.GetNumRule();
     if( bSameRule && rPrevInfo.GetDepth() >= rInfo.GetDepth() &&
         !rInfo.IsRestart() )
     {
         return rWrt;
     }
 
-    sal_Bool bStartValue = sal_False;
+    bool bStartValue = false;
     if( !bSameRule && rInfo.GetDepth() )
     {
         OUString aName( rInfo.GetNumRule()->GetName() );
@@ -118,7 +118,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                 // If it's a numbering rule, the current number should be
                 // exported as start value, but only if there are no nodes
                 // within the numbering that have a lower level
-                bStartValue = sal_True;
+                bStartValue = true;
                 if( rInfo.GetDepth() > 1 )
                 {
                     sal_uLong nPos =
@@ -143,7 +143,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                             {
                                 // node is numbered, but level is lower
                                 // => check completed
-                                bStartValue = sal_False;
+                                bStartValue = false;
                                 break;
                             }
                             nPos++;
@@ -278,7 +278,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
                                const SwHTMLNumRuleInfo& rNextInfo )
 {
     SwHTMLNumRuleInfo& rInfo = rWrt.GetNumInfo();
-    sal_Bool bSameRule = rNextInfo.GetNumRule() == rInfo.GetNumRule();
+    bool bSameRule = rNextInfo.GetNumRule() == rInfo.GetNumRule();
     if( bSameRule && rNextInfo.GetDepth() >= rInfo.GetDepth() &&
         !rNextInfo.IsRestart() )
     {
@@ -306,7 +306,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
         else
             pStr = OOO_STRING_SVTOOLS_HTML_orderlist;
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, false );
-        rWrt.bLFPossible = sal_True;
+        rWrt.bLFPossible = true;
     }
 
     return rWrt;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index f124b6b991a0..7d3c898fe202 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -121,7 +121,7 @@ const sal_uLong HTML_FRMOPTS_OLE_CSS1       =
 
 void SwHTMLParser::SetFixSize( const Size& rPixSize,
                                const Size& rTwipDfltSize,
-                               sal_Bool bPrcWidth, sal_Bool bPrcHeight,
+                               bool bPrcWidth, bool bPrcHeight,
                                SfxItemSet& /*rCSS1ItemSet*/,
                                SvxCSS1PropertyInfo& rCSS1PropInfo,
                                SfxItemSet& rFlyItemSet )
@@ -226,12 +226,12 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
         if( rCSS1PropInfo.bLeftMargin )
         {
             nLeftSpace = aLRItem.GetLeft();
-            rCSS1PropInfo.bLeftMargin = sal_False;
+            rCSS1PropInfo.bLeftMargin = false;
         }
         if( rCSS1PropInfo.bRightMargin )
         {
             nRightSpace = aLRItem.GetRight();
-            rCSS1PropInfo.bRightMargin = sal_False;
+            rCSS1PropInfo.bRightMargin = false;
         }
         rCSS1ItemSet.ClearItem( RES_LR_SPACE );
     }
@@ -262,12 +262,12 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
         if( rCSS1PropInfo.bTopMargin )
         {
             nUpperSpace = pULItem->GetUpper();
-            rCSS1PropInfo.bTopMargin = sal_False;
+            rCSS1PropInfo.bTopMargin = false;
         }
         if( rCSS1PropInfo.bBottomMargin )
         {
             nLowerSpace = pULItem->GetLower();
-            rCSS1PropInfo.bBottomMargin = sal_False;
+            rCSS1PropInfo.bBottomMargin = false;
         }
         rCSS1ItemSet.ClearItem( RES_UL_SPACE );
     }
@@ -296,7 +296,7 @@ void SwHTMLParser::InsertEmbed()
     OUString aURL, aType, aName, aAlt, aId, aStyle, aClass;
     Size aSize( USHRT_MAX, USHRT_MAX );
     Size aSpace( USHRT_MAX, USHRT_MAX );
-    sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False, bHidden = sal_False;
+    bool bPrcWidth = false, bPrcHeight = false, bHidden = false;
     sal_Int16 eVertOri = text::VertOrientation::NONE;
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
     SvCommandList aCmdLst;
@@ -394,7 +394,7 @@ void SwHTMLParser::InsertEmbed()
         // Size (0,0) wird in SetFrmSize auf (MINFLY, MINFLY) umgebogen
         aSize.Width() = 0; aSize.Height() = 0;
         aSpace.Width() = 0; aSpace.Height() = 0;
-        bPrcWidth = bPrcHeight = sal_False;
+        bPrcWidth = bPrcHeight = false;
     }
 
     // die URL aufbereiten
@@ -493,8 +493,8 @@ void SwHTMLParser::NewObject()
     sal_Int16 eVertOri = text::VertOrientation::TOP;
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
 
-    sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False,
-             bDeclare = sal_False;
+    bool bPrcWidth = false, bPrcHeight = false,
+             bDeclare = false;
     // Eine neue Command-List anlegen
     delete pAppletImpl;
     pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(),
@@ -516,7 +516,7 @@ void SwHTMLParser::NewObject()
             aClass = rOption.GetString();
             break;
         case HTML_O_DECLARE:
-            bDeclare = sal_True;
+            bDeclare = true;
             break;
         case HTML_O_CLASSID:
             aClassID = rOption.GetString();
@@ -577,7 +577,7 @@ void SwHTMLParser::NewObject()
 
     // Objects that are declared only are not evaluated. Moreover, only
     // Java applets are supported.
-    sal_Bool bIsApplet = sal_False;
+    bool bIsApplet = false;
 
     if( !bDeclare && aClassID.getLength() == 42 &&
         aClassID.startsWith("clsid:") )
@@ -660,7 +660,7 @@ void SwHTMLParser::InsertApplet()
     OUString aCodeBase, aCode, aName, aAlt, aId, aStyle, aClass;
     Size aSize( USHRT_MAX, USHRT_MAX );
     Size aSpace( 0, 0 );
-    sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False, bMayScript = sal_False;
+    bool bPrcWidth = false, bPrcHeight = false, bMayScript = false;
     sal_Int16 eVertOri = text::VertOrientation::TOP;
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
 
@@ -714,7 +714,7 @@ void SwHTMLParser::InsertApplet()
             aSpace.Height() = (long)rOption.GetNumber();
             break;
         case HTML_O_MAYSCRIPT:
-            bMayScript = sal_True;
+            bMayScript = true;
             break;
         }
 
@@ -820,7 +820,7 @@ void SwHTMLParser::InsertFloatingFrame()
     OUString aAlt, aId, aStyle, aClass;
     Size aSize( USHRT_MAX, USHRT_MAX );
     Size aSpace( 0, 0 );
-    sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False;
+    bool bPrcWidth = false, bPrcHeight = false;
     sal_Int16 eVertOri = text::VertOrientation::TOP;
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
 
@@ -885,7 +885,7 @@ void SwHTMLParser::InsertFloatingFrame()
             {
                 OUString aName = aFrameDesc.GetName();
                 ScrollingMode eScroll = aFrameDesc.GetScrollingMode();
-                sal_Bool bHasBorder = aFrameDesc.HasFrameBorder();
+                bool bHasBorder = aFrameDesc.HasFrameBorder();
                 Size aMargin = aFrameDesc.GetMargin();
 
                 xSet->setPropertyValue("FrameURL", uno::makeAny( OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) );
@@ -893,10 +893,10 @@ void SwHTMLParser::InsertFloatingFrame()
 
                 if ( eScroll == ScrollingAuto )
                     xSet->setPropertyValue("FrameIsAutoScroll",
-                        uno::makeAny( sal_True ) );
+                        uno::makeAny( true ) );
                 else
                     xSet->setPropertyValue("FrameIsScrollingMode",
-                        uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
+                        uno::makeAny( eScroll == ScrollingYes ) );
 
                 xSet->setPropertyValue("FrameIsBorder",
                         uno::makeAny( bHasBorder ) );
@@ -976,7 +976,7 @@ sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
 }
 
 Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
-                               sal_Bool bInCntnr )
+                               bool bInCntnr )
 {
     SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
 
@@ -995,7 +995,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         return rWrt;
 
     uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
-    sal_Bool bHiddenEmbed = sal_False;
+    bool bHiddenEmbed = false;
 
     if( !xSet.is() )
     {
@@ -1007,7 +1007,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
     // wenn meoglich vor dem "Objekt" einen Zeilen-Umbruch ausgeben
     if( rHTMLWrt.bLFPossible )
-        rHTMLWrt.OutNewLine( sal_True );
+        rHTMLWrt.OutNewLine( true );
 
     if( !rFrmFmt.GetName().isEmpty() )
         rHTMLWrt.OutImplicitMark( rFrmFmt.GetName(),
@@ -1056,7 +1056,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             // Das Plugin ist HIDDEN
             sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden);
             nFrmOpts = HTML_FRMOPTS_HIDDEN_EMBED;
-            bHiddenEmbed = sal_True;
+            bHiddenEmbed = true;
         }
         else
         {
@@ -1109,7 +1109,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             sOut.append('\"');
         }
 
-        sal_Bool bScript = sal_False;
+        bool bScript = false;
         aAny = xSet->getPropertyValue("AppletIsScript");
         aAny >>= bScript;
         if( bScript )
@@ -1160,7 +1160,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
         {
             const SvCommand& rCommand = aCommands[ --i ];
             const OUString& rName = rCommand.GetCommand();
-            sal_uInt16 nType = SwApplet_Impl::GetOptionType( rName, sal_True );
+            sal_uInt16 nType = SwApplet_Impl::GetOptionType( rName, true );
             if( SWHTML_OPTTYPE_TAG == nType )
             {
                 const OUString& rValue = rCommand.GetArgument();
@@ -1218,7 +1218,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             const SvCommand& rCommand = aCommands[ i ];
             const OUString& rName = rCommand.GetCommand();
 
-            if( SwApplet_Impl::GetOptionType( rName, sal_False ) == SWHTML_OPTTYPE_TAG )
+            if( SwApplet_Impl::GetOptionType( rName, false ) == SWHTML_OPTTYPE_TAG )
             {
                 const OUString& rValue = rCommand.GetArgument();
                 rWrt.Strm().WriteChar( ' ' );
@@ -1245,7 +1245,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 }
 
 Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
-                                  sal_Bool bInCntnr )
+                                  bool bInCntnr )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 36676e929881..b943098bf10f 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -68,7 +68,7 @@ void SwHTMLParser::NewDivision( int nToken )
     SvxAdjust eAdjust = HTML_CENTER_ON==nToken ? SVX_ADJUST_CENTER
                                                : SVX_ADJUST_END;
 
-    sal_Bool bHeader=sal_False, bFooter=sal_False;
+    bool bHeader=false, bFooter=false;
     const HTMLOptions& rHTMLOptions = GetOptions();
     for (size_t i = rHTMLOptions.size(); i; )
     {
@@ -102,24 +102,24 @@ void SwHTMLParser::NewDivision( int nToken )
             {
                 const OUString& rType = rOption.GetString();
                 if( rType.equalsIgnoreAsciiCase("header") )
-                    bHeader = sal_True;
+                    bHeader = true;
                 else if( rType.equalsIgnoreAsciiCase("footer") )
-                    bFooter = sal_True;
+                    bFooter = true;
             }
         }
     }
 
-    sal_Bool bAppended = sal_False;
+    bool bAppended = false;
     if( pPam->GetPoint()->nContent.GetIndex() )
     {
         AppendTxtNode( bHeader||bFooter||!aId.isEmpty()|| !aHRef.isEmpty() ? AM_NORMAL
                                                                 : AM_NOSPACE );
-        bAppended = sal_True;
+        bAppended = true;
     }
 
     _HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
 
-    sal_Bool bStyleParsed = sal_False, bPositioned = sal_False;
+    bool bStyleParsed = false, bPositioned = false;
     SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
     SvxCSS1PropertyInfo aPropInfo;
     if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
@@ -148,7 +148,7 @@ void SwHTMLParser::NewDivision( int nToken )
         SwFrmFmt& rPageFmt = pPageDesc->GetMaster();
 
         SwFrmFmt *pHdFtFmt;
-        sal_Bool bNew = sal_False;
+        bool bNew = false;
         sal_uInt16 nFlags = CONTEXT_FLAGS_HDRFTR;
         if( bHeader )
         {
@@ -156,9 +156,9 @@ void SwHTMLParser::NewDivision( int nToken )
             if( !pHdFtFmt )
             {
                 // noch keine Header, dann erzeuge einen.
-                rPageFmt.SetFmtAttr( SwFmtHeader( sal_True ));
+                rPageFmt.SetFmtAttr( SwFmtHeader( true ));
                 pHdFtFmt = (SwFrmFmt*)rPageFmt.GetHeader().GetHeaderFmt();
-                bNew = sal_True;
+                bNew = true;
             }
             nFlags |= HTML_CNTXT_HEADER_DIST;
         }
@@ -168,9 +168,9 @@ void SwHTMLParser::NewDivision( int nToken )
             if( !pHdFtFmt )
             {
                 // noch keine Footer, dann erzeuge einen.
-                rPageFmt.SetFmtAttr( SwFmtFooter( sal_True ));
+                rPageFmt.SetFmtAttr( SwFmtFooter( true ));
                 pHdFtFmt = (SwFrmFmt*)rPageFmt.GetFooter().GetFooterFmt();
-                bNew = sal_True;
+                bNew = true;
             }
             nFlags |= HTML_CNTXT_FOOTER_DIST;
         }
@@ -219,11 +219,11 @@ void SwHTMLParser::NewDivision( int nToken )
              (aId[0] == 's' || aId[0] == 'S' ) &&
              (aId[1] == 'd' || aId[1] == 'D' ) )
     {
-        sal_Bool bEndNote = sal_False, bFootNote = sal_False;
+        bool bEndNote = false, bFootNote = false;
         if( aId.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdendnote ) )
-            bEndNote = sal_True;
+            bEndNote = true;
         else if( aId.startsWithIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_sdfootnote ) )
-            bFootNote = sal_True;
+            bFootNote = true;
         if( bFootNote || bEndNote )
         {
             SwNodeIndex *pStartNdIdx = GetFootEndNoteSection( aId );
@@ -255,11 +255,11 @@ void SwHTMLParser::NewDivision( int nToken )
             if (aPrvNdIdx.GetNode().IsSectionNode())
             {
                 AppendTxtNode();
-                bAppended = sal_True;
+                bAppended = true;
             }
         }
         _HTMLAttrs *pPostIts = bAppended ? 0 : new _HTMLAttrs;
-        SetAttr( sal_True, sal_True, pPostIts );
+        SetAttr( true, true, pPostIts );
 
         // Namen der Section eindeutig machen
         const OUString aName( pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : 0 ) );
@@ -349,7 +349,7 @@ void SwHTMLParser::NewDivision( int nToken )
         // (ersten) Node des Bereich verschieben.
         if( pOldTxtNd )
             MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
-                               sal_True  );
+                               true  );
 
         if( pPostIts )
         {
@@ -360,7 +360,7 @@ void SwHTMLParser::NewDivision( int nToken )
             pPostIts = 0;
         }
 
-        pCntxt->SetSpansSection( sal_True );
+        pCntxt->SetSpansSection( true );
 
         // keine text::Bookmarks mit dem gleichen Namen wie Bereiche einfuegen
         if( !aPropInfo.aId.isEmpty() && aPropInfo.aId==aName )
@@ -378,7 +378,7 @@ void SwHTMLParser::NewDivision( int nToken )
 
     // Style parsen
     if( bStyleParsed )
-        InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+        InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
 
     PushContext( pCntxt );
 }
@@ -411,7 +411,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ )
     }
 }
 
-void SwHTMLParser::FixHeaderFooterDistance( sal_Bool bHeader,
+void SwHTMLParser::FixHeaderFooterDistance( bool bHeader,
                                             const SwPosition *pOldPos )
 {
     SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc();
@@ -502,7 +502,7 @@ void SwHTMLParser::FixHeaderFooterDistance( sal_Bool bHeader,
     pHdFtFmt->SetFmtAttr( aULSpace );
 }
 
-sal_Bool SwHTMLParser::EndSection( sal_Bool bLFStripped )
+bool SwHTMLParser::EndSection( bool bLFStripped )
 {
     SwEndNode *pEndNd = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()+1]
                             ->GetEndNode();
@@ -512,26 +512,26 @@ sal_Bool SwHTMLParser::EndSection( sal_Bool bLFStripped )
         if( !bLFStripped )
             StripTrailingPara();
         pPam->Move( fnMoveForward );
-        return sal_True;
+        return true;
     }
 
     OSL_ENSURE( !this, "Falsche PaM Position Beenden eines Bereichs" );
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool SwHTMLParser::EndSections( sal_Bool bLFStripped )
+bool SwHTMLParser::EndSections( bool bLFStripped )
 {
-    sal_Bool bSectionClosed = sal_False;
+    bool bSectionClosed = false;
     sal_uInt16 nPos = aContexts.size();
     while( nPos>nContextStMin )
     {
         _HTMLAttrContext *pCntxt = aContexts[--nPos];
         if( pCntxt->GetSpansSection() && EndSection( bLFStripped ) )
         {
-            bSectionClosed = sal_True;
-            pCntxt->SetSpansSection( sal_False );
-            bLFStripped = sal_False;
+            bSectionClosed = true;
+            pCntxt->SetSpansSection( false );
+            bLFStripped = false;
         }
     }
 
@@ -544,7 +544,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
     OUString aStyle, aClass, aLang, aDir;
     long nWidth = 100;
     sal_uInt16 nCols = columnsFromCss, nGutter = 10;
-    sal_Bool bPrcWidth = sal_True;
+    bool bPrcWidth = true;
 
     const HTMLOptions& rHTMLOptions = GetOptions();
     for (size_t i = rHTMLOptions.size(); i; )
@@ -587,13 +587,13 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
 
     //.is the multicol elememt contained in a container? That may be the
     // case for 5.0 documents.
-    sal_Bool bInCntnr = sal_False;
+    bool bInCntnr = false;
     sal_uInt16 i = aContexts.size();
     while( !bInCntnr && i > nContextStMin )
         bInCntnr = 0 != aContexts[--i]->GetFrmItemSet();
 
     // Parse style sheets, but don't position anything by now.
-    sal_Bool bStyleParsed = sal_False;
+    bool bStyleParsed = false;
     SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
     SvxCSS1PropertyInfo aPropInfo;
     if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
@@ -614,8 +614,8 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         nTwipWidth = MINFLY;
 
     // Do positioning.
-    sal_Bool bPositioned = sal_False;
-    if( bInCntnr || pCSS1Parser->MayBePositioned( aPropInfo, sal_True ) )
+    bool bPositioned = false;
+    if( bInCntnr || pCSS1Parser->MayBePositioned( aPropInfo, true ) )
     {
         SfxItemSet aFrmItemSet( pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
@@ -649,17 +649,17 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
 
         InsertFlyFrame( aFrmItemSet, pCntxt, aFlyName, CONTEXT_FLAGS_ABSPOS );
 
-        pCntxt->SetPopStack( sal_True );
-        bPositioned = sal_True;
+        pCntxt->SetPopStack( true );
+        bPositioned = true;
     }
 
-    sal_Bool bAppended = sal_False;
+    bool bAppended = false;
     if( !bPositioned )
     {
         if( pPam->GetPoint()->nContent.GetIndex() )
         {
             AppendTxtNode( AM_SPACE );
-            bAppended = sal_True;
+            bAppended = true;
         }
         else
         {
@@ -679,11 +679,11 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
             if (aPrvNdIdx.GetNode().IsSectionNode())
             {
                 AppendTxtNode();
-                bAppended = sal_True;
+                bAppended = true;
             }
         }
         _HTMLAttrs *pPostIts = bAppended ? 0 : new _HTMLAttrs;
-        SetAttr( sal_True, sal_True, pPostIts );
+        SetAttr( true, true, pPostIts );
 
         // Make section name unique.
         OUString aName( pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : 0 ) );
@@ -738,7 +738,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         // to the section's first node.
         if( pOldTxtNd )
             MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(),
-                               sal_True  );
+                               true  );
 
         if( pPostIts )
         {
@@ -748,7 +748,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
             pPostIts = 0;
         }
 
-        pCntxt->SetSpansSection( sal_True );
+        pCntxt->SetSpansSection( true );
 
         // Insert a bookmark if its name differs from the section's name only.
         if( !aPropInfo.aId.isEmpty() && aPropInfo.aId==aName )
@@ -757,7 +757,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
 
     // Additional attributes must be set as hard ones.
     if( bStyleParsed )
-        InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+        InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
 
     PushContext( pCntxt );
 }
@@ -790,7 +790,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
 
 void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
                                       sal_uLong nDestIdx,
-                                      sal_Bool bFmtBreak )
+                                      bool bFmtBreak )
 {
     SwCntntNode* pDestCntntNd =
         pDoc->GetNodes()[nDestIdx]->GetCntntNode();
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 3e6024e438f5..a2969cc8e62e 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -87,9 +87,9 @@ struct HTMLTableOptions
     HTMLTableFrame eFrame;
     HTMLTableRules eRules;
 
-    sal_Bool bPrcWidth : 1;
-    sal_Bool bTableAdjust : 1;
-    sal_Bool bBGColor : 1;
+    bool bPrcWidth : 1;
+    bool bTableAdjust : 1;
+    bool bBGColor : 1;
 
     Color aBorderColor;
     Color aBGColor;
@@ -110,9 +110,9 @@ class _HTMLTableContext
     sal_uInt16 nContextStAttrMin;
     sal_uInt16 nContextStMin;
 
-    sal_Bool    bRestartPRE : 1;
-    sal_Bool    bRestartXMP : 1;
-    sal_Bool    bRestartListing : 1;
+    bool    bRestartPRE : 1;
+    bool    bRestartXMP : 1;
+    bool    bRestartListing : 1;
 
 public:
 
@@ -125,9 +125,9 @@ public:
         pPos( pPs ),
         nContextStAttrMin( nCntxtStAttrMin ),
         nContextStMin( nCntxtStMin ),
-        bRestartPRE( sal_False ),
-        bRestartXMP( sal_False ),
-        bRestartListing( sal_False )
+        bRestartPRE( false ),
+        bRestartXMP( false ),
+        bRestartListing( false )
     {
         memset( &aAttrTab, 0, sizeof( _HTMLAttrTable ));
     }
@@ -165,7 +165,7 @@ class HTMLTableCnts
 
     SwHTMLTableLayoutCnts* pLayoutInfo;
 
-    sal_Bool bNoBreak;
+    bool bNoBreak;
 
     void InitCtor();
 
@@ -190,7 +190,7 @@ public:
 
     inline void SetTableBox( SwTableBox *pBox );
 
-    void SetNoBreak() { bNoBreak = sal_True; }
+    void SetNoBreak() { bNoBreak = true; }
 
     SwHTMLTableLayoutCnts *CreateLayoutInfo();
 };
@@ -211,12 +211,12 @@ class HTMLTableCell
     sal_uInt16 nWidth;                  // cell WIDTH
     double nValue;
     sal_Int16 eVertOri;         // vertical alignment of the cell
-    sal_Bool bProtected : 1;            // cell must not filled
-    sal_Bool bRelWidth : 1;             // nWidth is given in %
-    sal_Bool bHasNumFmt : 1;
-    sal_Bool bHasValue : 1;
-    sal_Bool bNoWrap : 1;
-    sal_Bool mbCovered : 1;
+    bool bProtected : 1;            // cell must not filled
+    bool bRelWidth : 1;             // nWidth is given in %
+    bool bHasNumFmt : 1;
+    bool bHasValue : 1;
+    bool bNoWrap : 1;
+    bool mbCovered : 1;
 
 public:
 
@@ -228,8 +228,8 @@ public:
     void Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
               sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
               ::boost::shared_ptr<SvxBoxItem> const pBoxItem,
-              sal_Bool bHasNumFmt, sal_uInt32 nNumFmt,
-              sal_Bool bHasValue, double nValue, sal_Bool bNoWrap, sal_Bool bCovered );
+              bool bHasNumFmt, sal_uInt32 nNumFmt,
+              bool bHasValue, double nValue, bool bNoWrap, bool bCovered );
 
     // Protect an empty 1x1 cell
     void SetProtected();
@@ -245,13 +245,13 @@ public:
     void SetColSpan( sal_uInt16 nCSpan ) { nColSpan = nCSpan; }
     sal_uInt16 GetColSpan() const { return nColSpan; }
 
-    inline void SetWidth( sal_uInt16 nWidth, sal_Bool bRelWidth );
+    inline void SetWidth( sal_uInt16 nWidth, bool bRelWidth );
 
     const SvxBrushItem *GetBGBrush() const { return pBGBrush; }
     ::boost::shared_ptr<SvxBoxItem> GetBoxItem() const { return m_pBoxItem; }
 
-    inline sal_Bool GetNumFmt( sal_uInt32& rNumFmt ) const;
-    inline sal_Bool GetValue( double& rValue ) const;
+    inline bool GetNumFmt( sal_uInt32& rNumFmt ) const;
+    inline bool GetValue( double& rValue ) const;
 
     sal_Int16 GetVertOri() const { return eVertOri; }
 
@@ -260,7 +260,7 @@ public:
 
     SwHTMLTableLayoutCell *CreateLayoutInfo();
 
-    sal_Bool IsCovered() const { return mbCovered; }
+    bool IsCovered() const { return mbCovered; }
 };
 
 // Row of a HTML table
@@ -270,7 +270,7 @@ class HTMLTableRow
 {
     HTMLTableCells *pCells;             // cells of the row
 
-    sal_Bool bIsEndOfGroup : 1;
+    bool bIsEndOfGroup : 1;
 
     sal_uInt16 nHeight;                     // options of <TR>/<TD>
     sal_uInt16 nEmptyRows;                  // number of empty rows are following
@@ -301,14 +301,14 @@ public:
     void SetBGBrush( SvxBrushItem *pBrush ) { pBGBrush = pBrush; }
     const SvxBrushItem *GetBGBrush() const { return pBGBrush; }
 
-    inline void SetEndOfGroup() { bIsEndOfGroup = sal_True; }
-    inline sal_Bool IsEndOfGroup() const { return bIsEndOfGroup; }
+    inline void SetEndOfGroup() { bIsEndOfGroup = true; }
+    inline bool IsEndOfGroup() const { return bIsEndOfGroup; }
 
     void IncEmptyRows() { nEmptyRows++; }
     sal_uInt16 GetEmptyRows() const { return nEmptyRows; }
 
     // Expand row by adding empty cells
-    void Expand( sal_uInt16 nCells, sal_Bool bOneCell=sal_False );
+    void Expand( sal_uInt16 nCells, bool bOneCell=false );
 
     // Shrink row by deleting empty cells
     void Shrink( sal_uInt16 nCells );
@@ -317,17 +317,17 @@ public:
 // Column of a HTML table
 class HTMLTableColumn
 {
-    sal_Bool bIsEndOfGroup;
+    bool bIsEndOfGroup;
 
     sal_uInt16 nWidth;                      // options of <COL>
-    sal_Bool bRelWidth;
+    bool bRelWidth;
 
     SvxAdjust eAdjust;
     sal_Int16 eVertOri;
 
     SwFrmFmt *aFrmFmts[6];
 
-    inline sal_uInt16 GetFrmFmtIdx( sal_Bool bBorderLine,
+    inline sal_uInt16 GetFrmFmtIdx( bool bBorderLine,
                                 sal_Int16 eVertOri ) const;
 
 public:
@@ -336,7 +336,7 @@ public:
 
     HTMLTableColumn();
 
-    inline void SetWidth( sal_uInt16 nWidth, sal_Bool bRelWidth);
+    inline void SetWidth( sal_uInt16 nWidth, bool bRelWidth);
 
     inline void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; }
     inline SvxAdjust GetAdjust() const { return eAdjust; }
@@ -344,12 +344,12 @@ public:
     inline void SetVertOri( sal_Int16 eV) { eVertOri = eV; }
     inline sal_Int16 GetVertOri() const { return eVertOri; }
 
-    inline void SetEndOfGroup() { bIsEndOfGroup = sal_True; }
-    inline sal_Bool IsEndOfGroup() const { return bIsEndOfGroup; }
+    inline void SetEndOfGroup() { bIsEndOfGroup = true; }
+    inline bool IsEndOfGroup() const { return bIsEndOfGroup; }
 
-    inline void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bBorderLine,
+    inline void SetFrmFmt( SwFrmFmt *pFmt, bool bBorderLine,
                            sal_Int16 eVertOri );
-    inline SwFrmFmt *GetFrmFmt( sal_Bool bBorderLine,
+    inline SwFrmFmt *GetFrmFmt( bool bBorderLine,
                                 sal_Int16 eVertOri ) const;
 
     SwHTMLTableLayoutColumn *CreateLayoutInfo();
@@ -421,15 +421,15 @@ class HTMLTable
     bool bInhLeftBorder;
     bool bInhRightBorder;
     bool bBordersSet;               // die Umrandung wurde bereits gesetzt
-    sal_Bool bForceFrame;
-    sal_Bool bTableAdjustOfTag;         // stammt nTableAdjust aus <TABLE>?
+    bool bForceFrame;
+    bool bTableAdjustOfTag;         // stammt nTableAdjust aus <TABLE>?
     sal_uInt32 nHeadlineRepeat;         // repeating rows
-    sal_Bool bIsParentHead;
-    sal_Bool bHasParentSection;
-    sal_Bool bHasToFly;
-    sal_Bool bFixedCols;
+    bool bIsParentHead;
+    bool bHasParentSection;
+    bool bHasToFly;
+    bool bFixedCols;
     bool bColSpec;                  // Gab es COL(GROUP)-Elemente?
-    sal_Bool bPrcWidth;                 // Breite ist eine %-Angabe
+    bool bPrcWidth;                 // Breite ist eine %-Angabe
 
     SwHTMLParser *pParser;          // der aktuelle Parser
     HTMLTable *pTopTable;           // die Tabelle auf dem Top-Level
@@ -447,7 +447,7 @@ class HTMLTable
     sal_uInt16 nBorder;                 // Breite der auesseren Umrandung
     HTMLTableFrame eFrame;          // Rahmen um die Tabelle
     HTMLTableRules eRules;          // Ramhen in der Tabelle
-    sal_Bool bTopCaption;               // Ueberschrift ueber der Tabelle
+    bool bTopCaption;               // Ueberschrift ueber der Tabelle
 
     void InitCtor( const HTMLTableOptions *pOptions );
 
@@ -465,15 +465,15 @@ class HTMLTable
     const SwStartNode* GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 nCell ) const;
 
     sal_uInt16 GetTopCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
-                            sal_Bool bSwBorders=sal_True ) const;
+                            bool bSwBorders=true ) const;
     sal_uInt16 GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
-                               sal_Bool bSwBorders=sal_True ) const;
+                               bool bSwBorders=true ) const;
 
     // Anpassen des frame::Frame-Formates einer Box
     void FixFrameFmt( SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
                       sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
-                      sal_Bool bFirstPara=sal_True, sal_Bool bLastPara=sal_True ) const;
-    void FixFillerFrameFmt( SwTableBox *pBox, sal_Bool bRight ) const;
+                      bool bFirstPara=true, bool bLastPara=true ) const;
+    void FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const;
 
     // den Inhalt (Lines/Boxen) eine Tabelle erstellen
     void _MakeTable( SwTableBox *pUpper=0 );
@@ -500,7 +500,7 @@ class HTMLTable
     void InheritBorders( const HTMLTable *pParent,
                          sal_uInt16 nRow, sal_uInt16 nCol,
                          sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
-                         sal_Bool bFirstPara, sal_Bool bLastPara );
+                         bool bFirstPara, bool bLastPara );
 
     // Linke und rechte Umrandung der umgebenen Tabelle erben
     void InheritVertBorders( const HTMLTable *pParent,
@@ -516,15 +516,15 @@ class HTMLTable
     const SvxBrushItem *GetInhBGBrush() const { return pInhBGBrush; }
 
     sal_uInt16 GetBorderWidth( const SvxBorderLine& rBLine,
-                           sal_Bool bWithDistance=sal_False ) const;
+                           bool bWithDistance=false ) const;
 
 public:
 
-    sal_Bool bFirstCell;                // wurde schon eine Zelle angelegt?
+    bool bFirstCell;                // wurde schon eine Zelle angelegt?
 
     HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
-               sal_Bool bParHead, sal_Bool bHasParentSec,
-               sal_Bool bHasToFly,
+               bool bParHead, bool bHasParentSec,
+               bool bHasToFly,
                const HTMLTableOptions *pOptions );
 
     ~HTMLTable();
@@ -533,11 +533,11 @@ public:
     inline HTMLTableCell *GetCell( sal_uInt16 nRow, sal_uInt16 nCell ) const;
 
     // Ueberschrift setzen/ermitteln
-    inline void SetCaption( const SwStartNode *pStNd, sal_Bool bTop );
+    inline void SetCaption( const SwStartNode *pStNd, bool bTop );
     const SwStartNode *GetCaptionStartNode() const { return pCaptionStartNode; }
-    sal_Bool IsTopCaption() const { return bTopCaption; }
+    bool IsTopCaption() const { return bTopCaption; }
 
-    SvxAdjust GetTableAdjust( sal_Bool bAny ) const
+    SvxAdjust GetTableAdjust( bool bAny ) const
     {
         return (bTableAdjustOfTag || bAny) ? eTableAdjust : SVX_ADJUST_END;
     }
@@ -551,19 +551,19 @@ public:
 
     // Einfuegen einer Zelle an der aktuellen Position
     void InsertCell( HTMLTableCnts *pCnts, sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
-                     sal_uInt16 nWidth, sal_Bool bRelWidth, sal_uInt16 nHeight,
+                     sal_uInt16 nWidth, bool bRelWidth, sal_uInt16 nHeight,
                      sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
                      boost::shared_ptr<SvxBoxItem> const pBoxItem,
-                     sal_Bool bHasNumFmt, sal_uInt32 nNumFmt,
-                     sal_Bool bHasValue, double nValue, sal_Bool bNoWrap );
+                     bool bHasNumFmt, sal_uInt32 nNumFmt,
+                     bool bHasValue, double nValue, bool bNoWrap );
 
     // Start/Ende einer neuen Zeile bekanntgeben
     void OpenRow( SvxAdjust eAdjust, sal_Int16 eVertOri,
                   SvxBrushItem *pBGBrush );
-    void CloseRow( sal_Bool bEmpty );
+    void CloseRow( bool bEmpty );
 
     // Ende einer neuen Section bekanntgeben
-    inline void CloseSection( sal_Bool bHead );
+    inline void CloseSection( bool bHead );
 
     // Ende einer Spalten-Gruppe bekanntgeben
     inline void CloseColGroup( sal_uInt16 nSpan, sal_uInt16 nWidth, bool bRelWidth,
@@ -581,23 +581,23 @@ public:
                     sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0,
                     sal_uInt16 nAbsRightSpace=0, sal_uInt16 nInhAbsSpace=0 );
 
-    inline sal_Bool IsNewDoc() const { return pParser->IsNewDoc(); }
+    inline bool IsNewDoc() const { return pParser->IsNewDoc(); }
 
-    void SetHasParentSection( sal_Bool bSet ) { bHasParentSection = bSet; }
-    sal_Bool HasParentSection() const { return bHasParentSection; }
+    void SetHasParentSection( bool bSet ) { bHasParentSection = bSet; }
+    bool HasParentSection() const { return bHasParentSection; }
 
     void SetParentContents( HTMLTableCnts *pCnts ) { pParentContents = pCnts; }
     HTMLTableCnts *GetParentContents() const { return pParentContents; }
 
     void MakeParentContents();
 
-    sal_Bool GetIsParentHeader() const { return bIsParentHead; }
+    bool GetIsParentHeader() const { return bIsParentHead; }
 
-    sal_Bool HasToFly() const { return bHasToFly; }
+    bool HasToFly() const { return bHasToFly; }
 
     void SetTable( const SwStartNode *pStNd, _HTMLTableContext *pCntxt,
                    sal_uInt16 nLeft, sal_uInt16 nRight,
-                   const SwTable *pSwTab=0, sal_Bool bFrcFrame=sal_False );
+                   const SwTable *pSwTab=0, bool bFrcFrame=false );
 
     _HTMLTableContext *GetContext() const { return pContext; }
 
@@ -619,7 +619,7 @@ public:
     const OUString& GetDirection() const { return aDir; }
 
     void IncBoxCount() { nBoxes++; }
-    sal_Bool IsOverflowing() const { return nBoxes > 64000; }
+    bool IsOverflowing() const { return nBoxes > 64000; }
 };
 
 void HTMLTableCnts::InitCtor()
@@ -627,7 +627,7 @@ void HTMLTableCnts::InitCtor()
     pNext = 0;
     pLayoutInfo = 0;
 
-    bNoBreak = sal_False;
+    bNoBreak = false;
 }
 
 HTMLTableCnts::HTMLTableCnts( const SwStartNode* pStNd ):
@@ -688,12 +688,12 @@ HTMLTableCell::HTMLTableCell():
     nWidth( 0 ),
     nValue(0),
     eVertOri( text::VertOrientation::NONE ),
-    bProtected(sal_False),
-    bRelWidth( sal_False ),
-    bHasNumFmt(sal_False),
-    bHasValue(sal_False),
-    bNoWrap(sal_False),
-    mbCovered(sal_False)
+    bProtected(false),
+    bRelWidth( false ),
+    bHasNumFmt(false),
+    bHasValue(false),
+    bNoWrap(false),
+    mbCovered(false)
 {}
 
 HTMLTableCell::~HTMLTableCell()
@@ -710,13 +710,13 @@ HTMLTableCell::~HTMLTableCell()
 void HTMLTableCell::Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
                          sal_Int16 eVert, SvxBrushItem *pBrush,
                          ::boost::shared_ptr<SvxBoxItem> const pBoxItem,
-                         sal_Bool bHasNF, sal_uInt32 nNF, sal_Bool bHasV, double nVal,
-                         sal_Bool bNWrap, sal_Bool bCovered )
+                         bool bHasNF, sal_uInt32 nNF, bool bHasV, double nVal,
+                         bool bNWrap, bool bCovered )
 {
     pContents = pCnts;
     nRowSpan = nRSpan;
     nColSpan = nCSpan;
-    bProtected = sal_False;
+    bProtected = false;
     eVertOri = eVert;
     pBGBrush = pBrush;
     m_pBoxItem = pBoxItem;
@@ -730,7 +730,7 @@ void HTMLTableCell::Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCS
     mbCovered = bCovered;
 }
 
-inline void HTMLTableCell::SetWidth( sal_uInt16 nWdth, sal_Bool bRelWdth )
+inline void HTMLTableCell::SetWidth( sal_uInt16 nWdth, bool bRelWdth )
 {
     nWidth = nWdth;
     bRelWidth = bRelWdth;
@@ -750,16 +750,16 @@ void HTMLTableCell::SetProtected()
 
     nRowSpan = 1;
     nColSpan = 1;
-    bProtected = sal_True;
+    bProtected = true;
 }
 
-inline sal_Bool HTMLTableCell::GetNumFmt( sal_uInt32& rNumFmt ) const
+inline bool HTMLTableCell::GetNumFmt( sal_uInt32& rNumFmt ) const
 {
     rNumFmt = nNumFmt;
     return bHasNumFmt;
 }
 
-inline sal_Bool HTMLTableCell::GetValue( double& rValue ) const
+inline bool HTMLTableCell::GetValue( double& rValue ) const
 {
     rValue = nValue;
     return bHasValue;
@@ -775,7 +775,7 @@ SwHTMLTableLayoutCell *HTMLTableCell::CreateLayoutInfo()
 
 HTMLTableRow::HTMLTableRow( sal_uInt16 nCells ):
     pCells(new HTMLTableCells),
-    bIsEndOfGroup(sal_False),
+    bIsEndOfGroup(false),
     nHeight(0),
     nEmptyRows(0),
     eAdjust(SVX_ADJUST_END),
@@ -811,7 +811,7 @@ inline HTMLTableCell *HTMLTableRow::GetCell( sal_uInt16 nCell ) const
     return &(*pCells)[nCell];
 }
 
-void HTMLTableRow::Expand( sal_uInt16 nCells, sal_Bool bOneCell )
+void HTMLTableRow::Expand( sal_uInt16 nCells, bool bOneCell )
 {
     // die Zeile wird mit einer einzigen Zelle aufgefuellt, wenn
     // bOneCell gesetzt ist. Das geht, nur fuer Zeilen, in die keine
@@ -872,8 +872,8 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
 }
 
 HTMLTableColumn::HTMLTableColumn():
-    bIsEndOfGroup(sal_False),
-    nWidth(0), bRelWidth(sal_False),
+    bIsEndOfGroup(false),
+    nWidth(0), bRelWidth(false),
     eAdjust(SVX_ADJUST_END), eVertOri(text::VertOrientation::TOP),
     bLeftBorder(false)
 {
@@ -881,7 +881,7 @@ HTMLTableColumn::HTMLTableColumn():
         aFrmFmts[i] = 0;
 }
 
-inline void HTMLTableColumn::SetWidth( sal_uInt16 nWdth, sal_Bool bRelWdth )
+inline void HTMLTableColumn::SetWidth( sal_uInt16 nWdth, bool bRelWdth )
 {
     if( bRelWidth==bRelWdth )
     {
@@ -898,7 +898,7 @@ inline SwHTMLTableLayoutColumn *HTMLTableColumn::CreateLayoutInfo()
     return new SwHTMLTableLayoutColumn( nWidth, bRelWidth, bLeftBorder );
 }
 
-inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( sal_Bool bBorderLine,
+inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( bool bBorderLine,
                                              sal_Int16 eVertOrient ) const
 {
     OSL_ENSURE( text::VertOrientation::TOP != eVertOrient, "Top ist nicht erlaubt" );
@@ -913,13 +913,13 @@ inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( sal_Bool bBorderLine,
     return n;
 }
 
-inline void HTMLTableColumn::SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bBorderLine,
+inline void HTMLTableColumn::SetFrmFmt( SwFrmFmt *pFmt, bool bBorderLine,
                                         sal_Int16 eVertOrient )
 {
     aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)] = pFmt;
 }
 
-inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( sal_Bool bBorderLine,
+inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( bool bBorderLine,
                                              sal_Int16 eVertOrient ) const
 {
     return aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)];
@@ -948,7 +948,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
     bFillerTopBorder = false; bFillerBottomBorder = false;
     bInhLeftBorder = false; bInhRightBorder = false;
     bBordersSet = false;
-    bForceFrame = sal_False;
+    bForceFrame = false;
     nHeadlineRepeat = 0;
 
     nLeftMargin = 0;
@@ -1052,8 +1052,8 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
 }
 
 HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
-                      sal_Bool bParHead,
-                      sal_Bool bHasParentSec, sal_Bool bHasToFlw,
+                      bool bParHead,
+                      bool bHasParentSec, bool bHasToFlw,
                       const HTMLTableOptions *pOptions ) :
     nCols( pOptions->nCols ),
     nFilledCols( 0 ),
@@ -1076,7 +1076,7 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
     eVertOri( pOptions->eVertOri ),
     eFrame( pOptions->eFrame ),
     eRules( pOptions->eRules ),
-    bTopCaption( sal_False ),
+    bTopCaption( false ),
     bFirstCell( !pTopTab )
 {
     InitCtor( pOptions );
@@ -1105,11 +1105,11 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
 {
     sal_uInt16 nW = bPrcWidth ? nWidth : pParser->ToTwips( nWidth );
 
-    sal_uInt16 nBorderWidth = GetBorderWidth( aBorderLine, sal_True );
+    sal_uInt16 nBorderWidth = GetBorderWidth( aBorderLine, true );
     sal_uInt16 nLeftBorderWidth =
-        ((*pColumns)[0]).bLeftBorder ? GetBorderWidth( aLeftBorderLine, sal_True ) : 0;
+        ((*pColumns)[0]).bLeftBorder ? GetBorderWidth( aLeftBorderLine, true ) : 0;
     sal_uInt16 nRightBorderWidth =
-        bRightBorder ? GetBorderWidth( aRightBorderLine, sal_True ) : 0;
+        bRightBorder ? GetBorderWidth( aRightBorderLine, true ) : 0;
     sal_uInt16 nInhLeftBorderWidth = 0;
     sal_uInt16 nInhRightBorderWidth = 0;
 
@@ -1122,7 +1122,7 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
                         nBorderWidth, nLeftBorderWidth, nRightBorderWidth,
                         nInhLeftBorderWidth, nInhRightBorderWidth );
 
-    sal_Bool bExportable = sal_True;
+    bool bExportable = true;
     sal_uInt16 i;
     for( i=0; i<nRows; i++ )
     {
@@ -1153,7 +1153,7 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
     return pLayoutInfo;
 }
 
-inline void HTMLTable::SetCaption( const SwStartNode *pStNd, sal_Bool bTop )
+inline void HTMLTable::SetCaption( const SwStartNode *pStNd, bool bTop )
 {
     pCaptionStartNode = pStNd;
     bTopCaption = bTop;
@@ -1244,7 +1244,7 @@ const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 n
                : pPrevCnts->GetTable()->GetPrevBoxStartNode( USHRT_MAX, USHRT_MAX ) );
 }
 
-static sal_Bool IsBoxEmpty( const SwTableBox *pBox )
+static bool IsBoxEmpty( const SwTableBox *pBox )
 {
     const SwStartNode *pSttNd = pBox->GetSttNd();
     if( pSttNd &&
@@ -1253,14 +1253,14 @@ static sal_Bool IsBoxEmpty( const SwTableBox *pBox )
         const SwCntntNode *pCNd =
             pSttNd->GetNodes()[pSttNd->GetIndex()+1]->GetCntntNode();
         if( pCNd && !pCNd->Len() )
-            return sal_True;
+            return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 sal_uInt16 HTMLTable::GetTopCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
-                                   sal_Bool bSwBorders ) const
+                                   bool bSwBorders ) const
 {
     sal_uInt16 nSpace = nCellPadding;
 
@@ -1270,7 +1270,7 @@ sal_uInt16 HTMLTable::GetTopCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
         if( bSwBorders )
         {
             sal_uInt16 nTopBorderWidth =
-                GetBorderWidth( aTopBorderLine, sal_True );
+                GetBorderWidth( aTopBorderLine, true );
             if( nSpace < nTopBorderWidth )
                 nSpace = nTopBorderWidth;
         }
@@ -1290,7 +1290,7 @@ sal_uInt16 HTMLTable::GetTopCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
 }
 
 sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
-                                      sal_Bool bSwBorders ) const
+                                      bool bSwBorders ) const
 {
     sal_uInt16 nSpace = nCellSpacing + nCellPadding;
 
@@ -1301,7 +1301,7 @@ sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
         if( bSwBorders )
         {
             sal_uInt16 nBottomBorderWidth =
-                GetBorderWidth( aBottomBorderLine, sal_True );
+                GetBorderWidth( aBottomBorderLine, true );
             if( nSpace < nBottomBorderWidth )
                 nSpace = nBottomBorderWidth;
         }
@@ -1310,13 +1310,13 @@ sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
     {
         if( (*pRows)[nRow+nRowSpan+1].bBottomBorder )
         {
-            sal_uInt16 nBorderWidth = GetBorderWidth( aBorderLine, sal_True );
+            sal_uInt16 nBorderWidth = GetBorderWidth( aBorderLine, true );
             if( nSpace < nBorderWidth )
                 nSpace = nBorderWidth;
         }
         else if( nRow==0 && bTopBorder && nSpace < MIN_BORDER_DIST )
         {
-            OSL_ENSURE( GetBorderWidth( aTopBorderLine, sal_True ) > 0,
+            OSL_ENSURE( GetBorderWidth( aTopBorderLine, true ) > 0,
                     "GetBottomCellSpace: |aTopLine| == 0" );
             OSL_ENSURE( !nCellPadding, "GetBottomCellSpace: CELLPADDING!=0" );
             // Wenn die Gegenueberliegende Seite umrandet ist muessen
@@ -1333,17 +1333,17 @@ sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
 void HTMLTable::FixFrameFmt( SwTableBox *pBox,
                              sal_uInt16 nRow, sal_uInt16 nCol,
                              sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
-                             sal_Bool bFirstPara, sal_Bool bLastPara ) const
+                             bool bFirstPara, bool bLastPara ) const
 {
     SwFrmFmt *pFrmFmt = 0;      // frame::Frame-Format
     sal_Int16 eVOri = text::VertOrientation::NONE;
     const SvxBrushItem *pBGBrushItem = 0;   // Hintergrund
     boost::shared_ptr<SvxBoxItem> pBoxItem;
-    sal_Bool bTopLine = sal_False, bBottomLine = sal_False, bLastBottomLine = sal_False;
-    sal_Bool bReUsable = sal_False;     // Format nochmals verwendbar?
+    bool bTopLine = false, bBottomLine = false, bLastBottomLine = false;
+    bool bReUsable = false;     // Format nochmals verwendbar?
     sal_uInt16 nEmptyRows = 0;
-    sal_Bool bHasNumFmt = sal_False;
-    sal_Bool bHasValue = sal_False;
+    bool bHasNumFmt = false;
+    bool bHasValue = false;
     sal_uInt32 nNumFmt = 0;
     double nValue = 0.0;
 
@@ -1381,9 +1381,9 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
         {
             nEmptyRows = (*pRows)[nRow+nRowSpan-1].GetEmptyRows();
             if( nRow+nRowSpan == nRows )
-                bLastBottomLine = sal_True;
+                bLastBottomLine = true;
             else
-                bBottomLine = sal_True;
+                bBottomLine = true;
         }
 
         eVOri = pCell->GetVertOri();
@@ -1415,7 +1415,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
         // letzen Absatz der Zelle handelt)
         if( pBox->GetSttNd() )
         {
-            sal_Bool bSet = (nCellPadding > 0);
+            bool bSet = (nCellPadding > 0);
 
             SvxBoxItem aBoxItem( RES_BOX );
             long nInnerFrmWidth = nFrmWidth;
@@ -1423,12 +1423,12 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
             if( bTopLine )
             {
                 aBoxItem.SetLine( &aTopBorderLine, BOX_LINE_TOP );
-                bSet = sal_True;
+                bSet = true;
             }
             if( bLastBottomLine )
             {
                 aBoxItem.SetLine( &aBottomBorderLine, BOX_LINE_BOTTOM );
-                bSet = sal_True;
+                bSet = true;
             }
             else if( bBottomLine )
             {
@@ -1450,7 +1450,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
                 {
                     aBoxItem.SetLine( &aBorderLine, BOX_LINE_BOTTOM );
                 }
-                bSet = sal_True;
+                bSet = true;
             }
             if( ((*pColumns)[nCol]).bLeftBorder )
             {
@@ -1458,13 +1458,13 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
                     0==nCol ? aLeftBorderLine : aBorderLine;
                 aBoxItem.SetLine( &rBorderLine, BOX_LINE_LEFT );
                 nInnerFrmWidth -= GetBorderWidth( rBorderLine );
-                bSet = sal_True;
+                bSet = true;
             }
             if( nCol+nColSpan == nCols && bRightBorder )
             {
                 aBoxItem.SetLine( &aRightBorderLine, BOX_LINE_RIGHT );
                 nInnerFrmWidth -= GetBorderWidth( aRightBorderLine );
-                bSet = sal_True;
+                bSet = true;
             }
 
             if (pBoxItem)
@@ -1497,7 +1497,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
             // Format nur setzten, wenn es auch einen Value gibt oder die Box leer ist.
             if( bHasNumFmt && (bHasValue || IsBoxEmpty(pBox)) )
             {
-                sal_Bool bLock = pFrmFmt->GetDoc()->GetNumberFormatter()
+                bool bLock = pFrmFmt->GetDoc()->GetNumberFormatter()
                                      ->IsTextFormat( nNumFmt );
                 SfxItemSet aItemSet( *pFrmFmt->GetAttrSet().GetPool(),
                                      RES_BOXATR_FORMAT, RES_BOXATR_VALUE );
@@ -1565,7 +1565,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
 
 }
 
-void HTMLTable::FixFillerFrameFmt( SwTableBox *pBox, sal_Bool bRight ) const
+void HTMLTable::FixFillerFrameFmt( SwTableBox *pBox, bool bRight ) const
 {
     SwFrmFmt *pFrmFmt = pBox->ClaimFrmFmt();
 
@@ -1671,8 +1671,8 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
             // Mindesthoehe handelt, kann sie genauso wie in
             // Netscape berechnet werden, also ohne Beruecksichtigung
             // der tatsaechlichen Umrandungsbreite.
-            nRowHeight += GetTopCellSpace( nTopRow, 1, sal_False ) +
-                       GetBottomCellSpace( nTopRow, 1, sal_False );
+            nRowHeight += GetTopCellSpace( nTopRow, 1, false ) +
+                       GetBottomCellSpace( nTopRow, 1, false );
 
             pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) );
         }
@@ -1699,13 +1699,13 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
     {
         sal_uInt16 nCol = nStartCol;
         sal_uInt16 nSplitCol = nRightCol;
-        sal_Bool bSplitted = sal_False;
+        bool bSplitted = false;
         while( !bSplitted )
         {
             OSL_ENSURE( nCol < nRightCol, "Zu weit gelaufen" );
 
             HTMLTableCell *pCell = GetCell(nTopRow,nCol);
-            const sal_Bool bSplit = 1 == pCell->GetColSpan();
+            const bool bSplit = 1 == pCell->GetColSpan();
 
             OSL_ENSURE((nCol != nRightCol-1) || bSplit, "Split-Flag wrong");
             if( bSplit )
@@ -1753,7 +1753,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
                     if ( 1 != nBoxRowSpan )
                         pBox->setRowSpan( nBoxRowSpan );
 
-                    bSplitted = sal_True;
+                    bSplitted = true;
                 }
 
                 OSL_ENSURE( pBox, "Colspan trouble" );
@@ -1809,7 +1809,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
         // mehrere Inhalts Sections: dann brauchen wir eine Box mit Zeilen
         pBox = new SwTableBox( pBoxFmt, 0, pUpper );
         SwTableLines& rLines = pBox->GetTabLines();
-        sal_Bool bFirstPara = sal_True;
+        bool bFirstPara = true;
 
         while( pCnts )
         {
@@ -1854,7 +1854,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
             }
 
             pCnts = pCnts->Next();
-            bFirstPara = sal_False;
+            bFirstPara = false;
         }
     }
 
@@ -1866,7 +1866,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
 void HTMLTable::InheritBorders( const HTMLTable *pParent,
                                 sal_uInt16 nRow, sal_uInt16 nCol,
                                 sal_uInt16 nRowSpan, sal_uInt16 /*nColSpan*/,
-                                sal_Bool bFirstPara, sal_Bool bLastPara )
+                                bool bFirstPara, bool bLastPara )
 {
     OSL_ENSURE( nRows>0 && nCols>0 && nCurRow==nRows,
             "Wurde CloseTable nicht aufgerufen?" );
@@ -1933,7 +1933,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable *pParent,
         bInhRightBorder = true; // erstmal nur merken
         aInhRightBorderLine = pParent->aRightBorderLine;
         nInhRightBorderWidth =
-            GetBorderWidth( aInhRightBorderLine, sal_True ) + MIN_BORDER_DIST;
+            GetBorderWidth( aInhRightBorderLine, true ) + MIN_BORDER_DIST;
     }
 
     if( ((*pParent->pColumns)[nCol]).bLeftBorder )
@@ -1942,7 +1942,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable *pParent,
         aInhLeftBorderLine = 0==nCol ? pParent->aLeftBorderLine
                                      : pParent->aBorderLine;
         nInhLeftBorderWidth =
-            GetBorderWidth( aInhLeftBorderLine, sal_True ) + MIN_BORDER_DIST;
+            GetBorderWidth( aInhLeftBorderLine, true ) + MIN_BORDER_DIST;
     }
 
     if( !bInhLeftBorder && (bFillerTopBorder || bFillerBottomBorder) )
@@ -1993,7 +1993,7 @@ void HTMLTable::SetBorders()
             if( pCell->GetContents()  )
             {
                 HTMLTableCnts *pCnts = pCell->GetContents();
-                sal_Bool bFirstPara = sal_True;
+                bool bFirstPara = true;
                 while( pCnts )
                 {
                     HTMLTable *pTable = pCnts->GetTable();
@@ -2006,7 +2006,7 @@ void HTMLTable::SetBorders()
                                                 0==pCnts->Next() );
                         pTable->SetBorders();
                     }
-                    bFirstPara = sal_False;
+                    bFirstPara = false;
                     pCnts = pCnts->Next();
                 }
             }
@@ -2017,7 +2017,7 @@ void HTMLTable::SetBorders()
 }
 
 sal_uInt16 HTMLTable::GetBorderWidth( const SvxBorderLine& rBLine,
-                                  sal_Bool bWithDistance ) const
+                                  bool bWithDistance ) const
 {
     sal_uInt16 nBorderWidth = rBLine.GetWidth();
     if( bWithDistance )
@@ -2063,11 +2063,11 @@ sal_Int16 HTMLTable::GetInheritedVertOri() const
 
 void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
                             sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
-                            sal_uInt16 nCellWidth, sal_Bool bRelWidth, sal_uInt16 nCellHeight,
+                            sal_uInt16 nCellWidth, bool bRelWidth, sal_uInt16 nCellHeight,
                             sal_Int16 eVertOrient, SvxBrushItem *pBGBrushItem,
                             boost::shared_ptr<SvxBoxItem> const pBoxItem,
-                            sal_Bool bHasNumFmt, sal_uInt32 nNumFmt,
-                            sal_Bool bHasValue, double nValue, sal_Bool bNoWrap )
+                            bool bHasNumFmt, sal_uInt32 nNumFmt,
+                            bool bHasValue, double nValue, bool bNoWrap )
 {
     if( !nRowSpan || (sal_uInt32)nCurRow + nRowSpan > USHRT_MAX )
         nRowSpan = 1;
@@ -2181,7 +2181,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
         nCurCol++;
 }
 
-inline void HTMLTable::CloseSection( sal_Bool bHead )
+inline void HTMLTable::CloseSection( bool bHead )
 {
     // die vorhergende Section beenden, falls es schon eine Zeile gibt
     OSL_ENSURE( nCurRow<=nRows, "ungeultige aktuelle Zeile" );
@@ -2220,7 +2220,7 @@ void HTMLTable::OpenRow( SvxAdjust eAdjust, sal_Int16 eVertOrient,
         nCurCol++;
 }
 
-void HTMLTable::CloseRow( sal_Bool bEmpty )
+void HTMLTable::CloseRow( bool bEmpty )
 {
     OSL_ENSURE( nCurRow<nRows, "aktulle Zeile hinter dem Tabellenende" );
 
@@ -2583,7 +2583,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
 
             pNewBox = NewTableBox( pPrevStNd, pLine );
             rBoxes.push_back( pNewBox );
-            FixFillerFrameFmt( pNewBox, sal_False );
+            FixFillerFrameFmt( pNewBox, false );
             pLayoutInfo->SetLeftFillerBox( pNewBox );
         }
 
@@ -2609,7 +2609,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
             pNewBox = NewTableBox( pStNd, pLine );
             rBoxes.push_back( pNewBox );
 
-            FixFillerFrameFmt( pNewBox, sal_True );
+            FixFillerFrameFmt( pNewBox, true );
             pLayoutInfo->SetRightFillerBox( pNewBox );
         }
     }
@@ -2643,10 +2643,10 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
         ((SwTable *)pSwTable)->SetRowsToRepeat( static_cast< sal_uInt16 >(nHeadlineRepeat) );
         ((SwTable *)pSwTable)->GCLines();
 
-        sal_Bool bIsInFlyFrame = pContext && pContext->GetFrmFmt();
+        bool bIsInFlyFrame = pContext && pContext->GetFrmFmt();
         if( bIsInFlyFrame && !nWidth )
         {
-            SvxAdjust eTblAdjust = GetTableAdjust(sal_False);
+            SvxAdjust eTblAdjust = GetTableAdjust(false);
             if( eTblAdjust != SVX_ADJUST_LEFT &&
                 eTblAdjust != SVX_ADJUST_RIGHT )
             {
@@ -2661,14 +2661,14 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                 SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
                 aFlyFrmSize.SetWidthPercent( 100 );
                 pContext->GetFrmFmt()->SetFmtAttr( aFlyFrmSize );
-                bIsInFlyFrame = sal_False;
+                bIsInFlyFrame = false;
             }
             else
             {
                 // Links und rechts ausgerichtete Tabellen ohne Breite
                 // duerfen leider nicht in der Breite angepasst werden, denn
                 // sie wuerden nur schrumpfen aber nie wachsen.
-                pLayoutInfo->SetMustNotRecalc( sal_True );
+                pLayoutInfo->SetMustNotRecalc( true );
                 if( pContext->GetFrmFmt()->GetAnchor().GetCntntAnchor()
                     ->nNode.GetNode().FindTableNode() )
                 {
@@ -2677,11 +2677,11 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                         nMax = USHRT_MAX;
                     SwFmtFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
                     pContext->GetFrmFmt()->SetFmtAttr( aFlyFrmSize );
-                    bIsInFlyFrame = sal_False;
+                    bIsInFlyFrame = false;
                 }
                 else
                 {
-                    pLayoutInfo->SetMustNotResize( sal_True );
+                    pLayoutInfo->SetMustNotResize( true );
                 }
             }
         }
@@ -2723,7 +2723,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
 
 void HTMLTable::SetTable( const SwStartNode *pStNd, _HTMLTableContext *pCntxt,
                           sal_uInt16 nLeft, sal_uInt16 nRight,
-                          const SwTable *pSwTab, sal_Bool bFrcFrame )
+                          const SwTable *pSwTab, bool bFrcFrame )
 {
     pPrevStNd = pStNd;
     pSwTable = pSwTab;
@@ -2755,7 +2755,7 @@ void HTMLTable::MakeParentContents()
         SetParentContents(
             pParser->InsertTableContents( GetIsParentHeader() ) );
 
-        SetHasParentSection( sal_True );
+        SetHasParentSection( true );
     }
 }
 
@@ -2800,7 +2800,7 @@ const SwStartNode *SwHTMLParser::InsertTableSection
         SwNode *const pNd = & pPam->GetPoint()->nNode.GetNode();
         pNd->GetTxtNode()->ChgFmtColl( pColl );
         pStNd = pNd->FindTableBoxStartNode();
-        pTable->bFirstCell = sal_False;
+        pTable->bFirstCell = false;
     }
     else
     {
@@ -2846,7 +2846,7 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId )
     if( pTable && pTable->bFirstCell )
     {
         pNd->GetTxtNode()->ChgFmtColl( pColl );
-        pTable->bFirstCell = sal_False;
+        pTable->bFirstCell = false;
         pStNd = pNd->FindTableBoxStartNode();
     }
     else
@@ -3085,18 +3085,18 @@ class _CellSaveStruct : public _SectionSaveStruct
     SvxAdjust eAdjust;
     sal_Int16 eVertOri;
 
-    sal_Bool bHead : 1;
-    sal_Bool bPrcWidth : 1;
-    sal_Bool bHasNumFmt : 1;
-    sal_Bool bHasValue : 1;
-    sal_Bool bBGColor : 1;
-    sal_Bool bNoWrap : 1;       // NOWRAP-Option
-    sal_Bool bNoBreak : 1;      // NOBREAK-Tag
+    bool bHead : 1;
+    bool bPrcWidth : 1;
+    bool bHasNumFmt : 1;
+    bool bHasValue : 1;
+    bool bBGColor : 1;
+    bool bNoWrap : 1;       // NOWRAP-Option
+    bool bNoBreak : 1;      // NOBREAK-Tag
 
 public:
 
-    _CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, sal_Bool bHd,
-                     sal_Bool bReadOpt );
+    _CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, bool bHd,
+                     bool bReadOpt );
 
     virtual ~_CellSaveStruct();
 
@@ -3104,11 +3104,11 @@ public:
     HTMLTableCnts *GetFirstContents() { return pCnts; }
 
     void ClearIsInSection() { pCurrCnts = 0; }
-    sal_Bool IsInSection() const { return pCurrCnts!=0; }
+    bool IsInSection() const { return pCurrCnts!=0; }
 
     void InsertCell( SwHTMLParser& rParser, HTMLTable *pCurTable );
 
-    sal_Bool IsHeaderCell() const { return bHead; }
+    bool IsHeaderCell() const { return bHead; }
 
     void StartNoBreak( const SwPosition& rPos );
     void EndNoBreak( const SwPosition& rPos );
@@ -3116,7 +3116,7 @@ public:
 };
 
 _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
-                                  sal_Bool bHd, sal_Bool bReadOpt ) :
+                                  bool bHd, bool bReadOpt ) :
     _SectionSaveStruct( rParser ),
     pCnts( 0 ),
     pCurrCnts( 0 ),
@@ -3131,12 +3131,12 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
     eAdjust( pCurTable->GetInheritedAdjust() ),
     eVertOri( pCurTable->GetInheritedVertOri() ),
     bHead( bHd ),
-    bPrcWidth( sal_False ),
-    bHasNumFmt( sal_False ),
-    bHasValue( sal_False ),
-    bBGColor( sal_False ),
-    bNoWrap( sal_False ),
-    bNoBreak( sal_False )
+    bPrcWidth( false ),
+    bHasNumFmt( false ),
+    bHasValue( false ),
+    bBGColor( false ),
+    bNoWrap( false ),
+    bNoBreak( false )
 {
     OUString aNumFmt, aValue;
 
@@ -3182,7 +3182,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
                 if( !rOption.GetString().isEmpty() )
                 {
                     rOption.GetColor( aBGColor );
-                    bBGColor = sal_True;
+                    bBGColor = true;
                 }
                 break;
             case HTML_O_BACKGROUND:
@@ -3202,14 +3202,14 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
                 break;
             case HTML_O_SDNUM:
                 aNumFmt = rOption.GetString();
-                bHasNumFmt = sal_True;
+                bHasNumFmt = true;
                 break;
             case HTML_O_SDVAL:
-                bHasValue = sal_True;
+                bHasValue = true;
                 aValue = rOption.GetString();
                 break;
             case HTML_O_NOWRAP:
-                bNoWrap = sal_True;
+                bNoWrap = true;
                 break;
             }
         }
@@ -3240,7 +3240,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
         nToken = HTML_TABLEDATA_ON;
         nColl = RES_POOLCOLL_TABLE;
     }
-    _HTMLAttrContext *pCntxt = new _HTMLAttrContext( nToken, nColl, aEmptyOUStr, sal_True );
+    _HTMLAttrContext *pCntxt = new _HTMLAttrContext( nToken, nColl, aEmptyOUStr, true );
     if( SVX_ADJUST_END != eAdjust )
         rParser.InsertAttr( &rParser.aAttrTab.pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST),
                             pCntxt );
@@ -3334,7 +3334,7 @@ void _CellSaveStruct::StartNoBreak( const SwPosition& rPos )
          pCnts->GetStartNode()->GetIndex() + 1 ==
             rPos.nNode.GetIndex()) )
     {
-        bNoBreak = sal_True;
+        bNoBreak = true;
     }
 }
 
@@ -3345,7 +3345,7 @@ void _CellSaveStruct::EndNoBreak( const SwPosition& rPos )
         delete pNoBreakEndParaIdx;
         pNoBreakEndParaIdx = new SwNodeIndex( rPos.nNode );
         nNoBreakEndCntntPos = rPos.nContent.GetIndex();
-        bNoBreak = sal_False;
+        bNoBreak = false;
     }
 }
 
@@ -3386,7 +3386,7 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ )
 }
 
 HTMLTableCnts *SwHTMLParser::InsertTableContents(
-                                        sal_Bool bHead )
+                                        bool bHead )
 {
     // eine neue Section anlegen, der PaM steht dann darin
     const SwStartNode *pStNd =
@@ -3437,8 +3437,8 @@ void SwHTMLParser::RegisterDrawObjectToTable( HTMLTable *pCurTable,
     pCurTable->RegisterDrawObject( pObj, nPrcWidth );
 }
 
-void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
-                                   sal_Bool bHead )
+void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
+                                   bool bHead )
 {
     if( !IsParserWorking() && !pPendStack )
         return;
@@ -3446,7 +3446,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
     _CellSaveStruct* pSaveStruct;
 
     int nToken = 0;
-    sal_Bool bPending = sal_False;
+    bool bPending = false;
     if( pPendStack )
     {
         pSaveStruct = (_CellSaveStruct*)pPendStack->pData;
@@ -3470,7 +3470,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
         if( !pCurTable->GetContext() )
         {
-            sal_Bool bTopTable = pTable==pCurTable;
+            bool bTopTable = pTable==pCurTable;
 
             // die Tabelle besitzt noch keinen Inhalt, d.h. die eigentliche
             // Tabelle muss erst noch angelegt werden
@@ -3490,7 +3490,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
             SfxItemSet aItemSet( pDoc->GetAttrPool(), aWhichIds );
             SvxCSS1PropertyInfo aPropInfo;
 
-            sal_Bool bStyleParsed = ParseStyleOptions( pCurTable->GetStyle(),
+            bool bStyleParsed = ParseStyleOptions( pCurTable->GetStyle(),
                                                    pCurTable->GetId(),
                                                    pCurTable->GetClass(),
                                                    aItemSet, aPropInfo,
@@ -3522,12 +3522,12 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
             // die aktuelle Position an die wir irgendwann zurueckkehren
             SwPosition *pSavePos = 0;
-            sal_Bool bForceFrame = sal_False;
-            sal_Bool bAppended = sal_False;
-            sal_Bool bParentLFStripped = sal_False;
+            bool bForceFrame = false;
+            bool bAppended = false;
+            bool bParentLFStripped = false;
             if( bTopTable )
             {
-                SvxAdjust eTblAdjust = pTable->GetTableAdjust(sal_False);
+                SvxAdjust eTblAdjust = pTable->GetTableAdjust(false);
 
                 // Wenn die Tabelle links oder rechts ausgerivchtet ist,
                 // oder in einen Rahmen soll, dann kommt sie auch in einen
@@ -3542,13 +3542,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                 OSL_ENSURE( !bForceFrame || pCurTable->HasParentSection(),
                         "Tabelle im Rahmen hat keine Umgebung!" );
 
-                sal_Bool bAppend = sal_False;
+                bool bAppend = false;
                 if( bForceFrame )
                 {
                     // Wenn die Tabelle in einen Rahmen kommt, muss
                     // nur ein neuer Absatz aufgemacht werden, wenn
                     // der Absatz Rahmen ohne Umlauf enthaelt.
-                    bAppend = HasCurrentParaFlys(sal_True);
+                    bAppend = HasCurrentParaFlys(true);
                 }
                 else
                 {
@@ -3590,7 +3590,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                                                         // was gesetzt sein kann.
                     }
                     AppendTxtNode( AM_NOSPACE );
-                    bAppended = sal_True;
+                    bAppended = true;
                 }
                 else if( !aParaAttrs.empty() )
                 {
@@ -3652,7 +3652,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                 if( bTopTable && !bAppended )
                 {
                     pPostIts = new _HTMLAttrs;
-                    SetAttr( sal_True, sal_True, pPostIts );
+                    SetAttr( true, true, pPostIts );
                 }
             }
             bNoParSpace = false;
@@ -3676,7 +3676,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                     SwSurround eSurround = SURROUND_NONE;
                     sal_Int16 eHori;
 
-                    switch( pCurTable->GetTableAdjust(sal_True) )
+                    switch( pCurTable->GetTableAdjust(true) )
                     {
                     case SVX_ADJUST_RIGHT:
                         eHori = text::HoriOrientation::RIGHT;
@@ -3692,7 +3692,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                         break;
                     }
                     SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrmSet,
-                                            sal_True );
+                                            true );
                     aFrmSet.Put( SwFmtSurround(eSurround) );
 
                     SwFmtFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
@@ -3800,7 +3800,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
             {
                 // noch offene Bereiche muessen noch entfernt werden
                 if( EndSections( bParentLFStripped ) )
-                    bParentLFStripped = sal_False;
+                    bParentLFStripped = false;
 
                 if( pCurTable->HasParentSection() )
                 {
@@ -3846,7 +3846,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
     if( !nToken )
         nToken = GetNextToken();    // Token nach <TABLE>
 
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( (IsParserWorking() && !bDone) || bPending )
     {
         SaveState( nToken );
@@ -3877,11 +3877,11 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
             SkipToken(-1);
         case HTML_TABLEHEADER_OFF:
         case HTML_TABLEDATA_OFF:
-            bDone = sal_True;
+            bDone = true;
             break;
         case HTML_TABLE_ON:
             {
-                sal_Bool bHasToFly = sal_False;
+                bool bHasToFly = false;
                 SvxAdjust eTabAdjust = SVX_ADJUST_END;
                 if( !pPendStack )
                 {
@@ -3896,7 +3896,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                     {
                         // Diese Schleife muss vorwartes sein, weil die
                         // erste Option immer gewinnt.
-                        sal_Bool bNeedsSection = sal_False;
+                        bool bNeedsSection = false;
                         const HTMLOptions& rHTMLOptions = GetOptions();
                         for (size_t i = 0; i < rHTMLOptions.size(); ++i)
                         {
@@ -3921,7 +3921,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                     {
                         // Wenn im aktuellen Absatz Flys verankert sind,
                         // muss die neue Tabelle in einen Rahmen.
-                        bHasToFly = HasCurrentParaFlys(sal_False,sal_True);
+                        bHasToFly = HasCurrentParaFlys(false,true);
                     }
 
                     // in der Zelle kann sich ein Bereich befinden!
@@ -3940,8 +3940,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                     // nur wenn die Tabelle wirklich zu Ende ist!
                     if( pSubTable )
                     {
-                        OSL_ENSURE( pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_LEFT &&
-                                pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_RIGHT,
+                        OSL_ENSURE( pSubTable->GetTableAdjust(false)!= SVX_ADJUST_LEFT &&
+                                pSubTable->GetTableAdjust(false)!= SVX_ADJUST_RIGHT,
                                 "links oder rechts ausgerichtete Tabellen gehoehren in Rahmen" );
 
                         HTMLTableCnts *pParentContents =
@@ -4047,7 +4047,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
         OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableCell: Es gibt wieder einen Pend-Stack" );
-        bPending = sal_False;
+        bPending = false;
         if( IsParserWorking() )
             SaveState( 0 );
 
@@ -4131,7 +4131,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
     // auch eine Numerierung muss beendet werden
     GetNumInfo().Clear();
 
-    SetAttr( sal_False );
+    SetAttr( false );
 
     pSaveStruct->InsertCell( *this, pCurTable );
 
@@ -4144,14 +4144,14 @@ class _RowSaveStruct : public SwPendingStackData
 public:
     SvxAdjust eAdjust;
     sal_Int16 eVertOri;
-    sal_Bool bHasCells;
+    bool bHasCells;
 
     _RowSaveStruct() :
-        eAdjust( SVX_ADJUST_END ), eVertOri( text::VertOrientation::TOP ), bHasCells( sal_False )
+        eAdjust( SVX_ADJUST_END ), eVertOri( text::VertOrientation::TOP ), bHasCells( false )
     {}
 };
 
-void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
+void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
                                   SvxAdjust eGrpAdjust,
                                   sal_Int16 eGrpVertOri )
 {
@@ -4163,7 +4163,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
     int nToken = 0;
     _RowSaveStruct* pSaveStruct;
 
-    sal_Bool bPending = sal_False;
+    bool bPending = false;
     if( pPendStack )
     {
         pSaveStruct = (_RowSaveStruct*)pPendStack->pData;
@@ -4182,7 +4182,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
         sal_Int16 eVertOri = eGrpVertOri;
         Color aBGColor;
         OUString aBGImage, aStyle, aId, aClass;
-        sal_Bool bBGColor = sal_False;
+        bool bBGColor = false;
         pSaveStruct = new _RowSaveStruct;
 
         if( bReadOptions )
@@ -4210,7 +4210,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
                     if( !rOption.GetString().isEmpty() )
                     {
                         rOption.GetColor( aBGColor );
-                        bBGColor = sal_True;
+                        bBGColor = true;
                     }
                     break;
                 case HTML_O_BACKGROUND:
@@ -4241,7 +4241,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
     if( !nToken )
         nToken = GetNextToken();    // naechstes Token
 
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( (IsParserWorking() && !bDone) || bPending )
     {
         SaveState( nToken );
@@ -4264,7 +4264,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
             if( !pCurTable->GetContext()  )
             {
                 SkipToken( -1 );
-                bDone = sal_True;
+                bDone = true;
             }
 
             break;
@@ -4278,14 +4278,14 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
         case HTML_TABLE_OFF:
             SkipToken( -1 );
         case HTML_TABLEROW_OFF:
-            bDone = sal_True;
+            bDone = true;
             break;
         case HTML_TABLEHEADER_ON:
         case HTML_TABLEDATA_ON:
-            BuildTableCell( pCurTable, sal_True, HTML_TABLEHEADER_ON==nToken );
+            BuildTableCell( pCurTable, true, HTML_TABLEHEADER_ON==nToken );
             if( SVPAR_PENDING != GetStatus() )
             {
-                pSaveStruct->bHasCells = sal_True;
+                pSaveStruct->bHasCells = true;
                 bDone = pTable->IsOverflowing();
             }
             break;
@@ -4308,10 +4308,10 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
             // spaltige Rahmen koennen wir hier leider nicht einguegen
             break;
         case HTML_FORM_ON:
-            NewForm( sal_False );   // keinen neuen Absatz aufmachen!
+            NewForm( false );   // keinen neuen Absatz aufmachen!
             break;
         case HTML_FORM_OFF:
-            EndForm( sal_False );   // keinen neuen Absatz aufmachen!
+            EndForm( false );   // keinen neuen Absatz aufmachen!
             break;
         case HTML_COMMENT:
             NextToken( nToken );
@@ -4334,7 +4334,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
         OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableRow: Es gibt wieder einen Pend-Stack" );
-        bPending = sal_False;
+        bPending = false;
         if( IsParserWorking() )
             SaveState( 0 );
 
@@ -4357,15 +4357,15 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
 }
 
 void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
-                                      sal_Bool bReadOptions,
-                                      sal_Bool bHead )
+                                      bool bReadOptions,
+                                      bool bHead )
 {
     // <THEAD>, <TBODY> bzw. <TFOOT> wurde bereits gelesen
     if( !IsParserWorking() && !pPendStack )
         return;
 
     int nToken = 0;
-    sal_Bool bPending = sal_False;
+    bool bPending = false;
     _RowSaveStruct* pSaveStruct;
 
     if( pPendStack )
@@ -4417,7 +4417,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
     if( !nToken )
         nToken = GetNextToken();    // naechstes Token
 
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( (IsParserWorking() && !bDone) || bPending )
     {
         SaveState( nToken );
@@ -4440,7 +4440,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
             if( !pCurTable->GetContext()  )
             {
                 SkipToken( -1 );
-                bDone = sal_True;
+                bDone = true;
             }
 
             break;
@@ -4452,7 +4452,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
         case HTML_THEAD_OFF:
         case HTML_TBODY_OFF:
         case HTML_TFOOT_OFF:
-            bDone = sal_True;
+            bDone = true;
             break;
         case HTML_CAPTION_ON:
             BuildTableCaption( pCurTable );
@@ -4463,12 +4463,12 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
         case HTML_TABLEHEADER_ON:
         case HTML_TABLEDATA_ON:
             SkipToken( -1 );
-            BuildTableRow( pCurTable, sal_False, pSaveStruct->eAdjust,
+            BuildTableRow( pCurTable, false, pSaveStruct->eAdjust,
                            pSaveStruct->eVertOri );
             bDone = pTable->IsOverflowing();
             break;
         case HTML_TABLEROW_ON:
-            BuildTableRow( pCurTable, sal_True, pSaveStruct->eAdjust,
+            BuildTableRow( pCurTable, true, pSaveStruct->eAdjust,
                            pSaveStruct->eVertOri );
             bDone = pTable->IsOverflowing();
             break;
@@ -4476,10 +4476,10 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
             // spaltige Rahmen koennen wir hier leider nicht einguegen
             break;
         case HTML_FORM_ON:
-            NewForm( sal_False );   // keinen neuen Absatz aufmachen!
+            NewForm( false );   // keinen neuen Absatz aufmachen!
             break;
         case HTML_FORM_OFF:
-            EndForm( sal_False );   // keinen neuen Absatz aufmachen!
+            EndForm( false );   // keinen neuen Absatz aufmachen!
             break;
         case HTML_TEXTTOKEN:
             // Blank-Strings sind Folge von CR+LF und kein Text
@@ -4494,7 +4494,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
 
         OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableSection: Es gibt wieder einen Pend-Stack" );
-        bPending = sal_False;
+        bPending = false;
         if( IsParserWorking() )
             SaveState( 0 );
 
@@ -4521,7 +4521,7 @@ struct _TblColGrpSaveStruct : public SwPendingStackData
 {
     sal_uInt16 nColGrpSpan;
     sal_uInt16 nColGrpWidth;
-    sal_Bool bRelColGrpWidth;
+    bool bRelColGrpWidth;
     SvxAdjust eColGrpAdjust;
     sal_Int16 eColGrpVertOri;
 
@@ -4532,7 +4532,7 @@ struct _TblColGrpSaveStruct : public SwPendingStackData
 
 inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() :
     nColGrpSpan( 1 ), nColGrpWidth( 0 ),
-    bRelColGrpWidth( sal_False ), eColGrpAdjust( SVX_ADJUST_END ),
+    bRelColGrpWidth( false ), eColGrpAdjust( SVX_ADJUST_END ),
     eColGrpVertOri( text::VertOrientation::TOP )
 {}
 
@@ -4543,7 +4543,7 @@ inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
 }
 
 void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
-                                       sal_Bool bReadOptions )
+                                       bool bReadOptions )
 {
     // <COLGROUP> wurde bereits gelesen, wenn bReadOptions
 
@@ -4551,7 +4551,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
         return;
 
     int nToken = 0;
-    sal_Bool bPending = sal_False;
+    bool bPending = false;
     _TblColGrpSaveStruct* pSaveStruct;
 
     if( pPendStack )
@@ -4610,7 +4610,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
     if( !nToken )
         nToken = GetNextToken();    // naechstes Token
 
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( (IsParserWorking() && !bDone) || bPending )
     {
         SaveState( nToken );
@@ -4633,7 +4633,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
             if( !pCurTable->GetContext()  )
             {
                 SkipToken( -1 );
-                bDone = sal_True;
+                bDone = true;
             }
 
             break;
@@ -4645,13 +4645,13 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
         case HTML_TABLE_OFF:
             SkipToken( -1 );
         case HTML_COLGROUP_OFF:
-            bDone = sal_True;
+            bDone = true;
             break;
         case HTML_COL_ON:
             {
                 sal_uInt16 nColSpan = 1;
                 sal_uInt16 nColWidth = pSaveStruct->nColGrpWidth;
-                sal_Bool bRelColWidth = pSaveStruct->bRelColGrpWidth;
+                bool bRelColWidth = pSaveStruct->bRelColGrpWidth;
                 SvxAdjust eColAdjust = pSaveStruct->eColGrpAdjust;
                 sal_Int16 eColVertOri = pSaveStruct->eColGrpVertOri;
 
@@ -4709,7 +4709,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
 
         OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableColGrp: Es gibt wieder einen Pend-Stack" );
-        bPending = sal_False;
+        bPending = false;
         if( IsParserWorking() )
             SaveState( 0 );
 
@@ -4799,7 +4799,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
             return;
         }
 
-        sal_Bool bTop = sal_True;
+        bool bTop = true;
         const HTMLOptions& rHTMLOptions = GetOptions();
         for ( size_t i = rHTMLOptions.size(); i; )
         {
@@ -4809,7 +4809,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
                 if (rOption.GetString().equalsIgnoreAsciiCase(
                         OOO_STRING_SVTOOLS_HTML_VA_bottom))
                 {
-                    bTop = sal_False;
+                    bTop = false;
                 }
             }
         }
@@ -4847,7 +4847,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
         nToken = GetNextToken();    // naechstes Token
 
     // </CAPTION> wird laut DTD benoetigt
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( IsParserWorking() && !bDone )
     {
         SaveState( nToken );
@@ -4860,9 +4860,9 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
             if( !pPendStack )
             {
                 pSaveStruct->pTable = pTable;
-                sal_Bool bHasToFly = pSaveStruct->pTable!=pCurTable;
-                BuildTable( pCurTable->GetTableAdjust( sal_True ),
-                            sal_False, sal_True, bHasToFly );
+                bool bHasToFly = pSaveStruct->pTable!=pCurTable;
+                BuildTable( pCurTable->GetTableAdjust( true ),
+                            false, true, bHasToFly );
             }
             else
             {
@@ -4880,11 +4880,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
         case HTML_TBODY_ON:
         case HTML_TABLEROW_ON:
             SkipToken( -1 );
-            bDone = sal_True;
+            bDone = true;
             break;
 
         case HTML_CAPTION_OFF:
-            bDone = sal_True;
+            bDone = true;
             break;
         default:
             if( pPendStack )
@@ -4924,7 +4924,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
     }
 
     // LF am Absatz-Ende entfernen
-    sal_Bool bLFStripped = StripTrailingLF() > 0;
+    bool bLFStripped = StripTrailingLF() > 0;
 
     if( pTable==pCurTable )
     {
@@ -4948,7 +4948,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
     EndContext( pCntxt );
     delete pCntxt;
 
-    SetAttr( sal_False );
+    SetAttr( false );
 
     // Stacks und Attribut-Tabelle wiederherstellen
     pSaveStruct->RestoreAll( *this );
@@ -5022,13 +5022,13 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
     nHSpace( 0 ), nVSpace( 0 ),
     eAdjust( eParentAdjust ), eVertOri( text::VertOrientation::CENTER ),
     eFrame( HTML_TF_VOID ), eRules( HTML_TR_NONE ),
-    bPrcWidth( sal_False ),
-    bTableAdjust( sal_False ),
-    bBGColor( sal_False ),
+    bPrcWidth( false ),
+    bTableAdjust( false ),
+    bBGColor( false ),
     aBorderColor( COL_GRAY )
 {
-    sal_Bool bBorderColor = sal_False;
-    sal_Bool bHasFrame = sal_False, bHasRules = sal_False;
+    bool bBorderColor = false;
+    bool bHasFrame = false, bHasRules = false;
 
     for (size_t i = rOptions.size(); i; )
     {
@@ -5064,7 +5064,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
                 if( rOption.GetEnum( nAdjust, aHTMLPAlignTable ) )
                 {
                     eAdjust = (SvxAdjust)nAdjust;
-                    bTableAdjust = sal_True;
+                    bTableAdjust = true;
                 }
             }
             break;
@@ -5089,11 +5089,11 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
             break;
         case HTML_O_FRAME:
             eFrame = rOption.GetTableFrame();
-            bHasFrame = sal_True;
+            bHasFrame = true;
             break;
         case HTML_O_RULES:
             eRules = rOption.GetTableRules();
-            bHasRules = sal_True;
+            bHasRules = true;
             break;
         case HTML_O_BGCOLOR:
             // Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netscape
@@ -5101,7 +5101,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
             if( !rOption.GetString().isEmpty() )
             {
                 rOption.GetColor( aBGColor );
-                bBGColor = sal_True;
+                bBGColor = true;
             }
             break;
         case HTML_O_BACKGROUND:
@@ -5109,7 +5109,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
             break;
         case HTML_O_BORDERCOLOR:
             rOption.GetColor( aBorderColor );
-            bBorderColor = sal_True;
+            bBorderColor = true;
             break;
         case HTML_O_BORDERCOLORDARK:
             if( !bBorderColor )
@@ -5136,7 +5136,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
     if( nCols && !nWidth )
     {
         nWidth = 100;
-        bPrcWidth = sal_True;
+        bPrcWidth = true;
     }
 
     // Wenn BORDER=0 oder kein BORDER gegeben ist, daan darf es auch
@@ -5149,15 +5149,15 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
 }
 
 HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
-                                     sal_Bool bIsParentHead,
-                                     sal_Bool bHasParentSection,
-                                     sal_Bool bHasToFly )
+                                     bool bIsParentHead,
+                                     bool bHasParentSection,
+                                     bool bHasToFly )
 {
     if( !IsParserWorking() && !pPendStack )
         return 0;
 
     int nToken = 0;
-    sal_Bool bPending = sal_False;
+    bool bPending = false;
     _TblSaveStruct* pSaveStruct;
 
     if( pPendStack )
@@ -5204,7 +5204,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
     if( !nToken )
         nToken = GetNextToken();    // naechstes Token
 
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( (IsParserWorking() && !bDone) || bPending )
     {
         SaveState( nToken );
@@ -5229,12 +5229,12 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                 // Wenn noch keine Tabelle eingefuegt wurde,
                 // die naechste Tabelle lesen
                 SkipToken( -1 );
-                bDone = sal_True;
+                bDone = true;
             }
 
             break;
         case HTML_TABLE_OFF:
-            bDone = sal_True;
+            bDone = true;
             break;
         case HTML_CAPTION_ON:
             BuildTableCaption( pCurTable );
@@ -5242,32 +5242,32 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
             break;
         case HTML_COL_ON:
             SkipToken( -1 );
-            BuildTableColGroup( pCurTable, sal_False );
+            BuildTableColGroup( pCurTable, false );
             break;
         case HTML_COLGROUP_ON:
-            BuildTableColGroup( pCurTable, sal_True );
+            BuildTableColGroup( pCurTable, true );
             break;
         case HTML_TABLEROW_ON:
         case HTML_TABLEHEADER_ON:
         case HTML_TABLEDATA_ON:
             SkipToken( -1 );
-            BuildTableSection( pCurTable, sal_False, sal_False );
+            BuildTableSection( pCurTable, false, false );
             bDone = pTable->IsOverflowing();
             break;
         case HTML_THEAD_ON:
         case HTML_TFOOT_ON:
         case HTML_TBODY_ON:
-            BuildTableSection( pCurTable, sal_True, HTML_THEAD_ON==nToken );
+            BuildTableSection( pCurTable, true, HTML_THEAD_ON==nToken );
             bDone = pTable->IsOverflowing();
             break;
         case HTML_MULTICOL_ON:
             // spaltige Rahmen koennen wir hier leider nicht einguegen
             break;
         case HTML_FORM_ON:
-            NewForm( sal_False );   // keinen neuen Absatz aufmachen!
+            NewForm( false );   // keinen neuen Absatz aufmachen!
             break;
         case HTML_FORM_OFF:
-            EndForm( sal_False );   // keinen neuen Absatz aufmachen!
+            EndForm( false );   // keinen neuen Absatz aufmachen!
             break;
         case HTML_TEXTTOKEN:
             // Blank-Strings sind u. U. eine Folge von CR+LF und kein Text
@@ -5283,7 +5283,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
 
         OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTable: Es gibt wieder einen Pend-Stack" );
-        bPending = sal_False;
+        bPending = false;
         if( IsParserWorking() )
             SaveState( 0 );
 
@@ -5334,7 +5334,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                     SwNodeRange aSrcRg( *pCapStNd, 1,
                                     *pCapStNd->EndOfSectionNode(), -1 );
 
-                    sal_Bool bTop = pTable->IsTopCaption();
+                    bool bTop = pTable->IsTopCaption();
                     SwStartNode *pTblStNd = pTCntxt->GetTableNode();
 
                     OSL_ENSURE( pTblStNd, "Wo ist der Tabellen-Node" );
@@ -5359,7 +5359,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                     if( bTop )
                     {
                         MovePageDescAttrs( pTblStNd, aSrcRg.aStart.GetIndex(),
-                                           sal_False );
+                                           false );
                     }
                 }
 
@@ -5367,7 +5367,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                 pPam->SetMark();
                 pPam->DeleteMark();
                 pDoc->DeleteSection( (SwStartNode *)pCapStNd );
-                pTable->SetCaption( 0, sal_False );
+                pTable->SetCaption( 0, false );
             }
 
             // SwTable aufbereiten
@@ -5417,7 +5417,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
             pPam->SetMark();
             pPam->DeleteMark();
             pDoc->DeleteSection( (SwStartNode *)pCapStNd );
-            pCurTable->SetCaption( 0, sal_False );
+            pCurTable->SetCaption( 0, false );
         }
     }
 
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 93d1bd13025d..0e027c613b48 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -67,34 +67,34 @@ class SwHTMLWrtTable : public SwWriteTable
     void PixelizeBorders();
 
     void OutTableCell( SwHTMLWriter& rWrt, const SwWriteTableCell *pCell,
-                       sal_Bool bOutVAlign ) const;
+                       bool bOutVAlign ) const;
 
     void OutTableCells( SwHTMLWriter& rWrt,
                         const SwWriteTableCells& rCells,
                         const SvxBrushItem *pBrushItem ) const;
 
-    virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox,
-                            sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const SAL_OVERRIDE;
+    virtual bool ShouldExpandSub( const SwTableBox *pBox,
+                            bool bExpandedBefore, sal_uInt16 nDepth ) const SAL_OVERRIDE;
 
-    static sal_Bool HasTabBackground( const SwTableLine& rLine,
-                        sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight );
-    static sal_Bool HasTabBackground( const SwTableBox& rBox,
-                        sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight );
+    static bool HasTabBackground( const SwTableLine& rLine,
+                        bool bTop, bool bBottom, bool bLeft, bool bRight );
+    static bool HasTabBackground( const SwTableBox& rBox,
+                        bool bTop, bool bBottom, bool bLeft, bool bRight );
 
 public:
     SwHTMLWrtTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth,
-                    sal_Bool bRel, sal_uInt16 nLeftSub=0, sal_uInt16 nRightSub=0,
+                    bool bRel, sal_uInt16 nLeftSub=0, sal_uInt16 nRightSub=0,
                     sal_uInt16 nNumOfRowsToRepeat = 0 );
     SwHTMLWrtTable( const SwHTMLTableLayout *pLayoutInfo );
 
     void Write( SwHTMLWriter& rWrt, sal_Int16 eAlign=text::HoriOrientation::NONE,
-                sal_Bool bTHead=sal_False, const SwFrmFmt *pFrmFmt=0,
-                const OUString *pCaption=0, sal_Bool bTopCaption=sal_False,
+                bool bTHead=false, const SwFrmFmt *pFrmFmt=0,
+                const OUString *pCaption=0, bool bTopCaption=false,
                 sal_uInt16 nHSpace=0, sal_uInt16 nVSpace=0 ) const;
 };
 
 SwHTMLWrtTable::SwHTMLWrtTable( const SwTableLines& rLines, long nWidth,
-                                sal_uInt32 nBWidth, sal_Bool bRel,
+                                sal_uInt32 nBWidth, bool bRel,
                                 sal_uInt16 nLSub, sal_uInt16 nRSub,
                                 sal_uInt16 nNumOfRowsToRepeat )
     : SwWriteTable( rLines, nWidth, nBWidth, bRel, MAX_DEPTH, nLSub, nRSub, nNumOfRowsToRepeat )
@@ -130,13 +130,13 @@ void SwHTMLWrtTable::PixelizeBorders()
     Pixelize( nCellPadding );
 }
 
-sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
-                        sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight )
+bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
+                        bool bTop, bool bBottom, bool bLeft, bool bRight )
 {
     OSL_ENSURE( bTop || bBottom || bLeft || bRight,
             "HasTabBackground: darf nicht aufgerufen werden" );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( rBox.GetSttNd() )
     {
         const SvxBrushItem& rBrushItem =
@@ -151,11 +151,11 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
     {
         const SwTableLines& rLines = rBox.GetTabLines();
         sal_uInt16 nCount = rLines.size();
-        sal_Bool bLeftRight = bLeft || bRight;
+        bool bLeftRight = bLeft || bRight;
         for( sal_uInt16 i=0; !bRet && i<nCount; i++ )
         {
-            sal_Bool bT = bTop && 0 == i;
-            sal_Bool bB = bBottom && nCount-1 == i;
+            bool bT = bTop && 0 == i;
+            bool bB = bBottom && nCount-1 == i;
             if( bT || bB || bLeftRight )
                 bRet = HasTabBackground( *rLines[i], bT, bB, bLeft, bRight);
         }
@@ -164,8 +164,8 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
     return bRet;
 }
 
-sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
-                        sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight )
+bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
+                        bool bTop, bool bBottom, bool bLeft, bool bRight )
 {
     OSL_ENSURE( bTop || bBottom || bLeft || bRight,
             "HasTabBackground: darf nicht aufgerufen werden" );
@@ -173,18 +173,18 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
     const SvxBrushItem& rBrushItem = rLine.GetFrmFmt()->GetBackground();
     /// The table line has a background, if its background color is not "no fill"/
     /// "auto fill" or it has a background graphic.
-    sal_Bool bRet = rBrushItem.GetColor() != COL_TRANSPARENT ||
+    bool bRet = rBrushItem.GetColor() != COL_TRANSPARENT ||
            !rBrushItem.GetGraphicLink().isEmpty() || rBrushItem.GetGraphic();
 
     if( !bRet )
     {
         const SwTableBoxes& rBoxes = rLine.GetTabBoxes();
         sal_uInt16 nCount = rBoxes.size();
-        sal_Bool bTopBottom = bTop || bBottom;
+        bool bTopBottom = bTop || bBottom;
         for( sal_uInt16 i=0; !bRet && i<nCount; i++ )
         {
-            sal_Bool bL = bLeft && 0 == i;
-            sal_Bool bR = bRight && nCount-1 == i;
+            bool bL = bLeft && 0 == i;
+            bool bR = bRight && nCount-1 == i;
             if( bTopBottom || bL || bR )
                 bRet = HasTabBackground( *rBoxes[i], bTop, bBottom, bL, bR );
         }
@@ -193,12 +193,12 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
     return bRet;
 }
 
-static sal_Bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders );
+static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders );
 
-static sal_Bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pBorders )
+static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pBorders )
 {
     if( *pBorders )
-        return sal_False;
+        return false;
 
     if( !pBox->GetSttNd() )
     {
@@ -221,10 +221,10 @@ static sal_Bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pB
     return !*pBorders;
 }
 
-static sal_Bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders )
+static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders )
 {
     if( *pBorders )
-        return sal_False;
+        return false;
 
     for( SwTableBoxes::const_iterator it = pLine->GetTabBoxes().begin();
              it != pLine->GetTabBoxes().end(); ++it)
@@ -235,11 +235,11 @@ static sal_Bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool
     return !*pBorders;
 }
 
-sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox,
-                                      sal_Bool bExpandedBefore,
+bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox,
+                                      bool bExpandedBefore,
                                       sal_uInt16 nDepth ) const
 {
-    sal_Bool bExpand = !pBox->GetSttNd() && nDepth>0;
+    bool bExpand = !pBox->GetSttNd() && nDepth>0;
     if( bExpand && bExpandedBefore )
     {
         // MIB 30.6.97: Wenn schon eine Box expandiert wurde, wird eine
@@ -247,7 +247,7 @@ sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox,
         sal_Bool bBorders = sal_False;
         lcl_TableBox_HasTabBorders( pBox, &bBorders );
         if( !bBorders )
-            bBorders = HasTabBackground( *pBox, sal_True, sal_True, sal_True, sal_True );
+            bBorders = HasTabBackground( *pBox, true, true, true, true );
         bExpand = bBorders;
     }
 
@@ -257,7 +257,7 @@ sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox,
 // Eine Box als einzelne Zelle schreiben
 void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
                                    const SwWriteTableCell *pCell,
-                                   sal_Bool bOutVAlign ) const
+                                   bool bOutVAlign ) const
 {
     const SwTableBox *pBox = pCell->GetBox();
     sal_uInt16 nRow = pCell->GetRow();
@@ -272,7 +272,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
     bool bOutWidth = true;
 
     const SwStartNode* pSttNd = pBox->GetSttNd();
-    sal_Bool bHead = sal_False;
+    bool bHead = false;
     if( pSttNd )
     {
         sal_uLong nNdPos = pSttNd->GetIndex()+1;
@@ -411,8 +411,8 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
 
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
-    rWrt.bTxtAttr = sal_False;
-    rWrt.bOutOpts = sal_True;
+    rWrt.bTxtAttr = false;
+    rWrt.bOutOpts = true;
     const SvxBrushItem *pBrushItem = 0;
     if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) )
     {
@@ -424,7 +424,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
     if( pBrushItem )
     {
         // Hintergrund ausgeben
-        rWrt.OutBackground( pBrushItem, sal_False );
+        rWrt.OutBackground( pBrushItem, false );
 
         if( rWrt.bCfgOutStyles )
             OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
@@ -434,16 +434,16 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
 
     sal_uInt32 nNumFmt = 0;
     double nValue = 0.0;
-    sal_Bool bNumFmt = sal_False, bValue = sal_False;
+    bool bNumFmt = false, bValue = false;
     if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOXATR_FORMAT, false, &pItem ) )
     {
         nNumFmt = ((const SwTblBoxNumFormat *)pItem)->GetValue();
-        bNumFmt = sal_True;
+        bNumFmt = true;
     }
     if( SFX_ITEM_SET==rItemSet.GetItemState( RES_BOXATR_VALUE, false, &pItem ) )
     {
         nValue = ((const SwTblBoxValue *)pItem)->GetValue();
-        bValue = sal_True;
+        bValue = true;
         if( !bNumFmt )
             nNumFmt = pBox->GetFrmFmt()->GetTblBoxNumFmt().GetValue();
     }
@@ -456,7 +456,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
     }
     sOut.append('>');
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    rWrt.bLFPossible = sal_True;
+    rWrt.bLFPossible = true;
 
     rWrt.IncIndentLevel();  // den Inhalt von <TD>...</TD> einruecken
 
@@ -498,7 +498,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
     HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bHead ? OOO_STRING_SVTOOLS_HTML_tableheader
                                                      : OOO_STRING_SVTOOLS_HTML_tabledata,
                                 false );
-    rWrt.bLFPossible = sal_True;
+    rWrt.bLFPossible = true;
 }
 
 // Eine Line als Zeilen ausgeben
@@ -531,10 +531,10 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
     rWrt.Strm().WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tablerow );
     if( pBrushItem )
     {
-        rWrt.OutBackground( pBrushItem, sal_False );
+        rWrt.OutBackground( pBrushItem, false );
 
-        rWrt.bTxtAttr = sal_False;
-        rWrt.bOutOpts = sal_True;
+        rWrt.bTxtAttr = false;
+        rWrt.bOutOpts = true;
         if( rWrt.bCfgOutStyles )
             OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
     }
@@ -562,8 +562,8 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
 }
 
 void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
-                            sal_Bool bTHead, const SwFrmFmt *pFrmFmt,
-                            const OUString *pCaption, sal_Bool bTopCaption,
+                            bool bTHead, const SwFrmFmt *pFrmFmt,
+                            const OUString *pCaption, bool bTopCaption,
                             sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const
 {
     sal_uInt16 nRow;
@@ -580,13 +580,13 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
         nFrameMask &= ~8;
 
     // Wert fur RULES bestimmen
-    sal_Bool bRowsHaveBorder = sal_False;
-    sal_Bool bRowsHaveBorderOnly = sal_True;
+    bool bRowsHaveBorder = false;
+    bool bRowsHaveBorderOnly = true;
     SwWriteTableRow *pRow = aRows[0];
     for( nRow=1; nRow < aRows.size(); nRow++ )
     {
         SwWriteTableRow *pNextRow = aRows[nRow];
-        sal_Bool bBorder = ( pRow->bBottomBorder || pNextRow->bTopBorder );
+        bool bBorder = ( pRow->bBottomBorder || pNextRow->bTopBorder );
         bRowsHaveBorder |= bBorder;
         bRowsHaveBorderOnly &= bBorder;
 
@@ -603,14 +603,14 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
         pRow = pNextRow;
     }
 
-    sal_Bool bColsHaveBorder = sal_False;
-    sal_Bool bColsHaveBorderOnly = sal_True;
+    bool bColsHaveBorder = false;
+    bool bColsHaveBorderOnly = true;
     SwWriteTableCol *pCol = aCols[0];
     sal_uInt16 nCol;
     for( nCol=1; nCol<aCols.size(); nCol++ )
     {
         SwWriteTableCol *pNextCol = aCols[nCol];
-        sal_Bool bBorder = ( pCol->bRightBorder || pNextCol->bLeftBorder );
+        bool bBorder = ( pCol->bRightBorder || pNextCol->bLeftBorder );
         bColsHaveBorder |= bBorder;
         bColsHaveBorderOnly &= bBorder;
         pCol->bRightBorder = bBorder;
@@ -712,7 +712,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
     // Hintergrund ausgeben
     if( pFrmFmt )
     {
-        rWrt.OutBackground( pFrmFmt->GetAttrSet(), sal_False );
+        rWrt.OutBackground( pFrmFmt->GetAttrSet(), false );
 
         if( rWrt.bCfgOutStyles && pFrmFmt )
             rWrt.OutCSS1_TableFrmFmtOptions( *pFrmFmt );
@@ -740,7 +740,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
 
     // <COLGRP>/<COL> ausgeben: Bei Export ueber Layout nur wenn beim
     // Import welche da waren, sonst immer.
-    sal_Bool bColGroups = (bColsHaveBorder && !bColsHaveBorderOnly);
+    bool bColGroups = (bColsHaveBorder && !bColsHaveBorderOnly);
     if( bColTags )
     {
         if( bColGroups )
@@ -807,15 +807,15 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
     // die Lines als Tabellenzeilen rausschreiben
 
     // <TBODY> ausgeben?
-    sal_Bool bTSections = (bRowsHaveBorder && !bRowsHaveBorderOnly);
-    sal_Bool bTBody = bTSections;
+    bool bTSections = (bRowsHaveBorder && !bRowsHaveBorderOnly);
+    bool bTBody = bTSections;
 
     // Wenn Sections ausgegeben werden muessen darf ein THEAD um die erste
     // Zeile nur ausgegeben werden, wenn unter der Zeile eine Linie ist
     if( bTHead &&
         (bTSections || bColGroups) &&
         nHeadEndRow<aRows.size()-1 && !aRows[nHeadEndRow]->bBottomBorder )
-        bTHead = sal_False;
+        bTHead = false;
 
     // <TBODY> aus ausgeben, wenn <THEAD> ausgegeben wird.
     bTSections |= bTHead;
@@ -858,7 +858,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
             rWrt.OutNewLine(); // <THEAD>/<TDATA> in neue Zeile
 
             if( bTHead && nRow==nHeadEndRow )
-                bTHead = sal_False;
+                bTHead = false;
 
             HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
                             bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, true );
@@ -885,13 +885,13 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
 
 Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
                            const SwFrmFmt *pFlyFrmFmt,
-                           const OUString *pCaption, sal_Bool bTopCaption )
+                           const OUString *pCaption, bool bTopCaption )
 {
 
     SwTable& rTbl = rNode.GetTable();
 
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
-    rHTMLWrt.bOutTable = sal_True;
+    rHTMLWrt.bOutTable = true;
 
     // die horizontale Ausrichtung des Rahmens hat (falls vorhanden)
     // Prioritaet. NONE bedeutet, dass keine horizontale
@@ -921,10 +921,10 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
     }
 
     // ggf. eine FORM oeffnen
-    sal_Bool bPreserveForm = sal_False;
+    bool bPreserveForm = false;
     if( !rHTMLWrt.bPreserveForm )
     {
-        rHTMLWrt.OutForm( sal_True, &rNode );
+        rHTMLWrt.OutForm( true, &rNode );
         bPreserveForm = (rHTMLWrt.pxFormComps && rHTMLWrt.pxFormComps->is() );
         rHTMLWrt.bPreserveForm = bPreserveForm;
     }
@@ -941,7 +941,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
     // text::HoriOrientation::NONE und text::HoriOrientation::FULL Tabellen benoetigen relative Breiten
     sal_uInt16 nNewDefListLvl = 0;
     bool bRelWidths = false;
-    sal_Bool bCheckDefList = sal_False;
+    bool bCheckDefList = false;
     switch( eTabHoriOri )
     {
     case text::HoriOrientation::FULL:
@@ -961,7 +961,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
                 // tatsaechliche Breite der Tabelle zu bestimmen. Wenn
                 // das nicht geht, machen wir eine 100% breite Tabelle
                 // draus.
-                nWidth = pFmt->FindLayoutRect(sal_True).Width();
+                nWidth = pFmt->FindLayoutRect(true).Width();
                 if( !nWidth )
                 {
                     bRelWidths = true;
@@ -980,16 +980,16 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
                 // Ohne rechten Rand bleibt auch eine absolute Breite erhalten
                 // Wir versuchen aber trotzdem ueber das Layout die
                 // tatsachliche Breite zu ermitteln.
-                long nRealWidth = pFmt->FindLayoutRect(sal_True).Width();
+                long nRealWidth = pFmt->FindLayoutRect(true).Width();
                 if( nRealWidth )
                     nWidth = nRealWidth;
             }
-            bCheckDefList = sal_True;
+            bCheckDefList = true;
         }
         break;
     case text::HoriOrientation::LEFT_AND_WIDTH:
         eTabHoriOri = text::HoriOrientation::LEFT;
-        bCheckDefList = sal_True;
+        bCheckDefList = true;
         // no break
     default:
         // In allen anderen Faellen kann eine absolute oder relative
@@ -1100,12 +1100,12 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
             HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(), true );
         }
         rHTMLWrt.IncIndentLevel();  // Inhalt von <CENTER> einruecken
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
     }
 
     // Wenn die Tabelle in keinem Rahmen ist kann man immer ein LF ausgeben.
     if( text::HoriOrientation::NONE==eTabHoriOri )
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
 
     const SwHTMLTableLayout *pLayout = rTbl.GetHTMLTableLayout();
 
@@ -1136,7 +1136,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
 
     // Wenn die Tabelle in keinem Rahmen war kann man immer ein LF ausgeben.
     if( text::HoriOrientation::NONE==eTabHoriOri )
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
 
     if( text::HoriOrientation::NONE!=eDivHoriOri )
     {
@@ -1145,7 +1145,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
         HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
                                text::HoriOrientation::CENTER==eDivHoriOri ? OOO_STRING_SVTOOLS_HTML_center
                                                         : OOO_STRING_SVTOOLS_HTML_division, false );
-        rHTMLWrt.bLFPossible = sal_True;
+        rHTMLWrt.bLFPossible = true;
     }
 
     // Pam hinter die Tabelle verschieben
@@ -1153,11 +1153,11 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
 
     if( bPreserveForm )
     {
-        rHTMLWrt.bPreserveForm = sal_False;
-        rHTMLWrt.OutForm( sal_False );
+        rHTMLWrt.bPreserveForm = false;
+        rHTMLWrt.OutForm( false );
     }
 
-    rHTMLWrt.bOutTable = sal_False;
+    rHTMLWrt.bOutTable = false;
 
     if( rHTMLWrt.GetNextNumInfo() &&
         !rHTMLWrt.GetNextNumInfo()->IsRestart() &&
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 640deb1b26d8..c98042734025 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -61,8 +61,8 @@ void CSS1Parser::InitRead( const OUString& rIn )
     nlLineNr = 0;
     nlLinePos = 0;
 
-    bWhiteSpace = sal_True; // Wenn noch nichts gelesen wurde ist das wie WS
-    bEOF = sal_False;
+    bWhiteSpace = true; // Wenn noch nichts gelesen wurde ist das wie WS
+    bEOF = false;
     eState = CSS1_PAR_WORKING;
     nValue = 0.;
 
@@ -76,7 +76,7 @@ sal_Unicode CSS1Parser::GetNextChar()
 {
     if( nInPos >= aIn.getLength() )
     {
-        bEOF = sal_True;
+        bEOF = true;
         return (sal_Unicode)EOF;
     }
 
@@ -109,10 +109,10 @@ CSS1Token CSS1Parser::GetNextToken()
 
     do {
         // Merken, ob davor White-Space gelesen wurde
-        sal_Bool bPrevWhiteSpace = bWhiteSpace;
-        bWhiteSpace = sal_False;
+        bool bPrevWhiteSpace = bWhiteSpace;
+        bWhiteSpace = false;
 
-        sal_Bool bNextCh = sal_True;
+        bool bNextCh = true;
         switch( cNextCh )
         {
         case '/': // COMMENT | '/'
@@ -123,7 +123,7 @@ CSS1Token CSS1Parser::GetNextToken()
                     // COMMENT
                     cNextCh = GetNextChar();
 
-                    sal_Bool bAsterisk = sal_False;
+                    bool bAsterisk = false;
                     while( !(bAsterisk && '/'==cNextCh) && !IsEOF() )
                     {
                         bAsterisk = ('*'==cNextCh);
@@ -133,7 +133,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 else
                 {
                     // '/'
-                    bNextCh = sal_False;
+                    bNextCh = false;
                     nRet = CSS1_SLASH;
                 }
             }
@@ -179,11 +179,11 @@ CSS1Token CSS1Parser::GetNextToken()
                         aToken = "";
                         sal_uInt16 nBlockLvl = 0;
                         sal_Unicode cQuoteCh = 0;
-                        sal_Bool bDone = sal_False, bEscape = sal_False;
+                        bool bDone = false, bEscape = false;
                         while( !bDone && !IsEOF() )
                         {
-                            sal_Bool bOldEscape = bEscape;
-                            bEscape = sal_False;
+                            bool bOldEscape = bEscape;
+                            bEscape = false;
                             switch( cNextCh )
                             {
                             case '{':
@@ -215,14 +215,14 @@ CSS1Token CSS1Parser::GetNextToken()
                                 break;
                             case '\\':
                                 if( !bOldEscape )
-                                    bEscape = sal_True;
+                                    bEscape = true;
                                 break;
                             }
                             cNextCh = GetNextChar();
                         }
                     }
 
-                    bNextCh = sal_False;
+                    bNextCh = false;
                 }
             }
             break;
@@ -234,7 +234,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 while( ( ' ' == cNextCh ||
                        (cNextCh >= 0x09 && cNextCh <= 0x0d) ) && !IsEOF() )
                 {
-                    bWhiteSpace = sal_True;
+                    bWhiteSpace = true;
                     cNextCh = GetNextChar();
                 }
 
@@ -262,13 +262,13 @@ CSS1Token CSS1Parser::GetNextToken()
                         nRet = CSS1_IDENT;
                     }
 
-                    bWhiteSpace = sal_False;
-                    bNextCh = sal_False;
+                    bWhiteSpace = false;
+                    bNextCh = false;
                 }
                 else
                 {
                     // Fehlerbehandlung: '!' ignorieren
-                    bNextCh = sal_False;
+                    bNextCh = false;
                 }
             }
             break;
@@ -308,7 +308,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 sal_Unicode cNextChSave = cNextCh;
                 sal_uInt32 nlLineNrSave = nlLineNr;
                 sal_uInt32 nlLinePosSave = nlLinePos;
-                sal_Bool bEOFSave = bEOF;
+                bool bEOFSave = bEOF;
 
                 // erstmal versuchen eine Hex-Zahl zu scannen
                 OUStringBuffer sTmpBuffer( 16 );
@@ -326,7 +326,7 @@ CSS1Token CSS1Parser::GetNextToken()
                     // wir haben eine hexadezimale Farbe gefunden
                     aToken += sTmpBuffer.makeStringAndClear();
                     nRet = CSS1_HEXCOLOR;
-                    bNextCh = sal_False;
+                    bNextCh = false;
 
                     break;
                 }
@@ -353,7 +353,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 while( ( ' ' == cNextCh ||
                        (cNextCh >= 0x09 && cNextCh <= 0x0d) ) && !IsEOF() )
                 {
-                    bWhiteSpace = sal_True;
+                    bWhiteSpace = true;
                     cNextCh = GetNextChar();
                 }
 
@@ -361,7 +361,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 switch( cNextCh )
                 {
                 case '%': // PERCENTAGE
-                    bWhiteSpace = sal_False;
+                    bWhiteSpace = false;
                     nRet = CSS1_PERCENTAGE;
                     break;
 
@@ -381,7 +381,7 @@ CSS1Token CSS1Parser::GetNextToken()
                         sal_Unicode cNextChOld = cNextCh;
                         sal_uLong nlLineNrOld  = nlLineNr;
                         sal_uLong nlLinePosOld = nlLinePos;
-                        sal_Bool bEOFOld = bEOF;
+                        bool bEOFOld = bEOF;
 
                         // den naechsten Identifer scannen
                         OUString aIdent;
@@ -475,13 +475,13 @@ CSS1Token CSS1Parser::GetNextToken()
                         }
                         else
                         {
-                            bWhiteSpace = sal_False;
+                            bWhiteSpace = false;
                         }
-                        bNextCh = sal_False;
+                        bNextCh = false;
                     }
                     break;
                 default: // NUMBER IDENT
-                    bNextCh = sal_False;
+                    bNextCh = false;
                     nRet = CSS1_NUMBER;
                     break;
                 }
@@ -532,7 +532,7 @@ CSS1Token CSS1Parser::GetNextToken()
                 sal_Unicode cNextChSave = cNextCh;
                 sal_uLong nlLineNrSave = nlLineNr;
                 sal_uLong nlLinePosSave = nlLinePos;
-                sal_Bool bEOFSave = bEOF;
+                bool bEOFSave = bEOF;
 
                 // erstmal versuchen eine Hex-Zahl zu scannen
                 OUStringBuffer sTmpBuffer( 6L );
@@ -550,7 +550,7 @@ CSS1Token CSS1Parser::GetNextToken()
                     // wir haben eine hexadezimale Farbe gefunden
                     aToken += sTmpBuffer.makeStringAndClear();
                     nRet = CSS1_HEXCOLOR;
-                    bNextCh = sal_False;
+                    bNextCh = false;
 
                     break;
                 }
@@ -564,21 +564,21 @@ CSS1Token CSS1Parser::GetNextToken()
             }
 
             nRet = CSS1_HASH;
-            bNextCh = sal_False;
+            bNextCh = false;
             break;
 
         case ' ':
         case '\t':
         case '\r':
         case '\n': // White-Space
-            bWhiteSpace = sal_True;
+            bWhiteSpace = true;
             break;
 
         case (sal_Unicode)EOF:
             if( IsEOF() )
             {
                 eState = CSS1_PAR_ACCEPTED;
-                bNextCh = sal_False;
+                bNextCh = false;
                 break;
             }
             // no break
@@ -588,7 +588,7 @@ CSS1Token CSS1Parser::GetNextToken()
             {
                 // IDENT
 
-                sal_Bool bHexColor = sal_True;
+                bool bHexColor = true;
 
                 // den naechsten Identifer scannen
                 OUStringBuffer sTmpBuffer( 64L );
@@ -609,7 +609,7 @@ CSS1Token CSS1Parser::GetNextToken()
 
                 if( bHexColor && sTmpBuffer.getLength()==6 )
                 {
-                    bNextCh = sal_False;
+                    bNextCh = false;
                     nRet = CSS1_HEXCOLOR;
 
                     break;
@@ -633,14 +633,14 @@ CSS1Token CSS1Parser::GetNextToken()
                     } while( (nNestCnt>1 || ')'!=cNextCh) && !IsEOF() );
                     sTmpBuffer2.append( cNextCh );
                     aToken += sTmpBuffer2.makeStringAndClear();
-                    bNextCh = sal_True;
+                    bNextCh = true;
                     nRet = 'u'==aToken[0] || 'U'==aToken[0]
                                 ? CSS1_URL
                                 : CSS1_RGB;
                 }
                 else
                 {
-                    bNextCh = sal_False;
+                    bNextCh = false;
                     nRet = CSS1_IDENT;
                 }
             }
@@ -677,7 +677,7 @@ void CSS1Parser::ParseStyleSheet()
     LOOP_CHECK_DECL
 
     // import*
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     while( !bDone && IsParserWorking() )
     {
         LOOP_CHECK_CHECK( "Endlos-Schleife in ParseStyleSheet()/import *" )
@@ -696,7 +696,7 @@ void CSS1Parser::ParseStyleSheet()
         case CSS1_PAGE_SYM:
 // /Feature: PrintExt
             // rule
-            bDone = sal_True;
+            bDone = true;
             break;
         default:
             // Fehlerbehandlung: ueberlesen
@@ -835,7 +835,7 @@ CSS1Selector *CSS1Parser::ParseSelector()
 {
     CSS1Selector *pRoot = 0, *pLast = 0;
 
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     CSS1Selector *pNew = 0;
 
     LOOP_CHECK_DECL
@@ -845,7 +845,7 @@ CSS1Selector *CSS1Parser::ParseSelector()
     {
         LOOP_CHECK_CHECK( "Endlos-Schleife in ParseSelector()" )
 
-        sal_Bool bNextToken = sal_True;
+        bool bNextToken = true;
 
         switch( nToken )
         {
@@ -878,7 +878,7 @@ CSS1Selector *CSS1Parser::ParseSelector()
                 else
                 {
                     // das war jetzt ein Look-Ahead
-                    bNextToken = sal_False;
+                    bNextToken = false;
                 }
                 pNew = new CSS1Selector( eType, aElement );
             }
@@ -929,7 +929,7 @@ CSS1Selector *CSS1Parser::ParseSelector()
 
         default:
             // wir wissen nicht was kommt, also aufhoehren
-            bDone = sal_True;
+            bDone = true;
             break;
         }
 
@@ -1025,7 +1025,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
     // term [operator term]*
     // hier sind wir sehr lax, was die Syntax angeht, sollte aber kein
     // Problem sein
-    sal_Bool bDone = sal_False;
+    bool bDone = false;
     sal_Unicode cSign = 0, cOp = 0;
     CSS1Expression *pNew = 0;
 
@@ -1075,7 +1075,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
             break;
 
         default:
-            bDone = sal_True;
+            bDone = true;
             break;
         }
 
@@ -1130,7 +1130,7 @@ CSS1Parser::~CSS1Parser()
 {
 }
 
-sal_Bool CSS1Parser::ParseStyleSheet( const OUString& rIn )
+bool CSS1Parser::ParseStyleSheet( const OUString& rIn )
 {
     OUString aTmp( rIn );
 
@@ -1153,19 +1153,19 @@ sal_Bool CSS1Parser::ParseStyleSheet( const OUString& rIn )
         aTmp = aTmp.copy( 0, aTmp.getLength() - 3 );
 
     if( aTmp.isEmpty() )
-        return sal_True;
+        return true;
 
     InitRead( aTmp );
 
     ParseStyleSheet();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool CSS1Parser::ParseStyleOption( const OUString& rIn )
+bool CSS1Parser::ParseStyleOption( const OUString& rIn )
 {
     if( rIn.isEmpty() )
-        return sal_True;
+        return true;
 
     InitRead( rIn );
 
@@ -1179,7 +1179,7 @@ sal_Bool CSS1Parser::ParseStyleOption( const OUString& rIn )
     CSS1Expression *pExpr = ParseDeclaration( aProperty );
     if( !pExpr )
     {
-        return sal_False;
+        return false;
     }
 
     // expression verarbeiten
@@ -1206,7 +1206,7 @@ sal_Bool CSS1Parser::ParseStyleOption( const OUString& rIn )
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 bool CSS1Parser::SelectorParsed( CSS1Selector* /* pSelector */, bool /*bFirst*/ )
@@ -1215,11 +1215,11 @@ bool CSS1Parser::SelectorParsed( CSS1Selector* /* pSelector */, bool /*bFirst*/
     return true;
 }
 
-sal_Bool CSS1Parser::DeclarationParsed( const OUString& /*rProperty*/,
+bool CSS1Parser::DeclarationParsed( const OUString& /*rProperty*/,
                                     const CSS1Expression * /* pExpr */ )
 {
     // Deklaration loeschen
-    return sal_True;
+    return true;
 }
 
 CSS1Selector::~CSS1Selector()
@@ -1232,7 +1232,7 @@ CSS1Expression::~CSS1Expression()
     delete pNext;
 }
 
-sal_Bool CSS1Expression::GetURL( OUString& rURL  ) const
+bool CSS1Expression::GetURL( OUString& rURL  ) const
 {
     OSL_ENSURE( CSS1_URL==eType, "CSS1-Ausruck ist keine Farbe URL" );
 
@@ -1242,25 +1242,25 @@ sal_Bool CSS1Expression::GetURL( OUString& rURL  ) const
                 ')' == aValue[aValue.getLength()-1],
                 "keine gueltiges URL(...)" );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( aValue.getLength() > 5 )
     {
         rURL = aValue.copy( 4, aValue.getLength() - 5 );
         rURL = comphelper::string::strip(rURL, ' ');
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
 }
 
-sal_Bool CSS1Expression::GetColor( Color &rColor ) const
+bool CSS1Expression::GetColor( Color &rColor ) const
 {
     OSL_ENSURE( CSS1_IDENT==eType || CSS1_RGB==eType ||
                 CSS1_HEXCOLOR==eType || CSS1_STRING==eType,
                 "CSS1-Ausruck kann keine Farbe sein" );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt32 nColor = SAL_MAX_UINT32;
 
     switch( eType )
@@ -1320,7 +1320,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
             rColor.SetGreen( aColors[1] );
             rColor.SetBlue( aColors[2] );
 
-            bRet = sal_True;    // etwas anderes als eine Farbe kann es nicht sein
+            bRet = true;    // etwas anderes als eine Farbe kann es nicht sein
         }
         break;
 
@@ -1339,7 +1339,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
         {
             // HACK fuer MS-IE: DIe Farbe kann auch in einem String stehen
             sal_Int32 nOffset = CSS1_STRING==eType ? 1 : 0;
-            sal_Bool bDouble = aValue.getLength()-nOffset == 3;
+            bool bDouble = aValue.getLength()-nOffset == 3;
             sal_Int32 i = nOffset, nEnd = (bDouble ? 3 : 6) + nOffset;
 
             nColor = 0;
@@ -1366,7 +1366,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
                         nColor += c;
                 }
             }
-            bRet = sal_True;
+            bRet = true;
         }
         break;
     default:
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index 84a8b68ac628..f4c0300cb758 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -138,8 +138,8 @@ public:
     inline sal_Int32 GetSLength() const;
     sal_Unicode GetOp() const { return cOp; }
 
-    sal_Bool GetURL( OUString& rURL ) const;
-    sal_Bool GetColor( Color &rRGB ) const;
+    bool GetURL( OUString& rURL ) const;
+    bool GetColor( Color &rRGB ) const;
 
     void SetNext( CSS1Expression *pNxt ) { pNext = pNxt; }
     const CSS1Expression *GetNext() const { return pNext; }
@@ -176,8 +176,8 @@ inline sal_Int32 CSS1Expression::GetSLength() const
  */
 class CSS1Parser
 {
-    sal_Bool bWhiteSpace : 1; // read a whitespace?
-    sal_Bool bEOF : 1; // is end of "file"?
+    bool bWhiteSpace : 1; // read a whitespace?
+    bool bEOF : 1; // is end of "file"?
 
     sal_Unicode cNextCh; // next character
 
@@ -204,9 +204,9 @@ class CSS1Parser
     CSS1Token GetNextToken();
 
     /// Is the parser still working?
-    sal_Bool IsParserWorking() const { return CSS1_PAR_WORKING == eState; }
+    bool IsParserWorking() const { return CSS1_PAR_WORKING == eState; }
 
-    sal_Bool IsEOF() const { return bEOF; }
+    bool IsEOF() const { return bEOF; }
 
     sal_uInt32 IncLineNr() { return ++nlLineNr; }
     sal_uInt32 IncLinePos() { return ++nlLinePos; }
@@ -228,7 +228,7 @@ protected:
      * @param rIn the style element as string
      * @return true if ???
      */
-    sal_Bool ParseStyleSheet( const OUString& rIn );
+    bool ParseStyleSheet( const OUString& rIn );
 
     /** parse the content of a HTML style option
      *
@@ -238,7 +238,7 @@ protected:
      * @param rIn the style option as string
      * @return true if ???
      */
-    sal_Bool ParseStyleOption( const OUString& rIn );
+    bool ParseStyleOption( const OUString& rIn );
 
     /** Called after a selector was parsed.
      *
@@ -254,7 +254,7 @@ protected:
      * @param pExpr ???
      * @return If true, the declaration will be deleted. (Returns always true?)
      */
-    virtual sal_Bool DeclarationParsed( const OUString& rProperty,
+    virtual bool DeclarationParsed( const OUString& rProperty,
                                     const CSS1Expression *pExpr );
 
 public:
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index cfc0d6bb465b..c1d3db5614a2 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -399,8 +399,8 @@ void SvxCSS1PropertyInfo::DestroyBorderInfos()
 void SvxCSS1PropertyInfo::Clear()
 {
     aId = "";
-    bTopMargin = bBottomMargin = sal_False;
-    bLeftMargin = bRightMargin = bTextIndent = sal_False;
+    bTopMargin = bBottomMargin = false;
+    bLeftMargin = bRightMargin = bTextIndent = false;
     nLeftMargin = nRightMargin = 0;
     eFloat = SVX_ADJUST_END;
 
@@ -424,22 +424,22 @@ void SvxCSS1PropertyInfo::Clear()
 void SvxCSS1PropertyInfo::Merge( const SvxCSS1PropertyInfo& rProp )
 {
     if( rProp.bTopMargin )
-        bTopMargin = sal_True;
+        bTopMargin = true;
     if( rProp.bBottomMargin )
-        bBottomMargin = sal_True;
+        bBottomMargin = true;
 
     if( rProp.bLeftMargin )
     {
-        bLeftMargin = sal_True;
+        bLeftMargin = true;
         nLeftMargin = rProp.nLeftMargin;
     }
     if( rProp.bRightMargin )
     {
-        bRightMargin = sal_True;
+        bRightMargin = true;
         nRightMargin = rProp.nRightMargin;
     }
     if( rProp.bTextIndent )
-        bTextIndent = sal_True;
+        bTextIndent = true;
 
     for( sal_uInt16 i=0; i<4; i++ )
     {
@@ -510,7 +510,7 @@ void SvxCSS1PropertyInfo::Merge( const SvxCSS1PropertyInfo& rProp )
     }
 }
 
-SvxCSS1BorderInfo *SvxCSS1PropertyInfo::GetBorderInfo( sal_uInt16 nLine, sal_Bool bCreate )
+SvxCSS1BorderInfo *SvxCSS1PropertyInfo::GetBorderInfo( sal_uInt16 nLine, bool bCreate )
 {
     sal_uInt16 nPos = 0;
     switch( nLine )
@@ -530,7 +530,7 @@ SvxCSS1BorderInfo *SvxCSS1PropertyInfo::GetBorderInfo( sal_uInt16 nLine, sal_Boo
 void SvxCSS1PropertyInfo::CopyBorderInfo( sal_uInt16 nSrcLine, sal_uInt16 nDstLine,
                                           sal_uInt16 nWhat )
 {
-    SvxCSS1BorderInfo *pSrcInfo = GetBorderInfo( nSrcLine, sal_False );
+    SvxCSS1BorderInfo *pSrcInfo = GetBorderInfo( nSrcLine, false );
     if( !pSrcInfo )
         return;
 
@@ -582,19 +582,19 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet,
     if( pDfltItem )
         aBoxItem = *pDfltItem;
 
-    SvxCSS1BorderInfo *pInfo = GetBorderInfo( BOX_LINE_TOP, sal_False );
+    SvxCSS1BorderInfo *pInfo = GetBorderInfo( BOX_LINE_TOP, false );
     if( pInfo )
         pInfo->SetBorderLine( BOX_LINE_TOP, aBoxItem );
 
-    pInfo = GetBorderInfo( BOX_LINE_BOTTOM, sal_False );
+    pInfo = GetBorderInfo( BOX_LINE_BOTTOM, false );
     if( pInfo )
         pInfo->SetBorderLine( BOX_LINE_BOTTOM, aBoxItem );
 
-    pInfo = GetBorderInfo( BOX_LINE_LEFT, sal_False );
+    pInfo = GetBorderInfo( BOX_LINE_LEFT, false );
     if( pInfo )
         pInfo->SetBorderLine( BOX_LINE_LEFT, aBoxItem );
 
-    pInfo = GetBorderInfo( BOX_LINE_RIGHT, sal_False );
+    pInfo = GetBorderInfo( BOX_LINE_RIGHT, false );
     if( pInfo )
         pInfo->SetBorderLine( BOX_LINE_RIGHT, aBoxItem );
 
@@ -655,12 +655,12 @@ SvxCSS1MapEntry::SvxCSS1MapEntry( const OUString& rKey, const SfxItemSet& rItemS
     aPropInfo( rProp )
 {}
 
-sal_Bool SvxCSS1Parser::StyleParsed( const CSS1Selector * /*pSelector*/,
+bool SvxCSS1Parser::StyleParsed( const CSS1Selector * /*pSelector*/,
                                  SfxItemSet& /*rItemSet*/,
                                  SvxCSS1PropertyInfo& /*rPropInfo*/ )
 {
     // wie man sieht passiert hier gar nichts
-    return sal_True;
+    return true;
 }
 
 bool SvxCSS1Parser::SelectorParsed( CSS1Selector *pSelector, bool bFirst )
@@ -685,17 +685,17 @@ bool SvxCSS1Parser::SelectorParsed( CSS1Selector *pSelector, bool bFirst )
     return false; // den Selektor haben wir gespeichert. Loeschen toedlich!
 }
 
-sal_Bool SvxCSS1Parser::DeclarationParsed( const OUString& rProperty,
+bool SvxCSS1Parser::DeclarationParsed( const OUString& rProperty,
                                        const CSS1Expression *pExpr )
 {
     OSL_ENSURE( pExpr, "DeclarationParsed() without Expression" );
 
     if( !pExpr )
-        return sal_True;
+        return true;
 
     ParseProperty( rProperty, pExpr );
 
-    return sal_True;    // die Deklaration brauchen wir nicht mehr. Loeschen!
+    return true;    // die Deklaration brauchen wir nicht mehr. Loeschen!
 }
 
 SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_uInt16 nMinFixLineSp,
@@ -709,7 +709,7 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_
     nMinFixLineSpace( nMinFixLineSp ),
     eDfltEnc( RTL_TEXTENCODING_DONTKNOW ),
     nScriptFlags( CSS1_SCRIPT_ALL ),
-    bIgnoreFontFamily( sal_False )
+    bIgnoreFontFamily( false )
 {
     // Item-Ids auch initialisieren
     aItemIds.nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, false );
@@ -793,7 +793,7 @@ const SvxCSS1MapEntry* SvxCSS1Parser::GetClass( const OUString& rClass ) const
 }
 
 void SvxCSS1Parser::InsertPage( const OUString& rPage,
-                                sal_Bool bPseudo,
+                                bool bPseudo,
                                 const SfxItemSet& rItemSet,
                                 const SvxCSS1PropertyInfo& rProp )
 {
@@ -826,12 +826,12 @@ SvxCSS1MapEntry* SvxCSS1Parser::GetTag( const OUString& rTag )
     return itr == aTags.end() ? NULL : itr->second;
 }
 
-sal_Bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn )
+bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn )
 {
     pItemSet = pSheetItemSet;
     pPropInfo = pSheetPropInfo;
 
-    sal_Bool bSuccess = CSS1Parser::ParseStyleSheet( rIn );
+    bool bSuccess = CSS1Parser::ParseStyleSheet( rIn );
 
     for (size_t i = 0; i < aSelectors.size(); ++i)
     {
@@ -849,14 +849,14 @@ sal_Bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn )
     return bSuccess;
 }
 
-sal_Bool SvxCSS1Parser::ParseStyleOption( const OUString& rIn,
+bool SvxCSS1Parser::ParseStyleOption( const OUString& rIn,
                                       SfxItemSet& rItemSet,
                                       SvxCSS1PropertyInfo& rPropInfo )
 {
     pItemSet = &rItemSet;
     pPropInfo = &rPropInfo;
 
-    sal_Bool bSuccess = CSS1Parser::ParseStyleOption( rIn );
+    bool bSuccess = CSS1Parser::ParseStyleOption( rIn );
     rItemSet.ClearItem( aItemIds.nDirection );
 
     pItemSet = 0;
@@ -865,7 +865,7 @@ sal_Bool SvxCSS1Parser::ParseStyleOption( const OUString& rIn,
     return bSuccess;
 }
 
-sal_Bool SvxCSS1Parser::GetEnum( const CSS1PropertyEnum *pPropTable,
+bool SvxCSS1Parser::GetEnum( const CSS1PropertyEnum *pPropTable,
                           const OUString &rValue, sal_uInt16& rEnum )
 {
     while( pPropTable->pName )
@@ -934,7 +934,7 @@ void SvxCSS1Parser::InsertMapEntry( const OUString& rKey,
     {
         SvxCSS1MapEntry* p = itr->second;
         MergeStyles( rItemSet, rProp,
-                     p->GetItemSet(), p->GetPropertyInfo(), sal_True );
+                     p->GetItemSet(), p->GetPropertyInfo(), true );
     }
 }
 
@@ -942,7 +942,7 @@ void SvxCSS1Parser::MergeStyles( const SfxItemSet& rSrcSet,
                                  const SvxCSS1PropertyInfo& rSrcInfo,
                                  SfxItemSet& rTargetSet,
                                  SvxCSS1PropertyInfo& rTargetInfo,
-                                 sal_Bool bSmart )
+                                 bool bSmart )
 {
     if( !bSmart )
     {
@@ -1068,8 +1068,8 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr,
     FontPitch ePitch = PITCH_DONTKNOW;
     rtl_TextEncoding eEnc = rParser.GetDfltEncoding();
     const FontList *pFList = rParser.GetFontList();
-    sal_Bool bFirst = sal_True;
-    sal_Bool bFound = sal_False;
+    bool bFirst = true;
+    bool bFound = false;
     while( pExpr && (bFirst || ','==pExpr->GetOp() || !pExpr->GetOp()) )
     {
         CSS1Token eType = pExpr->GetType();
@@ -1100,7 +1100,7 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr,
                         const FontInfo& rFInfo = pFList->GetFontInfo( hFont );
                         if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() )
                         {
-                            bFound = sal_True;
+                            bFound = true;
                             if( RTL_TEXTENCODING_SYMBOL == rFInfo.GetCharSet() )
                                 eEnc = RTL_TEXTENCODING_SYMBOL;
                         }
@@ -1113,7 +1113,7 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr,
         }
 
         pExpr = pExpr->GetNext();
-        bFirst = sal_False;
+        bFirst = false;
     }
 
     if( !aName.isEmpty() && !rParser.IsIgnoreFontFamily() )
@@ -1199,8 +1199,8 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr,
 {
     OSL_ENSURE( pExpr, "no expression" );
 
-    sal_Bool bPosture = sal_False;
-    sal_Bool bCaseMap = sal_False;
+    bool bPosture = false;
+    bool bCaseMap = false;
     FontItalic eItalic = ITALIC_NONE;
     SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED;
 
@@ -1224,15 +1224,15 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr,
                 {
                     // fuer 'normal' muessen wir auch die case-map aussch.
                     eCaseMap = SVX_CASEMAP_NOT_MAPPED;
-                    bCaseMap = sal_True;
+                    bCaseMap = true;
                 }
-                bPosture = sal_True;
+                bPosture = true;
             }
             else if( !bCaseMap &&
                      rValue.equalsIgnoreAsciiCase( "small-caps" ) )
             {
                 eCaseMap = SVX_CASEMAP_KAPITAELCHEN;
-                bCaseMap = sal_True;
+                bCaseMap = true;
             }
         }
 
@@ -1449,10 +1449,10 @@ static void ParseCSS1_background( const CSS1Expression *pExpr,
     Color aColor;
     OUString aURL;
 
-    sal_Bool bColor = sal_False, bTransparent = sal_False;
+    bool bColor = false, bTransparent = false;
     SvxGraphicPosition eRepeat = GPOS_TILED;
     SvxGraphicPosition ePos = GPOS_LT;
-    sal_Bool bHori = sal_False, bVert = sal_False;
+    bool bHori = false, bVert = false;
 
     while( pExpr && !pExpr->GetOp() )
     {
@@ -1478,12 +1478,12 @@ static void ParseCSS1_background( const CSS1Expression *pExpr,
                 if( !bHori )
                 {
                     ePos = nLength ? GPOS_MM : GPOS_LT;
-                    bHori = sal_True;
+                    bHori = true;
                 }
                 else if( !bVert )
                 {
                     MergeVert( ePos, (nLength ? GPOS_LM : GPOS_LT) );
-                    bVert = sal_True;
+                    bVert = true;
                 }
             }
             break;
@@ -1517,7 +1517,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr,
                 const OUString &rValue = pExpr->GetString();
                 if( rValue.equalsIgnoreAsciiCase( "transparent" ) )
                 {
-                    bTransparent = sal_True;
+                    bTransparent = true;
                 }
                 if( SvxCSS1Parser::GetEnum( aBGRepeatTable, rValue, nEnum ) )
                 {
@@ -1552,7 +1552,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr,
     // transparent schlaegt alles
     if( bTransparent )
     {
-        bColor = sal_False;
+        bColor = false;
         aURL = "";
     }
 
@@ -1588,7 +1588,7 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr,
 
     Color aColor;
 
-    sal_Bool bColor = sal_False, bTransparent = sal_False;
+    bool bColor = false, bTransparent = false;
 
     switch( pExpr->GetType() )
     {
@@ -1600,7 +1600,7 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr,
     case CSS1_STRING:       // Wegen MS-IE
         if( pExpr->GetString().equalsIgnoreAsciiCase( "transparent" ) )
         {
-            bTransparent = sal_True;
+            bTransparent = true;
         }
         else
         {
@@ -1845,11 +1845,11 @@ static void ParseCSS1_text_decoration( const CSS1Expression *pExpr,
 {
     OSL_ENSURE( pExpr, "no expression" );
 
-    sal_Bool bUnderline = sal_False;
-    sal_Bool bOverline = sal_False;
-    sal_Bool bCrossedOut = sal_False;
-    sal_Bool bBlink = sal_False;
-    sal_Bool bBlinkOn = sal_False;
+    bool bUnderline = false;
+    bool bOverline = false;
+    bool bCrossedOut = false;
+    bool bBlink = false;
+    bool bBlinkOn = false;
     FontUnderline eUnderline  = UNDERLINE_NONE;
     FontUnderline eOverline   = UNDERLINE_NONE;
     FontStrikeout eCrossedOut = STRIKEOUT_NONE;
@@ -1859,73 +1859,73 @@ static void ParseCSS1_text_decoration( const CSS1Expression *pExpr,
                      pExpr->GetType() == CSS1_STRING) && !pExpr->GetOp() )
     {
         OUString aValue = pExpr->GetString().toAsciiLowerCase();
-        sal_Bool bKnown = sal_False;
+        bool bKnown = false;
 
         switch( aValue[0] )
         {
         case 'n':
             if( aValue == "none" )
             {
-                bUnderline = sal_True;
+                bUnderline = true;
                 eUnderline = UNDERLINE_NONE;
 
-                bOverline = sal_True;
+                bOverline = true;
                 eOverline = UNDERLINE_NONE;
 
-                bCrossedOut = sal_True;
+                bCrossedOut = true;
                 eCrossedOut = STRIKEOUT_NONE;
 
-                bBlink = sal_True;
-                bBlinkOn = sal_False;
+                bBlink = true;
+                bBlinkOn = false;
 
-                bKnown = sal_True;
+                bKnown = true;
             }
             break;
 
         case 'u':
             if( aValue == "underline" )
             {
-                bUnderline = sal_True;
+                bUnderline = true;
                 eUnderline = UNDERLINE_SINGLE;
 
-                bKnown = sal_True;
+                bKnown = true;
             }
             break;
 
         case 'o':
             if( aValue == "overline" )
             {
-                bOverline = sal_True;
+                bOverline = true;
                 eOverline = UNDERLINE_SINGLE;
 
-                bKnown = sal_True;
+                bKnown = true;
             }
             break;
 
         case 'l':
             if( aValue == "line-through" )
             {
-                bCrossedOut = sal_True;
+                bCrossedOut = true;
                 eCrossedOut = STRIKEOUT_SINGLE;
 
-                bKnown = sal_True;
+                bKnown = true;
             }
             break;
 
         case 'b':
             if( aValue == "blink" )
             {
-                bBlink = sal_True;
-                bBlinkOn = sal_True;
+                bBlink = true;
+                bBlinkOn = true;
 
-                bKnown = sal_True;
+                bKnown = true;
             }
             break;
         }
 
         if( !bKnown )
         {
-            bUnderline = sal_True;
+            bUnderline = true;
             eUnderline = UNDERLINE_SINGLE;
         }
 
@@ -1973,12 +1973,12 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     short nIndent = 0;
-    sal_Bool bSet = sal_False;
+    bool bSet = false;
     switch( pExpr->GetType() )
     {
     case CSS1_LENGTH:
         nIndent = (short)pExpr->GetSLength();
-        bSet = sal_True;
+        bSet = true;
         break;
     case CSS1_PIXLENGTH:
         {
@@ -1986,7 +1986,7 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
             long nPHeight = 0;
             SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
             nIndent = (short)nPWidth;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PERCENTAGE:
@@ -2012,7 +2012,7 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
             aLRItem.SetTxtFirstLineOfst( nIndent );
             rItemSet.Put( aLRItem );
         }
-        rPropInfo.bTextIndent = sal_True;
+        rPropInfo.bTextIndent = true;
     }
 }
 
@@ -2024,13 +2024,13 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     long nLeft = 0;
-    sal_Bool bSet = sal_False;
+    bool bSet = false;
     switch( pExpr->GetType() )
     {
     case CSS1_LENGTH:
         {
             nLeft = pExpr->GetSLength();
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PIXLENGTH:
@@ -2038,7 +2038,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
             nLeft = (long)pExpr->GetNumber();
             long nPHeight = 0;
             SvxCSS1Parser::PixelToTwip( nLeft, nPHeight );
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PERCENTAGE:
@@ -2067,7 +2067,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
             aLRItem.SetTxtLeft( (sal_uInt16)nLeft );
             rItemSet.Put( aLRItem );
         }
-        rPropInfo.bLeftMargin = sal_True;
+        rPropInfo.bLeftMargin = true;
     }
 }
 
@@ -2079,13 +2079,13 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     long nRight = 0;
-    sal_Bool bSet = sal_False;
+    bool bSet = false;
     switch( pExpr->GetType() )
     {
     case CSS1_LENGTH:
         {
             nRight = pExpr->GetSLength();
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PIXLENGTH:
@@ -2093,7 +2093,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
             nRight = (long)pExpr->GetNumber();
             long nPHeight = 0;
             SvxCSS1Parser::PixelToTwip( nRight, nPHeight );
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PERCENTAGE:
@@ -2122,7 +2122,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
             aLRItem.SetRight( (sal_uInt16)nRight );
             rItemSet.Put( aLRItem );
         }
-        rPropInfo.bRightMargin = sal_True;
+        rPropInfo.bRightMargin = true;
     }
 }
 
@@ -2134,7 +2134,7 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     sal_uInt16 nUpper = 0;
-    sal_Bool bSet = sal_False;
+    bool bSet = false;
     switch( pExpr->GetType() )
     {
     case CSS1_LENGTH:
@@ -2143,7 +2143,7 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
             if( nTmp < 0 )
                 nTmp = 0;
             nUpper = (sal_uInt16)nTmp;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PIXLENGTH:
@@ -2154,7 +2154,7 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
                 nPHeight = 0;
             SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
             nUpper = (sal_uInt16)nPHeight;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PERCENTAGE:
@@ -2180,7 +2180,7 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
             aULItem.SetUpper( nUpper );
             rItemSet.Put( aULItem );
         }
-        rPropInfo.bTopMargin = sal_True;
+        rPropInfo.bTopMargin = true;
     }
 }
 
@@ -2192,7 +2192,7 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     sal_uInt16 nLower = 0;
-    sal_Bool bSet = sal_False;
+    bool bSet = false;
     switch( pExpr->GetType() )
     {
     case CSS1_LENGTH:
@@ -2201,7 +2201,7 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
             if( nTmp < 0 )
                 nTmp = 0;
             nLower = (sal_uInt16)nTmp;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PIXLENGTH:
@@ -2212,7 +2212,7 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
                 nPHeight = 0;
             SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
             nLower = (sal_uInt16)nPHeight;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PERCENTAGE:
@@ -2238,7 +2238,7 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
             aULItem.SetLower( nLower );
             rItemSet.Put( aULItem );
         }
-        rPropInfo.bBottomMargin = sal_True;
+        rPropInfo.bBottomMargin = true;
     }
 }
 
@@ -2250,11 +2250,11 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     long nMargins[4] = { 0, 0, 0, 0 };
-    sal_Bool bSetMargins[4] = { sal_False, sal_False, sal_False, sal_False };
+    bool bSetMargins[4] = { false, false, false, false };
 
     for( sal_uInt16 i=0; pExpr && i<4 && !pExpr->GetOp(); i++ )
     {
-        sal_Bool bSetThis = sal_False;
+        bool bSetThis = false;
         long nMargin = 0;
 
         switch( pExpr->GetType() )
@@ -2262,7 +2262,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
         case CSS1_LENGTH:
             {
                 nMargin = pExpr->GetSLength();
-                bSetThis = sal_True;
+                bSetThis = true;
             }
             break;
         case CSS1_PIXLENGTH:
@@ -2270,7 +2270,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
                 long nPWidth = 0;
                 nMargin =  (long)pExpr->GetNumber();
                 SvxCSS1Parser::PixelToTwip( nPWidth, nMargin );
-                bSetThis = sal_True;
+                bSetThis = true;
             }
             break;
         case CSS1_PERCENTAGE:
@@ -2291,19 +2291,19 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
             case 0:
                 nMargins[0] = nMargins[1] =nMargins[2] = nMargins[3] = nMargin;
                 bSetMargins[0] = bSetMargins[1] =
-                bSetMargins[2] = bSetMargins[3] = sal_True;
+                bSetMargins[2] = bSetMargins[3] = true;
                 break;
             case 1:
                 nMargins[1] = nMargins[3] = nMargin;    // right + left
-                bSetMargins[1] = bSetMargins[3] = sal_True;
+                bSetMargins[1] = bSetMargins[3] = true;
                 break;
             case 2:
                 nMargins[2] = nMargin;  // bottom
-                bSetMargins[2] = sal_True;
+                bSetMargins[2] = true;
                 break;
             case 3:
                 nMargins[3] = nMargin;  // left
-                bSetMargins[3] = sal_True;
+                bSetMargins[3] = true;
                 break;
             }
         }
@@ -2314,14 +2314,14 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
     {
         if( bSetMargins[3] )
         {
-            rPropInfo.bLeftMargin = sal_True;
+            rPropInfo.bLeftMargin = true;
             rPropInfo.nLeftMargin = nMargins[3];
             if( nMargins[3] < 0 )
                 nMargins[3] = 0;
         }
         if( bSetMargins[1] )
         {
-            rPropInfo.bRightMargin = sal_True;
+            rPropInfo.bRightMargin = true;
             rPropInfo.nRightMargin = nMargins[1];
             if( nMargins[1] < 0 )
                 nMargins[1] = 0;
@@ -2382,7 +2382,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
     }
 }
 
-static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
+static bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
                                    SfxItemSet & /*rItemSet*/,
                                    SvxCSS1PropertyInfo& rPropInfo,
                                    const SvxCSS1Parser& /*rParser*/,
@@ -2390,7 +2390,7 @@ static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
 {
     OSL_ENSURE( pExpr, "no expression" );
 
-    sal_Bool bSet = sal_False;
+    bool bSet = false;
     sal_uInt16 nDist = 0;
 
     switch( pExpr->GetType() )
@@ -2403,7 +2403,7 @@ static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
             else if( nTmp > USHRT_MAX-1 )
                 nTmp = USHRT_MAX-1;
             nDist = (sal_uInt16)nTmp;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PIXLENGTH:
@@ -2416,7 +2416,7 @@ static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
             if( nPWidth > USHRT_MAX-1 )
                 nPWidth = USHRT_MAX-1;
             nDist = (sal_uInt16)nPWidth;
-            bSet = sal_True;
+            bSet = true;
         }
         break;
     case CSS1_PERCENTAGE:
@@ -2504,7 +2504,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
                                   SfxItemSet & /*rItemSet*/,
                                   SvxCSS1PropertyInfo& rPropInfo,
                                   const SvxCSS1Parser& /*rParser*/,
-                                  sal_uInt16 nWhichLine, sal_Bool bAll )
+                                  sal_uInt16 nWhichLine, bool bAll )
 {
     OSL_ENSURE( pExpr, "no expression" );
 
@@ -2512,7 +2512,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
     sal_uInt16 nNWidth = 1;             // benannte Linien-Dicke (und default)
     CSS1BorderStyle eStyle = CSS1_BS_NONE; // Linien-Style
     Color aColor;
-    sal_Bool bColor = sal_False;
+    bool bColor = false;
 
     while( pExpr && !pExpr->GetOp() )
     {
@@ -2521,7 +2521,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
         case CSS1_RGB:
         case CSS1_HEXCOLOR:
             if( pExpr->GetColor( aColor ) )
-                bColor = sal_True;
+                bColor = true;
             break;
 
         case CSS1_IDENT:
@@ -2538,7 +2538,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
                 }
                 else if( pExpr->GetColor( aColor ) )
                 {
-                    bColor = sal_True;
+                    bColor = true;
                 }
             }
             break;
@@ -2549,7 +2549,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
 
         case CSS1_PIXLENGTH:
             {
-                sal_Bool bHori = nWhichLine == BOX_LINE_TOP ||
+                bool bHori = nWhichLine == BOX_LINE_TOP ||
                              nWhichLine == BOX_LINE_BOTTOM;
                 // Ein Pixel wird zur Haarlinie (ist huebscher)
                 long nWidthL = (long)pExpr->GetNumber();
@@ -2624,7 +2624,7 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr,
 
     case CSS1_PIXLENGTH:
         {
-            sal_Bool bHori = nWhichLine == BOX_LINE_TOP ||
+            bool bHori = nWhichLine == BOX_LINE_TOP ||
                          nWhichLine == BOX_LINE_BOTTOM;
             long nWidthL = (long)pExpr->GetNumber();
             long nPWidth = bHori ? 0 : nWidthL;
@@ -2748,7 +2748,7 @@ static void ParseCSS1_border_top( const CSS1Expression *pExpr,
                                   SvxCSS1PropertyInfo& rPropInfo,
                                   const SvxCSS1Parser& rParser )
 {
-    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_TOP, sal_False );
+    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_TOP, false );
 }
 
 static void ParseCSS1_border_right( const CSS1Expression *pExpr,
@@ -2756,7 +2756,7 @@ static void ParseCSS1_border_right( const CSS1Expression *pExpr,
                                     SvxCSS1PropertyInfo& rPropInfo,
                                     const SvxCSS1Parser& rParser )
 {
-    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_RIGHT, sal_False );
+    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_RIGHT, false );
 }
 
 static void ParseCSS1_border_bottom( const CSS1Expression *pExpr,
@@ -2764,7 +2764,7 @@ static void ParseCSS1_border_bottom( const CSS1Expression *pExpr,
                                      SvxCSS1PropertyInfo& rPropInfo,
                                      const SvxCSS1Parser& rParser )
 {
-    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_BOTTOM, sal_False );
+    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_BOTTOM, false );
 }
 
 static void ParseCSS1_border_left( const CSS1Expression *pExpr,
@@ -2772,7 +2772,7 @@ static void ParseCSS1_border_left( const CSS1Expression *pExpr,
                                    SvxCSS1PropertyInfo& rPropInfo,
                                    const SvxCSS1Parser& rParser )
 {
-    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_LEFT, sal_False );
+    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, BOX_LINE_LEFT, false );
 }
 
 static void ParseCSS1_border( const CSS1Expression *pExpr,
@@ -2780,7 +2780,7 @@ static void ParseCSS1_border( const CSS1Expression *pExpr,
                               SvxCSS1PropertyInfo& rPropInfo,
                               const SvxCSS1Parser& rParser )
 {
-    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, 0, sal_True );
+    ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, 0, true );
 }
 
 static void ParseCSS1_float( const CSS1Expression *pExpr,
@@ -2816,7 +2816,7 @@ static void ParseCSS1_position( const CSS1Expression *pExpr,
 static void ParseCSS1_length( const CSS1Expression *pExpr,
                               long& rLength,
                               SvxCSS1LengthType& rLengthType,
-                              sal_Bool bHori )
+                              bool bHori )
 {
     switch( pExpr->GetType() )
     {
@@ -2862,7 +2862,7 @@ static void ParseCSS1_width( const CSS1Expression *pExpr,
                              SvxCSS1PropertyInfo& rPropInfo,
                              const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nWidth, rPropInfo.eWidthType, sal_True );
+    ParseCSS1_length( pExpr, rPropInfo.nWidth, rPropInfo.eWidthType, true );
 }
 
 static void ParseCSS1_height( const CSS1Expression *pExpr,
@@ -2870,7 +2870,7 @@ static void ParseCSS1_height( const CSS1Expression *pExpr,
                               SvxCSS1PropertyInfo& rPropInfo,
                               const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nHeight, rPropInfo.eHeightType, sal_False );
+    ParseCSS1_length( pExpr, rPropInfo.nHeight, rPropInfo.eHeightType, false );
 }
 
 static void ParseCSS1_left( const CSS1Expression *pExpr,
@@ -2878,7 +2878,7 @@ static void ParseCSS1_left( const CSS1Expression *pExpr,
                              SvxCSS1PropertyInfo& rPropInfo,
                              const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nLeft, rPropInfo.eLeftType, sal_True );
+    ParseCSS1_length( pExpr, rPropInfo.nLeft, rPropInfo.eLeftType, true );
 }
 
 static void ParseCSS1_top( const CSS1Expression *pExpr,
@@ -2886,7 +2886,7 @@ static void ParseCSS1_top( const CSS1Expression *pExpr,
                            SvxCSS1PropertyInfo& rPropInfo,
                            const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nTop, rPropInfo.eTopType, sal_False );
+    ParseCSS1_length( pExpr, rPropInfo.nTop, rPropInfo.eTopType, false );
 }
 
 // Feature: PrintExt
@@ -2981,15 +2981,15 @@ static void ParseCSS1_page_break_inside( const CSS1Expression *pExpr,
     SvxCSS1PageBreak eBreak(SVX_CSS1_PBREAK_NONE);
     ParseCSS1_page_break_xxx( pExpr, eBreak );
 
-    sal_Bool bSetSplit = sal_False, bSplit = sal_True;
+    bool bSetSplit = false, bSplit = true;
     switch( eBreak )
     {
     case SVX_CSS1_PBREAK_AUTO:
-        bSetSplit = sal_True;
+        bSetSplit = true;
         break;
     case SVX_CSS1_PBREAK_AVOID:
-        bSplit = sal_False;
-        bSetSplit = sal_True;
+        bSplit = false;
+        bSetSplit = true;
         break;
     default:
         ;
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index adfc1eea08bd..87879eb3e7ce 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -101,12 +101,12 @@ public:
 
     OUString aId;             // ID fuer Bookmarks, Rahmen etc.
 
-    sal_Bool bTopMargin : 1;
-    sal_Bool bBottomMargin : 1;
+    bool bTopMargin : 1;
+    bool bBottomMargin : 1;
 
-    sal_Bool bLeftMargin : 1;
-    sal_Bool bRightMargin : 1;
-    sal_Bool bTextIndent : 1;
+    bool bLeftMargin : 1;
+    bool bRightMargin : 1;
+    bool bTextIndent : 1;
 
     SvxAdjust eFloat;
 
@@ -141,7 +141,7 @@ public:
 
     void Clear();
 
-    SvxCSS1BorderInfo *GetBorderInfo( sal_uInt16 nLine, sal_Bool bCreate=sal_True );
+    SvxCSS1BorderInfo *GetBorderInfo( sal_uInt16 nLine, bool bCreate=true );
     void CopyBorderInfo( sal_uInt16 nSrcLine, sal_uInt16 nDstLine, sal_uInt16 nWhat );
     void CopyBorderInfo( sal_uInt16 nCount, sal_uInt16 nWhat );
 
@@ -174,18 +174,18 @@ public:
     const OUString& GetKey()  const { return aKey; }
     void SetKey( const OUString& rKey ) { aKey = rKey.toAsciiUpperCase(); }
 
-    friend sal_Bool operator==( const SvxCSS1MapEntry& rE1,
+    friend bool operator==( const SvxCSS1MapEntry& rE1,
                             const SvxCSS1MapEntry& rE2 );
-    friend sal_Bool operator<( const SvxCSS1MapEntry& rE1,
+    friend bool operator<( const SvxCSS1MapEntry& rE1,
                             const SvxCSS1MapEntry& rE2 );
 };
 
-inline sal_Bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
+inline bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 )
 {
     return  rE1.aKey==rE2.aKey;
 }
 
-inline sal_Bool operator<( const SvxCSS1MapEntry& rE1,  const SvxCSS1MapEntry& rE2 )
+inline bool operator<( const SvxCSS1MapEntry& rE1,  const SvxCSS1MapEntry& rE2 )
 {
     return  rE1.aKey<rE2.aKey;
 }
@@ -222,7 +222,7 @@ class SvxCSS1Parser : public CSS1Parser
     rtl_TextEncoding    eDfltEnc;
     sal_uInt16          nScriptFlags;
 
-    sal_Bool bIgnoreFontFamily;
+    bool bIgnoreFontFamily;
 
     void ParseProperty( const OUString& rProperty,
                         const CSS1Expression *pExpr );
@@ -242,7 +242,7 @@ protected:
     // Selektor nicht mehr gespeichert!
     // Der ItemSet darf entsprechend modifiziert werden!
     // Die Implementierung dieser Methode gibt sal_False zurueck.
-    virtual sal_Bool StyleParsed( const CSS1Selector *pSelector,
+    virtual bool StyleParsed( const CSS1Selector *pSelector,
                               SfxItemSet& rItemSet,
                               SvxCSS1PropertyInfo& rPropInfo );
 
@@ -256,7 +256,7 @@ protected:
     // Diese Methode wird fuer jede geparste Property aufgerufen
     // sie fuegt das Item in den ItemSet 'pItemSet' ein
     // Sie sollte in abgeleiteten Parsern nicht mehr ueberladen werden!
-    virtual sal_Bool DeclarationParsed( const OUString& rProperty,
+    virtual bool DeclarationParsed( const OUString& rProperty,
                                     const CSS1Expression *pExpr ) SAL_OVERRIDE;
 
 public:
@@ -267,20 +267,20 @@ public:
                    sal_uInt16 *pWhichIds=0, sal_uInt16 nWhichIds=0 );
     virtual ~SvxCSS1Parser();
 
-    sal_Bool IsIgnoreFontFamily() const { return bIgnoreFontFamily; }
-    void SetIgnoreFontFamily( sal_Bool bSet ) { bIgnoreFontFamily = bSet; }
+    bool IsIgnoreFontFamily() const { return bIgnoreFontFamily; }
+    void SetIgnoreFontFamily( bool bSet ) { bIgnoreFontFamily = bSet; }
 
     // Parsen eines Style-Sheets. Fuer jeden gefundenen Selektor
     // wird StyleParsed mit dem entsprechenem Item-Set aufgerufen
-    virtual sal_Bool ParseStyleSheet( const OUString& rIn );
+    virtual bool ParseStyleSheet( const OUString& rIn );
 
     // Parsen einer Style-Option. Hier wird einfach nur der Item-Set
     // gefuellt.
-    sal_Bool ParseStyleOption( const OUString& rIn, SfxItemSet& rItemSet,
+    bool ParseStyleOption( const OUString& rIn, SfxItemSet& rItemSet,
                            SvxCSS1PropertyInfo& rPropInfo );
 
     // Umwandeln eines Strings in den Wert eines Enums
-    static sal_Bool GetEnum( const CSS1PropertyEnum *pPropTable,
+    static bool GetEnum( const CSS1PropertyEnum *pPropTable,
                          const OUString& rValue, sal_uInt16 &rEnum );
 
     // Pixel in Twips wandeln
@@ -306,7 +306,7 @@ public:
 
     const SvxCSS1MapEntry* GetClass( const OUString& rClass ) const;
 
-    void InsertPage( const OUString& rPage, sal_Bool bPseudo,
+    void InsertPage( const OUString& rPage, bool bPseudo,
                             const SfxItemSet& rItemSet,
                             const SvxCSS1PropertyInfo& rProp );
 
@@ -321,7 +321,7 @@ public:
                       const SvxCSS1PropertyInfo& rSrcInfo,
                       SfxItemSet& rTargetSet,
                       SvxCSS1PropertyInfo& rTargetInfo,
-                      sal_Bool bSmart );
+                      bool bSmart );
 
     sal_uInt16 GetMinFixLineSpace() const { return nMinFixLineSpace; }
 
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 63a0e58db1db..54fc5cc186bd 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -43,42 +43,42 @@ class SwCSS1Parser : public SvxCSS1Parser
 
     sal_uInt16 nDropCapCnt;
 
-    sal_Bool bIsNewDoc : 1;
+    bool bIsNewDoc : 1;
 
-    sal_Bool bBodyBGColorSet : 1;
-    sal_Bool bBodyBackgroundSet : 1;
-    sal_Bool bBodyTextSet : 1;
-    sal_Bool bBodyLinkSet : 1;
-    sal_Bool bBodyVLinkSet : 1;
+    bool bBodyBGColorSet : 1;
+    bool bBodyBackgroundSet : 1;
+    bool bBodyTextSet : 1;
+    bool bBodyLinkSet : 1;
+    bool bBodyVLinkSet : 1;
 
-    sal_Bool bSetFirstPageDesc : 1;
-    sal_Bool bSetRightPageDesc : 1;
+    bool bSetFirstPageDesc : 1;
+    bool bSetRightPageDesc : 1;
 
-    sal_Bool bTableHeaderTxtCollSet : 1;
-    sal_Bool bTableTxtCollSet : 1;
+    bool bTableHeaderTxtCollSet : 1;
+    bool bTableTxtCollSet : 1;
 
-    sal_Bool bLinkCharFmtsSet : 1;
+    bool bLinkCharFmtsSet : 1;
 
     // die Vorlagen fuer DL anlegen
     SwTxtFmtColl* GetDefListTxtFmtColl( sal_uInt16 nCollId, sal_uInt16 nDeep );
 
-    const SwPageDesc* GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreate );
+    const SwPageDesc* GetPageDesc( sal_uInt16 nPoolId, bool bCreate );
 
-    void SetTableTxtColl( sal_Bool bHeader );
+    void SetTableTxtColl( bool bHeader );
     void SetLinkCharFmts();
 
 protected:
-    virtual sal_Bool StyleParsed( const CSS1Selector *pSelector,
+    virtual bool StyleParsed( const CSS1Selector *pSelector,
                               SfxItemSet& rItemSet,
                               SvxCSS1PropertyInfo& rPropInfo ) SAL_OVERRIDE;
 
     using CSS1Parser::ParseStyleSheet;
 
 public:
-    SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, sal_Bool bNewDoc );
+    SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const OUString& rBaseURL, bool bNewDoc );
     virtual ~SwCSS1Parser();
 
-    virtual sal_Bool ParseStyleSheet( const OUString& rIn ) SAL_OVERRIDE;
+    virtual bool ParseStyleSheet( const OUString& rIn ) SAL_OVERRIDE;
 
     // Die Font-Hoehe fuer eine bestimmte Font-Groesse (0-6) ermitteln
     virtual sal_uInt32 GetFontHeight( sal_uInt16 nSize ) const SAL_OVERRIDE;
@@ -104,9 +104,9 @@ public:
     // eine Benutzter-Vorlage, die on-demand angelegt wird, wenn
     // bCreate gesetzt ist.
     SwPageDesc* GetMasterPageDesc();
-    inline const SwPageDesc* GetFirstPageDesc( sal_Bool bCreate=sal_False );
-    inline const SwPageDesc* GetRightPageDesc( sal_Bool bCreate=sal_False );
-    inline const SwPageDesc* GetLeftPageDesc( sal_Bool bCreate=sal_False );
+    inline const SwPageDesc* GetFirstPageDesc( bool bCreate=false );
+    inline const SwPageDesc* GetRightPageDesc( bool bCreate=false );
+    inline const SwPageDesc* GetLeftPageDesc( bool bCreate=false );
 
     // Attribute an der HTML-Seitenvorlage setzen (gesetzte Attribute
     // werden aus dem Item-Set geloescht ). Wird fuer's BODY-Tag
@@ -125,33 +125,33 @@ public:
     void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet,
                       const OUString *pName=0 );
 
-    sal_Bool SetFmtBreak( SfxItemSet& rItemSet,
+    bool SetFmtBreak( SfxItemSet& rItemSet,
                       const SvxCSS1PropertyInfo& rPropInfo );
 
     static void AddClassName( OUString& rFmtName, const OUString& rClass );
 
     static inline void AddFirstLetterExt( OUString& rFmtName );
 
-    static sal_Bool MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
-                                 sal_Bool bAutoWidth=sal_False );
+    static bool MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
+                                 bool bAutoWidth=false );
 
     static sal_uInt16 GetScriptFromClass( OUString& rClass,
-                                      sal_Bool bSubClassOnly = sal_True );
+                                      bool bSubClassOnly = true );
 
-    sal_Bool IsBodyBGColorSet() const { return bBodyBGColorSet; }
-    sal_Bool IsBodyBackgroundSet() const { return bBodyBackgroundSet; }
-    sal_Bool IsBodyTextSet() const { return bBodyTextSet; }
-    sal_Bool IsBodyLinkSet() const { return bBodyLinkSet; }
-    sal_Bool IsBodyVLinkSet() const { return bBodyVLinkSet; }
+    bool IsBodyBGColorSet() const { return bBodyBGColorSet; }
+    bool IsBodyBackgroundSet() const { return bBodyBackgroundSet; }
+    bool IsBodyTextSet() const { return bBodyTextSet; }
+    bool IsBodyLinkSet() const { return bBodyLinkSet; }
+    bool IsBodyVLinkSet() const { return bBodyVLinkSet; }
 
-    sal_Bool IsSetFirstPageDesc() const { return bSetFirstPageDesc; }
-    sal_Bool IsSetRightPageDesc() const { return bSetRightPageDesc; }
+    bool IsSetFirstPageDesc() const { return bSetFirstPageDesc; }
+    bool IsSetRightPageDesc() const { return bSetRightPageDesc; }
 
-    void SetBodyBGColorSet() { bBodyBGColorSet = sal_True; }
-    void SetBodyBackgroundSet() { bBodyBackgroundSet = sal_True; }
-    void SetBodyTextSet() { bBodyTextSet = sal_True; }
-    void SetBodyLinkSet() { bBodyLinkSet = sal_True; }
-    void SetBodyVLinkSet() { bBodyVLinkSet = sal_True; }
+    void SetBodyBGColorSet() { bBodyBGColorSet = true; }
+    void SetBodyBackgroundSet() { bBodyBackgroundSet = true; }
+    void SetBodyTextSet() { bBodyTextSet = true; }
+    void SetBodyLinkSet() { bBodyLinkSet = true; }
+    void SetBodyVLinkSet() { bBodyVLinkSet = true; }
 
     const SvxBrushItem& GetPageDescBackground() const;
 
@@ -168,17 +168,17 @@ inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName )
     rFmtName += ".FL";   // first letter
 }
 
-inline const SwPageDesc* SwCSS1Parser::GetFirstPageDesc( sal_Bool bCreate )
+inline const SwPageDesc* SwCSS1Parser::GetFirstPageDesc( bool bCreate )
 {
     return GetPageDesc( RES_POOLPAGE_FIRST, bCreate );
 }
 
-inline const SwPageDesc* SwCSS1Parser::GetRightPageDesc( sal_Bool bCreate )
+inline const SwPageDesc* SwCSS1Parser::GetRightPageDesc( bool bCreate )
 {
     return GetPageDesc( RES_POOLPAGE_RIGHT, bCreate );
 }
 
-inline const SwPageDesc* SwCSS1Parser::GetLeftPageDesc( sal_Bool bCreate )
+inline const SwPageDesc* SwCSS1Parser::GetLeftPageDesc( bool bCreate )
 {
     return GetPageDesc( RES_POOLPAGE_LEFT, bCreate );
 }
@@ -186,13 +186,13 @@ inline const SwPageDesc* SwCSS1Parser::GetLeftPageDesc( sal_Bool bCreate )
 inline void SwCSS1Parser::SetTHTagStyles()
 {
     if( !bTableHeaderTxtCollSet )
-        SetTableTxtColl( sal_True );
+        SetTableTxtColl( true );
 }
 
 inline void SwCSS1Parser::SetTDTagStyles()
 {
     if( !bTableTxtCollSet )
-        SetTableTxtColl( sal_False );
+        SetTableTxtColl( false );
 }
 
 inline void SwCSS1Parser::SetATagStyles()
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 14cb6c4c4725..2fb457c14a66 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -139,7 +139,7 @@ static HTMLOptionEnum aHTMLSpacerTypeTable[] =
 
 HTMLReader::HTMLReader()
 {
-    bTmplBrowseMode = sal_True;
+    bTmplBrowseMode = true;
 }
 
 OUString HTMLReader::GetTemplateName() const
@@ -228,8 +228,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
                             const OUString& rPath,
                             const OUString& rBaseURL,
                             bool bReadNewDoc,
-                            SfxMedium* pMed, sal_Bool bReadUTF8,
-                            sal_Bool bNoHTMLComments )
+                            SfxMedium* pMed, bool bReadUTF8,
+                            bool bNoHTMLComments )
     : SfxHTMLParser( rIn, bReadNewDoc, pMed ),
     SwClient( 0 ),
     aPathToFile( rPath ),
@@ -409,7 +409,7 @@ SwHTMLParser::~SwHTMLParser()
 #ifdef DBG_UTIL
     OSL_ENSURE( !m_nContinue, "DTOR im Continue!" );
 #endif
-    sal_Bool bAsync = pDoc->IsInLoadAsynchron();
+    bool bAsync = pDoc->IsInLoadAsynchron();
     pDoc->SetInLoadAsynchron( false );
     pDoc->set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode);
 
@@ -600,7 +600,7 @@ void SwHTMLParser::Continue( int nToken )
     Link aOLELink( pDoc->GetOle2Link() );
     pDoc->SetOle2Link( Link() );
 
-    sal_Bool bModified = pDoc->IsModified();
+    bool bModified = pDoc->IsModified();
     bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
     pDoc->GetIDocumentUndoRedo().DoUndo(false);
 
@@ -625,7 +625,7 @@ void SwHTMLParser::Continue( int nToken )
     // Laufbalken wieder abschalten
     EndProgress( pDoc->GetDocShell() );
 
-    sal_Bool bLFStripped = sal_False;
+    bool bLFStripped = false;
     if( SVPAR_PENDING != GetStatus() )
     {
         // noch die letzten Attribute setzen
@@ -636,7 +636,7 @@ void SwHTMLParser::Continue( int nToken )
                     (SwScriptFieldType*)pDoc->GetSysFldType( RES_SCRIPTFLD );
 
                 SwScriptField aFld( pType, aScriptType, aScriptSource,
-                                    sal_False );
+                                    false );
                 InsertAttr( SwFmtFld( aFld ) );
             }
 
@@ -671,7 +671,7 @@ void SwHTMLParser::Continue( int nToken )
             if( !aParaAttrs.empty() )
                 aParaAttrs.clear();
 
-            SetAttr( sal_False );
+            SetAttr( false );
 
             // Noch die erst verzoegert gesetzten Styles setzen
             pCSS1Parser->SetDelayedStyles();
@@ -739,8 +739,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
             SwTxtNode* pAktNd;
             sal_uLong nNodeIdx = pPos->nNode.GetIndex();
 
-            sal_Bool bHasFlysOrMarks =
-                HasCurrentParaFlys() || HasCurrentParaBookmarks( sal_True );
+            bool bHasFlysOrMarks =
+                HasCurrentParaFlys() || HasCurrentParaBookmarks( true );
 
             if( IsNewDoc() )
             {
@@ -888,7 +888,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
     // offen ist (muss bei Abbruch nicht sein), die Action beenden,
     // uns von der Shell abmelden und schliesslich die alte Shell
     // wieder rekonstruieren.
-    CallEndAction( sal_True );
+    CallEndAction( true );
 
 #ifdef DBG_UTIL
     m_nContinue--;
@@ -919,7 +919,7 @@ void SwHTMLParser::DocumentDetected()
         if( IsInHeader() )
             FinishHeader( true );
 
-        CallEndAction( sal_True, sal_True );
+        CallEndAction( true, true );
 
         pDoc->GetIDocumentUndoRedo().DoUndo(false);
         // Durch das DocumentDetected wurde im allgemeinen eine
@@ -1034,8 +1034,8 @@ void SwHTMLParser::NextToken( int nToken )
     if( !bDocInitalized )
         DocumentDetected();
 
-    sal_Bool bGetIDOption = sal_False, bInsertUnknown = sal_False;
-    sal_Bool bUpperSpaceSave = bUpperSpace;
+    bool bGetIDOption = false, bInsertUnknown = false;
+    bool bUpperSpaceSave = bUpperSpace;
     bUpperSpace = false;
 
     // The following special cases may or have to be treated after the
@@ -1347,7 +1347,7 @@ void SwHTMLParser::NextToken( int nToken )
 
     case HTML_NOSCRIPT_ON:
     case HTML_NOSCRIPT_OFF:
-        bInsertUnknown = sal_True;
+        bInsertUnknown = true;
         break;
 
     case HTML_STYLE_ON:
@@ -1400,7 +1400,7 @@ void SwHTMLParser::NextToken( int nToken )
             break;
         }
         else
-            bGetIDOption = sal_True;
+            bGetIDOption = true;
             // <BR>s in <PRE> resemble true LFs, hence no break
 
     case HTML_NEWPARA:
@@ -1433,7 +1433,7 @@ void SwHTMLParser::NextToken( int nToken )
         if( !pTable && !pDoc->IsInHeaderFooter( pPam->GetPoint()->nNode ) )
         {
             NewAttr( &aAttrTab.pBreak, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) );
-            EndAttr( aAttrTab.pBreak, 0, sal_False );
+            EndAttr( aAttrTab.pBreak, 0, false );
         }
         break;
 
@@ -1512,7 +1512,7 @@ void SwHTMLParser::NextToken( int nToken )
     case HTML_DEFLIST_OFF:
         if( nOpenParaToken )
             EndPara();
-        EndDefListItem( 0, sal_False, 1==nDefListDeep );
+        EndDefListItem( 0, false, 1==nDefListDeep );
         EndDefList();
         break;
 
@@ -1520,7 +1520,7 @@ void SwHTMLParser::NextToken( int nToken )
     case HTML_DT_ON:
         if( nOpenParaToken )
             EndPara();
-        EndDefListItem( 0, sal_False );// close <DD>/<DT> and set no template
+        EndDefListItem( 0, false );// close <DD>/<DT> and set no template
         NewDefListItem( nToken );
         break;
 
@@ -1529,7 +1529,7 @@ void SwHTMLParser::NextToken( int nToken )
         // c.f. HTML_LI_OFF
         // Actually we should close a DD/DT now.
         // But neither Netscape nor Microsoft do this and so don't we.
-        EndDefListItem( nToken, sal_False );
+        EndDefListItem( nToken, false );
         break;
 
     // divisions
@@ -1584,12 +1584,12 @@ void SwHTMLParser::NextToken( int nToken )
     // templates
     case HTML_PARABREAK_ON:
         if( nOpenParaToken )
-            EndPara( sal_True );
+            EndPara( true );
         NewPara();
         break;
 
     case HTML_PARABREAK_OFF:
-        EndPara( sal_True );
+        EndPara( true );
         break;
 
     case HTML_ADDRESS_ON:
@@ -1704,7 +1704,7 @@ void SwHTMLParser::NextToken( int nToken )
     case HTML_UNORDERLIST_OFF:
         if( nOpenParaToken )
             EndPara();
-        EndNumBulListItem( 0, sal_True, GetNumInfo().GetDepth()==1 );
+        EndNumBulListItem( 0, true, GetNumInfo().GetDepth()==1 );
         EndNumBulList( nToken );
         break;
 
@@ -1718,13 +1718,13 @@ void SwHTMLParser::NextToken( int nToken )
             EndPara();
         }
 
-        EndNumBulListItem( 0, sal_False );// close <LI>/<LH> and don't set a template
+        EndNumBulListItem( 0, false );// close <LI>/<LH> and don't set a template
         NewNumBulListItem( nToken );
         break;
 
     case HTML_LI_OFF:
     case HTML_LISTHEADER_OFF:
-        EndNumBulListItem( nToken, sal_False );
+        EndNumBulListItem( nToken, false );
         break;
 
     // Attribute :
@@ -2035,47 +2035,47 @@ void SwHTMLParser::NextToken( int nToken )
 extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
 
 static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
-                                 sal_Bool& rScriptDependent, sal_Bool& rFont,
+                                 bool& rScriptDependent, bool& rFont,
                                  sal_uInt16& rScriptType )
 {
     sal_uInt16 nWhich = rAttr.GetItem().Which();
     switch( nWhich )
     {
     case RES_CHRATR_FONT:
-        rFont = sal_True;
+        rFont = true;
     case RES_CHRATR_FONTSIZE:
     case RES_CHRATR_LANGUAGE:
     case RES_CHRATR_POSTURE:
     case RES_CHRATR_WEIGHT:
         rScriptType = i18n::ScriptType::LATIN;
-        rScriptDependent = sal_True;
+        rScriptDependent = true;
         break;
     case RES_CHRATR_CJK_FONT:
-        rFont = sal_True;
+        rFont = true;
     case RES_CHRATR_CJK_FONTSIZE:
     case RES_CHRATR_CJK_LANGUAGE:
     case RES_CHRATR_CJK_POSTURE:
     case RES_CHRATR_CJK_WEIGHT:
         rScriptType = i18n::ScriptType::ASIAN;
-        rScriptDependent = sal_True;
+        rScriptDependent = true;
         break;
     case RES_CHRATR_CTL_FONT:
-        rFont = sal_True;
+        rFont = true;
     case RES_CHRATR_CTL_FONTSIZE:
     case RES_CHRATR_CTL_LANGUAGE:
     case RES_CHRATR_CTL_POSTURE:
     case RES_CHRATR_CTL_WEIGHT:
         rScriptType = i18n::ScriptType::COMPLEX;
-        rScriptDependent = sal_True;
+        rScriptDependent = true;
         break;
     default:
-        rScriptDependent = sal_False;
-        rFont = sal_False;
+        rScriptDependent = false;
+        rFont = false;
         break;
     }
 }
 
-sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNum )
+bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, bool bUpdateNum )
 {
     // Ein harter Zeilen-Umbruch am Ende muss immer entfernt werden.
     // Einen zweiten ersetzen wir durch einen Absatz-Abstand.
@@ -2095,7 +2095,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
         const SvxULSpaceItem& rULSpace =
             (const SvxULSpaceItem&)pTxtNode->SwCntntNode::GetAttr( RES_UL_SPACE );
 
-        sal_Bool bChange = AM_NOSPACE==eMode ? rULSpace.GetLower() > 0
+        bool bChange = AM_NOSPACE==eMode ? rULSpace.GetLower() > 0
                                          : rULSpace.GetLower() == 0;
 
         if( bChange )
@@ -2103,7 +2103,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
             const SvxULSpaceItem& rCollULSpace =
                 pTxtNode->GetAnyFmtColl().GetULSpace();
 
-            sal_Bool bMayReset = AM_NOSPACE==eMode ? rCollULSpace.GetLower() == 0
+            bool bMayReset = AM_NOSPACE==eMode ? rCollULSpace.GetLower() == 0
                                                : rCollULSpace.GetLower() > 0;
 
             if( bMayReset &&
@@ -2123,7 +2123,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
 
     SwPosition aOldPos( *pPam->GetPoint() );
 
-    sal_Bool bRet = pDoc->AppendTxtNode( *pPam->GetPoint() );
+    bool bRet = pDoc->AppendTxtNode( *pPam->GetPoint() );
 
     // Zeichen-Attribute aufspalten und ggf keine setzen, die ueber den
     // ganzen Absatz gesetzt sind
@@ -2138,7 +2138,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
         _HTMLAttr *pAttr = *pTbl;
         if( pAttr && pAttr->GetItem().Which() < RES_PARATR_BEGIN )
         {
-            sal_Bool bWholePara = sal_False;
+            bool bWholePara = false;
 
             while( pAttr )
             {
@@ -2153,9 +2153,9 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
                         pAttr->GetSttCnt() == 0;
 
                     sal_Int32 nStt = pAttr->nSttCntnt;
-                    sal_Bool bScript = sal_False, bFont = sal_False;
+                    bool bScript = false, bFont = false;
                     sal_uInt16 nScriptItem;
-                    sal_Bool bInsert = sal_True;
+                    bool bInsert = true;
                        lcl_swhtml_getItemInfo( *pAttr, bScript, bFont,
                                             nScriptItem );
                         // den besehrigen Teil setzen
@@ -2335,7 +2335,7 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
                 sal_Int32 nStt = *pHt->GetStart();
                 if( nStt >= aEndPos[nIdx] )
                 {
-                    sal_Bool bFont = (nIdx % 5) == 0;
+                    bool bFont = (nIdx % 5) == 0;
                     const SfxPoolItem& rItem =
                         ((const SwCntntNode *)pTxtNd)->GetAttr( nWhich );
                     if( bFont ? swhtml_css1atr_equalFontItems(rItem,pHt->GetAttr())
@@ -2414,8 +2414,8 @@ void SwHTMLParser::AddParSpace()
             //I find out, that it's CJK/CTL, then I set the paragraph space
             //to the value set in HTML_CJK_PARSPACE/HTML_CTL_PARSPACE.
 
-            sal_Bool bIsCJK = false;
-            sal_Bool bIsCTL = false;
+            bool bIsCJK = false;
+            bool bIsCTL = false;
             SwpHints& rHints = pTxtNode->GetSwpHints();
             sal_uInt16 nWhich;
             SwTxtAttr *pHt;
@@ -2518,13 +2518,13 @@ void SwHTMLParser::ShowStatline()
         SwViewShell *pVSh = CheckActionViewShell();
         if( pVSh && pVSh->HasInvalidRect() )
         {
-            CallEndAction( sal_False, sal_False );
-            CallStartAction( pVSh, sal_False );
+            CallEndAction( false, false );
+            CallStartAction( pVSh, false );
         }
     }
 }
 
-SwViewShell *SwHTMLParser::CallStartAction( SwViewShell *pVSh, sal_Bool bChkPtr )
+SwViewShell *SwHTMLParser::CallStartAction( SwViewShell *pVSh, bool bChkPtr )
 {
     OSL_ENSURE( !pActionViewShell, "CallStartAction: SwViewShell schon gesetzt" );
 
@@ -2553,7 +2553,7 @@ SwViewShell *SwHTMLParser::CallStartAction( SwViewShell *pVSh, sal_Bool bChkPtr
     return pActionViewShell;
 }
 
-SwViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr )
+SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr )
 {
     if( bChkPtr )
     {
@@ -2578,7 +2578,7 @@ SwViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr
         SwViewShell *pSh = pActionViewShell;
         do {
             if( pSh->IsA( TYPE( SwCrsrShell ) ) )
-                ((SwCrsrShell*)pSh)->SttEndDoc(sal_True);
+                ((SwCrsrShell*)pSh)->SttEndDoc(true);
             pSh = (SwViewShell *)pSh->GetNext();
         } while( pSh != pActionViewShell );
 
@@ -2587,10 +2587,10 @@ SwViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr
     if( pActionViewShell->ISA( SwEditShell ) )
     {
         //Schon gescrollt?, dann dafuer sorgen, dass die View sich nicht bewegt!
-        const sal_Bool bOldLock = pActionViewShell->IsViewLocked();
-        pActionViewShell->LockView( sal_True );
-        const sal_Bool bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev();
-        pActionViewShell->SetEndActionByVirDev( sal_True );;
+        const bool bOldLock = pActionViewShell->IsViewLocked();
+        pActionViewShell->LockView( true );
+        const bool bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev();
+        pActionViewShell->SetEndActionByVirDev( true );;
         ((SwEditShell*)pActionViewShell)->EndAction();
         pActionViewShell->SetEndActionByVirDev( bOldEndActionByVirDev );
         pActionViewShell->LockView( bOldLock );
@@ -2637,7 +2637,7 @@ SwViewShell *SwHTMLParser::CheckActionViewShell()
     return pActionViewShell;
 }
 
-void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
+void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                              _HTMLAttrs *pPostIts )
 {
     SwPaM* pAttrPam = new SwPaM( *pPam->GetPoint() );
@@ -2655,7 +2655,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
         sal_uInt16 nWhich = pAttr->pItem->Which();
 
         sal_uLong nEndParaIdx = pAttr->GetEndParaIdx();
-        sal_Bool bSetAttr;
+        bool bSetAttr;
         if( bChkEnd )
         {
             // Zechen-Attribute mit Ende moeglich frueh,
@@ -2896,7 +2896,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
                 "Nur Auto-Rahmen brauchen eine Spezialbehandlung" );
         const SwPosition *pFlyPos = rAnchor.GetCntntAnchor();
         sal_uLong nFlyParaIdx = pFlyPos->nNode.GetIndex();
-        sal_Bool bMoveFly;
+        bool bMoveFly;
         if( bChkEnd )
         {
             bMoveFly = nFlyParaIdx < rEndIdx.GetIndex() ||
@@ -2987,7 +2987,7 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem )
 }
 
 void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
-                            sal_Bool bChkEmpty )
+                            bool bChkEmpty )
 {
     OSL_ENSURE( !ppDepAttr, "SwHTMLParser::EndAttr: ppDepAttr-Feature ungetestet?" );
     // Der Listenkopf ist im Attribut gespeichert
@@ -3016,7 +3016,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
         OSL_ENSURE( pLast, "Attribut nicht in eigener Liste gefunden!" );
     }
 
-    sal_Bool bMoveBack = sal_False;
+    bool bMoveBack = false;
     sal_uInt16 nWhich = pAttr->pItem->Which();
     if( !nEndCnt && RES_PARATR_BEGIN <= nWhich &&
         *pEndIdx != pAttr->GetSttPara() )
@@ -3029,16 +3029,16 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
     // nun das Attrubut beenden
     _HTMLAttr *pNext = pAttr->GetNext();
 
-    sal_Bool bInsert;
+    bool bInsert;
     sal_uInt16 nScriptItem = 0;
-    sal_Bool bScript = sal_False, bFont = sal_False;
+    bool bScript = false, bFont = false;
     // ein Bereich ??
     if( !bChkEmpty || (RES_PARATR_BEGIN <= nWhich && bMoveBack) ||
         RES_PAGEDESC == nWhich || RES_BREAK == nWhich ||
         *pEndIdx != pAttr->GetSttPara() ||
         nEndCnt != pAttr->GetSttCnt() )
     {
-        bInsert = sal_True;
+        bInsert = true;
         // We do some optimization for script depenedent attribtes here.
         if( *pEndIdx == pAttr->GetSttPara() )
         {
@@ -3047,7 +3047,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
     }
     else
     {
-        bInsert = sal_False;
+        bInsert = false;
     }
 
     if( bInsert && bScript )
@@ -3239,7 +3239,7 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab )
 }
 
 void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
-                                 sal_Bool bMoveEndBack )
+                                 bool bMoveEndBack )
 {
     // preliminary paragraph attributes are not allowed here, they could
     // be set here and then the pointers become invalid!
@@ -3255,7 +3255,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
     // neu aufspannen
     _HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab;
     _HTMLAttr** pSaveTbl = (_HTMLAttr**)&rNewAttrTab;
-    sal_Bool bSetAttr = sal_True;
+    bool bSetAttr = true;
     const sal_Int32 nSttCnt = pPam->GetPoint()->nContent.GetIndex();
     sal_Int32 nEndCnt = nSttCnt;
 
@@ -3346,7 +3346,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
 }
 
 void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab,
-                                   sal_Bool bSetNewStart )
+                                   bool bSetNewStart )
 {
     // preliminary paragraph attributes are not allowed here, they could
     // be set here and then the pointers become invalid!
@@ -3389,8 +3389,8 @@ void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab,
     }
 }
 
-void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, sal_Bool bLikePara,
-                               sal_Bool bInsAtStart )
+void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, bool bLikePara,
+                               bool bInsAtStart )
 {
     _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(),
                                      rItem );
@@ -3456,7 +3456,7 @@ void SwHTMLParser::NewStdAttr( int nToken )
             if( HTML_SPAN_ON != nToken || aClass.isEmpty() ||
                 !CreateContainer( aClass, aItemSet, aPropInfo, pCntxt ) )
                 DoPositioning( aItemSet, aPropInfo, pCntxt );
-            InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+            InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
         }
     }
 
@@ -3513,7 +3513,7 @@ void SwHTMLParser::NewStdAttr( int nToken,
         if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
             DoPositioning( aItemSet, aPropInfo, pCntxt );
 
-        InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+        InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
     }
     else
     {
@@ -3607,7 +3607,7 @@ void SwHTMLParser::NewBasefontAttr()
         if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
             DoPositioning( aItemSet, aPropInfo, pCntxt );
 
-        InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+        InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
     }
     else
     {
@@ -3650,7 +3650,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
     Color aColor;
     sal_uLong nFontHeight = 0;  // tatsaechlich einzustellende Font-Hoehe
     sal_uInt16 nSize = 0;       // Fontgroesse in Netscape-Notation (1-7)
-    sal_Bool bColor = sal_False;
+    bool bColor = false;
 
     const HTMLOptions& rHTMLOptions = GetOptions();
     for (size_t i = rHTMLOptions.size(); i; )
@@ -3681,7 +3681,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
             if( HTML_FONT_ON==nToken )
             {
                 rOption.GetColor( aColor );
-                bColor = sal_True;
+                bColor = true;
             }
             break;
         case HTML_O_FACE:
@@ -3758,7 +3758,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
                 pFList = pFListItem->GetFontList();
         }
 
-        sal_Bool bFound = sal_False;
+        bool bFound = false;
         sal_Int32 nStrPos = 0;
         while( nStrPos!= -1 )
         {
@@ -3774,7 +3774,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
                         const FontInfo& rFInfo = pFList->GetFontInfo( hFont );
                         if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() )
                         {
-                            bFound = sal_True;
+                            bFound = true;
                             if( RTL_TEXTENCODING_SYMBOL == rFInfo.GetCharSet() )
                                 eEnc = RTL_TEXTENCODING_SYMBOL;
                         }
@@ -3820,7 +3820,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
         if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
             DoPositioning( aItemSet, aPropInfo, pCntxt );
 
-        InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+        InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
     }
     else
     {
@@ -3936,7 +3936,7 @@ void SwHTMLParser::NewPara()
     nOpenParaToken = HTML_PARABREAK_ON;
 }
 
-void SwHTMLParser::EndPara( sal_Bool bReal )
+void SwHTMLParser::EndPara( bool bReal )
 {
     if( HTML_LI_ON==nOpenParaToken && pTable )
     {
@@ -4267,7 +4267,7 @@ void SwHTMLParser::NewDefList()
     }
 
     // einen neuen Absatz aufmachen
-    sal_Bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0;
+    bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0;
     if( pPam->GetPoint()->nContent.GetIndex() )
         AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
     else if( bSpace )
@@ -4276,7 +4276,7 @@ void SwHTMLParser::NewDefList()
     // ein Level mehr
     nDefListDeep++;
 
-    sal_Bool bInDD = sal_False, bNotInDD = sal_False;
+    bool bInDD = false, bNotInDD = false;
     sal_uInt16 nPos = aContexts.size();
     while( !bInDD && !bNotInDD && nPos>nContextStMin )
     {
@@ -4288,10 +4288,10 @@ void SwHTMLParser::NewDefList()
         case HTML_MENULIST_ON:
         case HTML_ORDERLIST_ON:
         case HTML_UNORDERLIST_ON:
-            bNotInDD = sal_True;
+            bNotInDD = true;
             break;
         case HTML_DD_ON:
-            bInDD = sal_True;
+            bInDD = true;
             break;
         }
     }
@@ -4342,7 +4342,7 @@ void SwHTMLParser::NewDefList()
 
 void SwHTMLParser::EndDefList()
 {
-    sal_Bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1;
+    bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1;
     if( pPam->GetPoint()->nContent.GetIndex() )
         AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE );
     else if( bSpace )
@@ -4370,7 +4370,7 @@ void SwHTMLParser::EndDefList()
 void SwHTMLParser::NewDefListItem( int nToken )
 {
     // festellen, ob das DD/DT in einer DL vorkommt
-    sal_Bool bInDefList = sal_False, bNotInDefList = sal_False;
+    bool bInDefList = false, bNotInDefList = false;
     sal_uInt16 nPos = aContexts.size();
     while( !bInDefList && !bNotInDefList && nPos>nContextStMin )
     {
@@ -4378,13 +4378,13 @@ void SwHTMLParser::NewDefListItem( int nToken )
         switch( nCntxtToken )
         {
         case HTML_DEFLIST_ON:
-            bInDefList = sal_True;
+            bInDefList = true;
             break;
         case HTML_DIRLIST_ON:
         case HTML_MENULIST_ON:
         case HTML_ORDERLIST_ON:
         case HTML_UNORDERLIST_ON:
-            bNotInDefList = sal_True;
+            bNotInDefList = true;
             break;
         }
     }
@@ -4402,8 +4402,8 @@ void SwHTMLParser::NewDefListItem( int nToken )
                                               : RES_POOLCOLL_HTML_DT) );
 }
 
-void SwHTMLParser::EndDefListItem( int nToken, sal_Bool bSetColl,
-                                   sal_Bool /*bLastPara*/ )
+void SwHTMLParser::EndDefListItem( int nToken, bool bSetColl,
+                                   bool /*bLastPara*/ )
 {
     // einen neuen Absatz aufmachen
     if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
@@ -4451,8 +4451,8 @@ void SwHTMLParser::EndDefListItem( int nToken, sal_Bool bSetColl,
         SetTxtCollAttrs();
 }
 
-sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
-                                       sal_Bool bSurroundOnly ) const
+bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly,
+                                       bool bSurroundOnly ) const
 {
     // bNoSurroundOnly:     Der Absatz enthaelt mindestens einen Rahmen
     //                      ohne Umlauf
@@ -4463,7 +4463,7 @@ sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
 
     const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
 
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     for ( sal_uInt16 i=0; i<rFrmFmtTbl.size(); i++ )
     {
         SwFrmFmt *const pFmt = rFrmFmtTbl[i];
@@ -4482,7 +4482,7 @@ sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
         {
             if( !(bNoSurroundOnly || bSurroundOnly) )
             {
-                bFound = sal_True;
+                bFound = true;
                 break;
             }
             else
@@ -4496,7 +4496,7 @@ sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
                 {
                     if( SURROUND_NONE==eSurround )
                     {
-                        bFound = sal_True;
+                        bFound = true;
                         break;
                     }
                 }
@@ -4504,12 +4504,12 @@ sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
                 {
                     if( SURROUND_NONE==eSurround )
                     {
-                        bFound = sal_False;
+                        bFound = false;
                         break;
                     }
                     else if( SURROUND_THROUGHT!=eSurround )
                     {
-                        bFound = sal_True;
+                        bFound = true;
                         // weitersuchen: Es koennten ja noch welche ohne
                         // Umlauf kommen ...
                     }
@@ -4537,7 +4537,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
     const OUString& rTopClass = pContext ? pContext->GetClass() : aEmptyOUStr;
     sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT;
 
-    sal_Bool bInPRE=sal_False;                          // etwas Kontext Info
+    bool bInPRE=false;                          // etwas Kontext Info
 
     sal_uInt16 nLeftMargin = 0, nRightMargin = 0;   // die Einzuege und
     short nFirstLineIndent = 0;                 // Abstaende
@@ -4553,11 +4553,11 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
             // Es gibt eine Vorlage, die zu setzen ist. Dann
             // muss zunaechst einmal entschieden werden,
             // ob die Vorlage auch gesetzt werden kann
-            sal_Bool bSetThis = sal_True;
+            bool bSetThis = true;
             switch( nColl )
             {
             case sal_uInt16(RES_POOLCOLL_HTML_PRE):
-                bInPRE = sal_True;
+                bInPRE = true;
                 break;
             case sal_uInt16(RES_POOLCOLL_TEXT):
                 // <TD><P CLASS=xxx> muss TD.xxx werden
@@ -4571,7 +4571,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
                 break;
             default:
                 if( bInPRE )
-                    bSetThis = sal_False;
+                    bSetThis = false;
                 break;
             }
 
@@ -4721,7 +4721,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
 
     // ggf. noch den Absatz-Einzug korrigieren
     const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
-    sal_Bool bSetLRSpace;
+    bool bSetLRSpace;
 
            bSetLRSpace = nLeftMargin != rLRItem.GetTxtLeft() ||
                       nFirstLineIndent != rLRItem.GetTxtFirstLineOfst() ||
@@ -4740,7 +4740,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
             NewAttr( &aAttrTab.pLRSpace, aLRItem );
             aAttrTab.pLRSpace->SetLikePara();
             aParaAttrs.push_back( aAttrTab.pLRSpace );
-            EndAttr( aAttrTab.pLRSpace, 0, sal_False );
+            EndAttr( aAttrTab.pLRSpace, 0, false );
         }
     }
 
@@ -4799,7 +4799,7 @@ void SwHTMLParser::NewCharFmt( int nToken )
             OSL_ENSURE( aClass.isEmpty() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
             DoPositioning( aItemSet, aPropInfo, pCntxt );
-            InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True );
+            InsertAttrs( aItemSet, aPropInfo, pCntxt, true );
         }
     }
 
@@ -4821,8 +4821,8 @@ void SwHTMLParser::InsertSpacer()
     sal_Int16 eHoriOri = text::HoriOrientation::NONE;
     Size aSize( 0, 0);
     long nSize = 0;
-    sal_Bool bPrcWidth = sal_False;
-    sal_Bool bPrcHeight = sal_False;
+    bool bPrcWidth = false;
+    bool bPrcHeight = false;
     sal_uInt16 nType = HTML_SPTYPE_HORI;
 
     const HTMLOptions& rHTMLOptions = GetOptions();
@@ -4941,7 +4941,7 @@ void SwHTMLParser::InsertSpacer()
             else
             {
                 NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (sal_uInt16)nSize, RES_UL_SPACE ) );
-                EndAttr( aAttrTab.pULSpace, 0, sal_False );
+                EndAttr( aAttrTab.pULSpace, 0, false );
 
                 AppendTxtNode();    // nicht am Abstand drehen!
             }
@@ -4974,7 +4974,7 @@ void SwHTMLParser::InsertSpacer()
                 aLRItem.SetTxtFirstLineOfst( nIndent );
 
                 NewAttr( &aAttrTab.pLRSpace, aLRItem );
-                EndAttr( aAttrTab.pLRSpace, 0, sal_False );
+                EndAttr( aAttrTab.pLRSpace, 0, false );
             }
             else
             {
@@ -5061,8 +5061,8 @@ void SwHTMLParser::InsertLineBreak()
     //     harter Zeilenumbruch eingefuegt
 
     OUString aId, aStyle, aClass;             // die ID der Bookmark
-    sal_Bool bClearLeft = sal_False, bClearRight = sal_False;
-    sal_Bool bCleared = sal_False;  // wurde ein CLEAR ausgefuehrt?
+    bool bClearLeft = false, bClearRight = false;
+    bool bCleared = false;  // wurde ein CLEAR ausgefuehrt?
 
     // dann holen wir mal die Optionen
     const HTMLOptions& rHTMLOptions = GetOptions();
@@ -5076,13 +5076,13 @@ void SwHTMLParser::InsertLineBreak()
                     const OUString &rClear = rOption.GetString();
                     if( rClear.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_all ) )
                     {
-                        bClearLeft = sal_True;
-                        bClearRight = sal_True;
+                        bClearLeft = true;
+                        bClearRight = true;
                     }
                     else if( rClear.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left ) )
-                        bClearLeft = sal_True;
+                        bClearLeft = true;
                     else if( rClear.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ) )
-                        bClearRight = sal_True;
+                        bClearRight = true;
                 }
                 break;
             case HTML_O_ID:
@@ -5139,9 +5139,9 @@ void SwHTMLParser::InsertLineBreak()
                     {
                         SwFmtSurround aSurround( eSurround );
                         if( SURROUND_NONE != eSurround )
-                            aSurround.SetAnchorOnly( sal_True );
+                            aSurround.SetAnchorOnly( true );
                         pFmt->SetFmtAttr( aSurround );
-                        bCleared = sal_True;
+                        bCleared = true;
                     }
                 } // Anker ist nicht im Node
             } // Schleife ueber Fly-Frames
@@ -5150,7 +5150,7 @@ void SwHTMLParser::InsertLineBreak()
 
     // Styles parsen
     SvxFmtBreakItem aBreakItem( SVX_BREAK_NONE, RES_BREAK );
-    sal_Bool bBreakItem = sal_False;
+    bool bBreakItem = false;
     if( HasStyleOptions( aStyle, aId, aClass ) )
     {
         SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
@@ -5161,7 +5161,7 @@ void SwHTMLParser::InsertLineBreak()
             if( pCSS1Parser->SetFmtBreak( aItemSet, aPropInfo ) )
             {
                 aBreakItem = (const SvxFmtBreakItem &)aItemSet.Get( RES_BREAK );
-                bBreakItem = sal_True;
+                bBreakItem = true;
             }
             if( !aPropInfo.aId.isEmpty() )
                 InsertBookmark( aPropInfo.aId );
@@ -5171,7 +5171,7 @@ void SwHTMLParser::InsertLineBreak()
     if( bBreakItem && SVX_BREAK_PAGE_AFTER==aBreakItem.GetBreak() )
     {
         NewAttr( &aAttrTab.pBreak, aBreakItem );
-        EndAttr( aAttrTab.pBreak, 0, sal_False );
+        EndAttr( aAttrTab.pBreak, 0, false );
     }
 
     if( !bCleared && !bBreakItem )
@@ -5193,7 +5193,7 @@ void SwHTMLParser::InsertLineBreak()
     if( bBreakItem && SVX_BREAK_PAGE_BEFORE==aBreakItem.GetBreak() )
     {
         NewAttr( &aAttrTab.pBreak, aBreakItem );
-        EndAttr( aAttrTab.pBreak, 0, sal_False );
+        EndAttr( aAttrTab.pBreak, 0, false );
     }
 }
 
@@ -5204,9 +5204,9 @@ void SwHTMLParser::InsertHorzRule()
 
     SvxAdjust eAdjust = SVX_ADJUST_END;
 
-    sal_Bool bPrcWidth = sal_False;
-    sal_Bool bNoShade = sal_False;
-    sal_Bool bColor = sal_False;
+    bool bPrcWidth = false;
+    bool bNoShade = false;
+    bool bColor = false;
 
     Color aColor;
     OUString aId;
@@ -5231,7 +5231,7 @@ void SwHTMLParser::InsertHorzRule()
             {
                 // 100%-Linien sind der default-Fall (keine Attrs neotig)
                 nWidth = 0;
-                bPrcWidth = sal_False;
+                bPrcWidth = false;
             }
             break;
         case HTML_O_ALIGN:
@@ -5239,11 +5239,11 @@ void SwHTMLParser::InsertHorzRule()
                 (SvxAdjust)rOption.GetEnum( aHTMLPAlignTable, static_cast< sal_uInt16 >(eAdjust) );
             break;
         case HTML_O_NOSHADE:
-            bNoShade = sal_True;
+            bNoShade = true;
             break;
         case HTML_O_COLOR:
             rOption.GetColor( aColor );
-            bColor = sal_True;
+            bColor = true;
             break;
         }
     }
@@ -5363,7 +5363,7 @@ void SwHTMLParser::InsertHorzRule()
 void SwHTMLParser::ParseMoreMetaOptions()
 {
     OUString aName, aContent;
-    sal_Bool bHTTPEquiv = sal_False;
+    bool bHTTPEquiv = false;
 
     const HTMLOptions& rHTMLOptions = GetOptions();
     for (size_t i = rHTMLOptions.size(); i; )
@@ -5373,11 +5373,11 @@ void SwHTMLParser::ParseMoreMetaOptions()
         {
         case HTML_O_NAME:
             aName = rOption.GetString();
-            bHTTPEquiv = sal_False;
+            bHTTPEquiv = false;
             break;
         case HTML_O_HTTPEQUIV:
             aName = rOption.GetString();
-            bHTTPEquiv = sal_True;
+            bHTTPEquiv = true;
             break;
         case HTML_O_CONTENT:
             aContent = rOption.GetString();
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 4ff86f48f1db..2b0bf01908e8 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -106,8 +106,8 @@ public:
     sal_Int32 GetSttCnt() const { return nSttCntnt; }
     sal_Int32 GetEndCnt() const { return nEndCntnt; }
 
-    sal_Bool IsLikePara() const { return bLikePara; }
-    void SetLikePara( sal_Bool bPara=sal_True ) { bLikePara = bPara; }
+    bool IsLikePara() const { return bLikePara; }
+    void SetLikePara( bool bPara=true ) { bLikePara = bPara; }
 
           SfxPoolItem& GetItem()        { return *pItem; }
     const SfxPoolItem& GetItem() const  { return *pItem; }
@@ -127,7 +127,7 @@ public:
     // sind. Sie werden deshalb einfach invalidiert und erst beim naechsten
     // _SetAttr() geloescht.
     void Invalidate() { bValid = false; }
-    sal_Bool IsValid() const { return bValid; }
+    bool IsValid() const { return bValid; }
 };
 
 // Tabelle der Attribute: Hier ist die Reihenfolge wichtig: Die Attribute
@@ -227,7 +227,7 @@ public:
     void ClearSaveDocContext();
 
     _HTMLAttrContext( sal_uInt16 nTokn, sal_uInt16 nPoolId, const OUString& rClass,
-                      sal_Bool bDfltColl=sal_False ) :
+                      bool bDfltColl=false ) :
         aClass( rClass ),
         pSaveDocContext( 0 ),
         pFrmItemSet( 0 ),
@@ -283,41 +283,41 @@ public:
 
     inline void SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, short nIndent );
 
-    inline sal_Bool IsLRSpaceChanged() const { return bLRSpaceChanged; }
+    inline bool IsLRSpaceChanged() const { return bLRSpaceChanged; }
     inline void GetMargins( sal_uInt16& nLeft, sal_uInt16& nRight,
                             short &nIndent ) const;
 
     inline void SetULSpace( sal_uInt16 nUpper, sal_uInt16 nLower );
-    inline sal_Bool IsULSpaceChanged() const { return bULSpaceChanged; }
+    inline bool IsULSpaceChanged() const { return bULSpaceChanged; }
     inline void GetULSpace( sal_uInt16& rUpper, sal_uInt16& rLower ) const;
 
-    sal_Bool HasAttrs() const { return !aAttrs.empty(); }
+    bool HasAttrs() const { return !aAttrs.empty(); }
     const _HTMLAttrs& GetAttrs() const { return aAttrs; }
     _HTMLAttrs& GetAttrs() { return aAttrs; }
 
-    void SetSpansSection( sal_Bool bSet ) { bSpansSection = bSet; }
-    sal_Bool GetSpansSection() const { return bSpansSection; }
+    void SetSpansSection( bool bSet ) { bSpansSection = bSet; }
+    bool GetSpansSection() const { return bSpansSection; }
 
-    void SetPopStack( sal_Bool bSet ) { bPopStack = bSet; }
-    sal_Bool GetPopStack() const { return bPopStack; }
+    void SetPopStack( bool bSet ) { bPopStack = bSet; }
+    bool GetPopStack() const { return bPopStack; }
 
-    sal_Bool HasSaveDocContext() const { return pSaveDocContext!=0; }
-    _HTMLAttrContext_SaveDoc *GetSaveDocContext( sal_Bool bCreate=sal_False );
+    bool HasSaveDocContext() const { return pSaveDocContext!=0; }
+    _HTMLAttrContext_SaveDoc *GetSaveDocContext( bool bCreate=false );
 
     const SfxItemSet *GetFrmItemSet() const { return pFrmItemSet; }
     SfxItemSet *GetFrmItemSet( SwDoc *pCreateDoc );
 
-    void SetFinishPREListingXMP( sal_Bool bSet ) { bFinishPREListingXMP = bSet; }
-    sal_Bool IsFinishPREListingXMP() const { return bFinishPREListingXMP; }
+    void SetFinishPREListingXMP( bool bSet ) { bFinishPREListingXMP = bSet; }
+    bool IsFinishPREListingXMP() const { return bFinishPREListingXMP; }
 
-    void SetRestartPRE( sal_Bool bSet ) { bRestartPRE = bSet; }
-    sal_Bool IsRestartPRE() const { return bRestartPRE; }
+    void SetRestartPRE( bool bSet ) { bRestartPRE = bSet; }
+    bool IsRestartPRE() const { return bRestartPRE; }
 
-    void SetRestartXMP( sal_Bool bSet ) { bRestartXMP = bSet; }
-    sal_Bool IsRestartXMP() const { return bRestartXMP; }
+    void SetRestartXMP( bool bSet ) { bRestartXMP = bSet; }
+    bool IsRestartXMP() const { return bRestartXMP; }
 
-    void SetRestartListing( sal_Bool bSet ) { bRestartListing = bSet; }
-    sal_Bool IsRestartListing() const { return bRestartListing; }
+    void SetRestartListing( bool bSet ) { bRestartListing = bSet; }
+    bool IsRestartListing() const { return bRestartListing; }
 
     void SetAppendMode( SwHTMLAppendMode eMode=AM_NORMAL ) { eAppend = eMode; }
     SwHTMLAppendMode GetAppendMode() const { return eAppend; }
@@ -481,15 +481,15 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void DocumentDetected();
     void Show();
     void ShowStatline();
-    SwViewShell *CallStartAction( SwViewShell *pVSh = 0, sal_Bool bChkPtr = sal_True );
-    SwViewShell *CallEndAction( sal_Bool bChkAction = sal_False, sal_Bool bChkPtr = sal_True );
+    SwViewShell *CallStartAction( SwViewShell *pVSh = 0, bool bChkPtr = true );
+    SwViewShell *CallEndAction( bool bChkAction = false, bool bChkPtr = true );
     SwViewShell *CheckActionViewShell();
 
     DECL_LINK( AsyncCallback, void* );
 
     // Attribute am Dok setzen
-    void _SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, _HTMLAttrs *pPostIts );
-    inline void SetAttr( sal_Bool bChkEnd = sal_True, sal_Bool bBeforeTable = sal_False,
+    void _SetAttr( bool bChkEnd, bool bBeforeTable, _HTMLAttrs *pPostIts );
+    inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false,
                          _HTMLAttrs *pPostIts = 0 )
     {
         if( !aSetAttrTab.empty() || !aMoveFlyFrms.empty() )
@@ -499,7 +499,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     _HTMLAttr **GetAttrTabEntry( sal_uInt16 nWhich );
 
     // Einen neuen Textknoten an PaM-Position anlegen
-    sal_Bool AppendTxtNode( SwHTMLAppendMode eMode=AM_NORMAL, sal_Bool bUpdateNum=sal_True );
+    bool AppendTxtNode( SwHTMLAppendMode eMode=AM_NORMAL, bool bUpdateNum=true );
     void AddParSpace();
 
     // Ein Attribut beginnen/beenden
@@ -507,33 +507,33 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     // gesetzt sein muessen, bevor das Attribut beendet werden darf
     void NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem );
     void EndAttr( _HTMLAttr *pAttr, _HTMLAttr **ppDepAttr=0,
-                  sal_Bool bChkEmpty=sal_True );
+                  bool bChkEmpty=true );
     void DeleteAttr( _HTMLAttr* pAttr );
 
-    void EndContextAttrs( _HTMLAttrContext *pContext, sal_Bool bRemove=sal_False );
+    void EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove=false );
     void SaveAttrTab( _HTMLAttrTable& rNewAttrTab );
     void SplitAttrTab( const SwPosition& rNewPos );
-    void SplitAttrTab( _HTMLAttrTable& rNewAttrTab, sal_Bool bMoveEndBack = sal_True );
+    void SplitAttrTab( _HTMLAttrTable& rNewAttrTab, bool bMoveEndBack = true );
     void RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab,
-                         sal_Bool bSetNewStart = sal_False );
-    void InsertAttr( const SfxPoolItem& rItem, sal_Bool bLikePara = sal_False,
-                     sal_Bool bInsAtStart=sal_False );
+                         bool bSetNewStart = false );
+    void InsertAttr( const SfxPoolItem& rItem, bool bLikePara = false,
+                     bool bInsAtStart=false );
     void InsertAttrs( _HTMLAttrs& rAttrs );
 
-    sal_Bool DoPositioning( SfxItemSet &rItemSet,
+    bool DoPositioning( SfxItemSet &rItemSet,
                         SvxCSS1PropertyInfo &rPropInfo,
                         _HTMLAttrContext *pContext );
-    sal_Bool CreateContainer( const OUString& rClass, SfxItemSet &rItemSet,
+    bool CreateContainer( const OUString& rClass, SfxItemSet &rItemSet,
                           SvxCSS1PropertyInfo &rPropInfo,
                           _HTMLAttrContext *pContext );
-    sal_Bool EndSection( sal_Bool bLFStripped=sal_False );
+    bool EndSection( bool bLFStripped=false );
 
     void InsertAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
-                      _HTMLAttrContext *pContext, sal_Bool bCharLvl=sal_False );
+                      _HTMLAttrContext *pContext, bool bCharLvl=false );
     void InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem,
                      _HTMLAttrContext *pCntxt );
     void SplitPREListingXMP( _HTMLAttrContext *pCntxt );
-    void FixHeaderFooterDistance( sal_Bool bHeader, const SwPosition *pOldPos );
+    void FixHeaderFooterDistance( bool bHeader, const SwPosition *pOldPos );
 
     void EndContext( _HTMLAttrContext *pContext );
     void ClearContext( _HTMLAttrContext *pContext );
@@ -562,22 +562,22 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     // des Kontexts mit Token nLimit suchen. Wenn bRemove gesetzt ist,
     // wird er entfernt
     _HTMLAttrContext *PopContext( sal_uInt16 nToken=0, sal_uInt16 nLimit=0,
-                                  sal_Bool bRemove=sal_True );
+                                  bool bRemove=true );
     inline const _HTMLAttrContext *GetTopContext() const;
 
-    sal_Bool GetMarginsFromContext( sal_uInt16 &nLeft, sal_uInt16 &nRight, short& nIndent,
-                                sal_Bool bIgnoreCurrent=sal_False ) const;
-    sal_Bool GetMarginsFromContextWithNumBul( sal_uInt16 &nLeft, sal_uInt16 &nRight,
+    bool GetMarginsFromContext( sal_uInt16 &nLeft, sal_uInt16 &nRight, short& nIndent,
+                                bool bIgnoreCurrent=false ) const;
+    bool GetMarginsFromContextWithNumBul( sal_uInt16 &nLeft, sal_uInt16 &nRight,
                                           short& nIndent ) const;
     void GetULSpaceFromContext( sal_uInt16 &rUpper, sal_uInt16 &rLower ) const;
 
-    void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, sal_Bool bFmtBreak );
+    void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, bool bFmtBreak );
 
     // Behandlung von Tags auf Absatz-Ebene
 
     // <P> und <H1> bis <H6>
     void NewPara();
-    void EndPara( sal_Bool bReal = sal_False );
+    void EndPara( bool bReal = false );
     void NewHeading( int nToken );
     void EndHeading();
 
@@ -598,7 +598,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void RestoreDocContext( _HTMLAttrContext *pCntxt );
 
     // alle durch <DIV> aufgespannten Bereiche verlassen
-    sal_Bool EndSections( sal_Bool bLFStripped );
+    bool EndSections( bool bLFStripped );
 
     // <MULTICOL>
     void NewMultiCol( sal_uInt16 columnsFromCss=0 );
@@ -615,15 +615,15 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void NewNumBulList( int nToken );
     void EndNumBulList( int nToken=0 );
     void NewNumBulListItem( int nToken );
-    void EndNumBulListItem( int nToken=0, sal_Bool bSetColl=sal_True,
-                            sal_Bool bLastPara=sal_False );
+    void EndNumBulListItem( int nToken=0, bool bSetColl=true,
+                            bool bLastPara=false );
 
     // Definitions-Listen <DL> mit <DD>, <DT>
     void NewDefList();
     void EndDefList();
     void NewDefListItem( int nToken );
-    void EndDefListItem( int nToken=0, sal_Bool bSetColl=sal_True,
-                         sal_Bool bLastPara=sal_False );
+    void EndDefListItem( int nToken=0, bool bSetColl=true,
+                         bool bLastPara=false );
 
     // Behandlung von Tags auf Zeichen-Ebene
 
@@ -672,7 +672,7 @@ private:
     void SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                  sal_Int16 eHoriOri,
                                  SfxItemSet& rFrmSet,
-                                 sal_Bool bDontAppend=sal_False );
+                                 bool bDontAppend=false );
     void SetAnchorAndAdjustment( const SfxItemSet &rItemSet,
                                  const SvxCSS1PropertyInfo &rPropInfo,
                                  SfxItemSet &rFrmItemSet );
@@ -686,7 +686,7 @@ private:
     // Die Groesse des Fly-Frames an die Vorgaben und Gegebenheiten anpassen
     // (nicht fuer Grafiken, deshalb htmlplug.cxx)
     void SetFixSize( const Size& rPixSize, const Size& rTwipDfltSize,
-                     sal_Bool bPrcWidth, sal_Bool bPrcHeight,
+                     bool bPrcWidth, bool bPrcHeight,
                      SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet );
     void SetVarSize( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
@@ -734,7 +734,7 @@ private:
     void InsertComment( const OUString& rName, const sal_Char *pTag = 0 );
 
     // sind im aktuellen Absatz ::com::sun::star::text::Bookmarks vorhanden?
-    sal_Bool HasCurrentParaBookmarks( sal_Bool bIgnoreStack=sal_False ) const;
+    bool HasCurrentParaBookmarks( bool bIgnoreStack=false ) const;
 
     // Einfuegen von Script/Basic-Elementen
 
@@ -757,13 +757,13 @@ private:
     void NewStyle();
     void EndStyle();
 
-    inline sal_Bool HasStyleOptions( const OUString &rStyle, const OUString &rId,
+    inline bool HasStyleOptions( const OUString &rStyle, const OUString &rId,
                                  const OUString &rClass, const OUString *pLang=0,
-                                    const OUString *pDir=0 );
-    sal_Bool ParseStyleOptions( const OUString &rStyle, const OUString &rId,
+                                 const OUString *pDir=0 );
+    bool ParseStyleOptions( const OUString &rStyle, const OUString &rId,
                             const OUString &rClass, SfxItemSet &rItemSet,
                             SvxCSS1PropertyInfo &rPropInfo,
-                             const OUString *pLang=0, const OUString *pDir=0 );
+                            const OUString *pLang=0, const OUString *pDir=0 );
 
     // Inserting Controls and ::com::sun::star::form::Forms (htmlform.cxx)
 
@@ -773,7 +773,7 @@ private:
                            sal_Int16 eHoriOri,
                            SfxItemSet& rCSS1ItemSet,
                            SvxCSS1PropertyInfo& rCSS1PropInfo,
-                           sal_Bool bHidden=sal_False );
+                           bool bHidden=false );
                         ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >  InsertControl( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & rFormComp,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rFCompPropSet,
                         const Size& rSize,
@@ -784,10 +784,10 @@ private:
                         const SvxMacroTableDtor& rMacroTbl,
                         const std::vector<OUString>& rUnoMacroTbl,
                         const std::vector<OUString>& rUnoMacroParamTbl,
-                        sal_Bool bSetPropSet = sal_True,
-                        sal_Bool bHidden = sal_False );
+                        bool bSetPropSet = true,
+                        bool bHidden = false );
     void SetControlSize( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz,
-                         sal_Bool bMinWidth, sal_Bool bMinHeight );
+                         bool bMinWidth, bool bMinHeight );
 
 public:
     void ResizeDrawObject( SdrObject* pObj, SwTwips nWidth );
@@ -795,8 +795,8 @@ private:
     void RegisterDrawObjectToTable( HTMLTable *pCurTable, SdrObject* pObj,
                                     sal_uInt8 nWidth );
 
-    void NewForm( sal_Bool bAppend=sal_True );
-    void EndForm( sal_Bool bAppend=sal_True );
+    void NewForm( bool bAppend=true );
+    void EndForm( bool bAppend=true );
 
     // Insert methods for <INPUT>, <TEXTAREA> und <SELECT>
     void InsertInput();
@@ -821,28 +821,28 @@ public:
     const SwStartNode *InsertTableSection( sal_uInt16 nPoolId );
 
     // Insert methods for various table tags
-    HTMLTableCnts *InsertTableContents( sal_Bool bHead );
+    HTMLTableCnts *InsertTableContents( bool bHead );
 
 private:
     // Create a section for the temporary storage of the table caption
     SwStartNode *InsertTempTableCaptionSection();
 
-    void BuildTableCell( HTMLTable *pTable, sal_Bool bReadOptions, sal_Bool bHead );
-    void BuildTableRow( HTMLTable *pTable, sal_Bool bReadOptions,
+    void BuildTableCell( HTMLTable *pTable, bool bReadOptions, bool bHead );
+    void BuildTableRow( HTMLTable *pTable, bool bReadOptions,
                         SvxAdjust eGrpAdjust, sal_Int16 eVertOri );
-    void BuildTableSection( HTMLTable *pTable, sal_Bool bReadOptions, sal_Bool bHead );
-    void BuildTableColGroup( HTMLTable *pTable, sal_Bool bReadOptions );
+    void BuildTableSection( HTMLTable *pTable, bool bReadOptions, bool bHead );
+    void BuildTableColGroup( HTMLTable *pTable, bool bReadOptions );
     void BuildTableCaption( HTMLTable *pTable );
     HTMLTable *BuildTable( SvxAdjust eCellAdjust,
-                           sal_Bool bIsParentHead = sal_False,
-                           sal_Bool bHasParentSection=sal_True,
-                           sal_Bool bHasToFlow = sal_False );
+                           bool bIsParentHead = false,
+                           bool bHasParentSection=true,
+                           bool bHasToFlow = false );
 
     // misc ...
 
     void ParseMoreMetaOptions();
 
-    sal_Bool FileDownload( const OUString& rURL, OUString& rStr );
+    bool FileDownload( const OUString& rURL, OUString& rStr );
     void InsertLink();
 
     void InsertIDOption();
@@ -851,7 +851,7 @@ private:
 
     void FillEndNoteInfo( const OUString& rContent );
     void FillFootNoteInfo( const OUString& rContent );
-    void InsertFootEndNote( const OUString& rName, sal_Bool bEndNote, sal_Bool bFixed );
+    void InsertFootEndNote( const OUString& rName, bool bEndNote, bool bFixed );
     void FinishFootEndNote();
     void InsertFootEndNoteText();
     SwNodeIndex *GetFootEndNoteSection( const OUString& rName );
@@ -863,8 +863,8 @@ private:
     void StripTrailingPara();
 
     // Are there fly frames in the current paragraph?
-    sal_Bool HasCurrentParaFlys( sal_Bool bNoSurroundOnly = sal_False,
-                             sal_Bool bSurroundOnly = sal_False ) const;
+    bool HasCurrentParaFlys( bool bNoSurroundOnly = false,
+                             bool bSurroundOnly = false ) const;
 
 public:         // used in tables
 
@@ -891,8 +891,8 @@ public:
                     const OUString& rFileName,
                     const OUString& rBaseURL,
                     bool bReadNewDoc = true,
-                    SfxMedium* pMed = 0, sal_Bool bReadUTF8 = sal_False,
-                    sal_Bool bIgnoreHTMLComments = sal_False );
+                    SfxMedium* pMed = 0, bool bReadUTF8 = false,
+                    bool bIgnoreHTMLComments = false );
 
     virtual SvParserState CallParser() SAL_OVERRIDE;
 
@@ -968,7 +968,7 @@ inline void _HTMLAttrContext::GetULSpace( sal_uInt16& rUpper,
     }
 }
 
-inline sal_Bool SwHTMLParser::HasStyleOptions( const OUString &rStyle,
+inline bool SwHTMLParser::HasStyleOptions( const OUString &rStyle,
                                             const OUString &rId,
                                             const OUString &rClass,
                                             const OUString *pLang,
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index fb7481047ca5..2e9b9e7568b4 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -86,34 +86,34 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
     "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
 SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
-    : bCfgOutStyles( sal_False )
-    , bCfgPreferStyles( sal_False )
-    , bCfgFormFeed( sal_False )
-    , bCfgStarBasic( sal_False )
-    , bCfgCpyLinkedGrfs( sal_False )
-    , bFirstLine( sal_False )
-    , bTagOn( sal_False )
-    , bTxtAttr( sal_False )
-    , bOutOpts( sal_False )
-    , bOutTable( sal_False )
-    , bOutHeader( sal_False )
-    , bOutFooter( sal_False )
-    , bOutFlyFrame( sal_False )
-    , bFirstCSS1Rule( sal_False )
-    , bFirstCSS1Property( sal_False )
-    , bPoolCollTextModified( sal_False )
-    , bCSS1IgnoreFirstPageDesc( sal_False )
-    , bNoAlign( sal_False )
-    , bClearLeft( sal_False )
-    , bClearRight( sal_False )
-    , bLFPossible( sal_False )
-    , bPreserveForm( sal_False )
-    , bCfgNetscape4( sal_False )
+    : bCfgOutStyles( false )
+    , bCfgPreferStyles( false )
+    , bCfgFormFeed( false )
+    , bCfgStarBasic( false )
+    , bCfgCpyLinkedGrfs( false )
+    , bFirstLine( false )
+    , bTagOn( false )
+    , bTxtAttr( false )
+    , bOutOpts( false )
+    , bOutTable( false )
+    , bOutHeader( false )
+    , bOutFooter( false )
+    , bOutFlyFrame( false )
+    , bFirstCSS1Rule( false )
+    , bFirstCSS1Property( false )
+    , bPoolCollTextModified( false )
+    , bCSS1IgnoreFirstPageDesc( false )
+    , bNoAlign( false )
+    , bClearLeft( false )
+    , bClearRight( false )
+    , bLFPossible( false )
+    , bPreserveForm( false )
+    , bCfgNetscape4( false )
     , mbSkipImages(false)
 
 {
     SetBaseURL( rBaseURL );
-    bFirstLine = sal_True;
+    bFirstLine = true;
     nBkmkTabPos = -1;
     pDfltColor = 0;
     nImgMapCnt = 1;
@@ -207,7 +207,7 @@ sal_uLong SwHTMLWriter::WriteStream()
 
     eCSS1Unit = (FieldUnit)SW_MOD()->GetMetric( pDoc->get(IDocumentSettingAccess::HTML_MODE) );
 
-    sal_Bool bWriteUTF8 = bWriteClipboardDoc;
+    bool bWriteUTF8 = bWriteClipboardDoc;
     eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding();
     const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( eDestEnc );
     eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
@@ -221,7 +221,7 @@ sal_uLong SwHTMLWriter::WriteStream()
     bCfgCpyLinkedGrfs = rHtmlOptions.IsSaveGraphicsLocal();
 
     // die HTML-Vorlage holen
-    sal_Bool bOldHTMLMode = sal_False;
+    bool bOldHTMLMode = false;
     sal_uInt16 nOldTxtFmtCollCnt = 0, nOldCharFmtCnt = 0;
 
     OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
@@ -243,19 +243,19 @@ sal_uLong SwHTMLWriter::WriteStream()
     pDfltColor = 0;
     pFootEndNotes = 0;
     pFmtFtn = 0;
-    bOutTable = bOutHeader = bOutFooter = bOutFlyFrame = sal_False;
+    bOutTable = bOutHeader = bOutFooter = bOutFlyFrame = false;
     pxFormComps = 0;
     nFormCntrlCnt = 0;
-    bPreserveForm = sal_False;
-    bClearLeft = bClearRight = sal_False;
-    bLFPossible = sal_False;
+    bPreserveForm = false;
+    bClearLeft = bClearRight = false;
+    bLFPossible = false;
 
     nLeftMargin = nDfltLeftMargin = nDfltRightMargin = 0;
     nDfltTopMargin = nDfltBottomMargin = 0;
     nFirstLineIndent = nDfltFirstLineIndent = 0;
-    bPoolCollTextModified = sal_False;
-    bFirstCSS1Property = bFirstCSS1Rule = sal_False;
-    bCSS1IgnoreFirstPageDesc = sal_False;
+    bPoolCollTextModified = false;
+    bFirstCSS1Property = bFirstCSS1Rule = false;
+    bCSS1IgnoreFirstPageDesc = false;
     nIndentLvl = 0;
     nWhishLineLen = 70;
     nLastLFPos = 0;
@@ -346,7 +346,7 @@ sal_uLong SwHTMLWriter::WriteStream()
     sal_uInt16 nHeaderAttrs = 0;
     pCurrPageDesc = MakeHeader( nHeaderAttrs );
 
-    bLFPossible = sal_True;
+    bLFPossible = true;
 
     // Formulare, die nur HiddenControls enthalten ausgeben.
     OutHiddenForms();
@@ -364,7 +364,7 @@ sal_uLong SwHTMLWriter::WriteStream()
         const SwFrmFmt *pHeaderFmt =
             ((const SwFmtHeader *)pItem)->GetHeaderFmt();
         if( pHeaderFmt )
-            OutHTML_HeaderFooter( *this, *pHeaderFmt, sal_True );
+            OutHTML_HeaderFooter( *this, *pHeaderFmt, true );
     }
 
     nTxtAttrsToIgnore = nHeaderAttrs;
@@ -372,7 +372,7 @@ sal_uLong SwHTMLWriter::WriteStream()
     nTxtAttrsToIgnore = 0;
 
     if( pxFormComps && pxFormComps->is() )
-        OutForm( sal_False, *pxFormComps );
+        OutForm( false, *pxFormComps );
 
     if( pFootEndNotes )
         OutFootEndNotes();
@@ -384,7 +384,7 @@ sal_uLong SwHTMLWriter::WriteStream()
         const SwFrmFmt *pFooterFmt =
             ((const SwFmtFooter *)pItem)->GetFooterFmt();
         if( pFooterFmt )
-            OutHTML_HeaderFooter( *this, *pFooterFmt, sal_False );
+            OutHTML_HeaderFooter( *this, *pFooterFmt, false );
     }
 
     if( bLFPossible )
@@ -593,7 +593,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
     else if( pCol )
     {
         // minumum gutter width
-        sal_uInt16 nGutter = pCol->GetGutterWidth( sal_True );
+        sal_uInt16 nGutter = pCol->GetGutterWidth( true );
         if( nGutter!=USHRT_MAX )
         {
             if( nGutter && Application::GetDefaultDevice() )
@@ -606,12 +606,12 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
     }
 
     rHTMLWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    if( rHTMLWrt.IsHTMLMode( rHTMLWrt.bCfgOutStyles ) )
+    if( rHTMLWrt.IsHTMLMode( rHTMLWrt.bCfgOutStyles ? HTMLMODE_ON : 0 ) )
         rHTMLWrt.OutCSS1_SectionFmtOptions( rFmt, pCol );
 
     rHTMLWrt.Strm().WriteChar( '>' );
 
-    rHTMLWrt.bLFPossible = sal_True;
+    rHTMLWrt.bLFPossible = true;
     if( !rName.isEmpty() && !bContinued )
         rHTMLWrt.OutImplicitMark( rName, "region" );
 
@@ -624,7 +624,7 @@ static void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt )
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine();
     HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
-    rHTMLWrt.bLFPossible = sal_True;
+    rHTMLWrt.bLFPossible = true;
 }
 
 static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
@@ -696,7 +696,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
         HTMLSaveData aSaveData( rHTMLWrt,
             rHTMLWrt.pCurPam->GetPoint()->nNode.GetIndex()+1,
             rSectNd.EndOfSectionIndex(),
-            sal_False, pFmt );
+            false, pFmt );
         rHTMLWrt.Out_SwDoc( rHTMLWrt.pCurPam );
     }
 
@@ -718,7 +718,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
 
 void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
 {
-    sal_Bool bSaveWriteAll = bWriteAll;     // sichern
+    bool bSaveWriteAll = bWriteAll;     // sichern
 
     // suche die naechste text::Bookmark-Position aus der text::Bookmark-Tabelle
     nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1;
@@ -726,7 +726,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
     // gebe alle Bereiche des Pams in das HTML-File aus.
     do {
         bWriteAll = bSaveWriteAll;
-        bFirstLine = sal_True;
+        bFirstLine = true;
 
         // suche den ersten am Pam-auszugebenen FlyFrame
         // fehlt noch:
@@ -774,8 +774,8 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
              */
             bWriteAll = bSaveWriteAll ||
                         nPos != pCurPam->GetMark()->nNode.GetIndex();
-            bFirstLine = sal_False;
-            bOutFooter = sal_False; // Nach einem Node keine Fusszeile mehr
+            bFirstLine = false;
+            bOutFooter = false; // Nach einem Node keine Fusszeile mehr
         }
 
         ChangeParaToken( 0 ); // MIB 8.7.97: Machen wir jetzt hier und nicht
@@ -1000,7 +1000,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
 
     const SfxItemSet& rItemSet = pPageDesc->GetMaster().GetAttrSet();
 
-    OutBackground( rItemSet, sal_True );
+    OutBackground( rItemSet, true );
 
     nDirection = GetHTMLDirection( rItemSet );
     OutDirection( nDirection );
@@ -1110,7 +1110,7 @@ void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL )
                               &aNonConvertableCharacters );
 }
 
-void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, sal_Bool bGraphic )
+void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic )
 {
     const Color &rBackColor = pBrushItem->GetColor();
     /// check, if background color is not "no fill"/"auto fill", instead of
@@ -1141,7 +1141,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, sal_Bool bGrap
     }
 }
 
-void SwHTMLWriter::OutBackground( const SfxItemSet& rItemSet, sal_Bool bGraphic )
+void SwHTMLWriter::OutBackground( const SfxItemSet& rItemSet, bool bGraphic )
 {
     const SfxPoolItem* pItem;
     if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false,
@@ -1246,7 +1246,7 @@ OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl)
     return sRet;
 }
 
-void SwHTMLWriter::OutNewLine( sal_Bool bCheck )
+void SwHTMLWriter::OutNewLine( bool bCheck )
 {
     if( !bCheck || (Strm().Tell()-nLastLFPos) > nIndentLvl )
     {
@@ -1280,8 +1280,8 @@ sal_uInt16 SwHTMLWriter::GetHTMLFontSize( sal_uInt32 nHeight ) const
 // Struktur speichert die aktuellen Daten des Writers zwischen, um
 // einen anderen Dokument-Teil auszugeben, wie z.B. Header/Footer
 HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
-                            sal_uLong nEnd, sal_Bool bSaveNum,
-                                const SwFrmFmt *pFrmFmt)
+                           sal_uLong nEnd, bool bSaveNum,
+                           const SwFrmFmt *pFrmFmt)
     : rWrt(rWriter)
     , pOldPam(rWrt.pCurPam)
     , pOldEnd(rWrt.GetEndPaM())
@@ -1308,9 +1308,9 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt,
 
     rWrt.SetEndPaM( rWrt.pCurPam );
     rWrt.pCurPam->Exchange( );
-    rWrt.bWriteAll = sal_True;
+    rWrt.bWriteAll = true;
     rWrt.nDefListLvl = 0;
-    rWrt.bOutHeader = rWrt.bOutFooter = sal_False;
+    rWrt.bOutHeader = rWrt.bOutFooter = false;
 
     // Ggf. die aktuelle Numerierungs-Info merken, damit sie wieder
     // neu aufgenommen werden kann. Nur dann belibt auch die Numerierungs-
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index ca79e903efe6..adf80c80fc96 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -244,9 +244,9 @@ struct SwHTMLFmtInfo
 
     // Konstruktor zum Erstellen der Format-Info
     SwHTMLFmtInfo( const SwFmt *pFmt, SwDoc *pDoc, SwDoc *pTemlate,
-                   sal_Bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW,
+                   bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW,
                    sal_uInt16 nScript=CSS1_OUTMODE_ANY_SCRIPT,
-                   sal_Bool bHardDrop=sal_False );
+                   bool bHardDrop=false );
     ~SwHTMLFmtInfo();
 
     friend bool operator==( const SwHTMLFmtInfo& rInfo1,
@@ -348,16 +348,16 @@ public:
 
     // Beschreibung der Export-Konfiguration
     // 0
-    sal_Bool bCfgOutStyles : 1;         // Styles exportieren
-    sal_Bool bCfgPreferStyles : 1;      // Styles herkoemmlichen Tags vorziehen
-    sal_Bool bCfgFormFeed : 1;          // Form-Feeds exportieren
-    sal_Bool bCfgStarBasic : 1;         // StarBasic exportieren
-    sal_Bool bCfgCpyLinkedGrfs : 1;
+    bool bCfgOutStyles : 1;         // Styles exportieren
+    bool bCfgPreferStyles : 1;      // Styles herkoemmlichen Tags vorziehen
+    bool bCfgFormFeed : 1;          // Form-Feeds exportieren
+    bool bCfgStarBasic : 1;         // StarBasic exportieren
+    bool bCfgCpyLinkedGrfs : 1;
 
     // Beschreibung dessen, was exportiert wird
 
-    sal_Bool bFirstLine : 1;            // wird die 1. Zeile ausgegeben ?
-    sal_Bool bTagOn : 1;                // Tag an oder aus/Attr-Start oder -Ende
+    bool bFirstLine : 1;            // wird die 1. Zeile ausgegeben ?
+    bool bTagOn : 1;                // Tag an oder aus/Attr-Start oder -Ende
 
     // Die folgenden beiden Flags geben an, wir Attribute exportiert werden:
     // bTxtAttr bOutOpts
@@ -367,36 +367,36 @@ public:
     // 0        1           (Absatz-)Attribute: Das Attribut wird als Option
     //                          eines bereits geschrieben Tags exportiert. Es
     //                          gibt kein End-Tag.
-    sal_Bool bTxtAttr : 1;
+    bool bTxtAttr : 1;
     // 8
-    sal_Bool bOutOpts : 1;
+    bool bOutOpts : 1;
 
-    sal_Bool bOutTable : 1;             // wird der Tabelleninhalt geschrieben?
-    sal_Bool bOutHeader : 1;
-    sal_Bool bOutFooter : 1;
-    sal_Bool bOutFlyFrame : 1;
+    bool bOutTable : 1;             // wird der Tabelleninhalt geschrieben?
+    bool bOutHeader : 1;
+    bool bOutFooter : 1;
+    bool bOutFlyFrame : 1;
 
     // Flags fuer Style-Export
 
-    sal_Bool bFirstCSS1Rule : 1;        // wurde schon eine Property ausgegeben
-    sal_Bool bFirstCSS1Property : 1;    // wurde schon eine Property ausgegeben
-    sal_Bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde
+    bool bFirstCSS1Rule : 1;        // wurde schon eine Property ausgegeben
+    bool bFirstCSS1Property : 1;    // wurde schon eine Property ausgegeben
+    bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde
                                     // modifiziert.
     // 16
-    sal_Bool bCSS1IgnoreFirstPageDesc : 1;
+    bool bCSS1IgnoreFirstPageDesc : 1;
 
     // was muss/kann/darf nicht ausgegeben werden?
 
-    sal_Bool bNoAlign : 1;              // HTML-Tag erlaubt kein ALIGN=...
-    sal_Bool bClearLeft : 1;            // <BR CLEAR=LEFT> am Absatz-Ende ausg.
-    sal_Bool bClearRight : 1;           // <BR CLEAR=RIGHT> am Absatz-Ende ausg.
-    sal_Bool bLFPossible : 1;           // ein Zeilenumbruch darf eingef. werden
+    bool bNoAlign : 1;              // HTML-Tag erlaubt kein ALIGN=...
+    bool bClearLeft : 1;            // <BR CLEAR=LEFT> am Absatz-Ende ausg.
+    bool bClearRight : 1;           // <BR CLEAR=RIGHT> am Absatz-Ende ausg.
+    bool bLFPossible : 1;           // ein Zeilenumbruch darf eingef. werden
 
     // sonstiges
 
-    sal_Bool bPreserveForm : 1;         // die aktuelle Form beibehalten
+    bool bPreserveForm : 1;         // die aktuelle Form beibehalten
 
-    sal_Bool bCfgNetscape4 : 1;         // Netscape4 Hacks
+    bool bCfgNetscape4 : 1;         // Netscape4 Hacks
 
     bool mbSkipImages : 1;
 
@@ -414,19 +414,19 @@ public:
     void OutHyperlinkHRefValue( const OUString& rURL );
 
     // gebe die evt. an der akt. Position stehenden FlyFrame aus.
-    sal_Bool OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx,
+    bool OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nCntntIdx,
                         sal_uInt8 nPos, HTMLOutContext *pContext = 0 );
     void OutFrmFmt( sal_uInt8 nType, const SwFrmFmt& rFmt,
                     const SdrObject *pSdrObj );
 
-    void OutForm( sal_Bool bTagOn=sal_True, const SwStartNode *pStNd=0 );
+    void OutForm( bool bTagOn=true, const SwStartNode *pStNd=0 );
     void OutHiddenForms();
     void OutHiddenForm( const css::uno::Reference<css::form::XForm>& rForm );
 
-    void OutForm( sal_Bool bOn, const css::uno::Reference<css::container::XIndexContainer>& rFormComps );
+    void OutForm( bool bOn, const css::uno::Reference<css::container::XIndexContainer>& rFormComps );
     void OutHiddenControls( const css::uno::Reference<css::container::XIndexContainer>& rFormComps,
                             const css::uno::Reference<css::beans::XPropertySet>& rPropSet );
-    sal_Bool HasControls() const;
+    bool HasControls() const;
 
     void OutFootEndNoteInfo();
     void OutFootEndNotes();
@@ -438,7 +438,7 @@ public:
 
     void OutAndSetDefList( sal_uInt16 nNewLvl );
 
-    void OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed=sal_True );
+    void OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed=true );
 
     inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
                                        const sal_Char *pVal );
@@ -448,15 +448,15 @@ public:
     void OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal,
                            const OUString *pSVal );
     void OutCSS1_UnitProperty( const sal_Char *pProp, long nVal );
-    void OutCSS1_PixelProperty( const sal_Char *pProp, long nVal, sal_Bool bVert );
-    void OutCSS1_SfxItemSet( const SfxItemSet& rItemSet, sal_Bool bDeep=sal_True );
+    void OutCSS1_PixelProperty( const sal_Char *pProp, long nVal, bool bVert );
+    void OutCSS1_SfxItemSet( const SfxItemSet& rItemSet, bool bDeep=true );
 
     // BODY-Tag-Events aus der SFX-Konfigaurion
     void OutBasicBodyEvents();
 
     // BACKGROUND/BGCOLOR-Option
-    void OutBackground( const SvxBrushItem *pBrushItem, sal_Bool bGraphic );
-    void OutBackground( const SfxItemSet& rItemSet, sal_Bool bGraphic );
+    void OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic );
+    void OutBackground( const SfxItemSet& rItemSet, bool bGraphic );
 
     void OutLanguage( LanguageType eLang );
     sal_uInt16 GetHTMLDirection( sal_uInt16 nDir ) const;
@@ -492,7 +492,7 @@ public:
     {
         return (sal_Int32)(Strm().Tell()-nLastLFPos);
     }
-    void OutNewLine( sal_Bool bCheck=sal_False );
+    void OutNewLine( bool bCheck=false );
 
     // fuer HTMLSaveData
     SwPaM* GetEndPaM() { return pOrigPam; }
@@ -535,15 +535,15 @@ public:
 
     static void SubtractItemSet( SfxItemSet& rItemSet,
                                  const SfxItemSet& rRefItemSet,
-                                 sal_Bool bSetDefaults,
-                                 sal_Bool bClearSame = sal_True,
+                                 bool bSetDefaults,
+                                 bool bClearSame = true,
                                    const SfxItemSet *pRefScriptItemSet=0 );
-    static sal_Bool HasScriptDependentItems( const SfxItemSet& rItemSet,
-                                               sal_Bool bCheckDropCap );
+    static bool HasScriptDependentItems( const SfxItemSet& rItemSet,
+                                               bool bCheckDropCap );
 
     static void GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
                                       const SdrObject *pObj,
-                                      sal_Bool bSetDefaults );
+                                      bool bSetDefaults );
 
     static sal_uInt16 GetDefListLvl( const OUString& rNm, sal_uInt16 nPoolId );
 
@@ -551,7 +551,7 @@ public:
     {
         return nHTMLMode;
     }
-    sal_Bool IsHTMLMode( sal_uInt32 nMode ) const
+    bool IsHTMLMode( sal_uInt32 nMode ) const
     {
         return (nHTMLMode & nMode) != 0;
     }
@@ -561,7 +561,7 @@ public:
 
     static const sal_Char *GetNumFormat( sal_uInt16 nFmt );
     static void PrepareFontList( const SvxFontItem& rFontItem, OUString& rNames,
-                                 sal_Unicode cQuote, sal_Bool bGeneric );
+                                 sal_Unicode cQuote, bool bGeneric );
     static sal_uInt16 GetCSS1ScriptForScriptType( sal_uInt16 nScriptType );
     static sal_uInt16 GetLangWhichIdFromScript( sal_uInt16 nScript );
 
@@ -612,35 +612,35 @@ struct HTMLSaveData
     SwHTMLNumRuleInfo *pOldNextNumRuleInfo; // Owner = HTML-Writer
     sal_uInt16 nOldDefListLvl;
     sal_uInt16 nOldDirection;
-    sal_Bool bOldWriteAll : 1;
-    sal_Bool bOldOutHeader : 1;
-    sal_Bool bOldOutFooter : 1;
-    sal_Bool bOldOutFlyFrame : 1;
+    bool bOldWriteAll : 1;
+    bool bOldOutHeader : 1;
+    bool bOldOutFooter : 1;
+    bool bOldOutFlyFrame : 1;
     const SwFlyFrmFmt* pOldFlyFmt;
 
     HTMLSaveData( SwHTMLWriter&, sal_uLong nStt, sal_uLong nEnd,
-                  sal_Bool bSaveNum=sal_True,
-                     const SwFrmFmt *pFrmFmt=0  );
+                  bool bSaveNum=true,
+                  const SwFrmFmt *pFrmFmt=0  );
     ~HTMLSaveData();
 };
 
 // einige Funktions-Deklarationen
 Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFmt,
-                               sal_Bool bInCntnr );
+                               bool bInCntnr );
 Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFmt,
-                                  sal_Bool bInCntnr );
+                                  bool bInCntnr );
 
 Writer& OutHTML_SwTxtNode( Writer&, const SwCntntNode& );
 Writer& OutHTML_SwTblNode( Writer& , SwTableNode &, const SwFrmFmt *,
-                           const OUString* pCaption=0, sal_Bool bTopCaption=sal_False );
+                           const OUString* pCaption=0, bool bTopCaption=false );
 
 Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const SwDrawFrmFmt& rFmt,
-                                     const SdrObject& rSdrObj, sal_Bool bInCntnr );
+                                     const SdrObject& rSdrObj, bool bInCntnr );
 Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, const SwDrawFrmFmt& rFmt,
                                      const SdrObject& rSdrObj );
 
 Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
-                              sal_Bool bHeader );
+                              bool bHeader );
 
 Writer& OutHTML_Image( Writer&, const SwFrmFmt& rFmt,
                        Graphic& rGraphic, const OUString& rAlternateTxt,
@@ -653,7 +653,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag,
 
 Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt );
 Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt );
-Writer& OutHTML_INetFmt( Writer&, const SwFmtINetFmt& rINetFmt, sal_Bool bOn );
+Writer& OutHTML_INetFmt( Writer&, const SwFmtINetFmt& rINetFmt, bool bOn );
 
 Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet );
 Writer& OutCSS1_ParaTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet );
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index c77864c6b122..bc9b3cba693e 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -72,7 +72,7 @@ class SW_DLLPUBLIC SwRelNumRuleSpaces
     SwNumRuleTbl* pNumRuleTbl;  // Liste aller benannten NumRules
 
 public:
-    SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNewDoc );
+    SwRelNumRuleSpaces( SwDoc& rDoc, bool bNewDoc );
     ~SwRelNumRuleSpaces();
 };
 
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index dc660557a4c1..71cc1db2a1d3 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -105,9 +105,9 @@ public:
 
     SfxPoolItem * pAttr;// Format Attribute
 
-    sal_Bool bOld;          // to mark Attributes *before* skipping field results
-    sal_Bool bOpen;     //Entry open, awaiting being closed
-    sal_Bool bConsumedByField;
+    bool bOld;          // to mark Attributes *before* skipping field results
+    bool bOpen;     //Entry open, awaiting being closed
+    bool bConsumedByField;
 
     sal_Int32 mnStartCP;
     sal_Int32 mnEndCP;
@@ -181,7 +181,7 @@ public:
 
     void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
 
-    virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand = LONG_MAX, sal_Bool consumedByField=sal_False);
+    virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand = LONG_MAX, bool consumedByField=false);
 
     void StealAttr(const SwNodeIndex& rNode, sal_uInt16 nAttrId = 0);
     void MarkAllAttrsOld();
@@ -301,8 +301,8 @@ class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
 {
     SwTOXBase* pTOXBase;
     sal_uInt16 nCols;
-    sal_Bool bHadBreakItem; // there was a break item BEFORE insertion of the TOX
-    sal_Bool bHadPageDescItem;
+    bool bHadBreakItem; // there was a break item BEFORE insertion of the TOX
+    bool bHadPageDescItem;
 public:
     SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0);
     SwFltTOX(const SwFltTOX&);
@@ -311,10 +311,10 @@ public:
     virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
     SwTOXBase* GetBase()            { return pTOXBase; }
     sal_uInt16 GetCols() const          { return nCols; }
-    void SetHadBreakItem(    sal_Bool bVal ) { bHadBreakItem    = bVal; }
-    void SetHadPageDescItem( sal_Bool bVal ) { bHadPageDescItem = bVal; }
-    sal_Bool HadBreakItem()    const { return bHadBreakItem; }
-    sal_Bool HadPageDescItem() const { return bHadPageDescItem; }
+    void SetHadBreakItem(    bool bVal ) { bHadBreakItem    = bVal; }
+    void SetHadPageDescItem( bool bVal ) { bHadPageDescItem = bVal; }
+    bool HadBreakItem()    const { return bHadBreakItem; }
+    bool HadPageDescItem() const { return bHadPageDescItem; }
 };
 
 class SwFltSection : public SfxPoolItem
@@ -358,7 +358,7 @@ class SwFltOutBase
     SwDoc& rDoc;
 protected:
     RndStdIds eFlyAnchor;
-    sal_Bool bFlyAbsPos;
+    bool bFlyAbsPos;
 
     SwDoc& GetDoc()                 { return rDoc; }
     SfxItemSet* NewFlyDefaults();
@@ -386,7 +386,7 @@ public:
     virtual bool IsInFly() = 0;
     virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) = 0;
     virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) = 0;
-    virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+    virtual bool BeginFly( RndStdIds eAnchor, bool bAbsolutePos,
                                const SfxItemSet* pMoreAttrs = 0 );
     virtual void SetFlyAnchor( RndStdIds eAnchor );
     virtual void EndFly();
@@ -405,10 +405,10 @@ class SwFltOutDoc : public SwFltOutBase
     SwTwips nTableWidth;
     sal_uInt16 usTableX;
     sal_uInt16 usTableY;
-    sal_Bool bReadNoTbl;                // Keine Tabellen
+    bool bReadNoTbl;                // Keine Tabellen
 
     SwTableBox* GetBox(sal_uInt16 ny, sal_uInt16 nx = USHRT_MAX);
-    sal_Bool SeekCell( short nRow, short nCol, sal_Bool bPam );
+    bool SeekCell( short nRow, short nCol, bool bPam );
     void SplitTable();
 public:
     SwFltOutDoc(SwDoc& rDocu, SwPaM* pP, SwFltControlStack& rStk,
@@ -424,19 +424,19 @@ public:
         , nTableWidth(0)
         , usTableX(0)
         , usTableY(0)
-        , bReadNoTbl(sal_False)
+        , bReadNoTbl(false)
     {
     }
 
-    void SetReadNoTable()           { bReadNoTbl = sal_True; }
-    sal_Bool IsTableWidthSet() const    { return 0 != nTableWidth; }
+    void SetReadNoTable()           { bReadNoTbl = true; }
+    bool IsTableWidthSet() const    { return 0 != nTableWidth; }
 
     virtual SwFltOutBase& operator << (const SfxPoolItem& rItem) SAL_OVERRIDE;
 
     virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
     virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
 
-    sal_Bool IsInTable();
+    bool IsInTable();
     virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
     virtual bool BeginTable() SAL_OVERRIDE;
     virtual void NextTableCell() SAL_OVERRIDE;
@@ -454,7 +454,7 @@ public:
     virtual bool IsInFly() SAL_OVERRIDE;
     virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) SAL_OVERRIDE;
     virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
-    virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+    virtual bool BeginFly( RndStdIds eAnchor, bool bAbsolutePos,
                                const SfxItemSet* pMoreAttrs = 0 ) SAL_OVERRIDE;
     virtual void EndFly() SAL_OVERRIDE;
 };
@@ -490,7 +490,7 @@ public:
     virtual bool IsInFly() SAL_OVERRIDE;
     virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) SAL_OVERRIDE;
     virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) SAL_OVERRIDE;
-    virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+    virtual bool BeginFly( RndStdIds eAnchor, bool bAbsolutePos,
                                const SfxItemSet* pMoreAttrs = 0 ) SAL_OVERRIDE;
     bool BeginStyleFly( SwFltOutDoc* pOutDoc );
     virtual void EndFly() SAL_OVERRIDE;
@@ -540,12 +540,12 @@ class SwFltShell
     sal_uInt16 nPageDescOffset; // fuers update der pagedescs
     rtl_TextEncoding eSrcCharSet; // charset der quelle
     friend class SwFltControlStack;
-    sal_Bool bNewDoc;
-    sal_Bool bStdPD;
-    sal_Bool bProtect;
+    bool bNewDoc;
+    bool bStdPD;
+    bool bProtect;
 
 public:
-    SwFltShell(SwDoc* , SwPaM& , const OUString& rBaseURL, sal_Bool bNew, sal_uLong = 0);
+    SwFltShell(SwDoc* , SwPaM& , const OUString& rBaseURL, bool bNew, sal_uLong = 0);
     ~SwFltShell();
 
     SwDoc& GetDoc()                 { return *aStack.pDoc; }
@@ -554,8 +554,8 @@ public:
                                           eSrcCharSet = eNew;
                                           return eOld;
                                         }
-    void SetUseStdPageDesc()        { bStdPD = sal_True; }
-    void SetProtect()               { bProtect = sal_True; }
+    void SetUseStdPageDesc()        { bStdPD = true; }
+    void SetProtect()               { bProtect = true; }
     SwPageDesc* MakePageDesc(SwPageDesc* pFirstPageDesc = NULL);
     SwPageDesc& GetPageDesc()       { return *pCurrentPageDesc; }
     void NextTab()                  { (*this) << sal_uInt8(0x09); }
@@ -589,8 +589,8 @@ public:
     void BeginFootnote();
     void EndFootnote();
 // methoden zur verwaltung von Tabellen
-    sal_Bool IsInTable() {
-        return ( pOut == pOutDoc ) ? pOutDoc->IsInTable() : 0; }
+    bool IsInTable() {
+        return ( pOut == pOutDoc ) && pOutDoc->IsInTable(); }
     const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) {
         return pOut->GetCellAttr(nWhich); }
     bool BeginTable() {
@@ -603,7 +603,7 @@ public:
         pOut->NextTableRow(); }
     void SetTableWidth(SwTwips nW) {
         pOut->SetTableWidth(nW); }
-    sal_Bool IsTableWidthSet() {
+    bool IsTableWidthSet() {
         return pOutDoc->IsTableWidthSet(); }
     void SetTableOrient(sal_Int16 eOri) {
         pOut->SetTableOrient(eOri); }
@@ -621,7 +621,7 @@ public:
         pOut->EndTable(); }
 // methoden zur verwaltung von Flys
     bool IsInFly() { return pOut->IsInFly(); }
-    bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, sal_Bool bAbsolutePos = sal_False );
+    bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, bool bAbsolutePos = false );
     void SetFlyAnchor( RndStdIds eAnchor )
         { pOut->SetFlyAnchor( eAnchor ); }
     void SetFlyXPos( short nXPos, sal_Int16 eHRel = com::sun::star::text::RelOrientation::FRAME,
@@ -652,7 +652,7 @@ public:
         nAktStyle = nUserCode;
         eSubMode = Style;
     }
-    sal_Bool IsStyleImported(sal_uInt16 nUserCode)
+    bool IsStyleImported(sal_uInt16 nUserCode)
         { return pColls[nUserCode] != 0; }
     void BaseStyle(sal_uInt16 nBased)
     {
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 08975dab388a..e6b105dfda21 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -104,10 +104,10 @@ namespace sw
         sal_uLong MSDateTimeFormatToSwFormat(OUString& rParams, SvNumberFormatter *pFormatter, sal_uInt16 &rLang, bool bHijri, sal_uInt16 nDocLang);
 
         /*Used to identify if the previous token is AM time field*/
-        sal_Bool IsPreviousAM(OUString& rParams, sal_Int32 nPos);
+        bool IsPreviousAM(OUString& rParams, sal_Int32 nPos);
 
         /*Used to identify if the next token is PM time field*/
-        sal_Bool IsNextPM(OUString& rParams, sal_Int32 nPos);
+        bool IsNextPM(OUString& rParams, sal_Int32 nPos);
 
         /** Used by MSDateTimeFormatToSwFormat to identify AM time fields
 
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index e6a2e089706e..0f9734d38ec9 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -25,7 +25,7 @@ class RTFSurround
 {
     union {
         struct {
-            sal_uInt16 nGoldCut : 1;
+            bool nGoldCut : 1;
             sal_uInt16 nOrder : 4;
         } Flags;
         sal_uInt8 nVal;
@@ -33,13 +33,13 @@ class RTFSurround
 public:
     RTFSurround( sal_uInt8 nValue ) { Value.nVal = nValue; }
 
-    RTFSurround( sal_Bool bGoldCut, sal_uInt8 nOrder ) {
+    RTFSurround( bool bGoldCut, sal_uInt8 nOrder ) {
         Value.Flags.nOrder = nOrder;
         Value.Flags.nGoldCut = bGoldCut;
     }
 
-    sal_uInt8 GetOrder()     const { return (sal_uInt8)Value.Flags.nOrder; }
-    sal_Bool GetGoldCut()   const { return (sal_Bool)Value.Flags.nGoldCut; }
+    sal_uInt8  GetOrder()   const { return (sal_uInt8)Value.Flags.nOrder; }
+    bool       GetGoldCut() const { return Value.Flags.nGoldCut; }
     sal_uInt16 GetValue()   const { return Value.nVal; }
 };
 
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 6e06756f4c76..4a3ccf22fb31 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -33,7 +33,7 @@ typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ];
 
 SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
 SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
-                         sal_Bool bDeep, sal_Bool bTstForDefault = sal_True );
+                         bool bDeep, bool bTstForDefault = true );
 
 /* Funktionspointer auf die Node-Write-Funktionen */
 
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 1e4e6463779d..7231ab1bf40b 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -251,8 +251,8 @@ protected:
     bool bLayoutExport : 1;
     bool bCollectBorderWidth : 1;
 
-    virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox,
-                                sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const;
+    virtual bool ShouldExpandSub( const SwTableBox *pBox,
+                                bool bExpandedBefore, sal_uInt16 nDepth ) const;
 
     void CollectTableRowsCols( long nStartRPos, sal_uInt32 nStartCPos,
                                long nParentLineHeight,
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index c51975b5135e..e1c9cedba34c 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -123,7 +123,7 @@ Writer::Writer()
     bASCII_NoLastLineEnd = bASCII_ParaAsBlanc = bASCII_ParaAsCR =
         bWriteClipboardDoc = bWriteOnlyFirstTable = bBlock =
         bOrganizerMode = false;
-    bExportPargraphNumbering = sal_True;
+    bExportPargraphNumbering = true;
 }
 
 Writer::~Writer()
@@ -153,18 +153,18 @@ void Writer::ResetWriter()
     pOrigFileName = 0;
     pDoc = 0;
 
-    bShowProgress = bUCS2_WithStartChar = sal_True;
+    bShowProgress = bUCS2_WithStartChar = true;
     bASCII_NoLastLineEnd = bASCII_ParaAsBlanc = bASCII_ParaAsCR =
         bWriteClipboardDoc = bWriteOnlyFirstTable = bBlock =
-        bOrganizerMode = sal_False;
+        bOrganizerMode = false;
 }
 
-sal_Bool Writer::CopyNextPam( SwPaM ** ppPam )
+bool Writer::CopyNextPam( SwPaM ** ppPam )
 {
     if( (*ppPam)->GetNext() == pOrigPam )
     {
         *ppPam = pOrigPam;          // set back to the beginning pam
-        return sal_False;           // end of the ring
+        return false;           // end of the ring
     }
 
     // otherwise copy the next value from the next Pam
@@ -173,7 +173,7 @@ sal_Bool Writer::CopyNextPam( SwPaM ** ppPam )
     *pCurPam->GetPoint() = *(*ppPam)->Start();
     *pCurPam->GetMark() = *(*ppPam)->End();
 
-    return sal_True;
+    return true;
 }
 
 // search the next Bookmark-Position from the Bookmark-Table
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index b83fab140467..294816098baa 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -37,8 +37,8 @@ Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt )
 }
 
 Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
-                        const SfxItemSet& rSet, sal_Bool bDeep,
-                        sal_Bool bTstForDefault )
+                        const SfxItemSet& rSet, bool bDeep,
+                        bool bTstForDefault )
 {
     // at first give the own attributes out
     const SfxItemPool& rPool = *rSet.GetPool();
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 43d38546d596..7416dc1d0677 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -387,7 +387,7 @@ long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow,
     return nRawHeight > 0 ? nRawHeight : 0;
 }
 
-sal_Bool SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, sal_Bool /*bExpandedBefore*/,
+bool SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, bool /*bExpandedBefore*/,
     sal_uInt16 nDepth) const
 {
     return !pBox->GetSttNd() && nDepth > 0;
@@ -404,7 +404,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
                                            const SwTableLines& rLines,
                                            sal_uInt16 nDepth )
 {
-    sal_Bool bSubExpanded = sal_False;
+    bool bSubExpanded = false;
     sal_uInt16 nLines = rLines.size();
 
 #if OSL_DEBUG_LEVEL > 0
@@ -515,7 +515,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
                                         nCPos - nOldCPos,
                                         pBox->GetTabLines(),
                                         nDepth-1 );
-                bSubExpanded = sal_True;
+                bSubExpanded = true;
             }
         }
     }
@@ -531,7 +531,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
                                         sal_uInt16 nNumOfHeaderRows )
 {
     sal_uInt16 nLines = rLines.size();
-    sal_Bool bSubExpanded = sal_False;
+    bool bSubExpanded = false;
 
     // Specifying the border
     long nRPos = nStartRPos;
@@ -601,7 +601,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
             // If the row spans the entire table, we can
             // print out the background to the row. Otherwise
             // we have to print out into the cell.
-            sal_Bool bOutAtRow = !nParentLineWidth;
+            bool bOutAtRow = !nParentLineWidth;
             if( !bOutAtRow && nStartCPos==0 )
             {
                 SwWriteTableCol aCol( nParentLineWidth );
@@ -716,7 +716,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
                                     pBox->GetTabLines(),
                                     pLineBrush, nDepth-1,
                                     nNumOfHeaderRows );
-                bSubExpanded = sal_True;
+                bSubExpanded = true;
             }
 
             nCol++; // The next cell begins in the next column
@@ -814,7 +814,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo )
     {
         SwWriteTableRow *pRow = aRows[nRow];
 
-        sal_Bool bHeightExported = sal_False;
+        bool bHeightExported = false;
         for( nCol=0; nCol<nCols; nCol++ )
         {
             const SwHTMLTableLayoutCell *pLayoutCell =
@@ -869,7 +869,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo )
 
             // The height requires only to be written once
             if( nHeight )
-                bHeightExported = sal_True;
+                bHeightExported = true;
         }
     }
 
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index d6adfccc92a5..5eca85e2b888 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -84,9 +84,9 @@ SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt)
     , bIsParaEnd(false)
 {
     pAttr = pHt;            // store a copy of the attribute
-    bOld    = sal_False;    // used for marking Attributes *before* skipping field results
-    bOpen = sal_True;       // lock the attribute --> may first
-    bConsumedByField = sal_False;
+    bOld    = false;    // used for marking Attributes *before* skipping field results
+    bOpen = true;       // lock the attribute --> may first
+    bConsumedByField = false;
 }
 
 SwFltStackEntry::~SwFltStackEntry()
@@ -101,7 +101,7 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
     // Everything with sal_uInt16s, lest the inserting of new text at
     // the cursor position moves the attribute's range
     // That's not the desired behavior!
-    bOpen = sal_False;                  // release and remember END
+    bOpen = false;                  // release and remember END
     m_aPtPos.SetPos(rEndPos);
 }
 
@@ -206,7 +206,7 @@ void SwFltControlStack::MarkAllAttrsOld()
 {
     size_t nCnt = maEntries.size();
     for (sal_uInt16 i=0; i < nCnt; ++i)
-        maEntries[i].bOld = sal_True;
+        maEntries[i].bOld = true;
 }
 
 namespace
@@ -314,8 +314,8 @@ void SwFltControlStack::KillUnlockedAttrs(const SwPosition& rPos)
 // be applied to the document and removed from the stack.
 // Returns if there were any selected attributes on the stack
 SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos,
-    sal_uInt16 nAttrId, sal_Bool bTstEnde, long nHand,
-    sal_Bool consumedByField)
+    sal_uInt16 nAttrId, bool bTstEnde, long nHand,
+    bool consumedByField)
 {
     SwFltStackEntry *pRet = NULL;
 
@@ -419,7 +419,7 @@ static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
 // it adheres to certain restrictions on bookmarks in tables (cannot
 // span more than one cell)
 static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
-                    SwPaM& rRegion, sal_Bool bCheck )
+                    SwPaM& rRegion, bool bCheck )
 {
     if (rEntry.MakeRegion(pDoc, rRegion, bCheck )){
         // sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
@@ -571,7 +571,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
             if ( ( !IsFlagSet(HYPO) || IsFlagSet(BOOK_AND_REF) ) &&
                  !rEntry.bConsumedByField )
             {
-                MakeBookRegionOrPoint(rEntry, pDoc, aRegion, sal_True);
+                MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true);
                 // #i120879# - create a cross reference heading bookmark if appropriate.
                 const IDocumentMarkAccess::MarkType eBookmarkType =
                     ( pB->IsTOCBookmark() &&
@@ -967,7 +967,7 @@ SfxPoolItem* SwFltBookmark::Clone(SfxItemPool*) const
 // methods of SwFltTOX follow
 SwFltTOX::SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols)
     : SfxPoolItem(RES_FLTR_TOX), pTOXBase(pBase), nCols( _nCols ),
-      bHadBreakItem( sal_False ), bHadPageDescItem( sal_False )
+      bHadBreakItem( false ), bHadPageDescItem( false )
 {
 }
 
@@ -1015,7 +1015,7 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const
 // manage positions, styles & headers/footers etc.
 
 // SwFltShell
-SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) :
+SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, bool bNew, sal_uLong nFieldFl) :
     pCurrentPageDesc(0),
     pSavedPos(0),
     eSubMode(None),
@@ -1027,8 +1027,8 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_B
     nPageDescOffset(GetDoc().GetPageDescCnt()),
     eSrcCharSet(RTL_TEXTENCODING_MS_1252),
     bNewDoc(bNew),
-    bStdPD(sal_False),
-    bProtect(sal_False)
+    bStdPD(false),
+    bProtect(false)
 {
     memset( pColls, 0, sizeof( pColls ) );
     pOutDoc = new SwFltOutDoc( *pDoc, pPaM, aStack, aEndStack );
@@ -1072,11 +1072,11 @@ SwFltShell::~SwFltShell()
         EndFly();
 
     GetDoc().SetUpdateExpFldStat(true);
-    GetDoc().SetInitDBFields(sal_True);
-    aStack.SetAttr(*pPaM->GetPoint(), 0, sal_False);
-    aStack.SetAttr(*pPaM->GetPoint(), 0, sal_False);
-    aEndStack.SetAttr(*pPaM->GetPoint(), 0, sal_False);
-    aEndStack.SetAttr(*pPaM->GetPoint(), 0, sal_False);
+    GetDoc().SetInitDBFields(true);
+    aStack.SetAttr(*pPaM->GetPoint(), 0, false);
+    aStack.SetAttr(*pPaM->GetPoint(), 0, false);
+    aEndStack.SetAttr(*pPaM->GetPoint(), 0, false);
+    aEndStack.SetAttr(*pPaM->GetPoint(), 0, false);
     if( bProtect ){     // The entire document is supposed to be protected
 
         SwDoc& rDoc = GetDoc();
@@ -1132,7 +1132,7 @@ OUString SwFltShell::ConvertUStr(const OUString& rInOut)
 OUString SwFltShell::QuoteStr( const OUString& rIn )
 {
     OUStringBuffer sOut( rIn );
-    sal_Bool bAllowCr = aStack.IsFlagSet( SwFltControlStack::ALLOW_FLD_CR );
+    bool bAllowCr = aStack.IsFlagSet( SwFltControlStack::ALLOW_FLD_CR );
 
     for( sal_Int32 n = 0; n < sOut.getLength(); ++n )
     {
@@ -1259,7 +1259,7 @@ SwFltShell& SwFltShell::operator << (SwFltBookmark& aBook)
 
 void SwFltShell::SetBookEnd(long nHandle)
 {
-    aEndStack.SetAttr( *pPaM->GetPoint(), RES_FLTR_BOOKMARK, sal_True, nHandle );
+    aEndStack.SetAttr( *pPaM->GetPoint(), RES_FLTR_BOOKMARK, true, nHandle );
 }
 
 SwFltShell& SwFltShell::EndItem( sal_uInt16 nAttrId )
@@ -1455,7 +1455,7 @@ void SwFltOutBase::EndTable()
     OSL_FAIL("EndTable outside of normal text");
 }
 
-/*virtual*/ sal_Bool SwFltOutDoc::IsInTable()
+/*virtual*/ bool SwFltOutDoc::IsInTable()
 {
     return pTable != 0;
 };
@@ -1471,21 +1471,21 @@ bool SwFltOutDoc::BeginTable()
     }
                             // Close all attributes, because otherwise
                             // attributes extending into Flys might be created
-    rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-    rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
+    rStack.SetAttr( *pPaM->GetPoint(), 0, false );
+    rEndStack.SetAttr( *pPaM->GetPoint(), 0, false );
 
 // create table:
     OSL_ENSURE(pTabSavedPos == NULL, "SwFltOutDoc");
     pTabSavedPos = new SwPosition(*pPaM->GetPoint());
     pTable = GetDoc().InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
-            *pTabSavedPos, 1, 1, text::HoriOrientation::LEFT, 0, 0, sal_False, sal_False ); // TODO MULTIHEADER
+            *pTabSavedPos, 1, 1, text::HoriOrientation::LEFT, 0, 0, false, false ); // TODO MULTIHEADER
     nTableWidth = 0;
     ((SwTable*)pTable)->LockModify();   // Don't adjust anything automatically!
 // set pam in 1st table cell
     usTableX =
     usTableY = 0;
-    SeekCell(usTableY, usTableX, sal_True);
+    SeekCell(usTableY, usTableX, true);
     return true;
 }
 
@@ -1551,7 +1551,7 @@ void SwFltOutDoc::NextTableCell()
          GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false ),
          0,
          pTableBoxes->size());
-    SeekCell(usTableY, usTableX, sal_True);
+    SeekCell(usTableY, usTableX, true);
     pTableBox = (*pTableBoxes)[usTableX];
     OSL_ENSURE(pTableBox != 0, "SwFltOutDoc:pTableBox");
     if(pTableBox)
@@ -1568,7 +1568,7 @@ void SwFltOutDoc::NextTableRow()
         aSelBoxes.insert( pTableBox );
         GetDoc().InsertRow(aSelBoxes);
         usTableX = 0;
-        SeekCell(++usTableY, usTableX, sal_True);
+        SeekCell(++usTableY, usTableX, true);
         GetDoc().SetTxtFmtColl(*pPaM,
             GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false ));
     }
@@ -1711,8 +1711,8 @@ void SwFltOutDoc::EndTable()
     }
     // Close all attributes, because otherwise
     // attributes extending into Flys might be created
-    rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-    rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
+    rStack.SetAttr( *pPaM->GetPoint(), 0, false );
+    rEndStack.SetAttr( *pPaM->GetPoint(), 0, false );
 
     if (GetDoc().GetCurrentViewShell()){
         SwTableNode* pTableNode = GetDoc().IsIdxInTbl(
@@ -1729,7 +1729,7 @@ void SwFltOutDoc::EndTable()
     nTableWidth = 0;
 }
 
-sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
+bool SwFltOutDoc::SeekCell(short nRow, short nCol, bool bPam)
 {
     // get structs to table cells
     const SwTableLines* pTableLines = &pTable->GetTabLines();
@@ -1740,17 +1740,17 @@ sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
     if ((sal_uInt16)nRow >= pTableLines->size())
     {
        OSL_ENSURE((sal_uInt16)nRow >= pTableLines->size(), "SwFltOutDoc");
-        return sal_False;
+        return false;
     }
     pTableLine = (*pTableLines)[nRow];
     pTableBoxes = &pTableLine->GetTabBoxes();
     if (nCol >= (short)pTableBoxes->size())
-        return sal_False;
+        return false;
     pTableBox = (*pTableBoxes)[nCol];
     if( !pTableBox->GetSttNd() )
     {
         OSL_ENSURE(pTableBox->GetSttNd(), "SwFltOutDoc");
-        return sal_False;
+        return false;
     }
     if(bPam)
     {
@@ -1759,7 +1759,7 @@ sal_Bool SwFltOutDoc::SeekCell(short nRow, short nCol, sal_Bool bPam)
         GetDoc().SetTxtFmtColl(*pPaM,
             GetDoc().GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false ));
     }
-    return sal_True;
+    return true;
 }
 
 // Flys in SwFltOutBase
@@ -1778,8 +1778,8 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults()
 }
 
 bool SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
-                           sal_Bool bAbsolutePos /*= sal_False*/,
-                           const SfxItemSet* pMoreAttrs /*= 0*/)
+                             bool bAbsolutePos /*= sal_False*/,
+                             const SfxItemSet* pMoreAttrs /*= 0*/)
 {
     (void) pMoreAttrs; // unused in non-debug
     OSL_ENSURE(!pMoreAttrs, "SwFltOutBase:BeginFly with pMoreAttrs" );
@@ -1824,8 +1824,8 @@ SwFrmFmt* SwFltOutDoc::MakeFly( RndStdIds eAnchor, SfxItemSet* pSet )
 }
 
 bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
-                           sal_Bool bAbsolutePos ,
-                           const SfxItemSet* pMoreAttrs)
+                            bool bAbsolutePos ,
+                            const SfxItemSet* pMoreAttrs)
 
 {
     SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, 0 );
@@ -1833,8 +1833,8 @@ bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
 
     // Close all attributes, because otherwise attributes extending into Flys might
     // be created
-    rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-    rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
+    rStack.SetAttr( *pPaM->GetPoint(), 0, false );
+    rEndStack.SetAttr( *pPaM->GetPoint(), 0, false );
 
     // create Fly:
     OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly");    // recursive doesn't work yet
@@ -1892,8 +1892,8 @@ void SwFltOutDoc::EndFly()
     }
     // Close all attributes, because otherwise
     // attributes extending into Flys might be created
-    rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
-    rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
+    rStack.SetAttr( *pPaM->GetPoint(), 0, false );
+    rEndStack.SetAttr( *pPaM->GetPoint(), 0, false );
 
     *pPaM->GetPoint() = *pFlySavedPos;              // restore Cursor
     delete pFlySavedPos;
@@ -1924,8 +1924,8 @@ void SwFltOutDoc::EndFly()
 }
 
 bool SwFltFormatCollection::BeginFly( RndStdIds eAnchor,
-                           sal_Bool bAbsolutePos,
-                           const SfxItemSet* pMoreAttrs)
+                                      bool bAbsolutePos,
+                                      const SfxItemSet* pMoreAttrs)
 
 {
     SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, pMoreAttrs );
@@ -1948,7 +1948,7 @@ bool SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
 }
 
 bool SwFltShell::BeginFly( RndStdIds eAnchor,
-                           sal_Bool bAbsolutePos)
+                           bool bAbsolutePos)
 {
     if (pOut->IsInFly()){
         OSL_FAIL("BeginFly in Fly");
@@ -2002,7 +2002,7 @@ void SwFltShell::BeginFootnote()
 
     // Close all attributes, because otherwise attributes extending into
     // footnotes might be created
-    aStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
+    aStack.SetAttr( *pPaM->GetPoint(), 0, false );
     //  Don't force-close EndStack for now, so bookmarks on footnotes can
     //  be applied to PMW
 
@@ -2032,7 +2032,7 @@ void SwFltShell::EndFootnote()
     // Close all attributes, because otherwise
     // attributes extending out of footnotes might
     // be created
-    aStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
+    aStack.SetAttr( *pPaM->GetPoint(), 0, false );
     //  Don't force-close EndStack for now, so bookmarks on footnotes can
     //  be applied to PMW
 
@@ -2045,7 +2045,7 @@ void SwFltShell::BeginHeader(SwPageDesc* /*pPD*/)
 {
     SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster();
     SwFrmFmt* pHdFtFmt;
-    pFmt->SetFmtAttr(SwFmtHeader(sal_True));
+    pFmt->SetFmtAttr(SwFmtHeader(true));
     pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt();
     const SwNodeIndex* pStartIndex = pHdFtFmt->GetCntnt().GetCntntIdx();
     if (!pStartIndex)
@@ -2061,7 +2061,7 @@ void SwFltShell::BeginFooter(SwPageDesc* /*pPD*/)
 {
     SwFrmFmt* pFmt =  &pCurrentPageDesc->GetMaster();
     SwFrmFmt* pHdFtFmt;
-    pFmt->SetFmtAttr(SwFmtFooter(sal_True));
+    pFmt->SetFmtAttr(SwFmtFooter(true));
     pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt();
     const SwNodeIndex* pStartIndex = pHdFtFmt->GetCntnt().GetCntntIdx();
     if (!pStartIndex)
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 05ecff20ea3a..67629b4f31c7 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -212,7 +212,7 @@ sal_uInt16 Ww1Style::ReadEstcp(sal_uInt8*&p, sal_uInt16& rnCountBytes)
 Ww1StyleSheet::Ww1StyleSheet(Ww1Fib& _rFib)
     : cstcStd(0),
     rFib(_rFib),
-    bOK(sal_False)
+    bOK(false)
 {
     sal_uInt16 cbStshf = rFib.GetFIB().cbStshfGet();
     OSL_ENSURE(cbStshf>=17, "Ww1StyleSheet");
@@ -365,7 +365,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, sal_uLong nFieldFlgs)
                     pFontA = 0; // no entries -> no Array
             }
     }
-    bOK = sal_True;
+    bOK = true;
 }
 
 W1_FFN* Ww1Fonts::GetFFN(sal_uInt16 nNum)
@@ -414,25 +414,25 @@ Ww1Picture::Ww1Picture(SvStream& rStream, sal_uLong ulFilePos)
 Ww1Sprm::Ww1Sprm(sal_uInt8* x, sal_uInt16 _nCountBytes)
     : p(NULL),
     nCountBytes(_nCountBytes),
-    bOK(sal_False),
+    bOK(false),
     pArr(NULL),
     count(0)
 {
     if (nCountBytes == 0)
-        bOK = sal_True;
+        bOK = true;
     else
         if ((p = new sal_uInt8[nCountBytes]) != NULL)
         {
             memcpy(p, x, nCountBytes);
             if (ReCalc())
-                bOK = sal_True;
+                bOK = true;
         }
 }
 
 Ww1Sprm::Ww1Sprm(SvStream& rStream, sal_uLong ulFilePos)
     : p(NULL),
     nCountBytes(0),
-    bOK(sal_False),
+    bOK(false),
     pArr(NULL),
     count(0)
 {
@@ -446,7 +446,7 @@ Ww1Sprm::Ww1Sprm(SvStream& rStream, sal_uLong ulFilePos)
                  || !nCountBytes
                  || rStream.Read(p, nCountBytes) == (sal_uLong)nCountBytes)
                     if (ReCalc())
-                        bOK = sal_True;
+                        bOK = true;
 }
 
 Ww1Sprm::~Ww1Sprm()
@@ -509,19 +509,19 @@ sal_uInt16 Ww1Sprm::GetSize(sal_uInt8 nId, sal_uInt8* pSprm)
     return nL;
 }
 
-sal_Bool Ww1Sprm::Fill(sal_uInt16 index, sal_uInt8& nId, sal_uInt16& nL, sal_uInt8*& pSprm)
+bool Ww1Sprm::Fill(sal_uInt16 index, sal_uInt8& nId, sal_uInt16& nL, sal_uInt8*& pSprm)
 {
     OSL_ENSURE(index < Count(), "Ww1Sprm");
     pSprm = p + pArr[index];
     nId = *pSprm;
     pSprm++;
     nL = GetTab(nId).Size(pSprm);
-    return sal_True;
+    return true;
 }
 
-sal_Bool Ww1Sprm::ReCalc()
+bool Ww1Sprm::ReCalc()
 {
-    sal_Bool bRet = sal_True;
+    bool bRet = true;
     delete[] pArr;
     pArr = NULL;
     count = 0;
@@ -854,10 +854,10 @@ Ww1Bookmarks::Ww1Bookmarks(Ww1Fib& rInFib)
     : aNames(rInFib), rFib(rInFib), nIsEnd(0)
 {
     pPos[0] = new Ww1PlcBookmarkPos(rFib, rFib.GetFIB().fcPlcfbkfGet(),
-                                    rFib.GetFIB().cbPlcfbkfGet(), sal_False);
+                                    rFib.GetFIB().cbPlcfbkfGet(), false);
     nPlcIdx[0] = 0;
     pPos[1] = new Ww1PlcBookmarkPos(rFib, rFib.GetFIB().fcPlcfbklGet(),
-                                    rFib.GetFIB().cbPlcfbklGet(), sal_True);
+                                    rFib.GetFIB().cbPlcfbklGet(), true);
     nPlcIdx[1] = 0;
     bOK = !aNames.GetError() && !pPos[0]->GetError() && !pPos[1]->GetError();
 }
@@ -924,11 +924,11 @@ const OUString Ww1Bookmarks::GetName() const
 // Fkp
 Ww1Fkp::Ww1Fkp(SvStream& rStream, sal_uLong ulFilePos, sal_uInt16 _nItemSize) :
     nItemSize(_nItemSize),
-    bOK(sal_False)
+    bOK(false)
 {
     if (rStream.Seek(ulFilePos) == (sal_uLong)ulFilePos)
         if (rStream.Read(aFkp, sizeof(aFkp)) == sizeof(aFkp))
-            bOK = sal_True;
+            bOK = true;
 }
 
 sal_uLong Ww1Fkp::Where(sal_uInt16 nIndex)
@@ -951,7 +951,7 @@ sal_uInt8* Ww1Fkp::GetData(sal_uInt16 nIndex)
 }
 
 // FkpPap
-sal_Bool Ww1FkpPap::Fill(sal_uInt16 nIndex, sal_uInt8*& p, sal_uInt16& rnCountBytes)
+bool Ww1FkpPap::Fill(sal_uInt16 nIndex, sal_uInt8*& p, sal_uInt16& rnCountBytes)
 {
     OSL_ENSURE( nIndex < Count(), "Ww1FkpPap::Fill() Index out of Range" );
     sal_uInt16 nOffset = *GetData(nIndex) * 2;
@@ -973,11 +973,11 @@ sal_Bool Ww1FkpPap::Fill(sal_uInt16 nIndex, sal_uInt8*& p, sal_uInt16& rnCountBy
         p = NULL;
         rnCountBytes = 0;
     }
-    return sal_True;
+    return true;
 }
 
 // FkpChp
-sal_Bool Ww1FkpChp::Fill(sal_uInt16 nIndex, W1_CHP& aChp)
+bool Ww1FkpChp::Fill(sal_uInt16 nIndex, W1_CHP& aChp)
 {
     OSL_ENSURE( nIndex < Count(), "Ww1FkpChp::Fill() Index out of Range" );
     memset(&aChp, 0, sizeof(aChp));
@@ -991,12 +991,12 @@ sal_Bool Ww1FkpChp::Fill(sal_uInt16 nIndex, W1_CHP& aChp)
         OSL_ENSURE(nCountBytes <= sizeof(aChp), "calc error");
         memcpy(&aChp, aFkp+nOffset, nCountBytes);
     }
-    return sal_True;
+    return true;
 }
 
 // Assoc
 Ww1Assoc::Ww1Assoc(Ww1Fib& _rFib)
-    : rFib(_rFib), pBuffer(NULL), bOK(sal_False)
+    : rFib(_rFib), pBuffer(NULL), bOK(false)
 {
     sal_uInt16 cb = rFib.GetFIB().cbSttbfAssocGet();
     sal_uInt16 i;
@@ -1015,7 +1015,7 @@ Ww1Assoc::Ww1Assoc(Ww1Fib& _rFib)
             pStrTbl[i] = pBuffer+j;
             j += (*pBuffer + j) + 1;
         }
-        bOK = sal_True;
+        bOK = true;
     }
 }
 
@@ -1046,7 +1046,7 @@ void Ww1Pap::Seek(sal_uLong ulSeek)
 // SH: Where has been passed a parameter which determines if the index should be set
 // to 0 upon constructing a new Fkp (must not happen for Push/Pop)
 // Can't think of an elegant way for now
-sal_uLong Ww1Pap::Where( sal_Bool bSetIndex )
+sal_uLong Ww1Pap::Where( bool bSetIndex )
 {
     sal_uLong ulRet = 0xffffffff;
     if (pPap == NULL)
@@ -1076,7 +1076,7 @@ void Ww1Pap::operator++()
 
 // SH: FindSprm looks for Sprm nId in grpprl
 // Return value: pointer or 0
-sal_Bool Ww1Pap::FindSprm(sal_uInt16 nId, sal_uInt8* pStart, sal_uInt8* pEnd)
+bool Ww1Pap::FindSprm(sal_uInt16 nId, sal_uInt8* pStart, sal_uInt8* pEnd)
 {
     Ww1Sprm aSprm( pStart, static_cast< sal_uInt16 >(pEnd-pStart) );
     sal_uInt16 nC = aSprm.Count();
@@ -1087,19 +1087,19 @@ sal_Bool Ww1Pap::FindSprm(sal_uInt16 nId, sal_uInt8* pStart, sal_uInt8* pEnd)
     for( i = 0; i < nC; i++ ){
         aSprm.Fill( i, nI, nLen, pData );
         if( nI == nId )
-            return sal_True;
+            return true;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool Ww1Pap::HasId0(sal_uInt16 nId)
+bool Ww1Pap::HasId0(sal_uInt16 nId)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     UpdateIdx();
 
     if( !pPap ){
         OSL_ENSURE( false, "Ww1Pap::HasId():: cannot create a pPap" );
-        return sal_False;
+        return false;
     }
 
     sal_uInt8* pByte;
@@ -1111,11 +1111,11 @@ sal_Bool Ww1Pap::HasId0(sal_uInt16 nId)
     return bRet;
 }
 
-sal_Bool Ww1Pap::HasId(sal_uInt16 nId)
+bool Ww1Pap::HasId(sal_uInt16 nId)
 {
     sal_uInt16 nPushedPlcIndex2 = nPlcIndex;
     sal_uInt16 nPushedFkpIndex2 = nFkpIndex;
-    sal_Bool bRet = HasId0( nId );
+    bool bRet = HasId0( nId );
     if (nPlcIndex != nPushedPlcIndex2)
     {
         delete pPap;
@@ -1123,7 +1123,7 @@ sal_Bool Ww1Pap::HasId(sal_uInt16 nId)
     }
     nPlcIndex = nPushedPlcIndex2;
     nFkpIndex = nPushedFkpIndex2;
-    Where( sal_False );
+    Where( false );
     return bRet;
 }
 
@@ -1143,7 +1143,7 @@ void Ww1Chp::Seek(sal_uLong ulSeek)
 // SH: Where has been passed a parameter which determines if the index should be set
 // to 0 upon constructing a new Fkp (must not happen for Push/Pop)
 // Can't think of an elegant way for now
-sal_uLong Ww1Chp::Where( sal_Bool bSetIndex )
+sal_uLong Ww1Chp::Where( bool bSetIndex )
 {
     sal_uLong ulRet = 0xffffffff;
     if (pChp == NULL)
@@ -1174,7 +1174,7 @@ void Ww1Chp::operator++()
 
 // Manager
 Ww1Manager::Ww1Manager(SvStream& rStrm, sal_uLong nFieldFlgs)
-    : bOK(sal_False), bInTtp(false), bInStyle(false), bStopAll(false), aFib(rStrm),
+    : bOK(false), bInTtp(false), bInStyle(false), bStopAll(false), aFib(rStrm),
     aDop(aFib), aFonts(aFib, nFieldFlgs), aDoc(aFib), pDoc(&aDoc),
     ulDocSeek(0), pSeek(&ulDocSeek), aFld(aFib), pFld(&aFld), aChp(aFib),
     aPap(aFib), aFtn(aFib), aBooks(aFib),
@@ -1191,22 +1191,22 @@ Ww1Manager::Ww1Manager(SvStream& rStrm, sal_uLong nFieldFlgs)
         && !aBooks.GetError();
 }
 
-sal_Bool Ww1Manager::HasInTable()
+bool Ww1Manager::HasInTable()
 {
     return aPap.HasId(24); // Ww1SingleSprmPFInTable
 }
 
-sal_Bool Ww1Manager::HasTtp()
+bool Ww1Manager::HasTtp()
 {
     return aPap.HasId(25); // Ww1SingleSprmPTtp
 }
 
-sal_Bool Ww1Manager::HasPPc()
+bool Ww1Manager::HasPPc()
 {
     return aPap.HasId(29); // Ww1SingleSprmPPc
 }
 
-sal_Bool Ww1Manager::HasPDxaAbs()
+bool Ww1Manager::HasPDxaAbs()
 {
     return aPap.HasId(26); // Ww1SingleSprmPDxaAbs
 }
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index a83c1e55be03..329e7b14c687 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -86,13 +86,13 @@ class Ww1StyleSheet;
 class Ww1Fib
 {
     W1_FIB aFib;
-    sal_Bool bOK;
+    bool bOK;
     SvStream& rStream;
 public:
     Ww1Fib(SvStream&);
     friend std::ostream& operator <<(std::ostream&, Ww1Fib&);
     W1_FIB& GetFIB()        { return aFib; }
-    sal_Bool GetError()         { return !bOK; }
+    bool GetError()         { return !bOK; }
     SvStream& GetStream()   { return rStream; }
 };
 
@@ -101,10 +101,10 @@ class Ww1Dop
 {
     W1_DOP aDop;
     Ww1Fib& rFib;
-    sal_Bool bOK;
+    bool bOK;
 public:
     Ww1Dop(Ww1Fib&);
-    sal_Bool GetError() {
+    bool GetError() {
         return !bOK; }
     W1_DOP& GetDOP() {
         return aDop; }
@@ -121,7 +121,7 @@ protected:
     sal_uLong ulFilePos;
     sal_uLong ulCountBytes;
     sal_uLong ulSeek;
-    sal_Bool bOK;
+    bool bOK;
 public:
     Ww1PlainText(Ww1Fib& rWwFib, sal_uLong nFilePos, sal_uLong nCountBytes);
     // within the text
@@ -145,7 +145,7 @@ public:
         OSL_ENSURE(ulSeek+1<ulCountBytes, "Ww1PlainText");
         ulSeek++;
     }
-    sal_Bool GetError()                     { return !bOK; }
+    bool GetError()                     { return !bOK; }
     sal_Unicode Out( Ww1Shell&, sal_uLong& );
     sal_Unicode Out( OUString&, sal_uLong=0xffffffff);
     sal_Unicode Out( sal_Unicode& );
@@ -222,14 +222,14 @@ class Ww1Style
     Ww1StyleSheet* pParent;
     sal_uInt8 stcBase;
     sal_uInt8 stcNext;
-    sal_Bool bUsed;
+    bool bUsed;
 public:
     Ww1Style();
     ~Ww1Style();
     bool IsUsed() const                 { return bUsed; }
     void SetDefaults(sal_uInt8);
     void SetParent(Ww1StyleSheet* newParent)    { pParent = newParent; }
-    void SetName(const OUString& rName)   { bUsed = sal_True; aName = rName; }
+    void SetName(const OUString& rName)   { bUsed = true; aName = rName; }
     const OUString& GetName() const       { return aName; }
     Ww1Style& GetBase();
     sal_uInt16 GetnBase() const             { return stcBase; }
@@ -248,7 +248,7 @@ class Ww1StyleSheet
     Ww1Style aStyles[256];
     sal_uInt16 cstcStd; // count style code standard
     Ww1Fib& rFib;
-    sal_Bool bOK;
+    bool bOK;
     sal_uInt16 ReadNames(sal_uInt8*&, sal_uInt16&);
     sal_uInt16 ReadChpx(sal_uInt8*&, sal_uInt16&);
     sal_uInt16 ReadPapx(sal_uInt8*&, sal_uInt16&);
@@ -267,7 +267,7 @@ public:
     friend std::ostream& operator <<(std::ostream&, Ww1StyleSheet&);
     void Out(Ww1Shell&, Ww1Manager&);
     friend class Ww1Style;
-    sal_Bool GetError() {
+    bool GetError() {
         return !bOK; }
 };
 
@@ -281,7 +281,7 @@ protected:
     Ww1Fib& rFib;
     sal_uLong nFieldFlags;
     sal_uInt16 nMax; // Array size
-    sal_Bool bOK;
+    bool bOK;
 public:
     Ww1Fonts(Ww1Fib&, sal_uLong nFieldFlgs);
     ~Ww1Fonts() {
@@ -292,7 +292,7 @@ public:
     sal_uInt16 Count() {
         return nMax; }
     friend std::ostream& operator <<(std::ostream&, Ww1Fonts&);
-    sal_Bool GetError() {
+    bool GetError() {
         return !bOK; }
     SvxFontItem GetFont(sal_uInt16);
 };
@@ -666,7 +666,7 @@ public:
 // The data type Sprm actually appearing in the file
 class Ww1Sprm
 {
-    sal_Bool ReCalc();
+    bool ReCalc();
     static Ww1SingleSprm* aTab[256];
     static Ww1SingleSprm* pSingleSprm;
 protected:
@@ -680,7 +680,7 @@ protected:
 
     sal_uInt8* p;
     sal_uInt16 nCountBytes;
-    sal_Bool bOK;
+    bool bOK;
     sal_uInt16* pArr;
     sal_uInt16 count;
     // without token, with length byte/word
@@ -694,7 +694,7 @@ protected:
 public:
     // SH: I need it to be public
     // returns for the n-th element id, size & pointer to data:
-    sal_Bool Fill(sal_uInt16, sal_uInt8&, sal_uInt16&, sal_uInt8*&);
+    bool Fill(sal_uInt16, sal_uInt8&, sal_uInt16&, sal_uInt8*&);
 
     Ww1Sprm(sal_uInt8*, sal_uInt16);
     Ww1Sprm(SvStream&, sal_uLong);
@@ -707,7 +707,7 @@ public:
         return nCountBytes != 255; }
     sal_uInt16 Count() {
         return count; }
-    sal_Bool GetError() {
+    bool GetError() {
         return !bOK; }
     static void DeinitTab();
 };
@@ -716,13 +716,13 @@ public:
 // of a picture filename or an embedded picture
 class Ww1Picture
 {
-    sal_Bool bOK;
+    bool bOK;
     W1_PIC* pPic;
 public:
     Ww1Picture(SvStream&, sal_uLong);
     ~Ww1Picture() {
         }
-    sal_Bool GetError() {
+    bool GetError() {
         return !bOK; }
     friend std::ostream& operator <<(std::ostream&, Ww1Picture&);
     void Out(Ww1Shell&, Ww1Manager&);
@@ -737,7 +737,7 @@ class Ww1Plc
     sal_uInt16 nCountBytes;
     sal_uInt16 iMac;
     sal_uInt16 nItemSize;
-    sal_Bool bOK;
+    bool bOK;
 protected:
     Ww1Fib& rFib;
     sal_uInt8* GetData(sal_uInt16);
@@ -752,7 +752,7 @@ public:
         end = Where(nIndex+1); }
     sal_uInt16 Count() {
         return iMac; }
-    sal_Bool GetError() {
+    bool GetError() {
         return !bOK; }
 };
 
@@ -874,7 +874,7 @@ public:
         {   if( pIdxA ) { delete pIdxA[0]; delete pIdxA; } }
     const OUString GetStr( sal_uInt16 nNum ) const;
     sal_uInt16 Count() const    { return nMax; }
-    sal_Bool GetError() const   { return (nMax != 0) && !pIdxA; }
+    bool GetError() const   { return (nMax != 0) && !pIdxA; }
 };
 
 class Ww1PlcBookmarkTxt: public Ww1StringList
@@ -889,7 +889,7 @@ public:
 class Ww1PlcBookmarkPos : public Ww1Plc
 {
 public:
-    Ww1PlcBookmarkPos(Ww1Fib& _rFib, sal_uLong start, sal_uInt16 nBytes, sal_Bool bEnd)
+    Ww1PlcBookmarkPos(Ww1Fib& _rFib, sal_uLong start, sal_uInt16 nBytes, bool bEnd)
         : Ww1Plc(_rFib, start, nBytes, (bEnd) ? 0 : 2)
     {}
 
@@ -920,7 +920,7 @@ class Ww1Fkp
 protected:
     sal_uInt8 aFkp[512];
     sal_uInt16 nItemSize;
-    sal_Bool bOK;
+    bool bOK;
     sal_uInt8* GetData(sal_uInt16);
 public:
     Ww1Fkp(SvStream&, sal_uLong, sal_uInt16);
@@ -936,7 +936,7 @@ public:
         : Ww1Fkp(rStream, ulFilePos, 1)
     {}
     friend std::ostream& operator <<(std::ostream&, Ww1FkpPap&);
-    sal_Bool Fill(sal_uInt16,  sal_uInt8*&, sal_uInt16&);
+    bool Fill(sal_uInt16,  sal_uInt8*&, sal_uInt16&);
 };
 
 class Ww1FkpChp : public Ww1Fkp
@@ -954,7 +954,7 @@ public:
     {}
 
     friend std::ostream& operator <<(std::ostream&, Ww1FkpChp&);
-    sal_Bool Fill(sal_uInt16, W1_CHP&);
+    bool Fill(sal_uInt16, W1_CHP&);
 };
 
 class Ww1SprmPapx : public Ww1Sprm
@@ -987,14 +987,14 @@ class Ww1Assoc
     Ww1Fib& rFib;
     sal_Char* pBuffer;
     sal_Char* pStrTbl[ MaxFields ];
-    sal_Bool bOK;
+    bool bOK;
 
     OUString GetStr(sal_uInt16);
 
 public:
     Ww1Assoc(Ww1Fib&);
     ~Ww1Assoc()             { delete pBuffer; }
-    sal_Bool GetError() const   { return !bOK; }
+    bool GetError() const   { return !bOK; }
     friend std::ostream& operator <<(std::ostream&, Ww1Assoc&);
     void Out(Ww1Shell&);
 };
@@ -1058,79 +1058,79 @@ public:
         if (grpfIhdt & 0x0020) nFirstFootL = nextIhdd++;
         OSL_ENSURE(nextIhdd<=Count(), "Ww1HeaderFooter");
     }
-    sal_Bool operator++()
+    bool operator++()
     {
-        sal_Bool bRet = sal_True;
+        bool bRet = true;
         eHeaderFooterMode = (HeaderFooterMode)((short)eHeaderFooterMode + 1);
         if( eHeaderFooterMode == MaxHeaderFooterMode)
         {
             eHeaderFooterMode = None;
-            bRet = sal_False;
+            bRet = false;
         }
         return bRet;
     }
-    sal_Bool FillFtnSep(sal_uLong& begin, sal_uLong& end)
+    bool FillFtnSep(sal_uLong& begin, sal_uLong& end)
     {
         if (nFtnSep == 0xffff)
-            return sal_False;
+            return false;
         Fill(nFtnSep, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillFtnFollowSep(sal_uLong& begin, sal_uLong& end)
+    bool FillFtnFollowSep(sal_uLong& begin, sal_uLong& end)
     {
         if (nFtnFollowSep == 0xffff)
-            return sal_False;
+            return false;
         Fill(nFtnFollowSep, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillFtnNote(sal_uLong& begin, sal_uLong& end)
+    bool FillFtnNote(sal_uLong& begin, sal_uLong& end)
     {
         if (nFtnNote == 0xffff)
-            return sal_False;
+            return false;
         Fill(nFtnNote, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillEvenHeadL(sal_uLong& begin, sal_uLong& end)
+    bool FillEvenHeadL(sal_uLong& begin, sal_uLong& end)
     {
         if (nEvenHeadL == 0xffff)
-            return sal_False;
+            return false;
         Fill(nEvenHeadL, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillOddHeadL(sal_uLong& begin, sal_uLong& end)
+    bool FillOddHeadL(sal_uLong& begin, sal_uLong& end)
     {
         if (nOddHeadL == 0xffff)
-            return sal_False;
+            return false;
         Fill(nOddHeadL, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillEvenFootL(sal_uLong& begin, sal_uLong& end)
+    bool FillEvenFootL(sal_uLong& begin, sal_uLong& end)
     {
         if (nEvenFootL == 0xffff)
-            return sal_False;
+            return false;
         Fill(nEvenFootL, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillOddFootL(sal_uLong& begin, sal_uLong& end)
+    bool FillOddFootL(sal_uLong& begin, sal_uLong& end)
     {
         if (nOddFootL == 0xffff)
-            return sal_False;
+            return false;
         Fill(nOddFootL, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillFirstHeadL(sal_uLong& begin, sal_uLong& end)
+    bool FillFirstHeadL(sal_uLong& begin, sal_uLong& end)
     {
         if (nFirstHeadL == 0xffff)
-            return sal_False;
+            return false;
         Fill(nFirstHeadL, begin, end);
-        return sal_True;
+        return true;
     }
-    sal_Bool FillFirstFootL(sal_uLong& begin, sal_uLong& end)
+    bool FillFirstFootL(sal_uLong& begin, sal_uLong& end)
     {
         if (nFirstFootL == 0xffff)
-            return sal_False;
+            return false;
         Fill(nFirstFootL, begin, end);
-        return sal_True;
+        return true;
     }
     void Start(Ww1Shell&, Ww1Manager&);
     void Stop(Ww1Shell&, Ww1Manager&, sal_Unicode&);
@@ -1212,7 +1212,7 @@ class Ww1Bookmarks
 
     sal_uInt16 nPlcIdx[2];
     sal_uInt16 nIsEnd;
-    sal_Bool bOK;
+    bool bOK;
 public:
     Ww1Bookmarks(Ww1Fib& rFib);
     ~Ww1Bookmarks()
@@ -1222,9 +1222,9 @@ public:
     }
     sal_uLong Where() const     { return pPos[nIsEnd]->WhereCP(nPlcIdx[nIsEnd]); }
     void operator++();
-    sal_Bool GetError() const   { return !bOK; }
+    bool GetError() const   { return !bOK; }
     long GetHandle() const;
-    sal_Bool GetIsEnd() const   { return ( nIsEnd ) ? sal_True : sal_False; }
+    bool GetIsEnd() const   { return ( nIsEnd ) ? sal_True : sal_False; }
     const OUString GetName() const;
     long Len() const;
     friend std::ostream& operator <<(std::ostream&, Ww1Bookmarks&);
@@ -1237,10 +1237,10 @@ class Ww1Footnotes : public Ww1PlcFootnoteRef
 {
     sal_uInt16 nPlcIndex;
     Ww1PlcFootnoteTxt aText;
-    sal_Bool bStarted;
+    bool bStarted;
 public:
     Ww1Footnotes(Ww1Fib& rFibL)
-        : Ww1PlcFootnoteRef(rFibL), nPlcIndex(0), aText(rFibL), bStarted(sal_False)
+        : Ww1PlcFootnoteRef(rFibL), nPlcIndex(0), aText(rFibL), bStarted(false)
     {}
     // within the text
     sal_uLong Where()
@@ -1290,7 +1290,7 @@ class Ww1Pap : public Ww1PlcPap
     sal_uLong ulOffset;
     Ww1FkpPap* pPap;
 
-    sal_Bool FindSprm(sal_uInt16 nId, sal_uInt8* pStart, sal_uInt8* pEnd);
+    bool FindSprm(sal_uInt16 nId, sal_uInt8* pStart, sal_uInt8* pEnd);
     void UpdateIdx()
     {
         if (pPap && nFkpIndex >= pPap->Count() )
@@ -1302,19 +1302,19 @@ class Ww1Pap : public Ww1PlcPap
         if( !pPap )
             Where();
     }
-    sal_Bool HasId0(sal_uInt16 nId);
+    bool HasId0(sal_uInt16 nId);
 
 public:
     Ww1Pap(Ww1Fib& rFib);
     ~Ww1Pap()   { delete pPap; }
-    sal_uLong Where( sal_Bool bSetIndex = sal_True ); // within the text
+    sal_uLong Where( bool bSetIndex = true ); // within the text
     void operator++();
-    sal_Bool FillStart(sal_uInt8*& pB, sal_uInt16& nSize)
+    bool FillStart(sal_uInt8*& pB, sal_uInt16& nSize)
     {
         UpdateIdx();
         return pPap->Fill(nFkpIndex, pB, nSize);
     }
-    sal_Bool FillStop(sal_uInt8*& pB, sal_uInt16& nSize)
+    bool FillStop(sal_uInt8*& pB, sal_uInt16& nSize)
     {
         return nFkpIndex ? pPap->Fill(nFkpIndex-1, pB, nSize) : sal_False;
     }
@@ -1331,7 +1331,7 @@ public:
         delete pPap;
         pPap = NULL;
     }
-    sal_Bool Pushed()
+    bool Pushed()
     {
         return nPushedPlcIndex != 0xffff;
     }
@@ -1345,9 +1345,9 @@ public:
         nPushedFkpIndex = 0xffff;
         delete pPap;
         pPap = NULL;
-        Where( sal_False );
+        Where( false );
     }
-    sal_Bool HasId(sal_uInt16 nId);
+    bool HasId(sal_uInt16 nId);
 };
 
 class Ww1Chp : public Ww1PlcChp
@@ -1373,14 +1373,14 @@ class Ww1Chp : public Ww1PlcChp
 public:
     Ww1Chp( Ww1Fib& rFib );
     ~Ww1Chp()   { delete pChp; }
-    sal_uLong Where( sal_Bool bSetIndex = sal_True ); // within the text
+    sal_uLong Where( bool bSetIndex = true ); // within the text
     void operator++();
-    sal_Bool FillStart(W1_CHP& rChp)
+    bool FillStart(W1_CHP& rChp)
     {
         UpdateIdx();
         return pChp->Fill(nFkpIndex, rChp);
     }
-    sal_Bool FillStop(W1_CHP& rChp)
+    bool FillStop(W1_CHP& rChp)
     { return nFkpIndex ? pChp->Fill(nFkpIndex-1, rChp) : sal_False;  }
     void Start(Ww1Shell&, Ww1Manager&);
     void Stop(Ww1Shell&, Ww1Manager&, sal_Unicode&);
@@ -1395,7 +1395,7 @@ public:
         delete pChp;
         pChp = NULL;
     }
-    sal_Bool Pushed()               { return nPushedPlcIndex != 0xffff; }
+    bool Pushed()               { return nPushedPlcIndex != 0xffff; }
     void Pop()
     {
         OSL_ENSURE(Pushed(), "Ww1Chp");
@@ -1406,7 +1406,7 @@ public:
         nPushedFkpIndex = 0xffff;
         delete pChp;
         pChp = NULL;
-        Where( sal_False );
+        Where( false );
     }
 };
 
@@ -1415,7 +1415,7 @@ public:
 // for being piped into the shell (pm side).
 class Ww1Manager
 {
-    sal_Bool bOK;
+    bool bOK;
     bool bInTtp;
     bool bInStyle;
     bool bStopAll;
@@ -1443,7 +1443,7 @@ class Ww1Manager
 
 public:
     Ww1Manager(SvStream& rStrm, sal_uLong nFieldFlgs);
-    sal_Bool GetError() const       { return !bOK; }
+    bool GetError() const       { return !bOK; }
 
     // for tables
     void SetInTtp(bool bSet = true)     { bInTtp = bSet; }
@@ -1452,13 +1452,13 @@ public:
     bool IsInStyle() const              { return bInStyle; }
     void SetStopAll(bool bSet = true)   { bStopAll = bSet; }
     bool IsStopAll() const              { return bStopAll; }
-    sal_Bool HasInTable();
-    sal_Bool HasTtp();
-    sal_Bool LastHasTtp();
+    bool HasInTable();
+    bool HasTtp();
+    bool LastHasTtp();
 
     // for flys
-    sal_Bool HasPPc();
-    sal_Bool HasPDxaAbs();
+    bool HasPPc();
+    bool HasPDxaAbs();
 
     Ww1Fib& GetFib()                    { return aFib; }
     Ww1PlainText& GetText()             { return *pDoc; }
@@ -1475,7 +1475,7 @@ public:
     SvxFontItem GetFont(sal_uInt16 nFCode);
     friend Ww1Shell& operator <<(Ww1Shell&, Ww1Manager&);
     friend std::ostream& operator <<(std::ostream&, Ww1Manager&);
-    sal_Bool Pushed()                       { return pDoc != &aDoc; }
+    bool Pushed()                       { return pDoc != &aDoc; }
     void Pop();
     void Push0(Ww1PlainText* pDoc, sal_uLong, Ww1Fields* = 0);
     void Push1(Ww1PlainText* pDoc, sal_uLong ulSeek, sal_uLong ulSeek2 = 0,
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index c7efecb14535..d52cfeea5436 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -206,7 +206,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
 // character is pending.
 
     bool bLIsTtp = false;
-    sal_Bool bLHasTtp = sal_False;
+    bool bLHasTtp = false;
     if( cUnknown == 0x07 )
     {
         bLIsTtp = IsInTtp();
@@ -358,7 +358,7 @@ void Ww1Footnotes::Start(Ww1Shell& rOut, Ww1Manager& rMan)
             OSL_ENSURE(c==0x02, "Ww1Footnotes");
             count--; // for the just read marker byte
             rOut.BeginFootnote();
-            bStarted = sal_True;
+            bStarted = true;
             rMan.Push0(pText, pText->Offset(rMan.GetFib()),
              new Ww1FootnoteFields(rMan.GetFib()));
             rOut << rMan;
@@ -472,33 +472,33 @@ static WWDateTime GetTimeDatePara( const OUString& rForm,
                        rForm.indexOf('d') != -1 ||
                        rForm.indexOf('D') != -1;
 
-        sal_Bool bLongDayOfWeek = rForm.indexOf("tttt") != -1 ||
+        bool bLongDayOfWeek = rForm.indexOf("tttt") != -1 ||
                                   rForm.indexOf("TTTT") != -1 ||
                                   rForm.indexOf("dddd") != -1 ||
                                   rForm.indexOf("DDDD") != -1;
 
-        sal_Bool bDayOfWeek = rForm.indexOf("ttt") != -1 ||
+        bool bDayOfWeek = rForm.indexOf("ttt") != -1 ||
                               rForm.indexOf("TTT") != -1 ||
                               rForm.indexOf("ddd") != -1 ||
                               rForm.indexOf("DDD") != -1;
 
                     //  M, MM -> numeric month
                     //  MMM, MMMM -> text. month
-        sal_Bool bLitMonth = rForm.indexOf("MMM") != -1;
+        bool bLitMonth = rForm.indexOf("MMM") != -1;
                     //  MMMM -> full month
-        sal_Bool bFullMonth = rForm.indexOf("MMMM") != -1;
+        bool bFullMonth = rForm.indexOf("MMMM") != -1;
                     //  jj, JJ -> 2-col-year
                     //  jjjj, JJJJ -> 4-col-year
-        sal_Bool bFullYear = rForm.indexOf("jjj") != -1 ||
+        bool bFullYear = rForm.indexOf("jjj") != -1 ||
                              rForm.indexOf("JJJ") != -1 ||
                              rForm.indexOf("yyy") != -1 ||
                              rForm.indexOf("YYY") != -1;
 
-        sal_uInt16 i = ( bLitMonth & 1 )
-                   | ( ( bFullYear & 1 ) << 1 )
-                   | ( ( bFullMonth & 1 ) << 2 )
-                   | ( ( bDayOfWeek & 1 ) << 3 )
-                   | ( ( bLongDayOfWeek & 1 ) << 4 );
+        sal_uInt16 i = (sal_uInt16) bLitMonth
+                   | ( (sal_uInt16)bFullYear  << 1 )
+                   | ( (sal_uInt16)bFullMonth << 2 )
+                   | ( (sal_uInt16)bDayOfWeek << 3 )
+                   | ( (sal_uInt16)bLongDayOfWeek << 4 );
         if( pDate )
         {
             if( !bHasDay && !bFullMonth )
@@ -887,7 +887,7 @@ oncemore:
             SwFieldType* pFT = rOut.GetDoc().InsertFldType(
                 SwSetExpFieldType( &rOut.GetDoc(), aName, nsSwGetSetExpType::GSE_STRING ) );
             pField = new SwSetExpField((SwSetExpFieldType*)pFT, aStr );
-            ((SwSetExpField*)pField)->SetInputFlag( sal_True );
+            ((SwSetExpField*)pField)->SetInputFlag( true );
             ((SwSetExpField*)pField)->SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
         }
         case 39: // filling command
diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx
index 48882ebd64f3..d57f7d82dbcc 100644
--- a/sw/source/filter/ww1/w1par.cxx
+++ b/sw/source/filter/ww1/w1par.cxx
@@ -57,7 +57,7 @@ sal_uLong WW1Reader::Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, co
     OSL_ENSURE(pStrm!=NULL, "W1-Read without Stream");
     if (pStrm != NULL)
     {
-        sal_Bool bNew = !bInsertMode;           // New Doc ( no insert )
+        bool bNew = !bInsertMode;           // New Doc ( no insert )
 
         sal_uLong nFieldFlags = WW1_Read_FieldIniFlags();
         Ww1Shell* pRdr = new Ww1Shell( rDoc, rPam, rBaseURL, bNew, nFieldFlags );
@@ -97,7 +97,7 @@ sal_uLong WW1Reader::Read(SwDoc& rDoc, const OUString& rBaseURL, SwPaM& rPam, co
 // SwFltShell is used in common with ww-filter. Information read from
 // the file gets 'piped' into the shell, like would be done for a
 // stream.
-Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags)
+Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, const OUString& rBaseURL, bool bNew, sal_uLong nFieldFlags)
     : SwFltShell(&rD, rPam, rBaseURL, bNew, nFieldFlags)
 {
 }
diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx
index 326655777486..6e0375323cee 100644
--- a/sw/source/filter/ww1/w1par.hxx
+++ b/sw/source/filter/ww1/w1par.hxx
@@ -27,7 +27,7 @@
 class Ww1Shell : public SwFltShell
 {
 public:
-    Ww1Shell(SwDoc&, SwPaM&, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags);
+    Ww1Shell(SwDoc&, SwPaM&, const OUString& rBaseURL, bool bNew, sal_uLong nFieldFlags);
 };
 
 #endif
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 6ce329ad5961..dea460de6d79 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -489,7 +489,7 @@ void Ww1SingleSprmTDefTable10::Start(
     for( i = 0; i < nCount; i++ ){
 // Collect info
         W1_TC* pTc = (W1_TC*)pTc0;
-        sal_Bool bMerged = (pTc) ? pTc->fMergedGet() : sal_False;
+        bool bMerged = (pTc) ? pTc->fMergedGet() : sal_False;
 
 // set cell widths
         sal_uInt16 nPos1 = SVBT16ToShort( pEndPos );
@@ -503,7 +503,7 @@ void Ww1SingleSprmTDefTable10::Start(
 
         if( pTc0 ){                     // are there actually TCs ?
             W1_TC* pTc2 = (W1_TC*)pTc0;
-            sal_Bool bMerged2 = pTc2->fMergedGet();
+            bool bMerged2 = pTc2->fMergedGet();
             if( !bMerged2 ){
 // and now the borders
                 SvxBoxItem aBox( (SvxBoxItem&)rOut.GetCellAttr( RES_BOX ));
diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx
index 9e28e0c18696..189103f88706 100644
--- a/sw/source/filter/ww1/w1struct.hxx
+++ b/sw/source/filter/ww1/w1struct.hxx
@@ -48,16 +48,16 @@ struct W1_FIB
     sal_uInt16 fFlagsGet() {
         return SVBT16ToShort(fFlags); }
     // SVBT16 fDot :1;// 0xa    0001
-    sal_Bool fDotGet() {
+    bool fDotGet() {
         return 0 != ((fFlagsGet() >> 0) & 1); }
     // SVBT16 fGlsy :1;//       0002
-    sal_Bool fGlsyGet() {
+    bool fGlsyGet() {
         return 0 != ((fFlagsGet() >> 1) & 1); }
     // SVBT16 fComplex :1;//        0004 when 1, file is in complex, fast-saved format.
-    sal_Bool fComplexGet() {
+    bool fComplexGet() {
         return 0 != ((fFlagsGet() >> 2) & 1); }
     // SVBT16 fHasPic :1;//     0008 file contains 1 or more pictures
-    sal_Bool fHasPicGet() {
+    bool fHasPicGet() {
         return 0 != ((fFlagsGet() >> 3) & 1); }
     // SVBT16 cQuickSaves :4;//     00F0 count of times file was quicksaved
     sal_uInt16 cQuickSavesGet() {
@@ -376,17 +376,17 @@ struct W1_DOP //Document Properties
     sal_uInt16 fFlagsGet() {
         return SVBT16ToShort(fFlags); }
     // SVBT16 fFacingPages : 1;// 1 when facing pages should be printed
-    sal_Bool fFacingPagesGet() {
+    bool fFacingPagesGet() {
         return 0 != ((fFlagsGet() >> 0) & 1); }
     // SVBT16 fWidowControl : 1;// 1 when widow control is in effect. 0 when widow control disabled.
-    sal_Bool fWidowControlGet() {
+    bool fWidowControlGet() {
         return 0 != ((fFlagsGet() >> 1) & 1); }
     // SVBT16 : 3;// unused
     // SVBT16 fpc : 2;// 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text
     sal_uInt16 fpcGet() {
         return (sal_uInt16)((fFlagsGet() >> 5) & 3); }
     // SVBT16 fWide : 1;// Landscape
-    sal_Bool fWideGet() {
+    bool fWideGet() {
         return 0 != ((fFlagsGet() >> 7) & 1); }
     // SVBT16 grpfIhdt : 8;// 0 specification of document headers and footers. See explanation under Headers and Footers topic.
     sal_uInt16 grpfIhdtGet() {
@@ -395,7 +395,7 @@ struct W1_DOP //Document Properties
     sal_uInt16 fFtnFlagsGet() {
         return SVBT16ToShort(fFtnFlags); }
     // SVBT16 fFtnRestart : 1;
-    sal_Bool fFtnRestartGet() {
+    bool fFtnRestartGet() {
         return 0 != ((fFtnFlagsGet() >> 0) & 1); }
     // SVBT16 nFtn : 15;// 1 initial footnote number for document
     sal_uInt16 nFtnGet() {
@@ -410,28 +410,28 @@ struct W1_DOP //Document Properties
     sal_uInt16 irmPropsGet() {
         return (sal_uInt16)((fRvsFlagsGet() >> 8) & 0x7f); }
     // SVBT16 fRevMarking   : 1;//   when 1, Word will mark revisions as the document is edited
-    sal_Bool fRevMarkingGet() {
+    bool fRevMarkingGet() {
         return 0 != ((fRvsFlagsGet() >> 15) & 1); }
     SVBT16 fSveFlags;
     sal_uInt16 fSveFlagsGet() {
         return SVBT16ToShort(fSveFlags); }
     // SVBT16 fBackup : 1;//     always make backup when document saved when 1.
-    sal_Bool fBackupGet() {
+    bool fBackupGet() {
         return 0 != ((fSveFlagsGet() >> 0) & 1); }
     // SVBT16 fExactCWords : 1;
-    sal_Bool fExactCWordsGet() {
+    bool fExactCWordsGet() {
         return 0 != ((fSveFlagsGet() >> 1) & 1); }
     // SVBT16 fPagHidden : 1;
-    sal_Bool fPagHiddenGet() {
+    bool fPagHiddenGet() {
         return 0 != ((fSveFlagsGet() >> 2) & 1); }
     // SVBT16 fPagResults : 1;
-    sal_Bool fPagResultsGet() {
+    bool fPagResultsGet() {
         return 0 != ((fSveFlagsGet() >> 3) & 1); }
     // SVBT16 fLockAtn : 1;//    when 1, annotations are locked for editing
-    sal_Bool fLockAtnGet() {
+    bool fLockAtnGet() {
         return 0 != ((fSveFlagsGet() >> 4) & 1); }
     // SVBT16 fMirrorMargins : 1;//  swap margins on left/right pages when 1.
-    sal_Bool fMirrorMarginsGet() {
+    bool fMirrorMarginsGet() {
         return 0 != ((fSveFlagsGet() >> 5) & 1); }
     // SVBT16 : 10;// unused
     SVBT16 fSpares;
@@ -498,40 +498,40 @@ struct W1_DOP //Document Properties
 
 struct W1_CHP
 {
-    SVBT16  fChar;
-    SVBT16  ftc;// Font Code
-    sal_uInt8   hps;// Font size in half points
-    sal_uInt8   hpsPos;// Sub/Superscript ( signed number, 0 = normal )
-    SVBT16  fText;
-    SVBT32  fcPic;// not stored in File
-    sal_uInt8   fnPic;// internal
-    SVBT16  hpsLargeChp;// ???
+    SVBT16      fChar;
+    SVBT16      ftc;    // Font Code
+    sal_uInt8   hps;    // Font size in half points
+    sal_uInt8   hpsPos; // Sub/Superscript ( signed number, 0 = normal )
+    SVBT16      fText;
+    SVBT32      fcPic;  // not stored in File
+    sal_uInt8   fnPic;  // internal
+    SVBT16      hpsLargeChp; // ???
 
     W1_CHP() { memset( this, 0, sizeof( *this)); }
 
     sal_uInt16 fCharGet()       { return SVBT16ToShort(fChar); }
     void fCharSet(sal_uInt16 n) { ShortToSVBT16(n, fChar); }
-    sal_Bool fBoldGet()         { return 0 != ((fCharGet() >> 0) & 1); }
-    void fBoldSet(sal_Bool b)   { fCharSet( ( fCharGet() & 0xfffe ) | ( b << 0 ) ); }
-    sal_Bool fItalicGet()       { return 0 != ((fCharGet() >> 1) & 1); }
-    void fItalicSet(sal_Bool b) { fCharSet( ( fCharGet() & 0xfffd ) | ( b << 1 ) ); }
-    sal_Bool fStrikeGet()       { return 0 != ((fCharGet() >> 2) & 1); }
-    sal_Bool fOutlineGet()      { return 0 != ((fCharGet() >> 3) & 1); }
-    sal_Bool fFldVanishGet()    { return 0 != ((fCharGet() >> 4) & 1); }
-    sal_Bool fSmallCapsGet()    { return 0 != ((fCharGet() >> 5) & 1); }
-    sal_Bool fCapsGet()         { return 0 != ((fCharGet() >> 6) & 1); }
-    sal_Bool fVanishGet()       { return 0 != ((fCharGet() >> 7) & 1); }
-    sal_Bool fRMarkGet()        { return 0 != ((fCharGet() >> 8) & 1); }
-    sal_Bool fSpecGet()         { return 0 != ((fCharGet() >> 9) & 1); }
-    sal_Bool fsIcoGet()         { return 0 != ((fCharGet() >> 10) & 1); }
-    sal_Bool fsFtcGet()         { return 0 != ((fCharGet() >> 11) & 1); }
-    void fsFtcSet(sal_Bool b)   { fCharSet( ( fCharGet() & 0xf7ff ) | ( b << 11 ) ); }
-    sal_Bool fsHpsGet()         { return 0 != ((fCharGet() >> 12) & 1); }
-    void fsHpsSet(sal_Bool b)   { fCharSet( ( fCharGet() & 0xefff ) | ( b << 12 ) ); }
-    sal_Bool fsKulGet()         { return 0 != ((fCharGet() >> 13) & 1); }
-    void fsKulSet(sal_Bool b)   { fCharSet( ( fCharGet() & 0xdfff ) | ( b << 13 ) ); }
-    sal_Bool fsPosGet()         { return 0 != ((fCharGet() >> 14) & 1); }
-    sal_Bool fsSpaceGet()       { return 0 != ((fCharGet() >> 15) & 1); }
+    bool fBoldGet()         { return 0 != ((fCharGet() >> 0) & 1); }
+    void fBoldSet(bool b)   { fCharSet( ( fCharGet() & 0xfffe ) | ( (sal_uInt16)b << 0 ) ); }
+    bool fItalicGet()       { return 0 != ((fCharGet() >> 1) & 1); }
+    void fItalicSet(bool b) { fCharSet( ( fCharGet() & 0xfffd ) | ( (sal_uInt16)b << 1 ) ); }
+    bool fStrikeGet()       { return 0 != ((fCharGet() >> 2) & 1); }
+    bool fOutlineGet()      { return 0 != ((fCharGet() >> 3) & 1); }
+    bool fFldVanishGet()    { return 0 != ((fCharGet() >> 4) & 1); }
+    bool fSmallCapsGet()    { return 0 != ((fCharGet() >> 5) & 1); }
+    bool fCapsGet()         { return 0 != ((fCharGet() >> 6) & 1); }
+    bool fVanishGet()       { return 0 != ((fCharGet() >> 7) & 1); }
+    bool fRMarkGet()        { return 0 != ((fCharGet() >> 8) & 1); }
+    bool fSpecGet()         { return 0 != ((fCharGet() >> 9) & 1); }
+    bool fsIcoGet()         { return 0 != ((fCharGet() >> 10) & 1); }
+    bool fsFtcGet()         { return 0 != ((fCharGet() >> 11) & 1); }
+    void fsFtcSet(bool b)   { fCharSet( ( fCharGet() & 0xf7ff ) | ( (sal_uInt16)b << 11 ) ); }
+    bool fsHpsGet()         { return 0 != ((fCharGet() >> 12) & 1); }
+    void fsHpsSet(bool b)   { fCharSet( ( fCharGet() & 0xefff ) | ( (sal_uInt16)b << 12 ) ); }
+    bool fsKulGet()         { return 0 != ((fCharGet() >> 13) & 1); }
+    void fsKulSet(bool b)   { fCharSet( ( fCharGet() & 0xdfff ) | ( (sal_uInt16)b << 13 ) ); }
+    bool fsPosGet()         { return 0 != ((fCharGet() >> 14) & 1); }
+    bool fsSpaceGet()       { return 0 != ((fCharGet() >> 15) & 1); }
     // SVBT16 fBold :1;// 1 == opposite boldness of style
     // SVBT16 fItalic :1;// 1 == opposite of style
     // SVBT16 fStrike :1;// 1 == opposite of style
@@ -562,7 +562,7 @@ struct W1_CHP
     sal_uInt16 icoGet()         { return (sal_uInt16)((fTextGet() >> 8) & 0xf); }
     sal_uInt16 kulGet()         { return (sal_uInt16)((fTextGet() >> 12) & 7); }
     void kulSet(sal_uInt16 n)   { fTextSet( ( fTextGet() & 0x8fff ) | ( ( n & 7 ) << 12 ) ); }
-    sal_Bool fSysVanishGet()    { return 0 != ((fTextGet() >> 15) & 1); }
+    bool fSysVanishGet()    { return 0 != ((fTextGet() >> 15) & 1); }
     // SVBT16 qpsSpace :6;// Char Spacing, -7 .. 56; 57 = -7, 63 = -1
     // SVBT16 wSpare2 : 2;// reserved
     // SVBT16 ico :4;// color of Text: 0=black, 1=blue, 2=cyan, 3=green, 4=magenta, 5=red, 6=yellow, 7=white
@@ -588,7 +588,7 @@ struct W1_FFN ///////////////////////////////////////// Font Descriptor
     sal_uInt16 prgGet() {
         return (sal_uInt16)((fFlagsGet() >> 0) & 3); }
     // sal_uInt8 fTrueType : 1;//   0x1:04  when 1, font is a TrueType font
-    sal_Bool fTrueTypeGet() {
+    bool fTrueTypeGet() {
         return 0 != ((fFlagsGet() >> 2) & 1); }
     // sal_uInt8 : 1;// 0x1:08  reserved
     // sal_uInt8 ff : 3;//  0x1:70  font family id
@@ -608,11 +608,11 @@ struct W1_PHE // Paragraph Height
     SVBT16 fFlags;
     sal_uInt16 fFlagsGet() {
         return SVBT16ToShort(fFlags); }
-    sal_Bool fSpareGet() {
+    bool fSpareGet() {
         return 0 != (fFlagsGet() & 1); }
-    sal_Bool fUnkGet() {
+    bool fUnkGet() {
         return 0 != ((fFlagsGet() >> 1) & 1); }
-    sal_Bool fDiffLinesGet() {
+    bool fDiffLinesGet() {
         return 0 != ((fFlagsGet() >> 2) & 1); }
     sal_uInt8 clMacGet() {
         return sal::static_int_cast< sal_uInt8, sal_uInt16 >((fFlagsGet() >> 8) & 0xff); }
@@ -693,17 +693,17 @@ struct W1_FLD // FieldDescriptor
     sal_uInt8 flt; // field type / flags
     sal_uInt8 fltGet() { return flt; }
     // variant, when ch==21:
-    sal_Bool fDifferGet() {
+    bool fDifferGet() {
         return (fltGet() >> 0) & 1; }
-    sal_Bool fResultDirtyGet() {
+    bool fResultDirtyGet() {
         return (fltGet() >> 2) & 1; }
-    sal_Bool ResultEditedGet() {
+    bool ResultEditedGet() {
         return (fltGet() >> 3) & 1; }
-    sal_Bool fLockedGet() {
+    bool fLockedGet() {
         return (fltGet() >> 4) & 1; }
-    sal_Bool fPrivateResultGet() {
+    bool fPrivateResultGet() {
         return (fltGet() >> 5) & 1; }
-    sal_Bool fNestedGet() {
+    bool fNestedGet() {
         return (fltGet() >> 6) & 1; }
 };
 
@@ -764,7 +764,7 @@ struct W1_PIC // PictureStructure
     sal_uInt8 brclGet() {
         return sal::static_int_cast< sal_uInt8, sal_uInt16 >(flagsGet() & 0xf); }
 //  fFrameEmpty : 1;// 0010 picture consists of a single frame
-    sal_Bool fFrameEmptyGet() {
+    bool fFrameEmptyGet() {
         return sal::static_int_cast< sal_uInt8, sal_uInt16 >((flagsGet() >> 4) & 1); }
 // win6 stuff:
 //  fBitmap : 1;// 0020 ==1, when picture is just a bitmap
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index da7a93b1e42e..5a25c86a5fe4 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -628,7 +628,7 @@ public:
     void OutputItem( const SfxPoolItem& rHt );
 
     /// Use OutputItem() on an item set - for styles.
-    void OutputStyleItemSet( const SfxItemSet& rSet, sal_Bool bDeep, sal_Bool bTestForDefault );
+    void OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault );
 
     /// Output frames.
     void OutputFlyFrame( const sw::Frame& rFmt );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 33219995f8da..1bc6305d33c3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7100,10 +7100,10 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
     const std::map< OUString, com::sun::star::uno::Any >& rMap = rItem.GetGrabBag();
 
     // get original values of theme-derived properties to check if they have changed during the edition
-    sal_Bool bWriteCSTheme = sal_True;
-    sal_Bool bWriteAsciiTheme = sal_True;
-    sal_Bool bWriteEastAsiaTheme = sal_True;
-    sal_Bool bWriteThemeFontColor = sal_True;
+    bool bWriteCSTheme = true;
+    bool bWriteAsciiTheme = true;
+    bool bWriteEastAsiaTheme = true;
+    bool bWriteThemeFontColor = true;
     OUString sOriginalValue;
     for ( std::map< OUString, com::sun::star::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i )
     {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 862b1283e458..c6572c4a888d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -360,7 +360,7 @@ void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode)
         const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >( &aNextIndex.GetNode() );
         m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode );
         // Save the current page description for now, so later we will be able to access the previous one.
-        m_pPrevPageDesc = pTxtNode->FindPageDesc(sal_False);
+        m_pPrevPageDesc = pTxtNode->FindPageDesc(false);
     }
     else if ( aNextIndex.GetNode().IsTableNode() )
     {
@@ -2941,7 +2941,7 @@ void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
     if ( m_rExport.bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax )
     {
         SwSurround eSurround = rSurround.GetSurround();
-        sal_Bool bGold = SURROUND_IDEAL == eSurround;
+        bool bGold = SURROUND_IDEAL == eSurround;
         if( bGold )
             eSurround = SURROUND_PARALLEL;
         RTFSurround aMC( bGold, static_cast< sal_uInt8 >(eSurround) );
@@ -3191,7 +3191,7 @@ void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& r
     if( bEven )
     {
         m_rExport.Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLSX );
-        m_rExport.OutLong( rCol.GetGutterWidth( sal_True ) );
+        m_rExport.OutLong( rCol.GetGutterWidth( true ) );
     }
     else
     {
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index c02dbea45904..ceea59d6b7ef 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -970,11 +970,11 @@ namespace sw
             return nKey;
         }
 
-        sal_Bool IsPreviousAM(OUString& rParams, sal_Int32 nPos)
+        bool IsPreviousAM(OUString& rParams, sal_Int32 nPos)
         {
             return nPos>=2 && rParams.matchIgnoreAsciiCase("am", nPos-2);
         }
-        sal_Bool IsNextPM(OUString& rParams, sal_Int32 nPos)
+        bool IsNextPM(OUString& rParams, sal_Int32 nPos)
         {
             return nPos+2<rParams.getLength() && rParams.matchIgnoreAsciiCase("pm", nPos+1);
         }
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 505b80cb262b..db1655836c0f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3135,12 +3135,12 @@ sal_uInt32 SwMSConvertControls::GenerateObjectID()
 
 // in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in
 // filter/source/msocximex.cxx, so.. we need an implementation here
-sal_Bool  SwMSConvertControls::ReadOCXStream( SotStorageRef& rSrc1,
+bool  SwMSConvertControls::ReadOCXStream( SotStorageRef& rSrc1,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef,
-        sal_Bool bFloatingCtrl )
+        bool bFloatingCtrl )
 {
     uno::Reference< form::XFormComponent > xFComp;
-    sal_Bool bRes = oox::ole::MSConvertOCXControls::ReadOCXStorage( rSrc1, xFComp );
+    bool bRes = oox::ole::MSConvertOCXControls::ReadOCXStorage( rSrc1, xFComp );
     if ( bRes && xFComp.is() )
     {
         com::sun::star::awt::Size aSz;  // not used in import
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 50243332ae98..a2c5083d53a0 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -402,7 +402,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
     //The hard formatting properties that affect the entire paragraph
     if (rNd.HasSwAttrSet())
     {
-        sal_Bool bDeep = sal_False;
+        bool bDeep = false;
         // only copy hard attributes - bDeep = false
         aExportSet.Set(rNd.GetSwAttrSet(), bDeep);
         // get the current font item. Use rNd.GetSwAttrSet instead of aExportSet:
@@ -2846,7 +2846,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
             {
                 /* Munge flys in fly into absolutely positioned elements for word 6 */
                 const SwTxtNode* pParTxtNode = rAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
-                const SwRect aPageRect = pParTxtNode->FindPageFrmRect( sal_False, 0, sal_False );
+                const SwRect aPageRect = pParTxtNode->FindPageFrmRect( false, 0, false );
 
                 aOffset = rFrmFmt.FindLayoutRect().Pos();
                 aOffset -= aPageRect.Pos();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 0d1e9c8aac2b..718761ae5bc5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2552,7 +2552,7 @@ void MSWordExportBase::WriteText()
         {
             SwCntntNode* pCNd = (SwCntntNode*)pNd;
 
-            const SwPageDesc* pTemp = pNd->FindPageDesc(sal_False);
+            const SwPageDesc* pTemp = pNd->FindPageDesc(false);
             if ( pTemp )
                 pAktPageDesc = pTemp;
 
@@ -2582,7 +2582,7 @@ void MSWordExportBase::WriteText()
                 && (rSect.GetType() != TOX_CONTENT_SECTION && rSect.GetType() != TOX_HEADER_SECTION )) //No sections in table
             {
                 //#120140# Do not need to insert a page/section break after a section end. Check this case first
-                sal_Bool bNeedExportBreakHere = sal_True;
+                bool bNeedExportBreakHere = true;
                 if ( aIdx.GetNode().IsTxtNode() )
                 {
                     SwTxtNode *pTempNext = aIdx.GetNode().GetTxtNode();
@@ -2593,7 +2593,7 @@ void MSWordExportBase::WriteText()
                             && pTempItem && ((SwFmtPageDesc*)pTempItem)->GetRegisteredIn())
                         {
                             //Next node has a new page style which means this node is a section end. Do not insert another page/section break here
-                            bNeedExportBreakHere = sal_False;
+                            bNeedExportBreakHere = false;
                         }
                     }
                 }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b82ea5c7285d..f2df0f1314b3 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -417,7 +417,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     //section.
     bool bBreakSet = false;
 
-    const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
+    const SwPageDesc * pPageDesc = rNd.FindPageDesc(false);
 
     // Even if pAktPageDesc != pPageDesc ,it might be because of the different header & footer types.
     if (pAktPageDesc != pPageDesc)
@@ -5461,7 +5461,7 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
     }
 }
 
-void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, sal_Bool bDeep, sal_Bool bTestForDefault )
+void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, bool bDeep, bool bTestForDefault )
 {
     // based on OutputItemSet() from wrt_fn.cxx
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 6879a57ec187..4f1b98ca1cd2 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2092,7 +2092,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
     OSL_ENSURE(pRecord || pFSPA, "give me something! to work with for anchoring");
     if (!pRecord && !pFSPA)
         return FLY_AT_PAGE;
-    sal_Bool bCurSectionVertical = maSectionManager.CurrentSectionIsVertical();
+    bool bCurSectionVertical = maSectionManager.CurrentSectionIsVertical();
 
     SvxMSDffImportRec aRecordFromFSPA;
     if (!pRecord)
@@ -2540,7 +2540,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     // inside table cell and its wrapping isn't 'SURROUND_THROUGH'
     if (bLayoutInTableCell && eSurround != SURROUND_THROUGHT)
     {
-        SwFmtFollowTextFlow aFollowTextFlow( sal_True );
+        SwFmtFollowTextFlow aFollowTextFlow( true );
         aFlySet.Put( aFollowTextFlow );
     }
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4ebfff78891f..a8c01e9efecb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -145,7 +145,7 @@ using namespace nsHdFtFlags;
 /** Expands to the size of a STATIC data array. */
 //#define STATIC_TABLE_SIZE( array )  (sizeof(array)/sizeof(*(array)))
 
-SwMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate )             // static
+SwMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate )             // static
 {
     if ( pObj )
     {
@@ -1204,7 +1204,7 @@ void SwWW8FltControlStack::NewAttr(const SwPosition& rPos,
 }
 
 SwFltStackEntry* SwWW8FltControlStack::SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId,
-    sal_Bool bTstEnde, long nHand, sal_Bool )
+    bool bTstEnde, long nHand, bool )
 {
     SwFltStackEntry *pRet = NULL;
     // Doing a textbox, and using the control stack only as a temporary
@@ -1940,7 +1940,7 @@ void SwWW8ImplReader::ImportDop()
         {
             uno::Reference<beans::XPropertySetInfo> xInfo =
                 xDocProps->getPropertySetInfo();
-            sal_Bool bValue = false;
+            bool bValue = false;
             if (xInfo.is())
             {
                 if (xInfo->hasPropertyByName("ApplyFormDesignMode"))
@@ -4355,7 +4355,7 @@ bool wwSectionManager::IsNewDoc() const
 void wwSectionManager::InsertSegments()
 {
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    bool bUseEnhFields = rOpt.IsUseEnhancedFields();
     mySegIter aEnd = maSegments.end();
     mySegIter aStart = maSegments.begin();
     for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
@@ -6156,12 +6156,12 @@ int WW8Reader::GetReaderType()
     return SW_STORAGE_READER | SW_STREAM_READER;
 }
 
-sal_Bool WW8Reader::HasGlossaries() const
+bool WW8Reader::HasGlossaries() const
 {
     return true;
 }
 
-sal_Bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, sal_Bool bSaveRelFiles) const
+bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const
 {
     bool bRet=false;
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 275d43c8b9ab..0fc5859bec1d 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -145,8 +145,8 @@ class WW8Reader : public StgReader
 public:
     virtual int GetReaderType() SAL_OVERRIDE;
 
-    virtual sal_Bool HasGlossaries() const SAL_OVERRIDE;
-    virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const SAL_OVERRIDE;
+    virtual bool HasGlossaries() const SAL_OVERRIDE;
+    virtual bool ReadGlossaries( SwTextBlocks&, bool bSaveRelFiles ) const SAL_OVERRIDE;
 };
 
 class SwWW8ImplReader;
@@ -349,7 +349,7 @@ public:
 
     void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr);
 
-    virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand=LONG_MAX, sal_Bool consumedByField=sal_False) SAL_OVERRIDE;
+    virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand=LONG_MAX, bool consumedByField=false) SAL_OVERRIDE;
 
     void SetToggleAttr(sal_uInt8 nId, bool bOn)
     {
@@ -641,7 +641,7 @@ public:
     std::vector<OUString> maListEntries;
     virtual ~WW8FormulaControl() {}
     void FormulaRead(SwWw8ControlType nWhich,SvStream *pD);
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> &rFComp,
@@ -659,7 +659,7 @@ private:
 public:
     WW8FormulaCheckBox(SwWW8ImplReader &rR);
 
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> &rFComp,
@@ -676,7 +676,7 @@ private:
 public:
     WW8FormulaListBox(SwWW8ImplReader &rR);
 
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> &rFComp,
@@ -692,28 +692,28 @@ private:
 public:
     WW8FormulaEditBox(SwWW8ImplReader &rR);
     //no real implementation, return false
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
+    virtual bool Import(const com::sun::star::uno::Reference <
         com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */,
         com::sun::star::uno::Reference <
         com::sun::star::form::XFormComponent> & /* rFComp */,
-        com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return sal_False; }
+        com::sun::star::awt::Size & /* rSz */) SAL_OVERRIDE { return false; }
 };
 
 class SwMSConvertControls: public oox::ole::MSConvertOCXControls
 {
 public:
     SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP );
-    virtual sal_Bool InsertFormula( WW8FormulaControl &rFormula);
+    virtual bool InsertFormula( WW8FormulaControl &rFormula);
     virtual bool InsertControl(const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent >& rFComp,
         const ::com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference <
         com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) SAL_OVERRIDE;
     bool ExportControl(WW8Export &rWrt, const SdrObject *pObj);
-    virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1,
+    virtual bool ReadOCXStream( SotStorageRef& rSrc1,
         com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > *pShapeRef=0,
-        sal_Bool bFloatingCtrl=false );
+        bool bFloatingCtrl=false );
 private:
     sal_uInt32 GenerateObjectID();
     SwPaM *pPaM;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6b3cd27efa3e..e017515a259d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2326,7 +2326,7 @@ void WW8TabDesc::CreateSwTable()
     // rows of a band can be duplicated easy.
     pTable = pIo->rDoc.InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
-            *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, sal_False, sal_True );
+            *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false, true );
 
     OSL_ENSURE(pTable && pTable->GetFrmFmt(), "insert table failed");
     if (!pTable || !pTable->GetFrmFmt())
@@ -3363,7 +3363,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
             }
             // #i33818# - The nested table doesn't have to leave
             // the table cell. Thus, the Writer fly frame has to follow the text flow.
-            pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( sal_True ) );
+            pTableDesc->pFlyFmt->SetFmtAttr( SwFmtFollowTextFlow( true ) );
         }
         else
             pTableDesc->SetSizePosition(0);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 50d23948ab8f..a838b6d87801 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -118,7 +118,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
     */
 
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    const sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    const bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     if (!bUseEnhFields)
     {
@@ -179,7 +179,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
     if (rStr[pF->nLCode-1]==0x01)
         ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_CHECKBOX);
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    const sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    const bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     if (!bUseEnhFields)
     {
@@ -236,7 +236,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
         ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN);
 
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     if (!bUseEnhFields)
     {
@@ -2123,23 +2123,23 @@ bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
     return(bRet);
 }
 
-sal_Bool SwMSConvertControls::InsertFormula(WW8FormulaControl &rFormula)
+bool SwMSConvertControls::InsertFormula(WW8FormulaControl &rFormula)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     const uno::Reference< lang::XMultiServiceFactory > & rServiceFactory =
         GetServiceFactory();
 
     if(!rServiceFactory.is())
-        return sal_False;
+        return false;
 
     awt::Size aSz;
     uno::Reference< form::XFormComponent> xFComp;
 
-    if (sal_True == (bRet = rFormula.Import(rServiceFactory, xFComp, aSz)))
+    if ((bRet = rFormula.Import(rServiceFactory, xFComp, aSz)))
     {
         uno::Reference <drawing::XShape> xShapeRef;
-        if (sal_True == (bRet = InsertControl(xFComp, aSz, &xShapeRef, false)))
+        if ((bRet = InsertControl(xFComp, aSz, &xShapeRef, false)))
             GetShapes()->add(xShapeRef);
     }
     return bRet;
@@ -2395,17 +2395,17 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString,
     return aRet;
 }
 
-sal_Bool WW8FormulaListBox::Import(const uno::Reference <
+bool WW8FormulaListBox::Import(const uno::Reference <
     lang::XMultiServiceFactory> &rServiceFactory,
     uno::Reference <form::XFormComponent> &rFComp,awt::Size &rSz )
 {
     uno::Reference<uno::XInterface> xCreate = rServiceFactory->createInstance("com.sun.star.form.component.ComboBox");
     if( !xCreate.is() )
-        return sal_False;
+        return false;
 
     rFComp = uno::Reference<form::XFormComponent>(xCreate, uno::UNO_QUERY);
     if( !rFComp.is() )
-        return sal_False;
+        return false;
 
     uno::Reference<beans::XPropertySet> xPropSet(xCreate, uno::UNO_QUERY);
 
@@ -2422,7 +2422,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
         xPropSet->setPropertyValue("HelpText", aTmp );
     }
 
-    sal_Bool bDropDown(sal_True);
+    bool bDropDown(true);
     xPropSet->setPropertyValue("Dropdown", css::uno::makeAny(bDropDown));
 
     if (!maListEntries.empty())
@@ -2456,7 +2456,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
         rSz = rRdr.MiserableDropDownFormHack(OUString(aBlank, SAL_N_ELEMENTS(aBlank)), xPropSet);
     }
 
-    return sal_True;
+    return true;
 }
 
 WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR)
@@ -2487,17 +2487,17 @@ static void lcl_AddToPropertyContainer
     xPropSet->setPropertyValue(rPropertyName, aAnyValue );
 }
 
-sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
+bool WW8FormulaCheckBox::Import(const uno::Reference <
     lang::XMultiServiceFactory> &rServiceFactory,
     uno::Reference <form::XFormComponent> &rFComp,awt::Size &rSz )
 {
     uno::Reference< uno::XInterface > xCreate = rServiceFactory->createInstance("com.sun.star.form.component.CheckBox");
     if( !xCreate.is() )
-        return sal_False;
+        return false;
 
     rFComp = uno::Reference< form::XFormComponent >( xCreate, uno::UNO_QUERY );
     if( !rFComp.is() )
-        return sal_False;
+        return false;
 
     uno::Reference< beans::XPropertySet > xPropSet( xCreate, uno::UNO_QUERY );
 
@@ -2520,7 +2520,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
     if (!sHelp.isEmpty())
         lcl_AddToPropertyContainer(xPropSet, "HelpF1Text", sHelp);
 
-    return sal_True;
+    return true;
 
 }
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a5ecce5d0882..45c877105e26 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -468,7 +468,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
         return nRet;
 
     const SvtFilterOptions &rOpt = SvtFilterOptions::Get();
-    sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
+    bool bUseEnhFields = rOpt.IsUseEnhancedFields();
 
     OSL_ENSURE(!maFieldStack.empty(), "Empty field stack\n");
     if (!maFieldStack.empty())
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3293e75181e8..90dbe058d59d 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -239,11 +239,11 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
             //fall-through
         case 3:
             eType = GRID_LINES_CHARS;
-            aGrid.SetSnapToChars(sal_True);
+            aGrid.SetSnapToChars(true);
             break;
         case 1:
             eType = GRID_LINES_CHARS;
-            aGrid.SetSnapToChars(sal_False);
+            aGrid.SetSnapToChars(false);
             break;
         case 2:
             eType = GRID_LINES_ONLY;
@@ -258,7 +258,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
         rDoc.set(IDocumentSettingAccess::ADD_EXT_LEADING, false);
 
     //force to set document as standard page mode
-    sal_Bool bSquaredMode = sal_False;
+    bool bSquaredMode = false;
     rDoc.SetDefaultPageMode( bSquaredMode );
     aGrid.SetSquaredMode( bSquaredMode );
 
@@ -2017,7 +2017,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
     //we no longer need to hack around the header/footer problems
     SwFmtSurround aSurround(pFS->eSurround);
     if ( pFS->eSurround == SURROUND_IDEAL )
-        aSurround.SetAnchorOnly( sal_True );
+        aSurround.SetAnchorOnly( true );
     Put( aSurround );
 
     short aSizeArray[5]={0};
@@ -3306,7 +3306,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
     {
         if ( pAktColl ) //importing style
         {
-            if( SFX_ITEM_SET == pAktColl->GetItemState( RES_CHRATR_UNDERLINE, sal_False ) )
+            if( SFX_ITEM_SET == pAktColl->GetItemState( RES_CHRATR_UNDERLINE, false ) )
             {
                 const SwAttrSet& aSet = pAktColl->GetAttrSet();
                 SvxUnderlineItem *pUnderline
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index b756d71d8a13..d4a3ad1cd7a4 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -140,7 +140,7 @@ void XTextRangeOrNodeIndexPosition::SetAsNodeIndex(
     // SwXTextRange -> PaM
     SwUnoInternalPaM aPaM(*pDoc);
 #if OSL_DEBUG_LEVEL > 0
-    sal_Bool bSuccess =
+    bool bSuccess =
 #endif
         ::sw::XTextRangeToSwPaM(aPaM, rRange);
     OSL_ENSURE(bSuccess, "illegal range");
@@ -159,7 +159,7 @@ XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos, SwDoc & rDoc)
     {
         SwUnoInternalPaM aUnoPaM(rDoc);
 #if OSL_DEBUG_LEVEL > 0
-        sal_Bool bSuccess =
+        bool bSuccess =
 #endif
             ::sw::XTextRangeToSwPaM(aUnoPaM, xRange);
         OSL_ENSURE(bSuccess, "illegal range");
@@ -200,7 +200,7 @@ public:
     OUString sAuthor;               // change author string
     OUString sComment;              // change comment string
     util::DateTime aDateTime;       // change DateTime
-    sal_Bool bMergeLastParagraph;   // the SwRangeRedline::IsDelLastPara flag
+    bool bMergeLastParagraph;   // the SwRangeRedline::IsDelLastPara flag
 
     // each position can may be either empty, an XTextRange, or an SwNodeIndex
 
@@ -225,7 +225,7 @@ RedlineInfo::RedlineInfo() :
     sAuthor(),
     sComment(),
     aDateTime(),
-    bMergeLastParagraph( sal_False ),
+    bMergeLastParagraph( false ),
     aAnchorStart(),
     aAnchorEnd(),
     pContentIndex(NULL),
@@ -383,7 +383,7 @@ void XMLRedlineImportHelper::Add(
     const OUString& rAuthor,
     const OUString& rComment,
     const util::DateTime& rDateTime,
-    sal_Bool bMergeLastPara)
+    bool bMergeLastPara)
 {
     // we need to do the following:
     // 1) parse type string
@@ -499,9 +499,9 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection(
 
 void XMLRedlineImportHelper::SetCursor(
     const OUString& rId,
-    sal_Bool bStart,
+    bool bStart,
     Reference<XTextRange> & rRange,
-    sal_Bool bIsOutsideOfParagraph)
+    bool bIsOutsideOfParagraph)
 {
     RedlineMapType::iterator aFind = aRedlineMap.find(rId);
     if (aRedlineMap.end() != aFind)
@@ -547,7 +547,7 @@ void XMLRedlineImportHelper::SetCursor(
 
 void XMLRedlineImportHelper::AdjustStartNodeCursor(
     const OUString& rId,        /// ID used in RedlineAdd() call
-    sal_Bool /*bStart*/,
+    bool /*bStart*/,
     Reference<XTextRange> & /*rRange*/)
 {
     // this method will modify the document directly -> lock SolarMutex
@@ -661,8 +661,8 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
         // create redline (using pRedlineData which gets copied in SwRangeRedline())
         SwRedlineData* pRedlineData = ConvertRedline(pRedlineInfo, pDoc);
         SwRangeRedline* pRedline =
-            new SwRangeRedline( pRedlineData, *aPaM.GetPoint(), sal_True,
-                           !pRedlineInfo->bMergeLastParagraph, sal_False );
+            new SwRangeRedline( pRedlineData, *aPaM.GetPoint(), true,
+                           !pRedlineInfo->bMergeLastParagraph, false );
 
         // set mark
         if( aPaM.HasMark() )
@@ -730,12 +730,12 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline(
     return pData;
 }
 
-void XMLRedlineImportHelper::SetShowChanges( sal_Bool bShow )
+void XMLRedlineImportHelper::SetShowChanges( bool bShow )
 {
     bShowChanges = bShow;
 }
 
-void XMLRedlineImportHelper::SetRecordChanges( sal_Bool bRecord )
+void XMLRedlineImportHelper::SetRecordChanges( bool bRecord )
 {
     bRecordChanges = bRecord;
 }
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 391c78968465..5a28e7952514 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -59,8 +59,8 @@ class XMLRedlineImportHelper
         ::com::sun::star::beans::XPropertySet> xModelPropertySet;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet> xImportInfoPropertySet;
-    sal_Bool bShowChanges;
-    sal_Bool bRecordChanges;
+    bool bShowChanges;
+    bool bRecordChanges;
     ::com::sun::star::uno::Sequence<sal_Int8> aProtectionKey;
 
 public:
@@ -85,7 +85,7 @@ public:
         const OUString& rAuthor,     // name of the author
         const OUString& rComment,    // redline comment
         const ::com::sun::star::util::DateTime& rDateTime, // date+time
-        sal_Bool bMergeLastParagraph);      // merge last paragraph?
+        bool bMergeLastParagraph);      // merge last paragraph?
 
     // create a text section for the redline, and return an
     // XText/XTextCursor that may be used to write into it.
@@ -99,12 +99,12 @@ public:
     // Accepts XTextRange objects.
     void SetCursor(
         const OUString& rId,     // ID used in RedlineAdd() call
-        sal_Bool bStart,                // start or end Range
+        bool bStart,                // start or end Range
         ::com::sun::star::uno::Reference<   // the actual XTextRange
             ::com::sun::star::text::XTextRange> & rRange,
         // text range is (from an XML view) outside of a paragraph
         // (i.e. before a table)
-        sal_Bool bIsOusideOfParagraph);
+        bool bIsOusideOfParagraph);
 
     /**
      * Adjust the start (end) position for a redline that begins in a
@@ -116,16 +116,16 @@ public:
      * after the position given in a previous SetCursor */
     void AdjustStartNodeCursor(
          const OUString& rId,        // ID used in RedlineAdd() call
-        sal_Bool bStart,
+        bool bStart,
         // XTextRange _inside_ a table/section
         ::com::sun::star::uno::Reference<
             ::com::sun::star::text::XTextRange> & rRange);
 
     // set redline mode: show changes
-    void SetShowChanges( sal_Bool bShowChanges );
+    void SetShowChanges( bool bShowChanges );
 
     // set redline mode: record changes
-    void SetRecordChanges( sal_Bool bRecordChanges );
+    void SetRecordChanges( bool bRecordChanges );
 
     // set redline protection key
     void SetProtectionKey(
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 80f3d783367b..9f11d7d058ab 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -285,7 +285,7 @@ sal_Int32 ReadThroughComponent(
 
     // open stream (and set parser input)
     OUString sStreamName = OUString::createFromAscii(pStreamName);
-    sal_Bool bContainsStream = sal_False;
+    bool bContainsStream = false;
     try
     {
         bContainsStream = xStorage->isStreamElement(sStreamName);
@@ -432,7 +432,7 @@ static void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
 
             // apply outline numbering rule, if none is set.
             const SfxPoolItem& rItem =
-                aCreatedDefaultOutlineStyles[ i ]->GetFmtAttr( RES_PARATR_NUMRULE, sal_False );
+                aCreatedDefaultOutlineStyles[ i ]->GetFmtAttr( RES_PARATR_NUMRULE, false );
             if ( static_cast<const SwNumRuleItem&>(rItem).GetValue().isEmpty() )
             {
                 SwNumRuleItem aItem( pOutlineRule->GetName() );
@@ -791,16 +791,16 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
     // force redline mode to "none"
     rDoc.SetRedlineMode_intern( nsRedlineMode_t::REDLINE_NONE );
 
-    const sal_Bool bOASIS = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 );
+    const bool bOASIS = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 );
     // #i28749# - set property <ShapePositionInHoriL2R>
     {
-        const sal_Bool bShapePositionInHoriL2R = !bOASIS;
+        const bool bShapePositionInHoriL2R = !bOASIS;
         xInfoSet->setPropertyValue(
                 "ShapePositionInHoriL2R",
                 makeAny( bShapePositionInHoriL2R ) );
     }
     {
-        const sal_Bool bTextDocInOOoFileFormat = !bOASIS;
+        const bool bTextDocInOOoFileFormat = !bOASIS;
         xInfoSet->setPropertyValue(
                 "TextDocInOOoFileFormat",
                 makeAny( bTextDocInOOoFileFormat ) );
@@ -892,9 +892,9 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
 
     // Notify math objects
     if( bInsertMode )
-        rDoc.PrtOLENotify( sal_False );
+        rDoc.PrtOLENotify( false );
     else if ( rDoc.IsOLEPrtNotifyPending() )
-        rDoc.PrtOLENotify( sal_True );
+        rDoc.PrtOLENotify( true );
 
     nRet = nRet ? nRet : (nWarn ? nWarn : (nWarn2 ? nWarn2 : nWarnRDF ) );
 
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 93e21829df61..378d80b55d79 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -82,9 +82,9 @@ SwXMLExport::SwXMLExport(
         nExportFlags ),
     pTableItemMapper( 0 ),
     pTableLines( 0 ),
-    bBlock( sal_False ),
-    bShowProgress( sal_True ),
-    bSavedShowChanges( sal_False ),
+    bBlock( false ),
+    bShowProgress( true ),
+    bSavedShowChanges( false ),
     doc( NULL ),
     sNumberFormat("NumberFormat"),
     sIsProtected("IsProtected"),
@@ -95,7 +95,7 @@ SwXMLExport::SwXMLExport(
 
 void SwXMLExport::setBlockMode()
 {
-    bBlock = sal_True;
+    bBlock = true;
 
 }
 
@@ -127,7 +127,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
 
     SwDoc *pDoc = getDoc();
 
-    sal_Bool bExtended = sal_False;
+    bool bExtended = false;
     if( (getExportFlags() & (EXPORT_FONTDECLS|EXPORT_STYLES|
                              EXPORT_MASTERSTYLES|EXPORT_CONTENT)) != 0 )
     {
@@ -171,7 +171,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
                                                 XML_NAMESPACE_UNKNOWN );
                             nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
                         }
-                        bExtended = sal_True;
+                        bExtended = true;
                     }
                 }
             }
@@ -272,7 +272,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
 
     // set redline mode if we export STYLES or CONTENT, unless redline
     // mode is taken care of outside (through info XPropertySet)
-    sal_Bool bSaveRedline =
+    bool bSaveRedline =
         ( (getExportFlags() & (EXPORT_CONTENT|EXPORT_STYLES)) != 0 );
     if( bSaveRedline )
     {
@@ -359,7 +359,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
     SwDoc *pDoc = getDoc();
     const Rectangle rRect =
         pDoc->GetDocShell()->GetVisArea( ASPECT_CONTENT );
-    sal_Bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP;
+    bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP;
 
    OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" );
 
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index bbae21dd378a..98a172a1861f 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -57,9 +57,9 @@ class SwXMLExport : public SvXMLExport
     SvXMLItemMapEntriesRef      xTableCellItemMap;
     UniReference < XMLPropertySetMapper > xParaPropMapper;
 
-    sal_Bool                    bBlock : 1;         // export text block?
-    sal_Bool                    bShowProgress : 1;
-    sal_Bool                    bSavedShowChanges : 1;
+    bool                    bBlock : 1;         // export text block?
+    bool                    bShowProgress : 1;
+    bool                    bSavedShowChanges : 1;
 
     SwDoc*                      doc; // cached for getDoc()
 
@@ -73,7 +73,7 @@ class SwXMLExport : public SvXMLExport
                                  SwXMLTableFrmFmtsSort_Impl& rExpRows,
                                  SwXMLTableFrmFmtsSort_Impl& rExpCells,
                                  SwXMLTableInfo_Impl& rTblInfo,
-                                 sal_Bool bTop=sal_False );
+                                 bool bTop=false );
 
     void ExportFmt( const SwFmt& rFmt,  enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
     void ExportTableFmt( const SwFrmFmt& rFmt, sal_uInt32 nAbsWidth );
@@ -135,9 +135,9 @@ public:
         return xParaPropMapper;
     }
 
-    sal_Bool IsShowProgress() const { return bShowProgress; }
-    void SetShowProgress( sal_Bool b ) { bShowProgress = b; }
-    sal_Bool IsBlockMode() const { return bBlock; }
+    bool IsShowProgress() const { return bShowProgress; }
+    void SetShowProgress( bool b ) { bShowProgress = b; }
+    bool IsBlockMode() const { return bBlock; }
 
     // XUnoTunnel
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 479954cb8c23..c1b2c7ec3d72 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -63,10 +63,10 @@ class SwXMLConditionParser_Impl
     sal_Int32 nPos;
     sal_Int32 nLength;
 
-    inline sal_Bool SkipWS();
-    inline sal_Bool MatchChar( sal_Unicode c );
-    inline sal_Bool MatchName( OUString& rName );
-    inline sal_Bool MatchNumber( sal_uInt32& rNumber );
+    inline bool SkipWS();
+    inline bool MatchChar( sal_Unicode c );
+    inline bool MatchName( OUString& rName );
+    inline bool MatchNumber( sal_uInt32& rNumber );
 
 public:
 
@@ -78,25 +78,25 @@ public:
     sal_uInt32 GetSubCondition() const { return nSubCondition; }
 };
 
-inline sal_Bool SwXMLConditionParser_Impl::SkipWS()
+inline bool SwXMLConditionParser_Impl::SkipWS()
 {
     while( nPos < nLength && ' ' == sInput[nPos] )
         nPos++;
-    return sal_True;
+    return true;
 }
 
-inline sal_Bool SwXMLConditionParser_Impl::MatchChar( sal_Unicode c )
+inline bool SwXMLConditionParser_Impl::MatchChar( sal_Unicode c )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( nPos < nLength && c == sInput[nPos] )
     {
         nPos++;
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
 
-inline sal_Bool SwXMLConditionParser_Impl::MatchName( OUString& rName )
+inline bool SwXMLConditionParser_Impl::MatchName( OUString& rName )
 {
     OUStringBuffer sBuffer( nLength );
     while( nPos < nLength &&
@@ -110,7 +110,7 @@ inline sal_Bool SwXMLConditionParser_Impl::MatchName( OUString& rName )
     return !rName.isEmpty();
 }
 
-inline sal_Bool SwXMLConditionParser_Impl::MatchNumber( sal_uInt32& rNumber )
+inline bool SwXMLConditionParser_Impl::MatchNumber( sal_uInt32& rNumber )
 {
     OUStringBuffer sBuffer( nLength );
     while( nPos < nLength && '0' <= sInput[nPos] && sInput[nPos] <= '9' )
@@ -735,7 +735,7 @@ public:
             SwXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName ,
             const uno::Reference< xml::sax::XAttributeList > & xAttrList,
-            sal_Bool bAuto );
+            bool bAuto );
     virtual ~SwXMLStylesContext_Impl();
 
     virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
@@ -815,7 +815,7 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext(
 SwXMLStylesContext_Impl::SwXMLStylesContext_Impl(
         SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList,
-        sal_Bool bAuto ) :
+        bool bAuto ) :
     SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList, bAuto )
 {
 }
@@ -958,7 +958,7 @@ void SwXMLMasterStylesContext_Impl::EndElement()
 SvXMLImportContext *SwXMLImport::CreateStylesContext(
         const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList,
-        sal_Bool bAuto )
+        bool bAuto )
 {
     SvXMLStylesContext *pContext =
         new SwXMLStylesContext_Impl( *this, XML_NAMESPACE_OFFICE, rLocalName,
@@ -983,7 +983,7 @@ SvXMLImportContext *SwXMLImport::CreateMasterStylesContext(
     return pContext;
 }
 
-void SwXMLImport::InsertStyles( sal_Bool bAuto )
+void SwXMLImport::InsertStyles( bool bAuto )
 {
     if( bAuto && GetAutoStyles() )
         GetAutoStyles()->CopyAutoStylesToDoc();
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 3476be079d2a..c4f1ab878a17 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -198,7 +198,7 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
     case XML_TOK_DOC_STYLES:
         GetSwImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
         pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList,
-                                                      sal_False );
+                                                      false );
         break;
     case XML_TOK_DOC_AUTOSTYLES:
         // don't use the autostyles from the styles-document for the progress
@@ -206,7 +206,7 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
             GetSwImport().GetProgressBarHelper()->Increment
                 ( PROGRESS_BAR_STEP );
         pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList,
-                                                      sal_True );
+                                                      true );
         break;
 
     case XML_TOK_DOC_MASTERSTYLES:
@@ -410,7 +410,7 @@ SwXMLImport::SwXMLImport(
     bShowProgress( true ),
     bOrganizerMode( false ),
     bInititedXForms( false ),
-    bPreserveRedlineMode( sal_True ),
+    bPreserveRedlineMode( true ),
     doc( NULL )
 {
     _InitItemImport();
@@ -437,7 +437,7 @@ void SwXMLImport::setTextInsertMode(
 }
 
 void SwXMLImport::setStyleInsertMode( sal_uInt16 nFamilies,
-                                      sal_Bool bOverwrite )
+                                      bool bOverwrite )
 {
     bInsert = !bOverwrite;
     nStyleFamilyMask = nFamilies;
@@ -536,14 +536,14 @@ void SwXMLImport::startDocument()
                         nFamilyMask |= SFX_STYLE_FAMILY_PSEUDO;
                 }
 
-                sal_Bool bOverwrite = sal_False;
+                bool bOverwrite = false;
                 const OUString sStyleInsertModeOverwrite("StyleInsertModeOverwrite");
                 if( xPropertySetInfo->hasPropertyByName(sStyleInsertModeOverwrite) )
                 {
                     aAny = xImportInfo->getPropertyValue(sStyleInsertModeOverwrite);
                     if( aAny.getValueType() == ::getBooleanCppuType() &&
                         *static_cast<const sal_Bool*>(aAny.getValue()) )
-                        bOverwrite = sal_True;
+                        bOverwrite = true;
                 }
 
                 setStyleInsertMode( nFamilyMask, bOverwrite );
@@ -863,9 +863,9 @@ void SwXMLImport::endDocument( void )
             // Notify math objects. If we are in the package filter this will
             // be done by the filter object itself
             if( IsInsertMode() )
-                pDoc->PrtOLENotify( sal_False );
+                pDoc->PrtOLENotify( false );
             else if ( pDoc->IsOLEPrtNotifyPending() )
-                pDoc->PrtOLENotify( sal_True );
+                pDoc->PrtOLENotify( true );
         }
 
         SdrModel* pDrawModel = pDoc->GetDrawModel();
@@ -999,11 +999,11 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
     const PropertyValue *pValue = aViewProps.getConstArray();
 
     sal_Int64 nTmp = 0;
-    sal_Bool bShowRedlineChanges = sal_False, bBrowseMode = sal_False;
-    sal_Bool bChangeShowRedline = sal_False, bChangeBrowseMode = sal_False;
+    bool bShowRedlineChanges = false, bBrowseMode = false;
+    bool bChangeShowRedline = false, bChangeBrowseMode = false;
 
     //TODO/LATER: why that cast?!
-    sal_Bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP;
+    bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP;
     //sal_Bool bTwip = pDoc->GetDocShell()->SfxInPlaceObject::GetMapUnit ( ) == MAP_TWIP;
 
     for (sal_Int32 i = 0; i < nCount ; i++)
@@ -1035,13 +1035,13 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
         else if ( pValue->Name == "ShowRedlineChanges" )
         {
             bShowRedlineChanges = *(sal_Bool *)(pValue->Value.getValue());
-            bChangeShowRedline = sal_True;
+            bChangeShowRedline = true;
         }
 // Headers and footers are not displayed in BrowseView anymore
         else if ( pValue->Name == "InBrowseMode" )
         {
             bBrowseMode = *(sal_Bool *)(pValue->Value.getValue());
-            bChangeBrowseMode = sal_True;
+            bChangeBrowseMode = true;
         }
         pValue++;
     }
@@ -1109,7 +1109,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
     const PropertyValue* pValues = aConfigProps.getConstArray();
 
     SvtSaveOptions aSaveOpt;
-    sal_Bool bIsUserSetting = aSaveOpt.IsLoadUserSettings(),
+    bool bIsUserSetting = aSaveOpt.IsLoadUserSettings(),
          bSet = bIsUserSetting;
 
     // for some properties we don't want to use the application
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 1788bce4573e..1dbb94adb1c7 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -77,7 +77,7 @@ class SwXMLImport: public SvXMLImport
     bool                bShowProgress : 1;
     bool                bOrganizerMode : 1;
     bool                bInititedXForms : 1;
-    sal_Bool                bPreserveRedlineMode;
+    bool                bPreserveRedlineMode;
 
     SwDoc*      doc; // cached for getDoc()
 
@@ -89,7 +89,7 @@ class SwXMLImport: public SvXMLImport
                      const ::com::sun::star::uno::Reference<
                         ::com::sun::star::text::XTextRange > & rInsertPos );
     void         setStyleInsertMode( sal_uInt16 nFamilies,
-                                     sal_Bool bOverwrite );
+                                     bool bOverwrite );
     void         setBlockMode();
     void         setOrganizerMode();
 
@@ -128,7 +128,7 @@ public:
     // XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    void                    InsertStyles( sal_Bool bAuto );
+    void                    InsertStyles( bool bAuto );
     void                    FinishStyles();
 
     // namespace office
@@ -141,7 +141,7 @@ public:
                 const OUString& rLocalName,
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-                sal_Bool bAuto );
+                bool bAuto );
     SvXMLImportContext *CreateMasterStylesContext(
                 const OUString& rLocalName,
                 const ::com::sun::star::uno::Reference<
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index d7825e5cf9b0..924481cc537e 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -184,7 +184,7 @@ private:
 public:
     bool AddRow( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix, sal_uInt32 nLine );
     bool AddCell( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix,
-                  sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop );
+                  sal_uInt32 nCol, sal_uInt32 nRow, bool bTop );
 };
 
 bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
@@ -291,7 +291,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
 
 void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
 static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix,
-                                  sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop )
+                                  sal_uInt32 nCol, sal_uInt32 nRow, bool bTop )
 {
     if( bTop )
     {
@@ -306,7 +306,7 @@ static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix,
 
 bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
                                          const OUString& rNamePrefix,
-                                            sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop )
+                                            sal_uInt32 nCol, sal_uInt32 nRow, bool bTop )
 {
     const SwFmtVertOrient *pVertOrient = 0;
     const SvxBrushItem *pBrush = 0;
@@ -537,7 +537,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
                                     SwXMLTableFrmFmtsSort_Impl& rExpRows,
                                     SwXMLTableFrmFmtsSort_Impl& rExpCells,
                                     SwXMLTableInfo_Impl& rTblInfo,
-                                    sal_Bool bTop )
+                                    bool bTop )
 {
     // pass 1: calculate columns
     SwXMLTableLines_Impl *pLines = new SwXMLTableLines_Impl( rLines );
@@ -709,7 +709,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
         if( bFixAbsWidth )
         {
             nBaseWidth = nAbsWidth;
-            nAbsWidth = pTblFmt->FindLayoutRect(sal_True).Width();
+            nAbsWidth = pTblFmt->FindLayoutRect(true).Width();
             if( !nAbsWidth )
             {
                 // TODO?
@@ -723,7 +723,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
         SwXMLTableInfo_Impl aTblInfo( &rTbl );
         ExportTableLinesAutoStyles( rTbl.GetTabLines(), nAbsWidth, nBaseWidth,
                                     pTblFmt->GetName(), aExpCols, aExpRows, aExpCells,
-                                    aTblInfo, sal_True);
+                                    aTblInfo, true);
     }
 }
 
@@ -1114,7 +1114,7 @@ void SwXMLTextParagraphExport::exportTable(
         const Reference < XTextContent > & rTextContent,
         bool bAutoStyles, bool _bProgress )
 {
-    sal_Bool bOldShowProgress = ((SwXMLExport&)GetExport()).IsShowProgress();
+    bool bOldShowProgress = ((SwXMLExport&)GetExport()).IsShowProgress();
     ((SwXMLExport&)GetExport()).SetShowProgress( _bProgress );
 
     Reference < XTextTable > xTxtTbl( rTextContent, UNO_QUERY );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index d3ffe6d5a25d..6f2feb5eae65 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -169,9 +169,9 @@ class SwXMLTableCell_Impl
     sal_uInt32 nRowSpan;
     sal_uInt32 nColSpan;
 
-    sal_Bool bProtected : 1;
-    sal_Bool bHasValue; // determines whether dValue attribute is valid
-    sal_Bool mbCovered;
+    bool bProtected : 1;
+    bool bHasValue; // determines whether dValue attribute is valid
+    bool mbCovered;
     bool m_bHasStringValue;
 
 public:
@@ -181,19 +181,19 @@ public:
         pStartNode( 0 ),
         nRowSpan( nRSpan ),
         nColSpan( nCSpan ),
-        bProtected( sal_False ),
-        bHasValue( sal_False ),
-        mbCovered( sal_False )
+        bProtected( false ),
+        bHasValue( false ),
+        mbCovered( false )
         , m_bHasStringValue(false)
         {}
 
     inline void Set( const OUString& rStyleName,
                       sal_uInt32 nRSpan, sal_uInt32 nCSpan,
                      const SwStartNode *pStNd, SwXMLTableContext *pTable,
-                     sal_Bool bProtect,
+                     bool bProtect,
                      const OUString* pFormula,
-                     sal_Bool bHasValue,
-                     sal_Bool bCovered,
+                     bool bHasValue,
+                     bool bCovered,
                      double dVal,
                      OUString const*const pStringValue,
                      OUString const& i_rXmlId);
@@ -207,9 +207,9 @@ public:
     const OUString& GetStyleName() const { return aStyleName; }
     const OUString& GetFormula() const { return sFormula; }
     double GetValue() const { return dValue; }
-    sal_Bool HasValue() const { return bHasValue; }
-    sal_Bool IsProtected() const { return bProtected; }
-    sal_Bool IsCovered() const { return mbCovered; }
+    bool HasValue() const { return bHasValue; }
+    bool IsProtected() const { return bProtected; }
+    bool IsCovered() const { return mbCovered; }
     bool HasStringValue() const { return m_bHasStringValue; }
     OUString const* GetStringValue() const {
         return (m_bHasStringValue) ? &m_StringValue : 0;
@@ -227,10 +227,10 @@ inline void SwXMLTableCell_Impl::Set( const OUString& rStyleName,
                                       sal_uInt32 nRSpan, sal_uInt32 nCSpan,
                                       const SwStartNode *pStNd,
                                       SwXMLTableContext *pTable,
-                                      sal_Bool bProtect,
+                                      bool bProtect,
                                       const OUString* pFormula,
-                                      sal_Bool bHasVal,
-                                      sal_Bool bCov,
+                                      bool bHasVal,
+                                      bool bCov,
                                       double dVal,
                                       OUString const*const pStringValue,
                                       OUString const& i_rXmlId )
@@ -289,7 +289,7 @@ class SwXMLTableRow_Impl
 
     SwXMLTableCells_Impl aCells;
 
-    sal_Bool bSplitable;
+    bool bSplitable;
 
 public:
 
@@ -304,10 +304,10 @@ public:
                      const OUString& rDfltCellStyleName,
                      const OUString& i_rXmlId );
 
-    void Expand( sal_uInt32 nCells, sal_Bool bOneCell );
+    void Expand( sal_uInt32 nCells, bool bOneCell );
 
-    void SetSplitable( sal_Bool bSet ) { bSplitable = bSet; }
-    sal_Bool IsSplitable() const { return bSplitable; }
+    void SetSplitable( bool bSet ) { bSplitable = bSet; }
+    bool IsSplitable() const { return bSplitable; }
 
     const OUString& GetStyleName() const { return aStyleName; }
     const OUString& GetDefaultCellStyleName() const { return aDfltCellStyleName; }
@@ -321,7 +321,7 @@ SwXMLTableRow_Impl::SwXMLTableRow_Impl( const OUString& rStyleName,
                                         const OUString& i_rXmlId ) :
     aStyleName( rStyleName ),
     mXmlId( i_rXmlId ),
-    bSplitable( sal_False )
+    bSplitable( false )
 {
     if( pDfltCellStyleName  )
         aDfltCellStyleName = *pDfltCellStyleName;
@@ -346,7 +346,7 @@ inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol )
     return nCol < aCells.size() ? &aCells[nCol] : 0;
 }
 
-void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, sal_Bool bOneCell )
+void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, bool bOneCell )
 {
     OSL_ENSURE( nCells <= USHRT_MAX,
             "SwXMLTableRow_Impl::Expand: too many cells" );
@@ -391,21 +391,21 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext
     SvXMLImportContextRef   xMyTable;
 
     double fValue;
-    sal_Bool bHasValue;
+    bool bHasValue;
     bool     m_bHasStringValue;
     bool     m_bValueTypeIsString;
-    sal_Bool bProtect;
+    bool bProtect;
 
     sal_uInt32                  nRowSpan;
     sal_uInt32                  nColSpan;
     sal_uInt32                  nColRepeat;
 
-    sal_Bool                    bHasTextContent : 1;
-    sal_Bool                    bHasTableContent : 1;
+    bool                    bHasTextContent : 1;
+    bool                    bHasTableContent : 1;
 
     SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
 
-    sal_Bool HasContent() const { return bHasTextContent || bHasTableContent; }
+    bool HasContent() const { return bHasTextContent || bHasTableContent; }
     inline void _InsertContent();
     inline void InsertContent();
     inline void InsertContentIfNotThere();
@@ -436,15 +436,15 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
     sFormula(),
     xMyTable( pTable ),
     fValue( 0.0 ),
-    bHasValue( sal_False ),
+    bHasValue( false ),
     m_bHasStringValue(false),
     m_bValueTypeIsString(false),
-    bProtect( sal_False ),
+    bProtect( false ),
     nRowSpan( 1UL ),
     nColSpan( 1UL ),
     nColRepeat( 1UL ),
-    bHasTextContent( sal_False ),
-    bHasTableContent( sal_False )
+    bHasTextContent( false ),
+    bHasTableContent( false )
 {
     sSaveParaDefault = GetImport().GetTextImport()->GetCellParaStyleDefault();
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -497,7 +497,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
                 if (::sax::Converter::convertDouble(fTmp, rValue))
                 {
                     fValue = fTmp;
-                    bHasValue = sal_True;
+                    bHasValue = true;
                 }
             }
             break;
@@ -507,7 +507,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
                 if (::sax::Converter::convertDuration(fTmp, rValue))
                 {
                     fValue = fTmp;
-                    bHasValue = sal_True;
+                    bHasValue = true;
                 }
             }
             break;
@@ -518,7 +518,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
                                                                       rValue))
                 {
                     fValue = fTmp;
-                    bHasValue = sal_True;
+                    bHasValue = true;
                 }
             }
             break;
@@ -528,7 +528,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
                 if (::sax::Converter::convertBool(bTmp, rValue))
                 {
                     fValue = (bTmp ? 1.0 : 0.0);
-                    bHasValue = sal_True;
+                    bHasValue = true;
                 }
             }
             break;
@@ -581,7 +581,7 @@ inline void SwXMLTableCellContext_Impl::_InsertContent()
 inline void SwXMLTableCellContext_Impl::InsertContent()
 {
     OSL_ENSURE( !HasContent(), "content already there" );
-    bHasTextContent = sal_True;
+    bHasTextContent = true;
     _InsertContent();
 }
 
@@ -595,7 +595,7 @@ inline void SwXMLTableCellContext_Impl::InsertContent(
                                                 SwXMLTableContext *pTable )
 {
     GetTable()->InsertCell( aStyleName, nRowSpan, nColSpan, 0, mXmlId, pTable, bProtect );
-    bHasTableContent = sal_True;
+    bHasTableContent = true;
 }
 
 SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
@@ -606,7 +606,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
     SvXMLImportContext *pContext = 0;
 
     OUString sXmlId;
-    sal_Bool bSubTable = sal_False;
+    bool bSubTable = false;
     if( XML_NAMESPACE_TABLE == nPrefix &&
         IsXMLToken( rLocalName, XML_TABLE ) )
     {
@@ -623,7 +623,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
                  IsXMLToken( aLocalName, XML_IS_SUB_TABLE ) &&
                  IsXMLToken( xAttrList->getValueByIndex( i ), XML_TRUE ) )
             {
-                bSubTable = sal_True;
+                bSubTable = true;
             }
             else if ( (XML_NAMESPACE_XML == nPrefix2) &&
                      IsXMLToken( aLocalName, XML_ID ) )
@@ -881,7 +881,7 @@ public:
     SwXMLTableRowContext_Impl(
             SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
-            SwXMLTableContext *pTable, sal_Bool bInHead=sal_False );
+            SwXMLTableContext *pTable, bool bInHead=false );
 
     virtual ~SwXMLTableRowContext_Impl();
 
@@ -899,7 +899,7 @@ SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport,
         const OUString& rLName,
         const Reference< xml::sax::XAttributeList > & xAttrList,
         SwXMLTableContext *pTable,
-        sal_Bool bInHead ) :
+        bool bInHead ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     xMyTable( pTable ),
     nRowRepeat( 1 )
@@ -992,7 +992,7 @@ class SwXMLTableRowsContext_Impl : public SvXMLImportContext
 {
     SvXMLImportContextRef   xMyTable;
 
-    sal_Bool bHeader;
+    bool bHeader;
 
     SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; }
 
@@ -1002,7 +1002,7 @@ public:
             const OUString& rLName,
             const Reference< xml::sax::XAttributeList > & xAttrList,
             SwXMLTableContext *pTable,
-            sal_Bool bHead );
+            bool bHead );
 
     virtual ~SwXMLTableRowsContext_Impl();
 
@@ -1018,7 +1018,7 @@ SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport,
         const OUString& rLName,
         const Reference< xml::sax::XAttributeList > &,
         SwXMLTableContext *pTable,
-        sal_Bool bHead ) :
+        bool bHead ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     xMyTable( pTable ),
     bHeader( bHead )
@@ -1056,7 +1056,7 @@ class SwXMLDDETableContext_Impl : public SvXMLImportContext
     OUString sDDEApplication;
     OUString sDDEItem;
     OUString sDDETopic;
-    sal_Bool bIsAutomaticUpdate;
+    bool bIsAutomaticUpdate;
 
 public:
 
@@ -1074,7 +1074,7 @@ public:
     OUString& GetDDEApplication()   { return sDDEApplication; }
     OUString& GetDDEItem()          { return sDDEItem; }
     OUString& GetDDETopic()         { return sDDETopic; }
-    sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; }
+    bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; }
 };
 
 TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext );
@@ -1086,7 +1086,7 @@ SwXMLDDETableContext_Impl::SwXMLDDETableContext_Impl(
         sDDEApplication(),
         sDDEItem(),
         sDDETopic(),
-        bIsAutomaticUpdate(sal_False)
+        bIsAutomaticUpdate(false)
 {
 }
 
@@ -1230,10 +1230,10 @@ class TableBoxIndex
 public:
     OUString msName;
     sal_Int32 mnWidth;
-    sal_Bool mbProtected;
+    bool mbProtected;
 
     TableBoxIndex( const OUString& rName, sal_Int32 nWidth,
-                   sal_Bool bProtected ) :
+                   bool bProtected ) :
         msName( rName ),
         mnWidth( nWidth ),
         mbProtected( bProtected )
@@ -1252,7 +1252,7 @@ class TableBoxIndexHasher
 public:
     size_t operator() (const TableBoxIndex& rArg) const
     {
-        return rArg.msName.hashCode() + rArg.mnWidth + rArg.mbProtected;
+        return rArg.msName.hashCode() + rArg.mnWidth + (rArg.mbProtected ? 1 : 0);
     }
 };
 
@@ -1456,7 +1456,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
     SvXMLImportContext *pContext = 0;
 
     const SvXMLTokenMap& rTokenMap = GetSwImport().GetTableElemTokenMap();
-    sal_Bool bHeader = sal_False;
+    bool bHeader = false;
     switch( rTokenMap.Get( nPrefix, rLocalName ) )
     {
     case XML_TOK_TABLE_HEADER_COLS:
@@ -1473,7 +1473,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
                                                       this );
         break;
     case XML_TOK_TABLE_HEADER_ROWS:
-        bHeader = sal_True;
+        bHeader = true;
         //fall-through
     case XML_TOK_TABLE_ROWS:
         pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
@@ -1566,9 +1566,9 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
                                     const SwStartNode *pStartNode,
                                     const OUString & i_rXmlId,
                                     SwXMLTableContext *pTable,
-                                    sal_Bool bProtect,
+                                    bool bProtect,
                                     const OUString* pFormula,
-                                    sal_Bool bHasValue,
+                                    bool bHasValue,
                                     double fValue,
                                     OUString const*const pStringValue )
 {
@@ -1853,9 +1853,9 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
     SwTableBox* pBox,
     const OUString& rStyleName,
     sal_Int32 nColumnWidth,
-    sal_Bool bProtected,
-    sal_Bool bMayShare,
-    sal_Bool& bNew,
+    bool bProtected,
+    bool bMayShare,
+    bool& bNew,
     bool* pModifyLocked )
 {
     if ( pSharedBoxFormats == NULL )
@@ -1875,7 +1875,7 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
         SwFmtFillOrder aFillOrder( pBoxFmt2->GetFillOrder() );
         pBoxFmt2->ResetAllFmtAttr(); // #i73790# - method renamed
         pBoxFmt2->SetFmtAttr( aFillOrder );
-        bNew = sal_True;    // it's a new format now
+        bNew = true;    // it's a new format now
 
         // share this format, if allowed
         if ( bMayShare )
@@ -1886,7 +1886,7 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
         // set the shared format
         pBoxFmt2 = aIter->second;
         pBox->ChgFrmFmt( pBoxFmt2 );
-        bNew = sal_False;   // copied from an existing format
+        bNew = false;   // copied from an existing format
 
         // claim it, if we are not allowed to share
         if ( !bMayShare )
@@ -1934,7 +1934,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
         for( i = nTopRow; i < nBottomRow; i++ )
         {
             // Could the table be splitted behind the current row?
-            sal_Bool bSplit = sal_True;
+            bool bSplit = true;
             SwXMLTableRow_Impl *pRow = &(*pRows)[(sal_uInt16)i];
             for( sal_uInt32 j=nLeftCol; j<nRightCol; j++ )
             {
@@ -2025,7 +2025,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
     // Share formats!
     const OUString sStyleName = pCell->GetStyleName();
     bool bModifyLocked;
-    sal_Bool bNew;
+    bool bNew;
     SwTableBoxFmt *pBoxFmt2 = GetSharedBoxFormat(
         pBox, sStyleName, nColWidth, pCell->IsProtected(),
         pCell->GetStartNode() && pCell->GetFormula().isEmpty() &&
@@ -2076,7 +2076,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
         {
             // default num format?
             const SfxPoolItem* pItem = NULL;
-            if( pBoxFmt2->GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem )
+            if( pBoxFmt2->GetItemState( RES_BOXATR_FORMAT, false, &pItem )
                             == SFX_ITEM_SET )
             {
                 const SwTblBoxNumFormat* pNumFormat =
@@ -2131,7 +2131,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
                 // Solution: the number format will be removed,
                 // the cell gets the default text format.
                 const SfxPoolItem* pItem = NULL;
-                if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, sal_False, &pItem )
+                if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, false, &pItem )
                     == SFX_ITEM_SET )
                 {
                     const SwDoc* pDoc = pBoxFmt->GetDoc();
@@ -2213,7 +2213,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
     while( nStartCol < nRightCol )
     {
         for( sal_uInt32 nRow=nTopRow; nRow<nBottomRow; nRow++ )
-            (*pRows)[nRow].SetSplitable( sal_True );
+            (*pRows)[nRow].SetSplitable( true );
 
         sal_uInt32 nCol = nStartCol;
         sal_uInt32 nSplitCol = nRightCol;
@@ -2795,10 +2795,10 @@ void SwXMLTableContext::MakeTable()
 
         // 3) create new DDE table, and
         SwDDETable* pDDETable = new SwDDETable( pTableNode->GetTable(),
-                                                pFldType, sal_False );
+                                                pFldType, false );
 
         // 4) set new (DDE)table at node.
-        pTableNode->SetNewTable(pDDETable, sal_False);
+        pTableNode->SetNewTable(pDDETable, false);
     }
 
     // ??? this is always false: root frame is only created in SwViewShell::Init
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 874dac575686..c69fbf4b0d1c 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -125,9 +125,9 @@ class SwXMLTableContext : public XMLTextTableContext
         SwTableBox* pBox,   /// the table box
         const OUString& rStyleName, /// XML style name
         sal_Int32 nColumnWidth,     /// width of column
-        sal_Bool bProtected,        /// is cell protected?
-        sal_Bool bMayShare, /// may the format be shared (no value, formula...)
-        sal_Bool& bNew,     /// true, if the format it not from the cache
+        bool bProtected,        /// is cell protected?
+        bool bMayShare, /// may the format be shared (no value, formula...)
+        bool& bNew,     /// true, if the format it not from the cache
         bool* pModifyLocked );  /// if set, call pBox->LockModify() and return old lock status
 
 public:
@@ -171,9 +171,9 @@ public:
                      const SwStartNode *pStNd=0,
                      const OUString & i_rXmlId = OUString(),
                      SwXMLTableContext *pTable=0,
-                     sal_Bool bIsProtected = sal_False,
+                     bool bIsProtected = false,
                      const OUString *pFormula=0,
-                     sal_Bool bHasValue = sal_False,
+                     bool bHasValue = false,
                      double fValue = 0.0,
                      OUString const*const pStringValue = 0);
     void InsertRow( const OUString& rStyleName,
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index b1eb05adc950..6cbb329be4cf 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -286,7 +286,7 @@ static void lcl_addFrameProperties(
     aAny = xSet->getPropertyValue("FrameName");
     aAny >>= aName;
 
-    sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode;
+    bool bIsAutoScroll = false, bIsScrollingMode;
     aAny = xSet->getPropertyValue("FrameIsAutoScroll");
     aAny >>= bIsAutoScroll;
     if ( !bIsAutoScroll )
@@ -295,7 +295,7 @@ static void lcl_addFrameProperties(
         aAny >>= bIsScrollingMode;
     }
 
-    sal_Bool bIsBorderSet, bIsAutoBorder = sal_False;
+    bool bIsBorderSet, bIsAutoBorder = false;
     aAny = xSet->getPropertyValue("FrameIsAutoBorder");
     aAny >>= bIsAutoBorder;
     if ( !bIsAutoBorder )
@@ -541,7 +541,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
                 aAny2 >>= aStr;
                 rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr );
 
-                sal_Bool bScript = sal_False;
+                bool bScript = false;
                 aAny2 = xSet->getPropertyValue("AppletIsScript");
                 aAny2 >>= bScript;
                 rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bScript ? XML_TRUE : XML_FALSE );
@@ -554,7 +554,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
                 while ( i > 0 )
                 {
                     beans::PropertyValue& aProp = aProps[--i];
-                    const sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True );
+                    const sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, true );
                     if ( nType2 == SWHTML_OPTTYPE_TAG)
                     {
                         OUString aStr2;
@@ -649,7 +649,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
                     while ( i > 0 )
                     {
                         beans::PropertyValue& aProp = aProps[--i];
-                        const sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_True );
+                        const sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, true );
                         if (SWHTML_OPTTYPE_PARAM == nType2 || SWHTML_OPTTYPE_SIZE == nType2 )
                         {
                             OUString aStr;
@@ -675,7 +675,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
                     while ( i > 0 )
                     {
                         beans::PropertyValue& aProp = aProps[--i];
-                        const sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, sal_False );
+                        const sal_uInt16 nType2 = SwApplet_Impl::GetOptionType( aProp.Name, false );
                         if ( nType2 == SWHTML_OPTTYPE_TAG)
                         {
                             OUString aStr;
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 09d620939d6a..8f91b79639e0 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -146,7 +146,7 @@ SwXMLTextImportHelper::SwXMLTextImportHelper(
         const uno::Reference<XPropertySet> & rInfoSet,
         bool bInsertM, bool bStylesOnlyM, bool _bProgress,
         bool bBlockM, bool bOrganizerM,
-        sal_Bool /*bPreserveRedlineMode*/ ) :
+        bool /*bPreserveRedlineMode*/ ) :
     XMLTextImportHelper( rModel, rImport, bInsertM, bStylesOnlyM, _bProgress,
                          bBlockM, bOrganizerM ),
     pRedlineHelper( NULL )
@@ -352,7 +352,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
         if( !pOLENd )
             pOLENd = lcl_GetOLENode( pFrmFmt );
         if( pOLENd )
-            pOLENd->SetOLESizeInvalid( sal_True );
+            pOLENd->SetOLESizeInvalid( true );
     }
 
     SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
@@ -758,7 +758,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
     lcl_putHeightAndWidth( aItemSet, nHeight, nWidth);
 
     ScrollingMode eScrollMode = ScrollingAuto;
-    sal_Bool bHasBorder = sal_False;
+    bool bHasBorder = false;
     bool bIsBorderSet = false;
     Size aMargin( SIZE_NOT_SET, SIZE_NOT_SET );
     const XMLPropStyleContext *pStyle = 0;
@@ -788,7 +788,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
                     {
                     case CTF_FRAME_DISPLAY_SCROLLBAR:
                         {
-                            sal_Bool bYes = *(sal_Bool *)rProp.maValue.getValue();
+                            bool bYes = *(sal_Bool *)rProp.maValue.getValue();
                             eScrollMode = bYes ? ScrollingYes : ScrollingNo;
                         }
                         break;
@@ -850,17 +850,17 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
 
                 if ( eScrollMode == ScrollingAuto )
                     xSet->setPropertyValue("FrameIsAutoScroll",
-                        makeAny( sal_True ) );
+                        makeAny( true ) );
                 else
                     xSet->setPropertyValue("FrameIsScrollingMode",
-                        makeAny( (sal_Bool) (eScrollMode == ScrollingYes) ) );
+                        makeAny( eScrollMode == ScrollingYes ) );
 
                 if ( bIsBorderSet )
                     xSet->setPropertyValue("FrameIsBorder",
                         makeAny( bHasBorder ) );
                 else
                     xSet->setPropertyValue("FrameIsAutoBorder",
-                        makeAny( sal_True ) );
+                        makeAny( true ) );
 
                 xSet->setPropertyValue("FrameMarginWidth",
                     makeAny( sal_Int32( aMargin.Width() ) ) );
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 1a7d1b884e45..83868b11b984 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -44,7 +44,7 @@ public:
                 ::com::sun::star::beans::XPropertySet>& rInfoSet,
             bool bInsertM, bool bStylesOnlyM, bool bProgress,
             bool bBlockM, bool bOrganizerM,
-            sal_Bool bPreserveRedlineMode );
+            bool bPreserveRedlineMode );
     virtual ~SwXMLTextImportHelper();
 
     virtual ::com::sun::star::uno::Reference<
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index c3dd6192bb4f..1c8258ceee40 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -106,19 +106,19 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl)
         const SwPageDesc *pPageDesc;
         if ( 0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos )
             pPageDesc = rSh.FindPageDescByName( m_pPageCollBox->GetSelectEntry(),
-                                                sal_True );
+                                                true );
         else
             pPageDesc = &rSh.GetPageDesc(rSh.GetCurPageDesc());
 
         OSL_ENSURE(pPageDesc, "Page description not found.");
         const sal_uInt16 nUserPage = sal_uInt16(m_pPageNumEdit->GetValue());
-        sal_Bool bOk = sal_True;
+        bool bOk = true;
         switch(pPageDesc->GetUseOn())
         {
             case nsUseOnPage::PD_MIRROR:
             case nsUseOnPage::PD_ALL: break;
             case nsUseOnPage::PD_LEFT: bOk = 0 == nUserPage % 2; break;
-            case nsUseOnPage::PD_RIGHT: bOk = static_cast< sal_Bool >(nUserPage % 2); break;
+            case nsUseOnPage::PD_RIGHT: bOk = 1 == nUserPage % 2; break;
             default:; //prevent warning
         }
         if(!bOk) {
@@ -182,22 +182,22 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS )
 
 void SwBreakDlg::CheckEnable()
 {
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     if ( bHtmlMode )
     {
         m_pColumnBtn->Enable(false);
         m_pPageCollBox->Enable(false);
-        bEnable = sal_False;
+        bEnable = false;
     }
-    else if(rSh.GetFrmType(0,sal_True)
+    else if(rSh.GetFrmType(0,true)
         & (FRMTYPE_FLY_ANY | FRMTYPE_HEADER | FRMTYPE_FOOTER  | FRMTYPE_FOOTNOTE))
     {
         m_pPageBtn->Enable(false);
         if(m_pPageBtn->IsChecked())
             m_pLineBtn->Check(true);
-        bEnable = sal_False;
+        bEnable = false;
     }
-    const sal_Bool bPage = m_pPageBtn->IsChecked();
+    const bool bPage = m_pPageBtn->IsChecked();
     m_pPageCollText->Enable( bPage );
     m_pPageCollBox->Enable ( bPage );
 
@@ -207,7 +207,7 @@ void SwBreakDlg::CheckEnable()
         // position 0 says 'Without' page template.
         const sal_Int32 nPos = m_pPageCollBox->GetSelectEntryPos();
         if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos )
-            bEnable = sal_False;
+            bEnable = false;
     }
     m_pPageNumBox->Enable(bEnable);
     m_pPageNumEdit->Enable(bEnable);
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 8b9787aef626..2b83a8313c3c 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -285,7 +285,7 @@ void SwDropCapsPict::UpdatePaintSettings( void )
             // CTL
             GetFontSettings( *mpPage, maCTLFont, RES_CHRATR_CTL_FONT );
 
-            mpPage->rSh.Pop(sal_False);
+            mpPage->rSh.Pop(false);
             mpPage->rSh.EndCrsrMove();
         }
         else
@@ -633,12 +633,12 @@ void  SwDropCapsPage::Reset(const SfxItemSet &rSet)
                         sal_uInt16( m_pDistanceField->Denormalize( m_pDistanceField->GetValue( FUNIT_TWIP ) ) ) );
 
     ClickHdl(m_pDropCapsBox);
-    bModified = sal_False;
+    bModified = false;
 }
 
 IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl)
 {
-    sal_Bool bChecked = m_pDropCapsBox->IsChecked();
+    bool bChecked = m_pDropCapsBox->IsChecked();
 
     m_pWholeWordCB->Enable( bChecked && !bHtmlMode );
 
@@ -661,7 +661,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl)
     else
         m_pPict->SetText("");
 
-    bModified = sal_True;
+    bModified = true;
 
     return 0;
 }
@@ -673,7 +673,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl)
 
     ModifyHdl(m_pDropCapsField);
 
-    bModified = sal_True;
+    bModified = true;
 
     return 0;
 }
@@ -724,7 +724,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
     else
         m_pPict->SetDistance((sal_uInt16)m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP)));
 
-    bModified = sal_True;
+    bModified = true;
 
     return 0;
 }
@@ -732,7 +732,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
 IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl)
 {
     m_pPict->UpdatePaintSettings();
-    bModified = sal_True;
+    bModified = true;
     return 0;
 }
 IMPL_LINK_NOARG_INLINE_END(SwDropCapsPage, SelectHdl)
@@ -748,7 +748,7 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet )
     {
         SwFmtDrop aFmt;
 
-        sal_Bool bOn = m_pDropCapsBox->IsChecked();
+        bool bOn = m_pDropCapsBox->IsChecked();
         if(bOn)
         {
             // quantity, lines, gap
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 88078074811f..90b49decb0e3 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -44,8 +44,8 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet&
     SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", rAttr),
 
     msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ),
-    bModified(sal_False),
-    bCurNumrule(sal_False)
+    bModified(false),
+    bCurNumrule(false)
 {
     get(m_pOutlineStartBX,         "boxOUTLINE");
     get(m_pOutlineLvLB,            "comboLB_OUTLINE_LEVEL");
@@ -113,7 +113,7 @@ bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
         pOutlineLv->SetValue( aOutlineLv );
         rSet.Put(*pOutlineLv);
         delete pOutlineLv;
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( m_pNumberStyleLB->GetSelectEntryPos() != m_pNumberStyleLB->GetSavedValue())
@@ -128,14 +128,14 @@ bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
             pRule->SetValue(aStyle);
             rSet.Put(*pRule);
             delete pRule;
-            bModified = sal_True;
+            bModified = true;
         }
     }
     if(m_pNewStartCB->GetState() != m_pNewStartCB->GetSavedValue() ||
         m_pNewStartNumberCB->GetState() != m_pNewStartNumberCB->GetSavedValue()||
        m_pNewStartNF->GetText() != m_pNewStartNF->GetSavedValue())
     {
-        bModified = sal_True;
+        bModified = true;
         bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState();
         bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState();
         rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked));
@@ -152,7 +152,7 @@ bool    SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
                                 m_pRestartNF->GetValue() : 0 ));
         aFmt.SetCountLines( m_pCountParaCB->IsChecked() );
         rSet.Put(aFmt);
-        bModified = sal_True;
+        bModified = true;
     }
     return bModified;
 }
@@ -205,7 +205,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
     eItemState = rSet.GetItemState( FN_NUMBER_NEWSTART );
     if(eItemState > SFX_ITEM_AVAILABLE )
     {
-        bCurNumrule = sal_True;
+        bCurNumrule = true;
         const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(FN_NUMBER_NEWSTART);
 
         m_pNewStartCB->SetState(rStart.GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -253,7 +253,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
     m_pRestartParaCountCB->SaveValue();
     m_pRestartNF->SaveValue();
 
-    bModified = sal_False;
+    bModified = false;
 }
 
 void SwParagraphNumTabPage::DisableOutline()
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 091248eefda2..215426c194e6 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -49,7 +49,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
                     const SfxItemSet& rCoreSet,
                     sal_uInt8 nDialogMode,
                     const OUString *pTitle,
-                    sal_Bool bDraw,
+                    bool bDraw,
                     const OString& sDefPage)
     : SfxTabDialog(pParent,
                  "ParagraphPropertiesDialog",
@@ -67,7 +67,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
     , m_nParaBorder(0)
 {
     nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
-    sal_Bool bHtmlMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON);
+    bool bHtmlMode = (nHtmlMode & HTMLMODE_ON) == HTMLMODE_ON;
     if(pTitle)
     {
         // Update title
@@ -197,7 +197,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     else if( m_nParaExt == nId )
     {
         // pagebreak only when the cursor is in the body-area and not in a table
-        const sal_uInt16 eType = rSh.GetFrmType(0,sal_True);
+        const sal_uInt16 eType = rSh.GetFrmType(0,true);
         if( !(FRMTYPE_BODY & eType) ||
             rSh.GetSelectionType() & nsSelectionType::SEL_TBL )
         {
@@ -207,7 +207,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     }
     else if( m_nParaDrpCps == nId )
     {
-        ((SwDropCapsPage&)rPage).SetFormat(sal_False);
+        ((SwDropCapsPage&)rPage).SetFormat(false);
     }
     else if( m_nParaBckGrnd == nId )
     {
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index f60dcb3d2597..e38941ac9a29 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -58,7 +58,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
     pCmds( SwCondCollItem::GetCmds() ),
     pFmt(0),
 
-    bNewTemplate(sal_False)
+    bNewTemplate(false)
 {
     get(m_pConditionCB, "condstyle");
     get(m_pContextFT, "contextft");
@@ -144,7 +144,7 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet)
 
 bool SwCondCollPage::FillItemSet(SfxItemSet &rSet)
 {
-    sal_Bool bModified = sal_True;
+    bool bModified = true;
     SwCondCollItem aCondItem;
     for (size_t i = 0; i < m_aStrArr.size(); ++i)
     {
@@ -204,10 +204,10 @@ const sal_uInt16* SwCondCollPage::GetRanges()
 
 IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox )
 {
-    const sal_Bool bEnable = pBox->IsChecked();
+    const bool bEnable = pBox->IsChecked();
     m_pContextFT->Enable( bEnable );
     m_pUsedFT->Enable( bEnable );
-    m_pTbLinks->EnableList( bEnable != sal_False );
+    m_pTbLinks->EnableList( bEnable );
     m_pStyleFT->Enable( bEnable );
     m_pStyleLB->Enable( bEnable );
     m_pFilterLB->Enable( bEnable );
@@ -231,7 +231,7 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn)
 
     OUString sSel = m_aStrArr[nPos] + "\t";
 
-    const sal_Bool bAssEnabled = pBtn != m_pRemovePB && m_pAssignPB->IsEnabled();
+    const bool bAssEnabled = pBtn != m_pRemovePB && m_pAssignPB->IsEnabled();
     m_pAssignPB->Enable( !bAssEnabled );
     m_pRemovePB->Enable(  bAssEnabled );
     if ( bAssEnabled )
@@ -283,7 +283,7 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
     return 0;
 }
 
-void SwCondCollPage::SetCollection( SwFmt* pFormat, sal_Bool bNew )
+void SwCondCollPage::SetCollection( SwFmt* pFormat, bool bNew )
 {
     pFmt = pFormat;
     bNewTemplate = bNew;
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index d465945ea77b..a03676e5b395 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -190,7 +190,7 @@ void SwMailConfigPage::Reset( const SfxItemSet& /*rSet*/ )
 
 IMPL_LINK(SwMailConfigPage, ReplyToHdl, CheckBox*, pBox)
 {
-    sal_Bool bEnable = pBox->IsChecked();
+    bool bEnable = pBox->IsChecked();
     m_pReplyToFT->Enable(bEnable);
     m_pReplyToED->Enable(bEnable);
     return 0;
@@ -434,7 +434,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl)
 
 IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox)
 {
-    sal_Bool bChecked = pBox->IsChecked();
+    bool bChecked = pBox->IsChecked();
     m_pSeparateAuthenticationRB->Enable(bChecked);
     m_pSMTPAfterPOPRB->Enable(bChecked);
     RadioButtonHdl_Impl( 0 );
@@ -444,9 +444,9 @@ IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox)
 
 IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl)
 {
-    sal_Bool bSeparate = m_pSeparateAuthenticationRB->IsChecked();
-    sal_Bool bIsEnabled = m_pSeparateAuthenticationRB->IsEnabled();
-    sal_Bool bNotSeparate = !bSeparate && bIsEnabled;
+    bool bSeparate = m_pSeparateAuthenticationRB->IsChecked();
+    bool bIsEnabled = m_pSeparateAuthenticationRB->IsEnabled();
+    bool bNotSeparate = !bSeparate && bIsEnabled;
     bSeparate &= bIsEnabled;
 
     m_pOutgoingServerFT->Enable(bSeparate);
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index fbc8888548fd..42a261c65b60 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -362,7 +362,7 @@ void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions )
     OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" );
     for ( sal_uLong i = 0; i < nCount; ++i )
     {
-        sal_Bool bChecked = ( ( nOptions & 0x00000001 ) == 0x00000001 );
+        bool bChecked = ( ( nOptions & 0x00000001 ) == 0x00000001 );
         m_pOptionsLB->CheckEntryPos( i, bChecked );
         nOptions = nOptions >> 1;
     }
@@ -411,7 +411,7 @@ SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& r
 
 bool SwCompatibilityOptPage::FillItemSet( SfxItemSet&  )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     if ( m_pWrtShell )
     {
         sal_uLong nSavedOptions = m_nSavedOptions;
@@ -423,56 +423,56 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet&  )
         for ( sal_uLong i = 0; i < nCount; ++i )
         {
             CompatibilityOptions nOption = static_cast< CompatibilityOptions >(i);
-            sal_Bool bChecked = m_pOptionsLB->IsChecked(i);
-            sal_Bool bSavedChecked = ( ( nSavedOptions & 0x00000001 ) == 0x00000001 );
+            bool bChecked = m_pOptionsLB->IsChecked(i);
+            bool bSavedChecked = ( ( nSavedOptions & 0x00000001 ) == 0x00000001 );
             if ( bChecked != bSavedChecked )
             {
                 if ( COPT_USE_PRINTERDEVICE == nOption )
                 {
                     m_pWrtShell->SetUseVirDev( !bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( ( COPT_ADD_SPACING == nOption || COPT_ADD_SPACING_AT_PAGES == nOption ) && !bSetParaSpaceMax )
                     bSetParaSpaceMax = true;
                 else if ( COPT_USE_OUR_TABSTOPS == nOption )
                 {
                     m_pWrtShell->SetTabCompat( !bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_NO_EXTLEADING == nOption )
                 {
                     m_pWrtShell->SetAddExtLeading( !bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_USE_LINESPACING == nOption )
                 {
                        m_pWrtShell->SetUseFormerLineSpacing( bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_ADD_TABLESPACING == nOption )
                 {
                     m_pWrtShell->SetAddParaSpacingToTableCells( bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_USE_OBJECTPOSITIONING == nOption )
                 {
                     m_pWrtShell->SetUseFormerObjectPositioning( bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_USE_OUR_TEXTWRAPPING == nOption )
                 {
                     m_pWrtShell->SetUseFormerTextWrapping( bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_CONSIDER_WRAPPINGSTYLE == nOption )
                 {
                     m_pWrtShell->SetConsiderWrapOnObjPos( bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
                 else if ( COPT_EXPAND_WORDSPACE == nOption )
                 {
                     m_pWrtShell->SetDoNotJustifyLinesWithManualBreak( !bChecked );
-                    bModified = sal_True;
+                    bModified = true;
                 }
             }
 
@@ -483,7 +483,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet&  )
         {
             m_pWrtShell->SetParaSpaceMax( m_pOptionsLB->IsChecked( (sal_uLong)COPT_ADD_SPACING ) );
             m_pWrtShell->SetParaSpaceMaxAtPages( m_pOptionsLB->IsChecked( (sal_uLong)COPT_ADD_SPACING_AT_PAGES ) );
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index be0eda245be1..55f047129e6a 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -129,7 +129,7 @@ SfxTabPage* SwLoadOptPage::Create( Window* pParent,
 
 bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwModule* pMod = SW_MOD();
 
     sal_Int32 nNewLinkMode = AUTOMATIC;
@@ -161,7 +161,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
             m_pWrtShell->SetModified();
         }
 
-        bRet = sal_True;
+        bRet = true;
     }
 
     const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos();
@@ -170,23 +170,23 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
         // Double-Cast for VA3.0
         const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos );
         rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if(m_pTabMF->IsVisible() && m_pTabMF->GetText() != m_pTabMF->GetSavedValue())
     {
         rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
                     (sal_uInt16)m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP))));
-        bRet = sal_True;
+        bRet = true;
     }
 
-    sal_Bool bIsUseCharUnitFlag = m_pUseCharUnit->IsChecked();
+    bool bIsUseCharUnitFlag = m_pUseCharUnit->IsChecked();
     SvtCJKOptions aCJKOptions;
         bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled();
-    if( bIsUseCharUnitFlag != m_pUseCharUnit->GetSavedValue())
+    if( (bIsUseCharUnitFlag ? 1 : 0) != m_pUseCharUnit->GetSavedValue())
     {
         rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag ));
-        bRet = sal_True;
+        bRet = true;
     }
 
     if (m_pWordCountED->GetText() != m_pWordCountED->GetSavedValue())
@@ -195,11 +195,11 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
             comphelper::ConfigurationChanges::create());
         officecfg::Office::Writer::WordCount::AdditionalSeparators::set(m_pWordCountED->GetText(), batch);
         batch->commit();
-        bRet = sal_True;
+        bRet = true;
     }
 
-    sal_Bool bIsSquaredPageModeFlag = m_pUseSquaredPageMode->IsChecked();
-    if ( bIsSquaredPageModeFlag != m_pUseSquaredPageMode->GetSavedValue() )
+    bool bIsSquaredPageModeFlag = m_pUseSquaredPageMode->IsChecked();
+    if ( (bIsSquaredPageModeFlag ? 1 : 0) != m_pUseSquaredPageMode->GetSavedValue() )
     {
         pMod->ApplyDefaultPageMode( bIsSquaredPageModeFlag );
         if ( m_pWrtShell )
@@ -208,7 +208,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
             pDoc->SetDefaultPageMode( bIsSquaredPageModeFlag );
             m_pWrtShell->SetModified();
         }
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -216,7 +216,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
 
 void SwLoadOptPage::Reset( const SfxItemSet& rSet)
 {
-    const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(sal_False);
+    const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(false);
     const SfxPoolItem* pItem;
 
     if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, false, &pItem))
@@ -226,8 +226,8 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet)
     m_nOldLinkMode = GLOBALSETTING;
     if (m_pWrtShell)
     {
-        eFldFlags = m_pWrtShell->GetFldUpdateFlags(sal_True);
-        m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(sal_True);
+        eFldFlags = m_pWrtShell->GetFldUpdateFlags(true);
+        m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(true);
     }
     if(GLOBALSETTING == m_nOldLinkMode)
         m_nOldLinkMode = pUsrPref->GetUpdateLinkMode();
@@ -300,7 +300,7 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl)
     {
         // Double-Cast for VA3.0
         FieldUnit eFieldUnit = (FieldUnit)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos );
-        sal_Bool bModified = m_pTabMF->IsModified();
+        bool bModified = m_pTabMF->IsModified();
         long nVal = bModified ?
             sal::static_int_cast<sal_Int32, sal_Int64 >( m_pTabMF->Denormalize( m_pTabMF->GetValue( FUNIT_TWIP ) )) :
                 m_nLastTab;
@@ -493,7 +493,7 @@ SfxTabPage* SwCaptionOptPage::Create( Window* pParent,
 
 bool SwCaptionOptPage::FillItemSet( SfxItemSet&  )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
     SaveEntry(m_pCheckLB->FirstSelected());    // apply current entry
@@ -597,7 +597,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl)
 
     if (pSelEntry)
     {
-        sal_Bool bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry));
+        bool bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry));
 
         m_pSettingsGroup->Enable(bChecked);
         bool bNumSep = bChecked && m_pLbCaptionOrder->GetSelectEntryPos() == 1;
@@ -771,7 +771,7 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
     DrawSample();
 
     SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected();
-    sal_Bool bChecked = sal_False;
+    bool bChecked = false;
     if (pSelEntry)
     {
         bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry));
@@ -816,7 +816,7 @@ void SwCaptionOptPage::DrawSample()
                         aNumVector.push_back(1);
 
                     const OUString sNumber( pSh->GetOutlineNumRule()->MakeNumString(
-                                                            aNumVector, sal_False ));
+                                                            aNumVector, false ));
                     if( !sNumber.isEmpty() )
                         aStr += sNumber + pFldType->GetDelimiter();
                 }
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index db1bbea6abc8..2740bf96fdff 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -234,7 +234,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
     aElem.bVertRulerRight       = m_pVRulerRightCBox->IsChecked();
     aElem.bSmoothScroll         = m_pSmoothCBox->IsChecked();
 
-    sal_Bool bRet = !pOldAttr || aElem != *pOldAttr;
+    bool bRet = !pOldAttr || aElem != *pOldAttr;
     if(bRet)
         bRet = 0 != rSet.Put(aElem);
 
@@ -245,7 +245,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
         // Double-Cast for VA3.0
         const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos );
         rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) );
-        bRet = sal_True;
+        bRet = true;
     }
 
     nMPos = m_pHMetric->GetSelectEntryPos();
@@ -254,7 +254,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
         // Double-Cast for VA3.0
         const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pHMetric->GetEntryData( nMPos );
         rSet.Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) );
-        bRet = sal_True;
+        bRet = true;
     }
     nMPos = m_pVMetric->GetSelectEntryPos();
     if ( nMPos != m_pVMetric->GetSavedValue() || nMPos != nGlobalMetricPos )
@@ -262,7 +262,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
         // Double-Cast for VA3.0
         const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pVMetric->GetEntryData( nMPos );
         rSet.Put( SfxUInt16Item( FN_VSCROLL_METRIC, nFieldUnit ) );
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
@@ -275,7 +275,7 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, CheckBox*, pBox)
 
 IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox)
 {
-    sal_Bool bChecked = pBox->IsChecked();
+    bool bChecked = pBox->IsChecked();
     m_pHRulerCBox->Enable(bChecked);
     m_pHMetric->Enable(bChecked);
     m_pVRulerCBox->Enable(bChecked);
@@ -291,8 +291,8 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
     : SfxTabPage(pParent, "PrintOptionsPage",
         "modules/swriter/ui/printoptionspage.ui", rCoreSet)
     , sNone(SW_RESSTR(SW_STR_NONE))
-    , bAttrModified(sal_False)
-    , bPreview(sal_False)
+    , bAttrModified(false)
+    , bPreview(false)
 {
     get(m_pGrfCB, "graphics");
     get(m_pCtrlFldCB, "formcontrols");
@@ -356,7 +356,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
     m_pProspectCB_RTL->Show(aCTLOptions.IsCTLFontEnabled());
 }
 
-void SwAddPrinterTabPage::SetPreview(sal_Bool bPrev)
+void SwAddPrinterTabPage::SetPreview(bool bPrev)
 {
     bPreview = bPrev;
     m_pCommentsFrame->Enable(!bPreview);
@@ -375,7 +375,7 @@ bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
     {
         SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
         aAddPrinterAttr.bPrintGraphic   = m_pGrfCB->IsChecked();
-        aAddPrinterAttr.bPrintTable     = sal_True; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
+        aAddPrinterAttr.bPrintTable     = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
         aAddPrinterAttr.bPrintDraw      = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
         aAddPrinterAttr.bPrintControl   = m_pCtrlFldCB->IsChecked();
         aAddPrinterAttr.bPrintPageBackground = m_pBackgroundCB->IsChecked();
@@ -385,12 +385,12 @@ bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
 
         aAddPrinterAttr.bPrintLeftPages     = m_pLeftPageCB->IsChecked();
         aAddPrinterAttr.bPrintRightPages    = m_pRightPageCB->IsChecked();
-        aAddPrinterAttr.bPrintReverse       = sal_False; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
+        aAddPrinterAttr.bPrintReverse       = false; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
         aAddPrinterAttr.bPrintProspect      = m_pProspectCB->IsChecked();
         aAddPrinterAttr.bPrintProspectRTL   = m_pProspectCB_RTL->IsChecked();
         aAddPrinterAttr.bPaperFromSetup     = m_pPaperFromSetupCB->IsChecked();
         aAddPrinterAttr.bPrintEmptyPages    = m_pPrintEmptyPagesCB->IsChecked();
-        aAddPrinterAttr.bPrintSingleJobs    = sal_True; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
+        aAddPrinterAttr.bPrintSingleJobs    = true; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
 
         if (m_pNoRB->IsChecked())  aAddPrinterAttr.nPrintPostIts =
                                                         POSTITS_NONE;
@@ -457,7 +457,7 @@ void    SwAddPrinterTabPage::Init()
 
 IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl)
 {
-    bAttrModified = sal_True;
+    bAttrModified = true;
     bool bIsProspect = m_pProspectCB->IsChecked();
     if (!bIsProspect)
         m_pProspectCB_RTL->Check( false );
@@ -483,7 +483,7 @@ void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
 
 IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, SelectHdl)
 {
-    bAttrModified=sal_True;
+    bAttrModified=true;
     return 0;
 }
 IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, SelectHdl)
@@ -519,20 +519,20 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
     pWrtShell(0),
     eLanguage( GetAppLanguage() ),
 
-    bListDefault(sal_False),
-    bSetListDefault(sal_True),
-    bLabelDefault(sal_False),
-    bSetLabelDefault(sal_True),
-    bIdxDefault(sal_False),
-    bSetIdxDefault(sal_True),
-    bDeletePrinter(sal_False),
-
-    bListHeightDefault    (sal_False),
-    bSetListHeightDefault (sal_False),
-    bLabelHeightDefault   (sal_False),
-    bSetLabelHeightDefault(sal_False),
-    bIndexHeightDefault     (sal_False),
-    bSetIndexHeightDefault  (sal_False),
+    bListDefault(false),
+    bSetListDefault(true),
+    bLabelDefault(false),
+    bSetLabelDefault(true),
+    bIdxDefault(false),
+    bSetIdxDefault(true),
+    bDeletePrinter(false),
+
+    bListHeightDefault    (false),
+    bSetListHeightDefault (false),
+    bLabelHeightDefault   (false),
+    bSetLabelHeightDefault(false),
+    bIndexHeightDefault     (false),
+    bSetIndexHeightDefault  (false),
 
     nFontGroup(FONT_GROUP_DEFAULT),
 
@@ -620,7 +620,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
 
 bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
 {
-    sal_Bool bNotDocOnly = !pDocOnlyCB->IsChecked();
+    bool bNotDocOnly = !pDocOnlyCB->IsChecked();
     SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly);
 
     const OUString sStandard    = pStandardBox->GetText();
@@ -872,7 +872,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellTitle = sOutBackup = rFontHL.GetFamilyName();
 
-        const SvxFontHeightItem& rFontHeightTitle = (const SvxFontHeightItem&)pColl->GetFmtAttr( nFontHeightWhich, sal_True );
+        const SvxFontHeightItem& rFontHeightTitle = (const SvxFontHeightItem&)pColl->GetFmtAttr( nFontHeightWhich, true );
         nTitleHeight = (sal_Int32)rFontHeightTitle.GetHeight();
 
         const sal_uInt16 nFontWhich = sal::static_int_cast< sal_uInt16, RES_CHRATR >(
@@ -884,7 +884,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
         bListDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
         sShellList = sListBackup = rFontLS.GetFamilyName();
 
-        const SvxFontHeightItem& rFontHeightList = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, sal_True);
+        const SvxFontHeightItem& rFontHeightList = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, true);
         nListHeight = (sal_Int32)rFontHeightList.GetHeight();
         bListHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
 
@@ -893,7 +893,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
         const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellLabel = sCapBackup = rFontCP.GetFamilyName();
-        const SvxFontHeightItem& rFontHeightLabel = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, sal_True);
+        const SvxFontHeightItem& rFontHeightLabel = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, true);
         nLabelHeight = (sal_Int32)rFontHeightLabel.GetHeight();
         bLabelHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
 
@@ -902,7 +902,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
         const SvxFontItem& rFontIDX = !nFontGroup ? pColl->GetFont() :
                 FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont();
         sShellIndex = sIdxBackup = rFontIDX.GetFamilyName();
-        const SvxFontHeightItem& rFontHeightIndex = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, sal_True);
+        const SvxFontHeightItem& rFontHeightIndex = (const SvxFontHeightItem&)pColl->GetFmtAttr(nFontHeightWhich, true);
         nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight();
         bIndexHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false);
     }
@@ -989,15 +989,15 @@ IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox )
     }
     else if(pBox == pListBox)
     {
-        bSetListDefault = sal_False;
+        bSetListDefault = false;
     }
     else if(pBox == pLabelBox)
     {
-        bSetLabelDefault = sal_False;
+        bSetLabelDefault = false;
     }
     else if(pBox == pIdxBox)
     {
-        bSetIdxDefault = sal_False;
+        bSetIdxDefault = false;
     }
     return 0;
 }
@@ -1016,15 +1016,15 @@ IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, FontSizeBox*, pBox )
     }
     else if(pBox == pListHeightLB)
     {
-        bSetListHeightDefault = sal_False;
+        bSetListHeightDefault = false;
     }
     else if(pBox == pLabelHeightLB)
     {
-        bSetLabelHeightDefault = sal_False;
+        bSetLabelHeightDefault = false;
     }
     else if(pBox == pIndexHeightLB)
     {
-        bSetIndexHeightDefault = sal_False;
+        bSetIndexHeightDefault = false;
     }
     return 0;
 }
@@ -1068,7 +1068,7 @@ void SwStdFontTabPage::PageCreated (SfxAllItemSet aSet)
 SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", rSet),
     pWrtShell(0),
-    bHTMLMode(sal_False)
+    bHTMLMode(false)
 {
     get(pHeaderCB,"header");
     get(pRepeatHeaderCB,"repeatheader");
@@ -1103,7 +1103,7 @@ SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent,
 
 bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
     if(pRowMoveMF->IsModified())
@@ -1142,7 +1142,7 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
             pWrtShell->GetView().GetViewFrame()->GetBindings().Invalidate( aInva );
         }
 
-        bRet = sal_True;
+        bRet = true;
     }
 
     SwInsertTableOptions aInsOpts( 0, 0 );
@@ -1170,19 +1170,19 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
     if (pNumFormattingCB->GetSavedValue() != pNumFormattingCB->GetState())
     {
         pModOpt->SetInsTblFormatNum(bHTMLMode, pNumFormattingCB->IsChecked());
-        bRet = sal_True;
+        bRet = true;
     }
 
     if (pNumFmtFormattingCB->GetSavedValue() != pNumFmtFormattingCB->GetState())
     {
         pModOpt->SetInsTblChangeNumFormat(bHTMLMode, pNumFmtFormattingCB->IsChecked());
-        bRet = sal_True;
+        bRet = true;
     }
 
     if (pNumAlignmentCB->GetSavedValue() != pNumAlignmentCB->GetState())
     {
         pModOpt->SetInsTblAlignNum(bHTMLMode, pNumAlignmentCB->IsChecked());
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -1514,7 +1514,7 @@ void SwMarkPreview::InitColors( void )
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
     m_aBgCol = Color( rSettings.GetWindowColor() );
 
-    sal_Bool bHC = rSettings.GetHighContrastMode();
+    bool bHC = rSettings.GetHighContrastMode();
     m_aLineCol = bHC? SwViewOption::GetFontColor() : Color( COL_BLACK );
     m_aShadowCol = bHC? m_aBgCol : rSettings.GetShadowColor();
     m_aTxtCol = bHC? SwViewOption::GetFontColor() : Color( COL_GRAY );
@@ -2243,7 +2243,7 @@ SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet&
 
 bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig();
 
     if( m_pAutoRB->IsChecked() != m_pAutoRB->GetSavedValue() ||
@@ -2257,25 +2257,25 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& )
         if ( m_pCharRB->IsChecked() ) eCmpMode = SVX_CMP_BY_CHAR;
 
         pOpt->SetCompareMode( eCmpMode );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if( TriState(m_pRsidCB->IsChecked()) != m_pRsidCB->GetSavedValue() )
     {
         pOpt->SetUseRsid( m_pRsidCB->IsChecked() );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if( TriState(m_pIgnoreCB->IsChecked()) != m_pIgnoreCB->GetSavedValue() )
     {
         pOpt->SetIgnorePieces( m_pIgnoreCB->IsChecked() );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if( m_pLenNF->IsModified() )
     {
         pOpt->SetPieceLen( m_pLenNF->GetValue() );
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
@@ -2343,7 +2343,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl)
 
 SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet)
     : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", rCoreSet)
-    , bAttrModified( sal_False )
+    , bAttrModified( false )
 {
     get(m_pTest1CBox, "unused");
     get(m_pTest2CBox, "dynamic");
@@ -2426,7 +2426,7 @@ void SwTestTabPage::Init()
 
 IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl)
 {
-    bAttrModified = sal_True;
+    bAttrModified = true;
     return 0;
 }
 IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl)
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 3fbafc890e9d..4cd330e7ff88 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -214,8 +214,8 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
     SwMailMergeConfigItem& rConfigItem = m_pAddressPage->GetWizard()->GetConfigItem();
     const SwDBData& rCurrentData = rConfigItem.GetCurrentDBData();
 
-    sal_Bool bEnableEdit = sal_False;
-    sal_Bool bEnableOK = sal_True;
+    bool bEnableEdit = false;
+    bool bEnableOK = true;
     m_pListLB->SelectAll( false );
 
     SwDBConfig aDb;
@@ -251,7 +251,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
             }
             catch (const uno::Exception&)
             {
-                bEnableOK = sal_False;
+                bEnableOK = false;
             }
             m_aDBData = rCurrentData;
         }
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 5c3cb5211839..e3ae204ef573 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -190,7 +190,7 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog(
 IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
 {
     OUString sEntry = pEdit->GetText();
-    sal_Bool bFound = sEntry.isEmpty();
+    bool bFound = sEntry.isEmpty();
 
     if(!bFound)
     {
@@ -200,7 +200,7 @@ IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
                     ++aHeaderIter)
             if(*aHeaderIter == sEntry)
             {
-                bFound = sal_True;
+                bFound = true;
                 break;
             }
     }
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index d6dd12ff75ca..ee02e42dd7d4 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -168,15 +168,15 @@ struct _DB_ColumnConfigData: private boost::noncopyable
     OUString sTblList;
     OUString sTmplNm;
     OUString sTAutoFmtNm;
-    sal_Bool bIsTable : 1,
+    bool bIsTable : 1,
          bIsField : 1,
          bIsHeadlineOn : 1,
          bIsEmptyHeadln : 1;
 
     _DB_ColumnConfigData()
     {
-        bIsTable = bIsHeadlineOn = sal_True;
-        bIsField = bIsEmptyHeadln = sal_False;
+        bIsTable = bIsHeadlineOn = true;
+        bIsField = bIsEmptyHeadln = false;
     }
 
     ~_DB_ColumnConfigData();
@@ -290,7 +290,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
                 case DataType::TIME:
                 case DataType::TIMESTAMP:
                 {
-                    pNew->bHasFmt = sal_True;
+                    pNew->bHasFmt = true;
                     Any aFormat = xCol->getPropertyValue("FormatKey");
                     if(aFormat.hasValue())
                     {
@@ -466,7 +466,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
     SwInsDBColumn aSrch( rBox.GetSelectEntry(), 0 );
     SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch );
 
-    sal_Bool bFromDB = m_pRbDbFmtFromDb == pButton;
+    bool bFromDB = m_pRbDbFmtFromDb == pButton;
     (*it)->bIsDBFmt = bFromDB;
     m_pLbDbFmtFromUsr->Enable( !bFromDB );
 
@@ -475,13 +475,13 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton )
 
 IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 {
-    sal_Bool bChgEnable = sal_True, bEnableTo = sal_True, bEnableFrom = sal_True;
+    bool bChgEnable = true, bEnableTo = true, bEnableFrom = true;
     m_pLbTblDbColumn->SetUpdateMode( false );
     m_pLbTableCol->SetUpdateMode( false );
 
     if( pButton == m_pIbDbcolAllTo )
     {
-        bEnableTo = sal_False;
+        bEnableTo = false;
 
         sal_Int32 n, nInsPos = m_pLbTableCol->GetSelectEntryPos(),
                nCnt = m_pLbTblDbColumn->GetEntryCount();
@@ -554,7 +554,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
     }
     else if( pButton == m_pIbDbcolAllFrom )
     {
-        bEnableFrom = sal_False;
+        bEnableFrom = false;
 
         m_pLbTblDbColumn->Clear();
         m_pLbTableCol->Clear();
@@ -565,7 +565,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
     }
     else if( pButton == m_pIbDbcolToEdit )
     {
-        bChgEnable = sal_False;
+        bChgEnable = false;
         // move data to Edit:
         OUString aFld( m_pLbTxtDbColumn->GetSelectEntry() );
         if( !aFld.isEmpty() )
@@ -695,7 +695,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
         }
         else
             nWidth = rSh.GetAnyCurRect(
-                                FRMTYPE_FLY_ANY & rSh.GetFrmType( 0, sal_True )
+                                FRMTYPE_FLY_ANY & rSh.GetFrmType( 0, true )
                                               ? RECT_FLY_PRT_EMBEDDED
                                               : RECT_PAGE_PRT ).Width();
 
@@ -726,7 +726,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
             const sal_Int32 nStep = nWidth / (nCols+1);
             for( sal_Int32 n = 0; n < nCols; ++n )
             {
-                aTabCols.Insert( nStep*(n+1), sal_False, n );
+                aTabCols.Insert( nStep*(n+1), false, n );
             }
         }
         delete pRep;
@@ -759,7 +759,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, AutoFmtHdl, PushButton*, pButton )
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), sal_False, pTAutoFmt));
+    boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pView->GetWrtShellPtr(), false, pTAutoFmt));
     OSL_ENSURE(pDlg, "Dialogdiet fail!");
     if( RET_OK == pDlg->Execute())
         pDlg->FillAutoFmtOfIndex( pTAutoFmt );
@@ -800,7 +800,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
         }
         else
         {
-            sal_Bool bEnableFmt = (*it)->bHasFmt;
+            bool bEnableFmt = (*it)->bHasFmt;
             m_pRbDbFmtFromDb->Enable( bEnableFmt );
             m_pRbDbFmtFromUsr->Enable( bEnableFmt );
 
@@ -809,7 +809,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
                 sTxt += " ("  + aSrch.sColumn + ")";
             }
 
-            sal_Bool bIsDBFmt = (*it)->bIsDBFmt;
+            bool bIsDBFmt = (*it)->bIsDBFmt;
             m_pRbDbFmtFromDb->Check( bIsDBFmt );
             m_pRbDbFmtFromUsr->Check( !bIsDBFmt );
             m_pLbDbFmtFromUsr->Enable( !bIsDBFmt );
@@ -831,7 +831,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton )
 {
     if( pButton == m_pCbTableHeadon )
     {
-        sal_Bool bEnable = m_pCbTableHeadon->IsChecked();
+        bool bEnable = m_pCbTableHeadon->IsChecked();
 
         m_pRbHeadlColnms->Enable( bEnable );
         m_pRbHeadlEmpty->Enable( bEnable );
@@ -863,7 +863,7 @@ static void lcl_InsTextInArr( const OUString& rTxt, _DB_Columns& rColArr )
 
 bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt,
                                 _DB_Columns& rColArr,
-                                sal_Bool bInsField )
+                                bool bInsField )
 {
     // create each of the database columns from the text again
     // and then save in an array
@@ -946,7 +946,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
     SwWrtShell& rSh = pView->GetWrtShell();
 
     //with the drag and drop interface no result set is initially available
-    sal_Bool bDisposeResultSet = sal_False;
+    bool bDisposeResultSet = false;
     // we don't have a cursor, so we have to create our own RowSet
     if ( !xResultSet.is() )
     {
@@ -959,11 +959,11 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
         return;
 
     rSh.StartAllAction();
-    sal_Bool bUndo = rSh.DoesUndo();
+    bool bUndo = rSh.DoesUndo();
     if( bUndo )
         rSh.StartUndo( UNDO_EMPTY );
 
-    sal_Bool bAsTable = m_pRbAsTable->IsChecked();
+    bool bAsTable = m_pRbAsTable->IsChecked();
     SvNumberFormatter& rNumFmtr = *rSh.GetNumberFormatter();
 
     if( rSh.HasSelection() )
@@ -977,7 +977,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
     do{                                 // middle checked loop!!
     if( bAsTable )          // Daten als Tabelle einfuegen
     {
-        rSh.DoUndo( sal_False );
+        rSh.DoUndo( false );
 
         sal_Int32 nCols = m_pLbTableCol->GetEntryCount();
         sal_Int32 nRows = 0;
@@ -1016,7 +1016,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
         const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-        sal_Bool bHTML = 0 != (::GetHtmlMode( pView->GetDocShell() ) & HTMLMODE_ON);
+        bool bHTML = 0 != (::GetHtmlMode( pView->GetDocShell() ) & HTMLMODE_ON);
         rSh.InsertTable(
             pModOpt->GetInsTblFlags(bHTML),
             nRows, nCols, text::HoriOrientation::FULL, (pSelection ? pTAutoFmt : 0) );
@@ -1027,8 +1027,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
         SfxItemSet aTblSet( rSh.GetAttrPool(), RES_BOXATR_FORMAT,
                                                 RES_BOXATR_VALUE );
-        sal_Bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells();
-        rSh.SetAutoUpdateCells( sal_False );
+        bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells();
+        rSh.SetAutoUpdateCells( false );
 
         if( m_pCbTableHeadon->IsChecked() )
         {
@@ -1184,7 +1184,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                 rSh.SwCrsrShell::Left(1,CRSR_SKIP_CHARS);
             }
 
-            rSh.DoUndo( sal_False );
+            rSh.DoUndo( false );
 
             SwTxtFmtColl* pColl = 0;
             {
@@ -1367,7 +1367,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
                 if( !pSelection )
                 {
-                    sal_Bool bNext = xResultSet->next();
+                    bool bNext = xResultSet->next();
                     if(!bNext)
                         break;
                 }
@@ -1399,7 +1399,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
 
     if( bUndo )
     {
-        rSh.DoUndo( sal_True );
+        rSh.DoUndo( true );
         rSh.AppendUndoForInsertFromDB( bAsTable );
         rSh.EndUndo( UNDO_EMPTY );
     }
@@ -1789,7 +1789,7 @@ void SwInsertDBColAutoPilot::Load()
                     {
                         if( rGet.bHasFmt && !rGet.bIsDBFmt )
                         {
-                            rSet.bIsDBFmt = sal_False;
+                            rSet.bIsDBFmt = false;
                             rSet.nUsrNumFmt = rNFmtr.GetEntryKey( rGet.sUsrNumFmt,
                                                                     rGet.eUsrNumFmtLng );
                             if( NUMBERFORMAT_ENTRY_NOT_FOUND == rSet.nUsrNumFmt )
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index ea4d9a83d1fd..c0bb2d074881 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -133,7 +133,7 @@ void SwMailMergeWizard::enterState( WizardState _nState )
 */
     if(_nState > MM_LAYOUTPAGE && m_rConfigItem.GetSourceView() &&
             ((m_rConfigItem.IsAddressBlock() && !m_rConfigItem.IsAddressInserted()) ||
-             (m_rConfigItem.IsGreetingLine(sal_False) && !m_rConfigItem.IsGreetingInserted() )))
+             (m_rConfigItem.IsGreetingLine(false) && !m_rConfigItem.IsGreetingInserted() )))
     {
         SwMailMergeLayoutPage::InsertAddressAndGreeting(m_rConfigItem.GetSourceView(),
                                 m_rConfigItem, Point(-1, -1), true);
@@ -228,8 +228,8 @@ void SwMailMergeWizard::UpdateRoadmap()
     bool bAddressFieldsConfigured = !m_rConfigItem.IsOutputToLetter() ||
                 !m_rConfigItem.IsAddressBlock() ||
                 m_rConfigItem.IsAddressFieldsAssigned();
-    bool bGreetingFieldsConfigured = !m_rConfigItem.IsGreetingLine(sal_False) ||
-            !m_rConfigItem.IsIndividualGreeting(sal_False)||
+    bool bGreetingFieldsConfigured = !m_rConfigItem.IsGreetingLine(false) ||
+            !m_rConfigItem.IsIndividualGreeting(false)||
                     m_rConfigItem.IsGreetingFieldsAssigned();
     //#i97436# if a document has to be loaded then enable output type page only
     m_bDocumentLoad = false;
@@ -265,7 +265,7 @@ void SwMailMergeWizard::UpdateRoadmap()
                 if(MM_LAYOUTPAGE == nPage)
                     bEnable &=
                         ((m_rConfigItem.IsAddressBlock() && !m_rConfigItem.IsAddressInserted()) ||
-                            (m_rConfigItem.IsGreetingLine(sal_False) && !m_rConfigItem.IsGreetingInserted() ));
+                            (m_rConfigItem.IsGreetingLine(false) && !m_rConfigItem.IsGreetingInserted() ));
             break;
         }
         enableState( nPage, bEnable );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index cb036a0ea0bd..a548b2827e84 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -206,7 +206,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton)
     return 0;
 }
 
-void SwMailMergeAddressBlockPage::EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective)
+void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective)
 {
     m_pSettingsFI->Enable(bAll);
     m_pAddressCB->Enable(bAll);
@@ -264,10 +264,10 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
     }
     m_pWizard->LeaveWait();
     sal_Int32 nPos = rConfig.GetResultSetPosition();
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     if(nPos < 1)
     {
-        bEnable = sal_False;
+        bEnable = false;
         nPos = 1;
     }
     else
@@ -286,7 +286,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
     m_pDocumentIndexFI->SetText(m_sDocument.replaceFirst("%1", OUString::number(nPos)));
 
     GetWizard()->enableButtons(WZB_NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
-    sal_Bool bHasResultSet = rConfig.GetResultSet().is();
+    bool bHasResultSet = rConfig.GetResultSet().is();
     m_pCurrentAddressFI->Show(bHasResultSet);
     if(bHasResultSet)
     {
@@ -367,7 +367,7 @@ const uno::Sequence< OUString >&    SwSelectAddressBlockDialog::GetAddressBlocks
 }
 
 void SwSelectAddressBlockDialog::SetSettings(
-        sal_Bool bIsCountry, const OUString& rCountry)
+        bool bIsCountry, const OUString& rCountry)
 {
     RadioButton *pActive = m_pNeverRB;
     if(bIsCountry)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 9192b1e69b8a..e13069eb6e3e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -71,7 +71,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
     DECL_LINK(AddressBlockSelectHdl_Impl, void *);
     DECL_LINK(HideParagraphsHdl_Impl, CheckBox*);
 
-    void                EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective);
+    void                EnableAddressBlock(bool bAll, bool bSelective);
 
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE;
@@ -111,8 +111,8 @@ public:
                                 sal_uInt16 nSelected);
     const com::sun::star::uno::Sequence< OUString>&    GetAddressBlocks();
 
-    void                SetSettings(sal_Bool bIsCountry, const OUString& sCountry);
-    sal_Bool            IsIncludeCountry() const {return !m_pNeverRB->IsChecked();}
+    void                SetSettings(bool bIsCountry, const OUString& sCountry);
+    bool            IsIncludeCountry() const {return !m_pNeverRB->IsChecked();}
     OUString     GetCountry() const;
 };
 
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index cda35b70f5fc..ab7a5e1b062a 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -82,7 +82,7 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox,
 
 IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl)
 {
-    sal_Bool bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked();
+    bool bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked();
     m_pFemaleFT->Enable(bIndividual);
     m_pFemaleLB->Enable(bIndividual);
     m_pFemalePB->Enable(bIndividual);
@@ -97,7 +97,7 @@ IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl)
 
     if( m_bIsTabPage )
     {
-        m_pWizard->GetConfigItem().SetIndividualGreeting(bIndividual, sal_False);
+        m_pWizard->GetConfigItem().SetIndividualGreeting(bIndividual, false);
         m_pWizard->UpdateRoadmap();
         m_pWizard->enableButtons(WZB_NEXT, m_pWizard->isStateEnabled(MM_PREPAREMERGEPAGE));
     }
@@ -204,10 +204,10 @@ void SwMailMergeGreetingsPage::UpdatePreview()
     m_pPreviewWIN->SetAddress(sPreview);
 }
 
-void    SwGreetingsHandler::Contains(sal_Bool bContainsGreeting)
+void    SwGreetingsHandler::Contains(bool bContainsGreeting)
 {
     m_pPersonalizedCB->Enable(bContainsGreeting);
-    sal_Bool bEnablePersonal = bContainsGreeting && m_pPersonalizedCB->IsChecked();
+    bool bEnablePersonal = bContainsGreeting && m_pPersonalizedCB->IsChecked();
     m_pFemaleFT->Enable(bEnablePersonal);
     m_pFemaleLB->Enable(bEnablePersonal);
     m_pFemalePB->Enable(bEnablePersonal);
@@ -279,8 +279,8 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent)
     m_pNextSetIB->SetClickHdl(aDataLink);
 
     SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
-    m_pGreetingLineCB->Check(rConfig.IsGreetingLine(sal_False));
-    m_pPersonalizedCB->Check(rConfig.IsIndividualGreeting(sal_False));
+    m_pGreetingLineCB->Check(rConfig.IsGreetingLine(false));
+    m_pPersonalizedCB->Check(rConfig.IsIndividualGreeting(false));
     ContainsHdl_Impl(m_pGreetingLineCB);
     aIndividualLink.Call(0);
 
@@ -347,14 +347,14 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason
         m_pNeutralCB->SelectEntryPos(nCount);
     }
     lcl_StoreGreetingsBox(*m_pNeutralCB, rConfig, SwMailMergeConfigItem::NEUTRAL);
-    rConfig.SetGreetingLine(m_pGreetingLineCB->IsChecked(), sal_False);
-    rConfig.SetIndividualGreeting(m_pPersonalizedCB->IsChecked(), sal_False);
+    rConfig.SetGreetingLine(m_pGreetingLineCB->IsChecked(), false);
+    rConfig.SetIndividualGreeting(m_pPersonalizedCB->IsChecked(), false);
     return true;
 }
 
 IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
 {
-    sal_Bool bContainsGreeting = pBox->IsChecked();
+    bool bContainsGreeting = pBox->IsChecked();
     SwGreetingsHandler::Contains(bContainsGreeting);
     m_pPreviewFI-> Enable(bContainsGreeting);
     m_pPreviewWIN->Enable(bContainsGreeting);
@@ -363,7 +363,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
     m_pPrevSetIB->Enable(bContainsGreeting);
     m_pNextSetIB->Enable(bContainsGreeting);
     SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
-    rConfig.SetGreetingLine(m_pGreetingLineCB->IsChecked(), sal_False);
+    rConfig.SetGreetingLine(m_pGreetingLineCB->IsChecked(), false);
     m_pWizard->UpdateRoadmap();
     return 0;
 }
@@ -383,10 +383,10 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton)
         rConfig.MoveResultSet( bNext ? ++nPos : --nPos);
     }
     sal_Int32 nPos = rConfig.GetResultSetPosition();
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     if(nPos < 1)
     {
-        bEnable = sal_False;
+        bEnable = false;
         nPos = 1;
     }
     else
@@ -459,8 +459,8 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard)
     m_aOK.SetClickHdl(LINK(this, SwMailBodyDialog, OKHdl));
 
     SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
-    m_aGreetingLineCB.Check(rConfig.IsGreetingLine(sal_True));
-    m_aPersonalizedCB.Check(rConfig.IsIndividualGreeting(sal_True));
+    m_aGreetingLineCB.Check(rConfig.IsGreetingLine(true));
+    m_aPersonalizedCB.Check(rConfig.IsIndividualGreeting(true));
     ContainsHdl_Impl(&m_aGreetingLineCB);
     aIndividualLink.Call(0);
 
@@ -493,7 +493,7 @@ SwMailBodyDialog::~SwMailBodyDialog()
 IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, CheckBox*, pBox)
 {
     SwGreetingsHandler::Contains(pBox->IsChecked());
-    m_pWizard->GetConfigItem().SetGreetingLine(pBox->IsChecked(), sal_True);
+    m_pWizard->GetConfigItem().SetGreetingLine(pBox->IsChecked(), true);
     return 0;
 }
 
@@ -501,9 +501,9 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
     rConfigItem.SetGreetingLine(
-                m_aGreetingLineCB.IsChecked(), sal_False);
+                m_aGreetingLineCB.IsChecked(), false);
     rConfigItem.SetIndividualGreeting(
-                m_aPersonalizedCB.IsChecked(), sal_False);
+                m_aPersonalizedCB.IsChecked(), false);
 
     if(m_aFemaleColumnLB.GetSelectEntryPos() != m_aFemaleColumnLB.GetSavedValue())
     {
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index e68cf9768bd7..04f48a0f366f 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -63,7 +63,7 @@ protected:
     DECL_LINK(IndividualHdl_Impl, void *);
     DECL_LINK(GreetingHdl_Impl, PushButton*);
 
-    void    Contains(sal_Bool bContainsGreeting);
+    void    Contains(bool bContainsGreeting);
     virtual void    UpdatePreview();
 };
 
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index ff3ef8ae0ebe..3df9f3a97a9a 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -142,7 +142,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
     m_pTopMF->SetDownHdl(aFrameHdl);
     m_pTopMF->SetLoseFocusHdl(aFrameHdl);
 
-    FieldUnit eFieldUnit = ::GetDfltMetric(sal_False);
+    FieldUnit eFieldUnit = ::GetDfltMetric(false);
     ::SetFieldUnit( *m_pLeftMF, eFieldUnit );
     ::SetFieldUnit( *m_pTopMF, eFieldUnit );
 
@@ -163,8 +163,8 @@ SwMailMergeLayoutPage::~SwMailMergeLayoutPage()
 void SwMailMergeLayoutPage::ActivatePage()
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
-    sal_Bool bGreetingLine = rConfigItem.IsGreetingLine(sal_False) && !rConfigItem.IsGreetingInserted();
-    sal_Bool bAddressBlock = rConfigItem.IsAddressBlock() && !rConfigItem.IsAddressInserted();
+    bool bGreetingLine = rConfigItem.IsGreetingLine(false) && !rConfigItem.IsGreetingInserted();
+    bool bAddressBlock = rConfigItem.IsAddressBlock() && !rConfigItem.IsAddressInserted();
 
     m_pPosition->Enable(bAddressBlock);
     AlignToTextHdl_Impl(m_pAlignToBodyCB);
@@ -175,7 +175,7 @@ void SwMailMergeLayoutPage::ActivatePage()
     if(m_pExampleWrtShell) // initially there's nothing to check
     {
         if(!rConfigItem.IsGreetingInserted() &&
-                m_bIsGreetingInserted != (0 != bGreetingLine) )
+                m_bIsGreetingInserted != bGreetingLine )
         {
             if( m_bIsGreetingInserted )
             {
@@ -197,7 +197,7 @@ void SwMailMergeLayoutPage::ActivatePage()
                 m_pExampleWrtShell->GotoFly( m_pAddressBlockFormat->GetName() );
                 m_pExampleWrtShell->DelRight();
                 m_pAddressBlockFormat = 0;
-                m_pExampleWrtShell->Pop(sal_False);
+                m_pExampleWrtShell->Pop(false);
             }
             else
             {
@@ -249,7 +249,7 @@ SwFrmFmt*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
         rConfigItem.SetAddressInserted(pAddressBlockFormat->GetName());
     }
     //now the greeting
-    if(rConfigItem.IsGreetingLine(sal_False) && !rConfigItem.IsGreetingInserted())
+    if(rConfigItem.IsGreetingLine(false) && !rConfigItem.IsGreetingInserted())
     {
         InsertGreeting( pView->GetWrtShell(), rConfigItem, false);
         rConfigItem.SetGreetingInserted();
@@ -285,7 +285,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
         aSet.Put(SvxBoxItem( RES_BOX ));
     aSet.Put(SwFmtSurround( SURROUND_NONE ));
 
-    rShell.NewFlyFrm(aSet, sal_True );
+    rShell.NewFlyFrm(aSet, true );
     SwFrmFmt* pRet = rShell.GetFlyFrmFmt();
     OSL_ENSURE( pRet, "Fly not inserted" );
 
@@ -310,8 +310,8 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
         // paragraph has to be hidden depending on the
         // IsIncludeCountry()/GetExcludeCountry() settings
 
-        sal_Bool bIncludeCountry = rConfigItem.IsIncludeCountry();
-        sal_Bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs();
+        bool bIncludeCountry = rConfigItem.IsIncludeCountry();
+        bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs();
         const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
         bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty());
 
@@ -406,13 +406,13 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
     const SwRect& rPageRect = rShell.GetAnyCurRect(RECT_PAGE);
     const Point aGreetingPos( DEFAULT_LEFT_DISTANCE + rPageRect.Left(), GREETING_TOP_DISTANCE );
 
-    const sal_Bool bRet = rShell.SetShadowCrsrPos( aGreetingPos, FILL_SPACE );
+    const bool bRet = rShell.SetShadowCrsrPos( aGreetingPos, FILL_SPACE );
 
     if(!bRet)
     {
         //there's already text at the desired position
         //go to start of the doc, directly!
-        rShell.SttEndDoc(sal_True);
+        rShell.SttEndDoc(true);
         //and go by paragraph until the position is reached
         long nYPos = rShell.GetCharRect().Top();
         while(nYPos < GREETING_TOP_DISTANCE)
@@ -455,7 +455,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
             }
     }
     //now insert the greeting text - if we have any?
-    const sal_Bool bIndividual = rConfigItem.IsIndividualGreeting(sal_False);
+    const bool bIndividual = rConfigItem.IsIndividualGreeting(false);
     if(bIndividual)
     {
         //lock expression fields - prevents hiding of the paragraph to insert into
@@ -487,7 +487,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
             const OUString sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME);
 
             const OUString& rFemaleGenderValue = rConfigItem.GetFemaleGenderValue();
-            sal_Bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs();
+            bool bHideEmptyParagraphs = rConfigItem.IsHideEmptyParagraphs();
             const SwDBData& rData = rConfigItem.GetCurrentDBData();
             const OUString sCommonBase(rData.sDataSource + "." + rData.sCommand + ".");
             const OUString sConditionBase("[" + sCommonBase + sGenderColumn + "]");
@@ -595,7 +595,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
     {
         rShell.Push();
         rShell.SplitNode();
-        rShell.Pop(sal_False);
+        rShell.Pop(false);
     }
     //put the cursor to the start of the paragraph
     rShell.SttPara();
@@ -627,7 +627,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)
                 Point(DEFAULT_LEFT_DISTANCE, DEFAULT_TOP_DISTANCE),
                 m_pAlignToBodyCB->IsChecked(), true);
     }
-    if(rConfigItem.IsGreetingLine(sal_False))
+    if(rConfigItem.IsGreetingLine(false))
     {
         InsertGreeting(*m_pExampleWrtShell, rConfigItem, true);
         m_bIsGreetingInserted = true;
@@ -705,7 +705,7 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
 
 IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, CheckBox*, pBox)
 {
-    sal_Bool bCheck = pBox->IsChecked() && pBox->IsEnabled();
+    bool bCheck = pBox->IsChecked() && pBox->IsEnabled();
     m_pLeftFT->Enable(!bCheck);
     m_pLeftMF->Enable(!bCheck);
     ChangeAddressHdl_Impl( 0 );
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 0645df2e8ec1..c276b4bdc7b9 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -484,7 +484,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
 
 IMPL_LINK(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, RadioButton*, pButton)
 {
-    sal_Bool bEnableFromTo = pButton == m_pFromRB;
+    bool bEnableFromTo = pButton == m_pFromRB;
     m_pFromNF->Enable(bEnableFromTo);
     m_pToFT->Enable(bEnableFromTo);
     m_pToNF->Enable(bEnableFromTo);
@@ -672,13 +672,13 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
             SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
             pTargetView->GetWrtShell().StartAction();
             SwgReaderOption aOpt;
-            aOpt.SetTxtFmts( sal_True );
-            aOpt.SetFrmFmts( sal_True );
-            aOpt.SetPageDescs( sal_True );
-            aOpt.SetNumRules( sal_True );
-            aOpt.SetMerge( sal_False );
+            aOpt.SetTxtFmts( true );
+            aOpt.SetFrmFmts( true );
+            aOpt.SetPageDescs( true );
+            aOpt.SetNumRules( true );
+            aOpt.SetMerge( false );
             pTempView->GetDocShell()->LoadStylesFromFile(
-                    sTargetTempURL, aOpt, sal_True );
+                    sTargetTempURL, aOpt, true );
 
             pTargetView->GetWrtShell().PastePages(pTempView->GetWrtShell(),
                     (sal_uInt16)rInfo.nStartPageInTarget, (sal_uInt16)rInfo.nEndPageInTarget );
@@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
     sPages += " - ";
     sPages += OUString::number(  rEndInfo.nEndPageInTarget );
 
-    pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False);
+    pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, false);
     if(m_pTempPrinter)
     {
         SfxPrinter *const pDocumentPrinter = pTargetView->GetWrtShell()
@@ -827,7 +827,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
     pTargetView->ExecPrint( aProps, false, true );
     SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh));
 
-    pTargetView->SetMailMergeConfigItem(0, 0, sal_False);
+    pTargetView->SetMailMergeConfigItem(0, 0, false);
     m_pWizard->enableButtons(WZB_CANCEL, true);
     m_pWizard->enableButtons(WZB_FINISH, true);
     return 0;
@@ -845,7 +845,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
 IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
 {
     sal_uLong nDocType = (sal_uLong)pBox->GetEntryData(pBox->GetSelectEntryPos());
-    sal_Bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType;
+    bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType;
     m_pSendAsPB->Enable( bEnable );
     m_pAttachmentGroup->Enable( bEnable );
     if(bEnable)
@@ -1079,13 +1079,13 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
         SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
         pTargetView->GetWrtShell().StartAction();
         SwgReaderOption aOpt;
-        aOpt.SetTxtFmts( sal_True );
-        aOpt.SetFrmFmts( sal_True );
-        aOpt.SetPageDescs( sal_True );
-        aOpt.SetNumRules( sal_True );
-        aOpt.SetMerge( sal_False );
+        aOpt.SetTxtFmts( true );
+        aOpt.SetFrmFmts( true );
+        aOpt.SetPageDescs( true );
+        aOpt.SetNumRules( true );
+        aOpt.SetMerge( false );
         pTempView->GetDocShell()->LoadStylesFromFile(
-                sTargetTempURL, aOpt, sal_True );
+                sTargetTempURL, aOpt, true );
         pTargetView->GetWrtShell().PastePages(pTempView->GetWrtShell(),
                 (sal_uInt16)rInfo.nStartPageInTarget, (sal_uInt16)rInfo.nEndPageInTarget );
         pTargetView->GetWrtShell().EndAction();
@@ -1134,7 +1134,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
                     continue;
                 }
                 OString sLine;
-                sal_Bool bDone = pInStream->ReadLine( sLine );
+                bool bDone = pInStream->ReadLine( sLine );
                 while ( bDone )
                 {
                     sBody += OStringToOUString(sLine, eEncoding);
@@ -1161,12 +1161,12 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
             aDesc.sAttachmentName = sAttachment;
             aDesc.sMimeType = sMimeType;
 
-            if(rConfigItem.IsGreetingLine(sal_True))
+            if(rConfigItem.IsGreetingLine(true))
             {
                 OUString sNameColumn = rConfigItem.GetAssignedColumn(MM_PART_LASTNAME);
                 OUString sName = lcl_GetColumnValueOf(sNameColumn, xColAccess);
                 OUString sGreeting;
-                if(!sName.isEmpty() && rConfigItem.IsIndividualGreeting(sal_True))
+                if(!sName.isEmpty() && rConfigItem.IsIndividualGreeting(true))
                 {
                     OUString sGenderColumn = rConfigItem.GetAssignedColumn(MM_PART_GENDER);
                     const OUString& sFemaleValue = rConfigItem.GetFemaleGenderValue();
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 935fcecc7344..8dc93ddb9512 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -129,7 +129,7 @@ IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl)
     SwDocShell* pDocShell = (SwDocShell*) SfxObjectShell::Current();
     SwFEShell* pFEShell = pDocShell->GetFEShell();
     if(pFEShell)
-        m_pLineNo->SetText( OUString::number( pFEShell->GetLineCount(sal_False)));
+        m_pLineNo->SetText( OUString::number( pFEShell->GetLineCount(false)));
     //pButton->Disable();
     return 0;
 }
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 35468ddc63e7..de4c780ea7dc 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -348,7 +348,7 @@ OUString AbstractSwFldDlg_Impl::GetText() const
     return pDlg->GetText();
 }
 
-void AbstractSwFldDlg_Impl::Start( sal_Bool bShowl )
+void AbstractSwFldDlg_Impl::Start( bool bShowl )
 {
     pDlg->Start( bShowl );
 }
@@ -390,7 +390,7 @@ void    AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess(
     pDlg->SetAlternativeAccess( xSecond, xThird);
 }
 
-void    AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( sal_Bool bAccept )
+void    AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( bool bAccept )
 {
     pDlg->AcceptAll( bAccept);
 }
@@ -425,7 +425,7 @@ OUString AbstractInsFootNoteDlg_Impl::GetFontName()
     return pDlg->GetFontName();
 }
 
-sal_Bool AbstractInsFootNoteDlg_Impl::IsEndNote()
+bool AbstractInsFootNoteDlg_Impl::IsEndNote()
 {
     return pDlg->IsEndNote();
 }
@@ -462,12 +462,12 @@ OUString AbstractJavaEditDialog_Impl::GetScriptType() const
     return pDlg->GetScriptType();
 }
 
-sal_Bool AbstractJavaEditDialog_Impl::IsUrl() const
+bool AbstractJavaEditDialog_Impl::IsUrl() const
 {
     return pDlg->IsUrl();
 }
 
-sal_Bool AbstractJavaEditDialog_Impl::IsNew() const
+bool AbstractJavaEditDialog_Impl::IsNew() const
 {
     return pDlg->IsNew();
 }
@@ -517,12 +517,12 @@ OUString AbstractMailMergeDlg_Impl::GetPath() const
     return pDlg->GetPath();
 }
 
-sal_Bool AbstractMailMergeCreateFromDlg_Impl::IsThisDocument() const
+bool AbstractMailMergeCreateFromDlg_Impl::IsThisDocument() const
 {
     return pDlg->IsThisDocument();
 }
 
-sal_Bool AbstractMailMergeFieldConnectionsDlg_Impl::IsUseExistingConnections() const
+bool AbstractMailMergeFieldConnectionsDlg_Impl::IsUseExistingConnections() const
 {
     return pDlg->IsUseExistingConnections();
 }
@@ -631,7 +631,7 @@ OUString AbstractMailMergeWizard_Impl::GetReloadDocument() const
     return pDlg->GetReloadDocument();
 }
 
-sal_Bool AbstractMailMergeWizard_Impl::ShowPage( sal_uInt16 nLevel )
+bool AbstractMailMergeWizard_Impl::ShowPage( sal_uInt16 nLevel )
 {
     return pDlg->skipUntil(nLevel);
 }
@@ -767,7 +767,7 @@ SfxAbstractTabDialog *  SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(
 }
 
 AbstractDropDownFieldDialog *  SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(Window *pParent,
-    SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton)
+    SwWrtShell &rSh, SwField* pField, bool bNextButton)
 {
     sw::DropDownFieldDialog* pDlg = new sw::DropDownFieldDialog(pParent, rSh, pField, bNextButton);
     return new AbstractDropDownFieldDialog_Impl( pDlg );
@@ -775,7 +775,7 @@ AbstractDropDownFieldDialog *  SwAbstractDialogFactory_Impl::CreateDropDownField
 
 SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet,
                                                                  SwWrtShell* pWrtSh, Printer* pPrt,
-                                                                 sal_Bool bInsert )
+                                                                 bool bInsert )
 {
     SfxTabDialog* pDlg = new SwEnvDlg( pParent, rSet, pWrtSh,pPrt, bInsert  );
     return new AbstractTabDialog_Impl( pDlg );
@@ -797,7 +797,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pP
                                                     const SfxItemSet& rCoreSet  ,
                                                     sal_uInt8 nDialogMode,
                                                     const OUString *pCollName,
-                                                    sal_Bool bDraw ,
+                                                    bool bDraw ,
                                                     const OString& sDefPage)
 {
     SfxTabDialog* pDlg = new SwParaDlg( pParent, rVw, rCoreSet,nDialogMode, pCollName, bDraw, sDefPage );
@@ -842,7 +842,7 @@ AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(
 }
 
 AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(Window* pParent,
-    SwWrtShell* pShell, sal_Bool bSetAutoFmt, const SwTableAutoFmt* pSelFmt)
+    SwWrtShell* pShell, bool bSetAutoFmt, const SwTableAutoFmt* pSelFmt)
 {
     SwAutoFormatDlg* pDlg = new SwAutoFormatDlg(pParent, pShell, bSetAutoFmt, pSelFmt);
     return new AbstractSwAutoFormatDlg_Impl(pDlg);
@@ -865,7 +865,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(Window* pPar
     return 0;
 }
 
-SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId )
+SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId )
 {
     SfxModalDialog* pDlg=NULL;
     switch ( nResId )
@@ -932,7 +932,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed
     return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg );
 }
 
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev)
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, bool& rWithPrev)
 {
     Dialog* pDlg = new SwMergeTblDlg( pParent, rWithPrev );
     return new VclAbstractDialog_Impl( pDlg );
@@ -978,7 +978,7 @@ AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pPa
 }
 
 AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
-    Window * pParent, SwWrtShell &rSh, sal_Bool bEd )
+    Window * pParent, SwWrtShell &rSh, bool bEd )
 {
     SwInsFootNoteDlg* pDlg = new SwInsFootNoteDlg(pParent, rSh, bEd);
     return new AbstractInsFootNoteDlg_Impl( pDlg );
@@ -1078,7 +1078,7 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo
                                                 Window* pParent, const SfxItemSet& rSet,
                                                 SwWrtShell &rShell,
                                                 SwTOXBase* pCurTOX, sal_uInt16 nToxType,
-                                                sal_Bool bGlobal)
+                                                bool bGlobal)
 {
     SwMultiTOXTabDialog* pDlg = new SwMultiTOXTabDialog( pParent, rSet, rShell, pCurTOX, nToxType, bGlobal );
     return new AbstractMultiTOXTabDialog_Impl( pDlg );
@@ -1098,22 +1098,22 @@ AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSecti
 }
 
 AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg(
-                                                    SfxBindings* pBindings,
+                                                       SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
-                                                    SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew )
+                                                       SfxChildWinInfo* pInfo,
+                                                       bool bNew )
 {
     SwIndexMarkFloatDlg* pDlg = new SwIndexMarkFloatDlg(pBindings, pChild, pParent, pInfo, bNew);
     return new AbstractIndexMarkFloatDlg_Impl(pDlg);
 }
 
 AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
-                                                    SfxBindings* pBindings,
+                                                       SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
-                                                    SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew)
+                                                       SfxChildWinInfo* pInfo,
+                                                       bool bNew)
 {
     SwAuthMarkFloatDlg* pDlg = new SwAuthMarkFloatDlg( pBindings, pChild, pParent, pInfo, bNew );
     return new AbstractAuthMarkFloatDlg_Impl( pDlg );
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 2a40abd65a01..10c584d1462d 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -200,12 +200,12 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
     virtual void                SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void                SetCurPageId( const OString &rName ) SAL_OVERRIDE;
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
-    virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE;
+    virtual const sal_uInt16*   GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE;
     virtual void                SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE;
         //From class Window.
-    virtual void        SetText( const OUString& rStr ) SAL_OVERRIDE;
-    virtual OUString    GetText() const SAL_OVERRIDE;
-    virtual void                Start( sal_Bool bShow = sal_True ) SAL_OVERRIDE;  //this method from SfxTabDialog
+    virtual void                SetText( const OUString& rStr ) SAL_OVERRIDE;
+    virtual OUString            GetText() const SAL_OVERRIDE;
+    virtual void                Start( bool bShow = true ) SAL_OVERRIDE;  //this method from SfxTabDialog
     virtual void                ShowReferencePage() SAL_OVERRIDE;
     virtual void                Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE;
     virtual void                ReInitDlg() SAL_OVERRIDE;
@@ -225,7 +225,7 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
 class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg )
-    virtual void            AcceptAll( sal_Bool bAccept ) SAL_OVERRIDE;
+    virtual void            AcceptAll( bool bAccept ) SAL_OVERRIDE;
 };
 
 class SwGlossaryDlg;
@@ -251,7 +251,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
 {
     DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg)
     virtual OUString        GetFontName() SAL_OVERRIDE;
-    virtual sal_Bool        IsEndNote() SAL_OVERRIDE;
+    virtual bool            IsEndNote() SAL_OVERRIDE;
     virtual OUString        GetStr() SAL_OVERRIDE;
     //from class Window
     virtual void    SetHelpId( const OString& sHelpId ) SAL_OVERRIDE;
@@ -273,8 +273,8 @@ class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
     DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
     virtual OUString            GetScriptText() const SAL_OVERRIDE;
     virtual OUString            GetScriptType() const SAL_OVERRIDE;
-    virtual sal_Bool            IsUrl() const SAL_OVERRIDE;
-    virtual sal_Bool            IsNew() const SAL_OVERRIDE;
+    virtual bool                IsUrl() const SAL_OVERRIDE;
+    virtual bool                IsNew() const SAL_OVERRIDE;
     virtual bool                IsUpdate() const SAL_OVERRIDE;
 };
 
@@ -296,14 +296,14 @@ class SwMailMergeCreateFromDlg;
 class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg
 {
     DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg)
-    virtual sal_Bool    IsThisDocument() const SAL_OVERRIDE ;
+    virtual bool    IsThisDocument() const SAL_OVERRIDE ;
 };
 
 class SwMailMergeFieldConnectionsDlg;
 class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg
 {
     DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg)
-    virtual sal_Bool    IsUseExistingConnections() const SAL_OVERRIDE ;
+    virtual bool    IsUseExistingConnections() const SAL_OVERRIDE ;
 };
 
 class SwMultiTOXTabDialog;
@@ -364,7 +364,7 @@ public:
 
     virtual void                SetReloadDocument(const OUString& rURL) SAL_OVERRIDE;
     virtual OUString            GetReloadDocument() const SAL_OVERRIDE;
-    virtual sal_Bool            ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE;
+    virtual bool                ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE;
     virtual sal_uInt16          GetRestartPage() const SAL_OVERRIDE;
 };
 
@@ -400,8 +400,8 @@ public:
     virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE;
 
     virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh,
-        SwField* pField, sal_Bool bNextButton = sal_False) SAL_OVERRIDE;
-    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) SAL_OVERRIDE;
+        SwField* pField, bool bNextButton = false) SAL_OVERRIDE;
+    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE;
     virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
                                                      SwDBMgr* pDBMgr, bool bLabel) SAL_OVERRIDE;
 
@@ -411,7 +411,7 @@ public:
                                                     const SfxItemSet& rCoreSet,
                                                     sal_uInt8 nDialogMode,
                                                     const OUString *pCollName = 0,
-                                                    sal_Bool bDraw = sal_False,
+                                                    bool bDraw = false,
                                                     const OString& sDefPage = OString() ) SAL_OVERRIDE;
 
     virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) SAL_OVERRIDE;
@@ -419,11 +419,11 @@ public:
     virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE;
 
     virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
-                                                            sal_Bool bSetAutoFmt = sal_True,
+                                                            bool bSetAutoFmt = true,
                                                             const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE;
     virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE;
 
-    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) SAL_OVERRIDE;
+    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE;
     virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE;
     virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
         const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE;
@@ -434,7 +434,7 @@ public:
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE;
     virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) SAL_OVERRIDE;
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev) SAL_OVERRIDE;
+    virtual VclAbstractDialog*          CreateTblMergeDialog(Window* pParent, bool& rWithPrev) SAL_OVERRIDE;
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog( const OString &rDialogType,
                                                 SfxViewFrame *pFrame, Window *pParent,
                                                 const SfxItemSet& rCoreSet,
@@ -455,7 +455,7 @@ public:
     virtual AbstractFldInputDlg*        CreateFldInputDlg(Window *pParent,
         SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE;
     virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(
-        Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) SAL_OVERRIDE;
+        Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE;
     virtual VclAbstractDialog *         CreateTitlePageDlg ( Window * pParent ) SAL_OVERRIDE;
     virtual VclAbstractDialog *         CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE;
     virtual AbstractInsTableDlg*        CreateInsTableDlg(SwView& rView) SAL_OVERRIDE;
@@ -479,22 +479,22 @@ public:
                                                 Window* pParent, const SfxItemSet& rSet,
                                                 SwWrtShell &rShell,
                                                 SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
-                                                sal_Bool bGlobal = sal_False) SAL_OVERRIDE;
+                                                bool bGlobal = false) SAL_OVERRIDE;
     virtual AbstractEditRegionDlg*      CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE;
     virtual AbstractInsertSectionTabDialog*     CreateInsertSectionTabDialog(
         Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE;
     virtual AbstractMarkFloatDlg*       CreateIndexMarkFloatDlg(
-                                                    SfxBindings* pBindings,
+                                                       SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
-                                                    SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew=sal_True) SAL_OVERRIDE;
+                                                       SfxChildWinInfo* pInfo,
+                                                       bool bNew=true) SAL_OVERRIDE;
     virtual AbstractMarkFloatDlg*       CreateAuthMarkFloatDlg(
-                                                    SfxBindings* pBindings,
+                                                       SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
-                                                    SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew=sal_True) SAL_OVERRIDE;
+                                                       SfxChildWinInfo* pInfo,
+                                                       bool bNew=true) SAL_OVERRIDE;
     virtual VclAbstractDialog *         CreateIndexMarkModalDlg(
                                                 Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE;
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 2011284a80d0..548d8ba1f8e6 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -391,14 +391,14 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
     if( !m_pTree->FirstSelected() && m_pTree->First() )
         m_pTree->Select( m_pTree->First() );
     m_pTree->Show();
-    bDontCheckPasswd = sal_False;
+    bDontCheckPasswd = false;
 }
 
-sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
+bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
 {
     if(bDontCheckPasswd)
-        return sal_True;
-    sal_Bool bRet = sal_True;
+        return true;
+    bool bRet = true;
     SvTreeListEntry* pEntry = m_pTree->FirstSelected();
     while( pEntry )
     {
@@ -407,7 +407,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
             && pRepr->GetSectionData().GetPassword().getLength())
         {
             SfxPasswordDialog aPasswdDlg(this);
-            bRet = sal_False;
+            bRet = false;
             if (aPasswdDlg.Execute())
             {
                 const OUString sNewPasswd( aPasswdDlg.GetPassword() );
@@ -417,7 +417,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
                         pRepr->GetSectionData().GetPassword(), sNewPasswd))
                 {
                     pRepr->SetTempPasswd(aNewPasswd);
-                    bRet = sal_True;
+                    bRet = true;
                 }
                 else
                 {
@@ -713,7 +713,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
         m_pPasswdCB->Enable(bPasswdEnabled);
         m_pPasswdPB->Enable(bPasswdEnabled);
     }
-    bDontCheckPasswd = sal_False;
+    bDontCheckPasswd = false;
     return 0;
 }
 
@@ -758,7 +758,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
 
     rSh.StartAllAction();
     rSh.StartUndo();
-    rSh.ResetSelect( 0,sal_False );
+    rSh.ResetSelect( 0,false );
     SvTreeListEntry* pEntry = m_pTree->First();
 
     while( pEntry )
@@ -776,13 +776,13 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
             if( pFmt->GetCol() != pRepr->GetCol() )
                 pSet->Put( pRepr->GetCol() );
 
-            if( pFmt->GetBackground(sal_False) != pRepr->GetBackground() )
+            if( pFmt->GetBackground(false) != pRepr->GetBackground() )
                 pSet->Put( pRepr->GetBackground() );
 
-            if( pFmt->GetFtnAtTxtEnd(sal_False) != pRepr->GetFtnNtAtEnd() )
+            if( pFmt->GetFtnAtTxtEnd(false) != pRepr->GetFtnNtAtEnd() )
                 pSet->Put( pRepr->GetFtnNtAtEnd() );
 
-            if( pFmt->GetEndAtTxtEnd(sal_False) != pRepr->GetEndNtAtEnd() )
+            if( pFmt->GetEndAtTxtEnd(false) != pRepr->GetEndNtAtEnd() )
                 pSet->Put( pRepr->GetEndNtAtEnd() );
 
             if( pFmt->GetBalancedColumns() != pRepr->GetBalance() )
@@ -831,7 +831,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
     pBox->EnableTriState(false);
     SvTreeListEntry* pEntry = m_pTree->FirstSelected();
     OSL_ENSURE(pEntry,"no entry found");
-    sal_Bool bCheck = TRISTATE_TRUE == pBox->GetState();
+    bool bCheck = TRISTATE_TRUE == pBox->GetState();
     while( pEntry )
     {
         SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData();
@@ -973,14 +973,14 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
         return 0;
     SvTreeListEntry* pEntry = m_pTree->FirstSelected();
     pBox->EnableTriState(false);
-    sal_Bool bMulti = 1 < m_pTree->GetSelectionCount();
-    sal_Bool bFile = pBox->IsChecked();
+    bool bMulti = 1 < m_pTree->GetSelectionCount();
+    bool bFile = pBox->IsChecked();
     if(pEntry)
     {
         while(pEntry)
         {
             const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
-            sal_Bool bContent = pSectRepr->IsContent();
+            bool bContent = pSectRepr->IsContent();
             if( pBox->IsChecked() && bContent && rSh.HasSelection() )
             {
                 if( RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() )
@@ -1203,7 +1203,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
         bool bFile = m_pFileCB->IsChecked();
         SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
         SwSectionData & rData( pSectRepr->GetSectionData() );
-        sal_Bool bDDE = pBox->IsChecked();
+        bool bDDE = pBox->IsChecked();
         if(bDDE)
         {
             m_pFileNameFT->Hide();
@@ -1396,10 +1396,10 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
     return 0;
 }
 
-Image SwEditRegionDlg::BuildBitmap( sal_Bool bProtect, sal_Bool bHidden )
+Image SwEditRegionDlg::BuildBitmap( bool bProtect, bool bHidden )
 {
     ImageList& rImgLst = aImageIL;
-    return rImgLst.GetImage((int(!bHidden)+(bProtect<<1)) + 1);
+    return rImgLst.GetImage((int(!bHidden)+((bProtect ? 1 : 0)<<1)) + 1);
 }
 
 /*--------------------------------------------------------------------
@@ -1471,8 +1471,8 @@ void SwInsertSectionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     {
         const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)GetInputSetImpl()->Get(RES_FRM_SIZE);
         ((SwColumnPage&)rPage).SetPageWidth(rSize.GetWidth());
-        ((SwColumnPage&)rPage).ShowBalance(sal_True);
-        ((SwColumnPage&)rPage).SetInSection(sal_True);
+        ((SwColumnPage&)rPage).ShowBalance(true);
+        ((SwColumnPage&)rPage).SetInSection(true);
     }
     else if (nId == m_nIndentPage)
         ((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh);
@@ -1612,7 +1612,7 @@ bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
 {
     SwSectionData aSection(CONTENT_SECTION, m_pCurName->GetText());
     aSection.SetCondition(m_pConditionED->GetText());
-    sal_Bool bProtected = m_pProtectCB->IsChecked();
+    bool bProtected = m_pProtectCB->IsChecked();
     aSection.SetProtectFlag(bProtected);
     aSection.SetHidden(m_pHideCB->IsChecked());
     // edit in readonly sections
@@ -1624,7 +1624,7 @@ bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
     }
     const OUString sFileName = m_pFileNameED->GetText();
     const OUString sSubRegion = m_pSubRegionED->GetText();
-    sal_Bool bDDe = m_pDDECB->IsChecked();
+    bool bDDe = m_pDDECB->IsChecked();
     if(m_pFileCB->IsChecked() && (!sFileName.isEmpty() || !sSubRegion.isEmpty() || bDDe))
     {
         OUString aLinkFile;
@@ -1679,7 +1679,7 @@ SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent,
 
 IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox )
 {
-    sal_Bool bHide = pBox->IsChecked();
+    bool bHide = pBox->IsChecked();
     m_pConditionED->Enable(bHide);
     m_pConditionFT->Enable(bHide);
     return 0;
@@ -1692,7 +1692,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, ChangeEditInReadonlyHdl)
 
 IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox )
 {
-    sal_Bool bCheck = pBox->IsChecked();
+    bool bCheck = pBox->IsChecked();
     m_pPasswdCB->Enable(bCheck);
     m_pPasswdPB->Enable(bCheck);
     return 0;
@@ -1700,8 +1700,8 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox )
 
 IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
 {
-    sal_Bool bChange = pButton == m_pPasswdPB;
-    sal_Bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked();
+    bool bChange = pButton == m_pPasswdPB;
+    bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked();
     if(bSet)
     {
         if(!m_aNewPasswd.getLength() || bChange)
@@ -1746,7 +1746,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
             pBox->Check( false );
     }
 
-    sal_Bool bFile = pBox->IsChecked();
+    bool bFile = pBox->IsChecked();
     m_pFileNameFT->Enable(bFile);
     m_pFileNameED->Enable(bFile);
     m_pFilePB->Enable(bFile);
@@ -1779,8 +1779,8 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl)
 
 IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
 {
-    sal_Bool bDDE = pBox->IsChecked();
-    sal_Bool bFile = m_pFileCB->IsChecked();
+    bool bDDE = pBox->IsChecked();
+    bool bFile = m_pFileCB->IsChecked();
     m_pFilePB->Enable(!bDDE && bFile);
     if(bDDE)
     {
@@ -1923,8 +1923,8 @@ bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
     return true;
 }
 
-void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
-                                    const SwFmtFtnEndAtTxtEnd& rAttr )
+void SwSectionFtnEndTabPage::ResetState( bool bFtn,
+                                         const SwFmtFtnEndAtTxtEnd& rAttr )
 {
     CheckBox *pNtAtTextEndCB, *pNtNumCB, *pNtNumFmtCB;
     FixedText*pPrefixFT, *pSuffixFT;
@@ -2005,9 +2005,9 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
 
 void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet )
 {
-    ResetState( sal_True, (const SwFmtFtnAtTxtEnd&)rSet.Get(
+    ResetState( true, (const SwFmtFtnAtTxtEnd&)rSet.Get(
                                     RES_FTN_AT_TXTEND, false ));
-    ResetState( sal_False, (const SwFmtEndAtTxtEnd&)rSet.Get(
+    ResetState( false, (const SwFmtEndAtTxtEnd&)rSet.Get(
                                     RES_END_AT_TXTEND, false ));
 }
 
@@ -2019,7 +2019,7 @@ SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent,
 
 IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
 {
-    sal_Bool bFoot = pFtnNtAtTextEndCB == pBox || pFtnNtNumCB == pBox ||
+    bool bFoot = pFtnNtAtTextEndCB == pBox || pFtnNtNumCB == pBox ||
                     pFtnNtNumFmtCB == pBox ;
 
     CheckBox *pNumBox, *pNumFmtBox, *pEndBox;
@@ -2056,9 +2056,9 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
         pSuffixED = pEndSuffixED;
     }
 
-    sal_Bool bEnableAtEnd = TRISTATE_TRUE == pEndBox->GetState();
-    sal_Bool bEnableNum = bEnableAtEnd && TRISTATE_TRUE == pNumBox->GetState();
-    sal_Bool bEnableNumFmt = bEnableNum && TRISTATE_TRUE == pNumFmtBox->GetState();
+    bool bEnableAtEnd = TRISTATE_TRUE == pEndBox->GetState();
+    bool bEnableNum = bEnableAtEnd && TRISTATE_TRUE == pNumBox->GetState();
+    bool bEnableNumFmt = bEnableNum && TRISTATE_TRUE == pNumFmtBox->GetState();
 
     pNumBox->Enable( bEnableAtEnd );
     pOffsetTxt->Enable( bEnableNum );
@@ -2112,8 +2112,8 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage
     }
     else if (nId == m_nColumnPageId)
     {
-        ((SwColumnPage&)rPage).ShowBalance(sal_True);
-        ((SwColumnPage&)rPage).SetInSection(sal_True);
+        ((SwColumnPage&)rPage).ShowBalance(true);
+        ((SwColumnPage&)rPage).SetInSection(true);
     }
     else if (nId == m_nIndentPage)
         ((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh);
@@ -2150,7 +2150,7 @@ bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet)
 void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet)
 {
     //this page doesn't show up in HTML mode
-    FieldUnit aMetric = ::GetDfltMetric(sal_False);
+    FieldUnit aMetric = ::GetDfltMetric(false);
     SetMetric(*m_pBeforeMF, aMetric);
     SetMetric(*m_pAfterMF , aMetric);
 
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 82f94802a6d6..8a62fff1eaf3 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -136,7 +136,7 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet)
     SetExchangeSupport();
 
     // Metrics
-    FieldUnit aMetric = ::GetDfltMetric(sal_False);
+    FieldUnit aMetric = ::GetDfltMetric(false);
     SetMetric(*m_pAddrLeftField, aMetric);
     SetMetric(*m_pAddrTopField, aMetric);
     SetMetric(*m_pSendLeftField, aMetric);
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 67dec60a65d3..bd0eebc77e5e 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -135,7 +135,7 @@ void SwEnvPreview::Paint(const Rectangle &)
 }
 
 SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
-                    SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert)
+                    SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert)
     : SfxTabDialog(pParent, "EnvDialog",
         "modules/swriter/ui/envdialog.ui", &rSet)
     , aEnvItem((const SwEnvItem&) rSet.Get(FN_ENVELOP))
@@ -269,7 +269,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl)
 
 IMPL_LINK_NOARG(SwEnvPage, SenderHdl)
 {
-    const sal_Bool bEnable = m_pSenderBox->IsChecked();
+    const bool bEnable = m_pSenderBox->IsChecked();
     GetParentSwEnvDlg()->aEnvItem.bSend = bEnable;
     m_pSenderEdit->Enable(bEnable);
     if ( bEnable )
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 714f2bc12642..492a816b3e49 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -42,7 +42,7 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet)
     SetExchangeSupport();
 
     // Metrics
-    FieldUnit eUnit = ::GetDfltMetric(sal_False);
+    FieldUnit eUnit = ::GetDfltMetric(false);
     SetMetric(*m_pRightField, eUnit);
     SetMetric(*m_pDownField, eUnit);
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index b0b5b96e8976..a679796377f2 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -92,7 +92,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 }
 
 SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
-                                SwDBMgr* pDBMgr_, sal_Bool bLabel)
+                                SwDBMgr* pDBMgr_, bool bLabel)
     : SfxTabDialog(pParent, "LabelDialog",
         "modules/swriter/ui/labeldialog.ui", &rSet)
     , pDBMgr(pDBMgr_)
@@ -196,7 +196,7 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem)
     }
 }
 
-SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, sal_Bool bCont)
+SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont)
 {
     SwLabRec* pRec = NULL;
     bool bFound = false;
@@ -294,7 +294,7 @@ void SwLabPage::SetToBusinessCard()
     m_pSheetButton->SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET);
     m_pMakeBox->SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND);
     m_pTypeBox->SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE);
-    m_bLabel = sal_False;
+    m_bLabel = false;
     m_pAddressFrame->Hide();
 };
 
@@ -355,7 +355,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
     GetParentSwLabDlg()->ReplaceGroup( aMake );
     aItem.aLstMake = aMake;
 
-    const sal_Bool   bCont    = m_pContButton->IsChecked();
+    const bool   bCont    = m_pContButton->IsChecked();
     const size_t nCount   = GetParentSwLabDlg()->Recs().size();
     size_t nLstType = 0;
 
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG_INLINE_END(SwLabPage, TypeHdl)
 void SwLabPage::DisplayFormat()
 {
     MetricField aField(this, WinBits(0));
-    FieldUnit aMetric = ::GetDfltMetric(sal_False);
+    FieldUnit aMetric = ::GetDfltMetric(false);
     SetMetric(aField, aMetric);
     aField.SetDecimalDigits(2);
     aField.SetMin         (0);
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 256027c5b132..ba14f0e17ae6 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -155,7 +155,7 @@ IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox )
                         aBlockNames.getConstArray() );
         }
         if(pExampleFrame->IsInitialized())
-            pExampleFrame->ClearDocument( sal_True );
+            pExampleFrame->ClearDocument( true );
     }
     return 0;
 }
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index c763b0e2d3c2..0570ae151ac1 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -311,7 +311,7 @@ SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet)
     get(m_pSavePB, "save");
 
     // Metrics
-    FieldUnit aMetric = ::GetDfltMetric(sal_False);
+    FieldUnit aMetric = ::GetDfltMetric(false);
     SetMetric(*m_pHDistField, aMetric);
     SetMetric(*m_pVDistField , aMetric);
     SetMetric(*m_pWidthField , aMetric);
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index db4f7d018ab2..00efa604f004 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -115,7 +115,7 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject&  ) throw (Runtime
     if(rParent.pImpl->xSelSupp.is())
         rParent.pImpl->xSelSupp->getSelection() >>= aSelection;
 
-    sal_Bool bEnable = aSelection.getLength() > 0;
+    bool bEnable = aSelection.getLength() > 0;
     rParent.aMarkedRB.Enable(bEnable);
     if(bEnable)
         rParent.aMarkedRB.Check();
@@ -386,7 +386,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     if (aColumnLB.GetSelectEntryCount() == 0)
         aColumnLB.SelectEntryPos(0);
 
-    const sal_Bool bEnable = m_aSelection.getLength() != 0;
+    const bool bEnable = m_aSelection.getLength() != 0;
     aMarkedRB.Enable(bEnable);
     if (bEnable)
         aMarkedRB.Check();
@@ -574,7 +574,7 @@ IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn )
 
 IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, RadioButton *, pBtn )
 {
-    sal_Bool bPrint = pBtn == &aPrinterRB;
+    bool bPrint = pBtn == &aPrinterRB;
     aSingleJobsCB.Enable(bPrint);
 
     aSaveMergedDocumentFL.Enable( !bPrint );
@@ -624,7 +624,7 @@ IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*,  pBtn )
 
 IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox )
 {
-    sal_Bool bEnable = pBox->IsChecked();
+    bool bEnable = pBox->IsChecked();
     aColumnFT.Enable( bEnable );
     aColumnLB.Enable(bEnable);
     aPathFT.Enable( bEnable );
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index e24a86d4ec48..97e6a171256f 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -44,7 +44,7 @@ class SwLabPage : public SfxTabPage
     ListBox*          m_pHiddenSortTypeBox;
     FixedText*        m_pFormatInfo;
 
-    sal_Bool        m_bLabel;
+    bool        m_bLabel;
 
     SwLabPage(Window* pParent, const SfxItemSet& rSet);
 
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 1eb7e5107a52..3d32f7391de7 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
     Description: edit insert-field
  --------------------------------------------------------------------*/
 sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS,
-                              SwField* pField, sal_Bool bNextButton)
+                              SwField* pField, bool bNextButton)
     : SvxStandardDialog(pParent, "DropdownFieldDialog",
         "modules/swriter/ui/dropdownfielddialog.ui")
     , rSh( rS )
@@ -67,7 +67,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS,
         m_pListItemsLB->SelectEntry(pDropField->GetSelectedItem());
     }
 
-    sal_Bool bEnable = !rSh.IsCrsrReadonly();
+    bool bEnable = !rSh.IsCrsrReadonly();
     m_pOKPB->Enable( bEnable );
 
     m_pListItemsLB->GrabFocus();
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 4af3c051c213..580e42867583 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -230,14 +230,14 @@ IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl)
 
 IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
 {
-    sal_Bool bEnable = sal_False;
+    bool bEnable = false;
 
     SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry();
 
     if (pEntry)
     {
         if (m_pAvailDBTLB->GetParent(pEntry))
-            bEnable = sal_True;
+            bEnable = true;
         m_pDefineBT->Enable( bEnable );
     }
     return 0;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 40b1f68d223f..526743adfb06 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -233,7 +233,7 @@ bool SwFldDBPage::FillItemSet(SfxItemSet& )
         OUString sTempTableName;
         OUString sTempColumnName;
         OUString sTempDBName = m_pDatabaseTLB->GetDBName(sTempTableName, sTempColumnName);
-        sal_Bool bDBListBoxChanged = m_sOldDBName != sTempDBName ||
+        bool bDBListBoxChanged = m_sOldDBName != sTempDBName ||
             m_sOldTableName != sTempTableName || m_sOldColumnName != sTempColumnName;
         if (!IsFldEdit() ||
             m_pConditionED->GetSavedValue() != m_pConditionED->GetText() ||
@@ -278,7 +278,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
         SwWrtShell *pSh = GetWrtShell();
         if(!pSh)
             pSh = ::GetActiveWrtShell();
-        sal_Bool bCond = sal_False, bSetNo = sal_False, bFormat = sal_False, bDBFormat = sal_False;
+        bool bCond = false, bSetNo = false, bFormat = false, bDBFormat = false;
         const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
         m_pDatabaseTLB->ShowColumns(nTypeId == TYP_DBFLD);
@@ -302,8 +302,8 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
         switch (nTypeId)
         {
             case TYP_DBFLD:
-                bFormat = sal_True;
-                bDBFormat = sal_True;
+                bFormat = true;
+                bDBFormat = true;
                 m_pNumFormatLB->Show();
                 m_pFormatLB->Hide();
 
@@ -323,10 +323,10 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
                 break;
 
             case TYP_DBNUMSETFLD:
-                bSetNo = sal_True;
+                bSetNo = true;
                 // no break!
             case TYP_DBNEXTSETFLD:
-                bCond = sal_True;
+                bCond = true;
                 if (IsFldEdit())
                 {
                     m_pConditionED->SetText(GetCurField()->GetPar1());
@@ -338,7 +338,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
                 break;
 
             case TYP_DBSETNUMBERFLD:
-                bFormat = sal_True;
+                bFormat = true;
                 m_pNewFormatRB->Check();
                 m_pNumFormatLB->Hide();
                 m_pFormatLB->Show();
@@ -360,11 +360,11 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
         if (nTypeId != TYP_DBFLD)
         {
             m_pDBFormatRB->Enable(bDBFormat);
-            m_pNewFormatRB->Enable(bDBFormat|bFormat);
+            m_pNewFormatRB->Enable(bDBFormat || bFormat);
             m_pNumFormatLB->Enable(bDBFormat);
             m_pFormatLB->Enable(bFormat);
         }
-        m_pFormat->Enable(bDBFormat|bFormat);
+        m_pFormat->Enable(bDBFormat || bFormat);
 
         if (!IsFldEdit())
         {
@@ -434,7 +434,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
 
         if (nTypeId == TYP_DBFLD)
         {
-            sal_Bool bNumFormat = sal_False;
+            bool bNumFormat = false;
 
             if (pEntry != 0)
             {
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 58e8035afaff..6334fc37b856 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -80,7 +80,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pParent, const SfxItemSet& rCoreSet)
 
     m_pTypeTLB->SetNodeDefaultImages();
     //enable 'active' language selection
-    m_pFormatLB->SetShowLanguageControl(sal_True);
+    m_pFormatLB->SetShowLanguageControl(true);
 
     SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, false );
     if ( pItem )
@@ -280,8 +280,8 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
         nExtSubType = DI_SUB_TIME;
 
     sal_uInt16 nOldType = 0;
-    sal_Bool bEnable = sal_False;
-    sal_Bool bOneArea = sal_False;
+    bool bEnable = false;
+    bool bOneArea = false;
 
     if (m_pFormatLB->IsEnabled())
         nOldType = m_pFormatLB->GetFormatType();
@@ -293,12 +293,12 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
 
         case DI_SUB_DATE:
             nNewType = NUMBERFORMAT_DATE;
-            bOneArea = sal_True;
+            bOneArea = true;
             break;
 
         case DI_SUB_TIME:
             nNewType = NUMBERFORMAT_TIME;
-            bOneArea = sal_True;
+            bOneArea = true;
             break;
     }
     if (!nNewType)
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
             m_pFormatLB->SetFormatType(nNewType);
             m_pFormatLB->SetOneArea(bOneArea);
         }
-        bEnable = sal_True;
+        bEnable = true;
     }
 
     sal_uLong nFormat = IsFldEdit() ? ((SwDocInfoField*)GetCurField())->GetFormat() : 0;
@@ -399,14 +399,14 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType)
         }
     }
 
-    sal_Bool bEnable = nSize != 0;
+    bool bEnable = nSize != 0;
 
     if (nSize)
     {
         if (!m_pSelectionLB->GetSelectEntryCount())
             m_pSelectionLB->SelectEntryPos(nSelPos == USHRT_MAX ? 0 : nSelPos);
 
-        bEnable = sal_True;
+        bEnable = true;
     }
 
     m_pSelection->Enable(bEnable);
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 1260773c8867..27c125d8e33e 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -75,7 +75,7 @@ SwFldDokPage::SwFldDokPage(Window* pParent, const SfxItemSet& rCoreSet )
     m_pDateOffsetED->SetMin(LONG_MIN);
     m_pDateOffsetED->SetMax(LONG_MAX);
     //enable 'active' language selection
-    m_pNumFormatLB->SetShowLanguageControl(sal_True);
+    m_pNumFormatLB->SetShowLanguageControl(true);
 }
 
 SwFldDokPage::~SwFldDokPage()
@@ -291,7 +291,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
             m_pSelectionLB->SetSelectHdl(LINK(this, SwFldDokPage, SubTypeHdl));
         }
 
-        sal_Bool bEnable = nCount != 0;
+        bool bEnable = nCount != 0;
 
         if (bEnable && !m_pSelectionLB->GetSelectEntryCount())
             m_pSelectionLB->SelectEntryPos(0);
@@ -301,16 +301,16 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
         // fill Format-Listbox
         sal_Int32 nSize = FillFormatLB(nTypeId);
 
-        sal_Bool bValue = sal_False, bLevel = sal_False, bNumFmt = sal_False, bOffset = sal_False;
-        sal_Bool bFormat = nSize != 0;
-        sal_Bool bOneArea = sal_False;
-        sal_Bool bFixed = sal_False;
+        bool bValue = false, bLevel = false, bNumFmt = false, bOffset = false;
+        bool bFormat = nSize != 0;
+        bool bOneArea = false;
+        bool bFixed = false;
         sal_uInt16 nFmtType = 0;
 
         switch (nTypeId)
         {
             case TYP_DATEFLD:
-                bFormat = bNumFmt = bOneArea = bOffset = sal_True;
+                bFormat = bNumFmt = bOneArea = bOffset = true;
 
                 nFmtType = NUMBERFORMAT_DATE;
 
@@ -324,7 +324,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
                 break;
 
             case TYP_TIMEFLD:
-                bFormat = bNumFmt = bOneArea = bOffset = sal_True;
+                bFormat = bNumFmt = bOneArea = bOffset = true;
 
                 nFmtType = NUMBERFORMAT_TIME;
 
@@ -359,27 +359,27 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
                     else
                         m_pValueED->SetText(((SwPageNumberField*)GetCurField())->GetUserString());
                 }
-                bValue = sal_True;
+                bValue = true;
                 break;
 
             case TYP_CHAPTERFLD:
                 m_pValueFT->SetText(SW_RESSTR(STR_LEVEL));
                 if (IsFldEdit())
                     m_pLevelED->SetText(OUString::number(((SwChapterField*)GetCurField())->GetLevel() + 1));
-                bLevel = sal_True;
+                bLevel = true;
                 break;
 
             case TYP_PAGENUMBERFLD:
                 m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
                 if (IsFldEdit())
                     m_pValueED->SetText(GetCurField()->GetPar2());
-                bValue = sal_True;
+                bValue = true;
                 break;
 
             case TYP_EXTUSERFLD:
             case TYP_AUTHORFLD:
             case TYP_FILENAMEFLD:
-                bFixed = sal_True;
+                bFixed = true;
                 break;
 
             default:
@@ -426,7 +426,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
 
         if (m_pNumFormatLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND)
             m_pNumFormatLB->SelectEntryPos(0);
-        m_pValueFT->Enable(bValue | bLevel | bOffset);
+        m_pValueFT->Enable(bValue || bLevel || bOffset);
         m_pValueED->Enable(bValue);
     }
 
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 65e5c99962db..8fc8170ed32f 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -121,12 +121,12 @@ void SwFldEditDlg::Init()
         pSh->StartAction();
         pSh->CreateCrsr();
 
-        sal_Bool bMove = rMgr.GoNext();
+        bool bMove = rMgr.GoNext();
         if( bMove )
             rMgr.GoPrev();
         m_pNextBT->Enable(bMove);
 
-        if( 0 != ( bMove = rMgr.GoPrev() ) )
+        if( ( bMove = rMgr.GoPrev() ) )
             rMgr.GoNext();
         m_pPrevBT->Enable( bMove );
 
@@ -200,10 +200,10 @@ SwFldEditDlg::~SwFldEditDlg()
     pSh->EnterStdMode();
 }
 
-void SwFldEditDlg::EnableInsert(sal_Bool bEnable)
+void SwFldEditDlg::EnableInsert(bool bEnable)
 {
     if( bEnable && pSh->IsReadOnlyAvailable() && pSh->HasReadonlySel() )
-        bEnable = sal_False;
+        bEnable = false;
     GetOKButton()->Enable( bEnable );
 }
 
@@ -265,11 +265,11 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
     /* #108536# Only create selection if there is none
         already. Normalize PaM instead of swapping. */
     if ( ! pSh->HasSelection() )
-        pSh->Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+        pSh->Right(CRSR_SKIP_CHARS, true, 1, false );
 
     pSh->NormalizePam();
 
-    sal_uInt16 nGroup = rMgr.GetGroup(sal_False, pCurFld->GetTypeId(), pCurFld->GetSubType());
+    sal_uInt16 nGroup = rMgr.GetGroup(false, pCurFld->GetTypeId(), pCurFld->GetSubType());
 
     if (nGroup != pTabPage->GetGroup())
         pTabPage = (SwFldPage*)CreatePage(nGroup);
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 3cb7b72c4dfe..ab4ea04a282b 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -220,12 +220,12 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
                 m_pFormatLB->SelectEntryPos(0);
         }
 
-        sal_Bool bValue = sal_False, bName = sal_False, bMacro = sal_False, bInsert = sal_True;
-        sal_Bool bFormat = nSize != 0;
+        bool bValue = false, bName = false, bMacro = false, bInsert = true;
+        bool bFormat = nSize != 0;
 
         // two controls for conditional text
-        sal_Bool bDropDown = TYP_DROPDOWN == nTypeId;
-        sal_Bool bCondTxtFld = TYP_CONDTXTFLD == nTypeId;
+        bool bDropDown = TYP_DROPDOWN == nTypeId;
+        bool bCondTxtFld = TYP_CONDTXTFLD == nTypeId;
 
         m_pCond1FT->Show(!bDropDown && bCondTxtFld);
         m_pCond1ED->Show(!bDropDown && bCondTxtFld);
@@ -277,11 +277,11 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
         switch (nTypeId)
         {
             case TYP_MACROFLD:
-                bMacro = sal_True;
+                bMacro = true;
                 if (!GetFldMgr().GetMacroPath().isEmpty())
-                    bValue = sal_True;
+                    bValue = true;
                 else
-                    bInsert = sal_False;
+                    bInsert = false;
 
                 m_pNameFT->SetText(SW_RESSTR(STR_MACNAME));
                 m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
@@ -293,7 +293,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
             case TYP_HIDDENPARAFLD:
                 m_pNameFT->SetText(SW_RESSTR(STR_COND));
                 m_pNameED->SetDropEnable(true);
-                bName = sal_True;
+                bName = true;
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
                 break;
@@ -306,7 +306,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
                 SwWrtShell* pSh = GetActiveWrtShell();
                 if (!IsFldEdit() && pSh )
                     m_pValueED->SetText(pSh->GetSelTxt());
-                bName = bValue = sal_True;
+                bName = bValue = true;
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
             }
@@ -321,7 +321,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
                     m_pCond2ED->SetText(GetCurField()->GetPar2().getToken(1, '|'));
                 }
 
-                bName = bValue = sal_True;
+                bName = bValue = true;
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
                 break;
@@ -329,14 +329,14 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
             case TYP_JUMPEDITFLD:
                 m_pNameFT->SetText(SW_RESSTR(STR_JUMPEDITFLD));
                 m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
-                bName = bValue = sal_True;
+                bName = bValue = true;
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
                 break;
 
             case TYP_INPUTFLD:
                 m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
-                bValue = sal_True;
+                bValue = true;
                 m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                 m_pValueED->SetAccessibleName(m_pValueFT->GetText());
                 break;
@@ -345,11 +345,11 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
                 {
                     m_pNameFT->SetText(SW_RESSTR(STR_COMBCHRS_FT));
                     m_pNameED->SetDropEnable(true);
-                    bName = sal_True;
+                    bName = true;
 
                     const sal_Int32 nLen = m_pNameED->GetText().getLength();
                     if( !nLen || nLen > MAX_COMBINED_CHARACTERS )
-                        bInsert = sal_False;
+                        bInsert = false;
                     m_pNameED->SetAccessibleName(m_pNameFT->GetText());
                     m_pValueED->SetAccessibleName(m_pValueFT->GetText());
                 }
@@ -444,7 +444,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl)
     //enable "Add" button when text is in the Edit that's not already member of the box
     m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() &&
                 LISTBOX_ENTRY_NOTFOUND == m_pListItemsLB->GetEntryPos(m_pListItemED->GetText()));
-    sal_Bool bEnableButtons = m_pListItemsLB->GetSelectEntryCount() > 0;
+    bool bEnableButtons = m_pListItemsLB->GetSelectEntryCount() > 0;
     m_pListRemovePB->Enable(bEnableButtons);
     m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectEntryPos() > 0));
     m_pListDownPB->Enable(bEnableButtons &&
@@ -474,7 +474,7 @@ void SwFldFuncPage::UpdateSubType()
         m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(i));
     }
 
-    sal_Bool bEnable = nCount != 0;
+    bool bEnable = nCount != 0;
 
     m_pSelectionLB->Enable( bEnable );
 
@@ -627,12 +627,12 @@ IMPL_LINK_NOARG(SwFldFuncPage, ModifyHdl)
 {
     const sal_Int32 nLen = m_pNameED->GetText().getLength();
 
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
     if( TYP_COMBINED_CHARS == nTypeId &&
         (!nLen || nLen > MAX_COMBINED_CHARACTERS ))
-        bEnable = sal_False;
+        bEnable = false;
 
     EnableInsert( bEnable );
 
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index be9a092f93bf..f3a4c4220285 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -67,7 +67,7 @@ SwFldPage::~SwFldPage()
 void SwFldPage::Init()
 {
     SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current();
-    sal_Bool bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON);
+    bool bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON);
 
     m_bFldEdit = 0 == GetTabDialog();
 
@@ -82,7 +82,7 @@ void SwFldPage::Init()
         // initialise Rangelistbox
         if( m_bFldDlgHtmlMode && m_bFirstHTMLInit )
         {
-            m_bFirstHTMLInit = sal_False;
+            m_bFirstHTMLInit = false;
             SwWrtShell *pSh = m_pWrtShell;
             if(! pSh)
                 pSh = ::GetActiveWrtShell();
@@ -111,27 +111,27 @@ void SwFldPage::ActivatePage()
      Description: complete reset; edit new field
  --------------------------------------------------------------------*/
 
-void SwFldPage::EditNewField( sal_Bool bOnlyActivate )
+void SwFldPage::EditNewField( bool bOnlyActivate )
 {
     if( !bOnlyActivate )
     {
         m_nTypeSel = LISTBOX_ENTRY_NOTFOUND;
     }
     m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND;
-    m_bRefresh = sal_True;
+    m_bRefresh = true;
     Reset(*(SfxItemSet*)0);
-    m_bRefresh = sal_False;
+    m_bRefresh = false;
 }
 
 /*--------------------------------------------------------------------
      Description: insert field
  --------------------------------------------------------------------*/
 
-sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUString& rPar1,
+bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUString& rPar1,
                             const OUString& rPar2, sal_uLong nFormatId,
-                            sal_Unicode cSeparator, sal_Bool bIsAutomaticLanguage)
+                            sal_Unicode cSeparator, bool bIsAutomaticLanguage)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwView* pView = GetActiveView();
     SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr();
 
@@ -346,7 +346,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
      Description: enable/disable "Insert"-Button
  --------------------------------------------------------------------*/
 
-void SwFldPage::EnableInsert(sal_Bool bEnable)
+void SwFldPage::EnableInsert(bool bEnable)
 {
     SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog();
 
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 719e701cee09..dedbae5fcf2f 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -37,10 +37,10 @@ class SwFldPage : public SfxTabPage
     sal_Int32           m_nTypeSel;
     sal_Int32           m_nSelectionSel;
     bool                m_bFldEdit;
-    sal_Bool                m_bInsert;
-    sal_Bool                m_bFldDlgHtmlMode;
-    sal_Bool                m_bRefresh;
-    sal_Bool                m_bFirstHTMLInit;
+    bool                m_bInsert;
+    bool                m_bFldDlgHtmlMode;
+    bool                m_bRefresh;
+    bool                m_bFirstHTMLInit;
 
 protected:
 
@@ -48,8 +48,8 @@ protected:
     void                SetTypeSel(sal_Int32  nSet)     { m_nTypeSel = nSet;}
     sal_Int32           GetSelectionSel() const     { return m_nSelectionSel;}
     void                SetSelectionSel(sal_Int32  nSet){ m_nSelectionSel = nSet;}
-    sal_Bool                IsFldDlgHtmlMode() const    { return m_bFldDlgHtmlMode;}
-    sal_Bool                IsRefresh() const           { return m_bRefresh;}
+    bool                IsFldDlgHtmlMode() const    { return m_bFldDlgHtmlMode;}
+    bool                IsRefresh() const           { return m_bRefresh;}
     SwField*            GetCurField()               { return m_pCurFld;}
     SwWrtShell*         GetWrtShell() { return m_pWrtShell;}
 
@@ -62,17 +62,17 @@ protected:
                                  const ListBox* pLst3 = 0);
     void                RestorePos( ListBox* pLst1, ListBox* pLst2 = 0,
                                     ListBox* pLst3 = 0 );
-    void                EnableInsert(sal_Bool bEnable = sal_True);
+    void                EnableInsert(bool bEnable = true);
     inline bool         IsFldEdit() const   { return m_bFldEdit; }
 
     // insert field
-    sal_Bool                InsertFld(  sal_uInt16 nTypeId,
+    bool                InsertFld(  sal_uInt16 nTypeId,
                                     sal_uInt16 nSubType,
                                     const OUString& rPar1,
                                     const OUString& rPar2,
                                     sal_uLong nFormatId,
                                     sal_Unicode cDelim = ' ',
-                                    sal_Bool bIsAutomaticLanguage = sal_True);
+                                    bool bIsAutomaticLanguage = true);
 
     using SfxTabPage::ActivatePage;
 
@@ -86,7 +86,7 @@ public:
 
     inline SwFldMgr&    GetFldMgr()         { return m_aMgr; }
     void                SetWrtShell( SwWrtShell* m_pWrtShell );
-    void                EditNewField( sal_Bool bOnlyActivate = sal_False );
+    void                EditNewField( bool bOnlyActivate = false );
     virtual sal_uInt16      GetGroup() = 0;
 };
 
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index f1820e81b558..87daaac6c63e 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -342,7 +342,7 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
         // fill selection-ListBox
         UpdateSubType();
 
-        sal_Bool bName = sal_False;
+        bool bName = false;
         nFldDlgFmtSel = 0;
 
         if ( ( !IsFldEdit() || m_pSelectionLB->GetEntryCount() ) &&
@@ -358,15 +358,15 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
                 if (REFFLDFLAG & (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(nOld))
                     // the old one stays
                     nFldDlgFmtSel = m_pFormatLB->GetSelectEntryPos();
-                bName = sal_True;
+                bName = true;
                 break;
 
             case TYP_SETREFFLD:
-                bName = sal_True;
+                bName = true;
                 break;
 
             case REFFLDFLAG_BOOKMARK:
-                bName = sal_True;
+                bName = true;
                 // no break!!!
             default:
                 if( REFFLDFLAG & nTypeId )
@@ -747,13 +747,13 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
     OUString aName(m_pNameED->GetText());
     const bool bEmptyName = aName.isEmpty();
 
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
     if ((nTypeId == TYP_SETREFFLD && !GetFldMgr().CanInsertRefMark(aName)) ||
         (bEmptyName && (nTypeId == TYP_GETREFFLD || nTypeId == TYP_SETREFFLD ||
                        nTypeId == REFFLDFLAG_BOOKMARK)))
-        bEnable = sal_False;
+        bEnable = false;
 
     EnableInsert(bEnable);
 
@@ -764,7 +764,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
 
 bool SwFldRefPage::FillItemSet(SfxItemSet& )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
     sal_uInt16 nSubType = 0;
@@ -825,7 +825,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet& )
                 aVal = OUString::number( aArr[nPos]->nSeqNo );
 
                 if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
-                    bModified = sal_True; // can happen with fields of which the references were deleted
+                    bModified = true; // can happen with fields of which the references were deleted
             }
             else if (IsFldEdit())
                 aVal = OUString::number( pRefFld->GetSeqNo() );
@@ -846,7 +846,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet& )
                 aVal = OUString::number( aArr[nPos]->nSeqNo );
 
                 if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
-                    bModified = sal_True; // can happen with fields of which the reference was deleted
+                    bModified = true; // can happen with fields of which the reference was deleted
             }
             else if (IsFldEdit())
                 aVal = OUString::number( pRefFld->GetSeqNo() );
@@ -915,7 +915,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet& )
                     aVal = OUString::number( aArr[nPos]->nSeqNo );
 
                     if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
-                        bModified = sal_True; // can happen with fields of which the reference was deleted
+                        bModified = true; // can happen with fields of which the reference was deleted
                 }
                 else if (IsFldEdit())
                     aVal = OUString::number( pRefFld->GetSeqNo() );
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 9fa310f42093..bc39b2392b8f 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -86,7 +86,7 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
                 -1,
                 utl::OConfigurationTreeRoot::CM_READONLY);
 
-        sal_Bool bDatabaseFields = sal_True;
+        bool bDatabaseFields = true;
         aCfgRoot.getNodeValue(
             OUString("DatabaseFields")) >>= bDatabaseFields;
 
@@ -212,7 +212,7 @@ IMPL_LINK_NOARG(SwFldDlg, CancelHdl)
 void SwFldDlg::ReInitDlg()
 {
     SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current();
-    sal_Bool bNewMode = (::GetHtmlMode(pDocSh) & HTMLMODE_ON) != 0;
+    bool bNewMode = (::GetHtmlMode(pDocSh) & HTMLMODE_ON) != 0;
 
     if (bNewMode != m_bHtmlMode)
     {
@@ -246,7 +246,7 @@ void SwFldDlg::ReInitDlg()
     Description: newly initialise TabPage after Doc-Switch
  --------------------------------------------------------------------*/
 
-void SwFldDlg::ReInitTabPage( sal_uInt16 nPageId, sal_Bool bOnlyActivate )
+void SwFldDlg::ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate )
 {
     SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId);
 
@@ -278,7 +278,7 @@ void SwFldDlg::Activate()
     }
 }
 
-void SwFldDlg::EnableInsert(sal_Bool bEnable)
+void SwFldDlg::EnableInsert(bool bEnable)
 {
     if( bEnable )
     {
@@ -287,7 +287,7 @@ void SwFldDlg::EnableInsert(sal_Bool bEnable)
         if( !pView ||
                 (pView->GetWrtShell().IsReadOnlyAvailable() &&
                     pView->GetWrtShell().HasReadonlySel()) )
-            bEnable = sal_False;
+            bEnable = false;
     }
     GetOKButton().Enable(bEnable);
 }
@@ -299,7 +299,7 @@ void SwFldDlg::InsertHdl()
 
 void SwFldDlg::ActivateDatabasePage()
 {
-    m_bDataBaseMode = sal_True;
+    m_bDataBaseMode = true;
     ShowPage(m_nDbId);
     SfxTabPage* pDBPage = GetTabPage(m_nDbId);
     if( pDBPage )
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 99ba1bd603cd..4e4ae2f3dc82 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -81,7 +81,7 @@ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet )
 
     m_pChapterLevelLB->SelectEntryPos(0);
     //enable 'active' language selection
-    m_pNumFormatLB->SetShowLanguageControl(sal_True);
+    m_pNumFormatLB->SetShowLanguageControl(true);
 }
 
 SwFldVarPage::~SwFldVarPage()
@@ -198,7 +198,7 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl)
 
     if (nOld != GetTypeSel() || nOld == LISTBOX_ENTRY_NOTFOUND)
     {
-        bInit = sal_True;
+        bInit = true;
         if (nOld != LISTBOX_ENTRY_NOTFOUND)
         {
             m_pNameED->SetText(OUString());
@@ -209,7 +209,7 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl)
         UpdateSubType();    // initialise selection-listboxes
     }
 
-    bInit = sal_False;
+    bInit = false;
 
     return 0;
 }
@@ -242,9 +242,9 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
     sal_Int32 nSize = m_pFormatLB->GetEntryCount();
 
-    sal_Bool bValue = sal_False, bName = sal_False, bNumFmt = sal_False,
-            bInvisible = sal_False, bShowChapterFrame = sal_False;
-    sal_Bool bFormat = nSize != 0;
+    bool bValue = false, bName = false, bNumFmt = false,
+            bInvisible = false, bShowChapterFrame = false;
+    bool bFormat = nSize != 0;
 
     switch (nTypeId)
     {
@@ -282,19 +282,19 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                     m_pValueED->SetText(OUString());
                 }
             }
-            bValue = bName = bNumFmt = bInvisible = sal_True;
+            bValue = bName = bNumFmt = bInvisible = true;
 
             m_pValueED->SetDropEnable(true);
             break;
         }
 
         case TYP_SETFLD:
-            bValue = sal_True;
+            bValue = true;
 
-            bNumFmt = bInvisible = sal_True;
+            bNumFmt = bInvisible = true;
 
             if (!IsFldDlgHtmlMode())
-                bName = sal_True;
+                bName = true;
             else
             {
                 m_pNumFormatLB->Clear();
@@ -340,8 +340,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
         case TYP_FORMELFLD:
             {
-                bValue = sal_True;
-                bNumFmt = sal_True;
+                bValue = true;
+                bNumFmt = true;
                 m_pValueFT->SetText(SW_RESSTR(STR_FORMULA));
                 m_pValueED->SetDropEnable(true);
             }
@@ -373,16 +373,16 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                         if(pSetTyp)
                         {
                             if (pSetTyp->GetType() & nsSwGetSetExpType::GSE_STRING)    // textual?
-                                bFormat = sal_True;
+                                bFormat = true;
                             else                    // numeric
-                                bNumFmt = sal_True;
+                                bNumFmt = true;
                         }
                     }
                 }
                 else
-                    bFormat = sal_False;
+                    bFormat = false;
 
-                EnableInsert(bFormat|bNumFmt);
+                EnableInsert(bFormat || bNumFmt);
             }
             break;
 
@@ -391,7 +391,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
             if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
             {
-                bValue = bNumFmt = sal_True;
+                bValue = bNumFmt = true;
 
                 OUString sName;
 
@@ -423,7 +423,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                         m_pValueED->SetText(((SwSetExpField*)GetCurField())->GetPromptText());
                 }
                 else    // USERFLD
-                    bFormat = bNumFmt = sal_False;
+                    bFormat = bNumFmt = false;
             }
             break;
 
@@ -453,7 +453,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                     }
                 }
             }
-            bName = bValue = sal_True;
+            bName = bValue = true;
             break;
 
         case TYP_SEQFLD:
@@ -496,7 +496,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
         case TYP_SETREFPAGEFLD:
             {
-                bValue = sal_False;
+                bValue = false;
                 m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
 
                 if (IsFldEdit() || pBox)    // only when interacting via mouse
@@ -504,7 +504,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
                 if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
-                    bValue = sal_True;      // SubType OFF - knows no Offset
+                    bValue = true;      // SubType OFF - knows no Offset
                     if (IsFldEdit())
                         m_pValueED->SetText(OUString::number(((SwRefPageSetField*)GetCurField())->GetOffset()));
                 }
@@ -521,9 +521,9 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
     m_pFormatLB->Show(!bNumFmt);
 
     if (IsFldEdit())
-        bName = sal_False;
+        bName = false;
 
-    m_pFormat->Enable(bFormat|bNumFmt);
+    m_pFormat->Enable(bFormat || bNumFmt);
     m_pNameFT->Enable(bName);
     m_pNameED->Enable(bName);
     m_pValueFT->Enable(bValue);
@@ -598,29 +598,29 @@ void SwFldVarPage::UpdateSubType()
             }
             else
             {
-                sal_Bool bInsert = sal_False;
+                bool bInsert = false;
 
                 switch (nTypeId)
                 {
                     case TYP_INPUTFLD:
                         if (aList[i] == GetCurField()->GetPar1())
-                            bInsert = sal_True;
+                            bInsert = true;
                         break;
 
                     case TYP_FORMELFLD:
-                        bInsert = sal_True;
+                        bInsert = true;
                         break;
 
                     case TYP_GETFLD:
                         if (aList[i].equals(((const SwFormulaField*)GetCurField())->GetFormula()))
-                            bInsert = sal_True;
+                            bInsert = true;
                         break;
 
                     case TYP_SETFLD:
                     case TYP_USERFLD:
                         if (aList[i] == GetCurField()->GetTyp()->GetName())
                         {
-                            bInsert = sal_True;
+                            bInsert = true;
                             if (GetCurField()->GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE)
                                 m_pInvisibleCB->Check();
                         }
@@ -638,7 +638,7 @@ void SwFldVarPage::UpdateSubType()
 
                     default:
                         if (aList[i] == GetCurField()->GetPar1())
-                            bInsert = sal_True;
+                            bInsert = true;
                         break;
                 }
                 if (bInsert)
@@ -652,7 +652,7 @@ void SwFldVarPage::UpdateSubType()
         }
     }
 
-    sal_Bool bEnable = m_pSelectionLB->GetEntryCount() != 0;
+    bool bEnable = m_pSelectionLB->GetEntryCount() != 0;
     ListBox *pLB = 0;
 
     if (bEnable)
@@ -690,7 +690,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
     // fill Format-Listbox
     m_pFormatLB->Clear();
     m_pNumFormatLB->Clear();
-    sal_Bool bSpecialFmt = sal_False;
+    bool bSpecialFmt = false;
 
     if( TYP_GETREFPAGEFLD != nTypeId )
     {
@@ -806,7 +806,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
 {
     OUString sValue(m_pValueED->GetText());
-    sal_Bool bHasValue = !sValue.isEmpty();
+    bool bHasValue = !sValue.isEmpty();
     const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
     bool bInsert = false, bApply = false, bDelete = false;
 
@@ -1076,7 +1076,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
 
 IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
 {
-    sal_Bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0;
+    bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0;
 
     m_pSeparatorED->Enable(bEnable);
     m_pSeparatorFT->Enable(bEnable);
@@ -1087,7 +1087,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
 
 IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
 {
-    sal_Bool bEnable = !m_pSeparatorED->GetText().isEmpty() ||
+    bool bEnable = !m_pSeparatorED->GetText().isEmpty() ||
                     m_pChapterLevelLB->GetSelectEntryPos() == 0;
     EnableInsert(bEnable);
 
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index ca0c23e03fa6..ab4222e4245b 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -74,7 +74,7 @@ class SwFldVarPage : public SwFldPage
     OUString            sOldNameFT;
 
     sal_uLong           nOldFormat;
-    sal_Bool                bInit;
+    bool                bInit;
 
     DECL_LINK(TypeHdl, void *);
     DECL_LINK( SubTypeHdl, ListBox* pLB = 0 );
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 2ebbb9880035..2a1d5ea5cca8 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -35,7 +35,7 @@
  --------------------------------------------------------------------*/
 
 SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
-                              SwField* pField, sal_Bool bNextButton )
+                              SwField* pField, bool bNextButton )
     : SvxStandardDialog( pParent, "InputFieldDialog",
         "modules/swriter/ui/inputfielddialog.ui")
     , rSh( rS )
@@ -100,7 +100,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
 
     // JP 31.3.00: Inputfields in readonly regions must be allowed to
     //              input any content. - 74639
-    sal_Bool bEnable = !rSh.IsCrsrReadonly();
+    bool bEnable = !rSh.IsCrsrReadonly();
 
     m_pOKBT->Enable( bEnable );
     m_pEditED->SetReadOnly( !bEnable );
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index fad10ca8b6b3..bbc4f00e9521 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -45,8 +45,8 @@ using namespace ::com::sun::star;
 SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
     SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"),
 
-    bNew(sal_True),
-    bIsUrl(sal_False),
+    bNew(true),
+    bIsUrl(false),
 
     pSh(pWrtSh),
     pFileDlg(NULL),
@@ -134,8 +134,8 @@ void SwJavaEditDialog::Apply()
 
 void SwJavaEditDialog::CheckTravel()
 {
-    sal_Bool bTravel = sal_False;
-    sal_Bool bNext(sal_False), bPrev(sal_False);
+    bool bTravel = false;
+    bool bNext(false), bPrev(false);
 
     if(!bNew)
     {
@@ -147,9 +147,9 @@ void SwJavaEditDialog::CheckTravel()
         if( bNext )
             pMgr->GoPrev();
 
-        if( 0 != ( bPrev = pMgr->GoPrev() ) )
+        if( ( bPrev = pMgr->GoPrev() ) )
             pMgr->GoNext();
-        bTravel |= bNext|bPrev;
+        bTravel |= bNext || bPrev;
 
         pSh->DestroyCrsr();
         pSh->EndAction();
@@ -219,12 +219,12 @@ void SwJavaEditDialog::SetFld()
 
 bool SwJavaEditDialog::IsUpdate() const
 {
-    return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
+    return pFld && ( (bIsUrl ? 1 : 0) != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
 }
 
 IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl)
 {
-    sal_Bool bEnable = m_pUrlRB->IsChecked();
+    bool bEnable = m_pUrlRB->IsChecked();
     m_pUrlPB->Enable(bEnable);
     m_pUrlED->Enable(bEnable);
     m_pEditED->Enable(!bEnable);
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 10a3e55527ef..cc591f370de2 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -442,23 +442,23 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
     else if (nId == m_nTypeId)
     {
-        ((SwFrmPage&)rPage).SetNewFrame( sal_True );
-        ((SwFrmPage&)rPage).SetFormatUsed( sal_True );
+        ((SwFrmPage&)rPage).SetNewFrame( true );
+        ((SwFrmPage&)rPage).SetFormatUsed( true );
     }
     else if (nId == m_nOptionsId)
     {
-        ((SwFrmAddPage&)rPage).SetFormatUsed(sal_True);
-        ((SwFrmAddPage&)rPage).SetNewFrame(sal_True);
+        ((SwFrmAddPage&)rPage).SetFormatUsed(true);
+        ((SwFrmAddPage&)rPage).SetNewFrame(true);
     }
     else if (nId == m_nWrapId)
     {
-        ((SwWrapTabPage&)rPage).SetFormatUsed( sal_True, sal_False );
+        ((SwWrapTabPage&)rPage).SetFormatUsed( true, false );
     }
     else if (nId == m_nColumnId)
     {
         if( nType == SFX_STYLE_FAMILY_FRAME )
-            ((SwColumnPage&)rPage).SetFrmMode(sal_True);
-        ((SwColumnPage&)rPage).SetFormatUsed( sal_True );
+            ((SwColumnPage&)rPage).SetFrmMode(true);
+        ((SwColumnPage&)rPage).SetFormatUsed( true );
     }
     //UUUU do not remove; many other style dialog combinations still use the SfxTabPage
     // for the SvxBrushItem (see RID_SVXPAGE_BACKGROUND)
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 12abb8e882ee..3e1d5aa59fcd 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -276,10 +276,10 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
         break;
     }
 
-    sal_Bool bIsSection = pSet == pSectionSet || pSet == pSelectionSet;
+    bool bIsSection = pSet == pSectionSet || pSet == pSelectionSet;
     pTabPage->ShowBalance(bIsSection);
     pTabPage->SetInSection(bIsSection);
-    pTabPage->SetFrmMode(sal_True);
+    pTabPage->SetFrmMode(true);
     pTabPage->SetPageWidth(nWidth);
     if( pSet )
         pTabPage->Reset(*pSet);
@@ -404,9 +404,9 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
     , nFirstVis(0)
     , nMinWidth(MINLAY)
     , pModifiedField(0)
-    , bFormat(sal_False)
-    , bFrm(sal_False)
-    , bHtmlMode(sal_False)
+    , bFormat(false)
+    , bFrm(false)
+    , bHtmlMode(false)
     , bLockUpdate(false)
 {
     get(m_pCLNrEdt, "colsnf");
@@ -576,7 +576,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
         ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
     if(nHtmlMode & HTMLMODE_ON)
     {
-        bHtmlMode = sal_True;
+        bHtmlMode = true;
         m_pAutoWidthBox->Enable(false);
     }
     FieldUnit aMetric = ::GetDfltMetric(bHtmlMode);
@@ -681,10 +681,10 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
         for( sal_uInt16 i = 1; i < nCols; ++i )
             nMin = std::min(nMin, nColWidth[i]);
 
-        sal_Bool bAutoWidth = m_pAutoWidthBox->IsChecked();
+        bool bAutoWidth = m_pAutoWidthBox->IsChecked();
         if(!bAutoWidth)
         {
-            pColMgr->SetAutoWidth(sal_False);
+            pColMgr->SetAutoWidth(false);
                 // when the user didn't allocate the whole width,
                 // add the missing amount to the last column.
             long nSum = 0;
@@ -780,7 +780,7 @@ void SwColumnPage::Init()
 {
     m_pCLNrEdt->SetValue(nCols);
 
-    sal_Bool bAutoWidth = pColMgr->IsAutoWidth() || bHtmlMode;
+    bool bAutoWidth = pColMgr->IsAutoWidth() || bHtmlMode;
     m_pAutoWidthBox->Check( bAutoWidth );
 
     sal_Int32 nColumnWidthSum = 0;
@@ -856,10 +856,10 @@ bool SwColumnPage::isLineNotNone() const
 ------------------------------------------------------------------------*/
 void SwColumnPage::UpdateCols()
 {
-    sal_Bool bEnableBtns= sal_False;
-    sal_Bool bEnable12  = sal_False;
-    sal_Bool bEnable3   = sal_False;
-    const sal_Bool bEdit = !m_pAutoWidthBox->IsChecked();
+    bool bEnableBtns= false;
+    bool bEnable12  = false;
+    bool bEnable3   = false;
+    const bool bEdit = !m_pAutoWidthBox->IsChecked();
     if ( nCols > nVisCols )
     {
         bEnableBtns = true && !bHtmlMode;
@@ -870,8 +870,8 @@ void SwColumnPage::UpdateCols()
         // here are purposely hardly any breaks
         switch(nCols)
         {
-            case 3: bEnable3 = sal_True;
-            case 2: bEnable12= sal_True; break;
+            case 3: bEnable3 = true;
+            case 2: bEnable12= true; break;
             default: /* do nothing */;
         }
     }
@@ -1231,7 +1231,7 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
             pColMgr->SetActualWidth(nTotalWish);
             Init();
         }
-        sal_Bool bPercent;
+        bool bPercent;
         // only relative data in frame format
         if ( bFormat || (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff) )
         {
@@ -1243,10 +1243,10 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
             aDistEd2.SetRefValue(nTotalWish);
 
             // switch to %-view
-            bPercent = sal_True;
+            bPercent = true;
         }
         else
-            bPercent = sal_False;
+            bPercent = false;
 
         aEd1.ShowPercent(bPercent);
         aEd2.ShowPercent(bPercent);
@@ -1308,12 +1308,12 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
     return 0;
 }
 
-void SwColumnPage::SetFrmMode(sal_Bool bMod)
+void SwColumnPage::SetFrmMode(bool bMod)
 {
     bFrm = bMod;
 }
 
-void SwColumnPage::SetInSection(sal_Bool bSet)
+void SwColumnPage::SetInSection(bool bSet)
 {
     if(!SW_MOD()->GetCTLOptions().IsCTLFontEnabled())
         return;
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index c9774e26cc58..30a373ef8fd8 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -246,7 +246,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
 void SwCaptionDialog::Apply()
 {
     InsCaptionOpt aOpt;
-    aOpt.UseCaption() = sal_True;
+    aOpt.UseCaption() = true;
     OUString aName( m_pCategoryBox->GetText() );
     if ( aName == m_sNone )
     {
@@ -366,7 +366,7 @@ void SwCaptionDialog::DrawSample()
                     aNumVector.push_back(1);
 
                 OUString sNumber( rSh.GetOutlineNumRule()->
-                                MakeNumString(aNumVector, sal_False ));
+                                MakeNumString(aNumVector, false ));
                 if( !sNumber.isEmpty() )
                     aStr += sNumber + pFldType->GetDelimiter();
             }
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index add00da6754f..c6ee60133c98 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -162,12 +162,12 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     else if (nId == m_nWrapId)
     {
         ((SwWrapTabPage&)rPage).SetNewFrame(m_bNew);
-        ((SwWrapTabPage&)rPage).SetFormatUsed(m_bFormat, sal_False);
+        ((SwWrapTabPage&)rPage).SetFormatUsed(m_bFormat, false);
         ((SwWrapTabPage&)rPage).SetShell(m_pWrtShell);
     }
     else if (nId == m_nColumnId)
     {
-        ((SwColumnPage&)rPage).SetFrmMode(sal_True);
+        ((SwColumnPage&)rPage).SetFrmMode(true);
         ((SwColumnPage&)rPage).SetFormatUsed(m_bFormat);
 
         const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 03c2b05b0fea..2775966644ce 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -453,7 +453,7 @@ static void lcl_InsertVectors(ListBox& rBox,
 
 // --> OD 2009-08-31 #mongolianlayout#
 // add input parameter
-static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, bool bVertical, sal_Bool bVerticalL2R, sal_Bool bRTL)
+static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, bool bVertical, bool bVerticalL2R, bool bRTL)
 {
     //special handling of STR_FROMLEFT
     if ( SwFPos::FROMLEFT == eStringId )
@@ -586,7 +586,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
 // standard frame TabPage
 namespace
 {
-    void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, MetricField& _rPF_Edit)
+    void HandleAutoCB( bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, MetricField& _rPF_Edit)
     {
         _rFT_man.Show( !_bChecked );
         _rFT_auto.Show( _bChecked );
@@ -599,17 +599,17 @@ SwFrmPage::SwFrmPage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "FrmTypePage",
         "modules/swriter/ui/frmtypepage.ui", rSet)
     ,
-    bAtHorzPosModified( sal_False ),
-    bAtVertPosModified( sal_False ),
-    bFormat(sal_False),
-    bNew(sal_True),
-    bNoModifyHdl(sal_True),
+    bAtHorzPosModified( false ),
+    bAtVertPosModified( false ),
+    bFormat(false),
+    bNew(true),
+    bNoModifyHdl(true),
     // --> OD 2009-08-31 #mongolianlayout# - no used
 //    bVerticalChanged(sal_False),
     bIsVerticalFrame(false),
-    bIsVerticalL2R(sal_False),
-    bIsInRightToLeft(sal_False),
-    bHtmlMode(sal_False),
+    bIsVerticalL2R(false),
+    bIsInRightToLeft(false),
+    bHtmlMode(false),
     nHtmlMode(0),
     nUpperBorder(0),
     nLowerBorder(0),
@@ -883,7 +883,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
             m_pAnchorAtFrameRB->Hide();
         // --> OD 2009-08-31 #mongolianlayout#
 //        if ( !bVerticalChanged && pSh->IsFrmVertical(sal_True, bIsInRightToLeft) )
-        if ( pSh->IsFrmVertical( sal_True, bIsInRightToLeft, bIsVerticalL2R ) )
+        if ( pSh->IsFrmVertical( true, bIsInRightToLeft, bIsVerticalL2R ) )
         {
             OUString sHLabel = m_pHorizontalFT->GetText();
             m_pHorizontalFT->SetText(m_pVerticalFT->GetText());
@@ -1001,12 +1001,12 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
                                   m_pAnchorAtFrameRB->IsChecked() );
     }
 
-    Init( rSet, sal_True );
+    Init( rSet, true );
     m_pAtVertPosED->SaveValue();
     m_pAtHorzPosED->SaveValue();
     m_pFollowTextFlowCB->SaveValue();
 
-    bNoModifyHdl = sal_False;
+    bNoModifyHdl = false;
     //lock PercentFields
     m_aWidthED.LockAutoCalculation(true);
     m_aHeightED.LockAutoCalculation(true);
@@ -1068,10 +1068,10 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
         }
 
         pOldItem = GetOldItem(rSet, FN_HORI_ORIENT);
-        sal_Bool bSame = sal_False;
+        bool bSame = false;
         if ((bNew == bFormat) && pOldItem)
         {
-             bSame = static_cast< sal_Bool >(aHoriOrient == (SwFmtHoriOrient&)*pOldItem);
+             bSame = aHoriOrient == (SwFmtHoriOrient&)*pOldItem;
         }
         if ((bNew && !bFormat) || ((bAtHorzPosModified || bMod) && !bSame))
         {
@@ -1092,7 +1092,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
         aVertOrient.SetVertOrient    ( eVOri);
         aVertOrient.SetRelationOrient( eRel );
 
-        sal_Bool bMod = m_pAtVertPosED->GetText() != m_pAtVertPosED->GetSavedValue();
+        bool bMod = m_pAtVertPosED->GetText() != m_pAtVertPosED->GetSavedValue();
 
         if ( eVOri == text::VertOrientation::NONE &&
              ( bNew || (bAtVertPosModified || bMod) || nOldV != eVOri) )
@@ -1107,15 +1107,14 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
             aVertOrient.SetPos( nY );
         }
         pOldItem = GetOldItem(rSet, FN_VERT_ORIENT);
-        sal_Bool bSame = sal_False;
+        bool bSame = false;
         if((bNew == bFormat) && pOldItem)
         {
-             bSame = static_cast< sal_Bool >( bFormat ?
-                aVertOrient.GetVertOrient() == ((SwFmtVertOrient*)pOldItem)->GetVertOrient() &&
-                aVertOrient.GetRelationOrient() == ((SwFmtVertOrient*)pOldItem)->GetRelationOrient() &&
-                aVertOrient.GetPos() == ((SwFmtVertOrient*)pOldItem)->GetPos()
-
-                    : aVertOrient == (SwFmtVertOrient&)*pOldItem );
+             bSame = bFormat ?
+                      aVertOrient.GetVertOrient() == ((SwFmtVertOrient*)pOldItem)->GetVertOrient() &&
+                      aVertOrient.GetRelationOrient() == ((SwFmtVertOrient*)pOldItem)->GetRelationOrient() &&
+                      aVertOrient.GetPos() == ((SwFmtVertOrient*)pOldItem)->GetPos()
+                    : aVertOrient == (SwFmtVertOrient&)*pOldItem;
         }
         if( ( bNew && !bFormat ) || ((bAtVertPosModified || bMod) && !bSame ))
         {
@@ -1248,7 +1247,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
             nOldHRel = ((RelationMap *)m_pHoriRelationLB->GetEntryData(nPos))->nRelation;
     }
 
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     if ( eId == FLY_AT_PAGE )
     {
         pVMap = bHtmlMode ? aVPageHtmlMap : aVPageMap;
@@ -1291,7 +1290,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
     {
         pVMap = bHtmlMode ? aVAsCharHtmlMap     : aVAsCharMap;
         pHMap = 0;
-        bEnable = sal_False;
+        bEnable = false;
     }
     m_pHorizontalDLB->Enable( bEnable );
     m_pHorizontalFT->Enable( bEnable );
@@ -1694,9 +1693,9 @@ RndStdIds SwFrmPage::GetAnchor()
 // Bsp - Update
 void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
 {
-    bNoModifyHdl = sal_True;
+    bNoModifyHdl = true;
     Init(rSet);
-    bNoModifyHdl = sal_False;
+    bNoModifyHdl = false;
     //lock PercentFields
     m_aWidthED.LockAutoCalculation(true);
     m_aHeightED.LockAutoCalculation(true);
@@ -1923,13 +1922,13 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
 
     if (bHori)
     {
-        sal_Bool bEnable = text::HoriOrientation::NONE == nAlign;
+        bool bEnable = text::HoriOrientation::NONE == nAlign;
         m_pAtHorzPosED->Enable( bEnable );
         m_pAtHorzPosFT->Enable( bEnable );
     }
     else
     {
-        sal_Bool bEnable = text::VertOrientation::NONE == nAlign && m_bAllowVertPositioning;
+        bool bEnable = text::VertOrientation::NONE == nAlign && m_bAllowVertPositioning;
         m_pAtVertPosED->Enable( bEnable );
         m_pAtVertPosFT->Enable( bEnable );
     }
@@ -1951,9 +1950,9 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
     UpdateExample();
 
     if (bHori)
-        bAtHorzPosModified = sal_True;
+        bAtHorzPosModified = true;
     else
-        bAtVertPosModified = sal_True;
+        bAtVertPosModified = true;
 
     // special treatment for HTML-Mode with horizonal-vertical-dependencies
     if(bHtmlMode && (FLY_AT_CHAR == GetAnchor()))
@@ -2021,9 +2020,9 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
     UpdateExample();
 
     if (bHori)
-        bAtHorzPosModified = sal_True;
+        bAtHorzPosModified = true;
     else
-        bAtVertPosModified = sal_True;
+        bAtVertPosModified = true;
 
     if (bHtmlMode && (FLY_AT_CHAR == GetAnchor()))
     {
@@ -2119,14 +2118,14 @@ void SwFrmPage::UpdateExample()
     m_pExampleWN->Invalidate();
 }
 
-void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
+void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
 {
     if(!bFormat)
     {
         SwWrtShell* pSh = getFrmDlgParentShell();
 
         // size
-        const sal_Bool bSizeFixed = pSh->IsSelObjProtected( FLYPROTECT_FIXED );
+        const bool bSizeFixed = pSh->IsSelObjProtected( FLYPROTECT_FIXED );
 
         m_aWidthED .Enable( !bSizeFixed );
         m_aHeightED.Enable( !bSizeFixed );
@@ -2203,7 +2202,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
     if (!IsInGraficMode())
     {
         SwFrmSize eSize = rSize.GetHeightSizeType();
-        sal_Bool bCheck = eSize != ATT_FIX_SIZE;
+        bool bCheck = eSize != ATT_FIX_SIZE;
         m_pAutoHeightCB->Check( bCheck );
         HandleAutoCB( bCheck, *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() );
         if( eSize == ATT_VAR_SIZE )
@@ -2328,7 +2327,7 @@ const sal_uInt16* SwFrmPage::GetRanges()
     return aPageRg;
 }
 
-void SwFrmPage::SetFormatUsed(sal_Bool bFmt)
+void SwFrmPage::SetFormatUsed(bool bFmt)
 {
     bFormat = bFmt;
     if(bFormat)
@@ -2399,11 +2398,11 @@ void SwGrfExtPage::Reset(const SfxItemSet &rSet)
 void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SvxProtectItem& rProt = (const SvxProtectItem& )rSet.Get(RES_PROTECT);
-    sal_Bool bProtCntnt = rProt.IsCntntProtected();
+    bool bProtCntnt = rProt.IsCntntProtected();
 
     const SfxPoolItem* pItem = 0;
-    sal_Bool bEnable = sal_False;
-    sal_Bool bEnableMirrorRB = sal_False;
+    bool bEnable = false;
+    bool bEnableMirrorRB = false;
 
     SfxItemState eState = rSet.GetItemState(RES_GRFATR_MIRRORGRF, true, &pItem);
     if( SFX_ITEM_UNKNOWN != eState && !bProtCntnt && !bHtmlMode )
@@ -2411,7 +2410,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
         if( SFX_ITEM_SET != eState )
             pItem = &rSet.Get( RES_GRFATR_MIRRORGRF );
 
-        bEnable = sal_True;
+        bEnable = true;
 
         MirrorGraph eMirror = static_cast< MirrorGraph >(((const SwMirrorGrf* )pItem)->GetValue());
         switch( eMirror )
@@ -2486,14 +2485,14 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
 
 bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     if ( m_pMirrorHorzBox->GetSavedValue() != TriState(m_pMirrorHorzBox->IsChecked()) ||
          m_pMirrorVertBox->GetSavedValue() != TriState(m_pMirrorVertBox->IsChecked()) ||
          m_pAllPagesRB->GetSavedValue() != m_pAllPagesRB->IsChecked() ||
          m_pLeftPagesRB->GetSavedValue() != m_pLeftPagesRB->IsChecked() ||
          m_pRightPagesRB->GetSavedValue() != m_pRightPagesRB->IsChecked())
     {
-        bModified = sal_True;
+        bModified = true;
 
         bool bHori = false;
 
@@ -2507,7 +2506,7 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
                     RES_MIRROR_GRAPH_VERT : m_pMirrorVertBox->IsChecked() ?
                     RES_MIRROR_GRAPH_HOR  : RES_MIRROR_GRAPH_DONT;
 
-        sal_Bool bMirror = !m_pAllPagesRB->IsChecked();
+        bool bMirror = !m_pAllPagesRB->IsChecked();
         SwMirrorGrf aMirror( eMirror );
         aMirror.SetGrfToggle(bMirror );
         rSet.Put( aMirror );
@@ -2515,7 +2514,7 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet )
 
     if( aGrfName != aNewGrfName || m_pConnectED->IsModified() )
     {
-        bModified = sal_True;
+        bModified = true;
         aGrfName = m_pConnectED->GetText();
         rSet.Put( SvxBrushItem( aGrfName, aFilterName, GPOS_LT,
                                 SID_ATTR_GRAF_GRAPHIC ));
@@ -2562,14 +2561,14 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl)
         m_pAllPagesRB->Enable(false);
         m_pLeftPagesRB->Enable(false);
         m_pRightPagesRB->Enable(false);
-        m_pBmpWin->MirrorHorz(sal_False);
-        m_pBmpWin->MirrorVert(sal_False);
+        m_pBmpWin->MirrorHorz(false);
+        m_pBmpWin->MirrorVert(false);
 
         Graphic aGraphic;
         GraphicFilter::LoadGraphic( pGrfDlg->GetPath(), aEmptyOUStr, aGraphic );
         m_pBmpWin->SetGraphic(aGraphic);
 
-        sal_Bool bEnable = GRAPHIC_BITMAP      == aGraphic.GetType() ||
+        bool bEnable = GRAPHIC_BITMAP      == aGraphic.GetType() ||
                             GRAPHIC_GDIMETAFILE == aGraphic.GetType();
         m_pMirrorVertBox->Enable(bEnable);
         m_pMirrorHorzBox->Enable(bEnable);
@@ -2582,7 +2581,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl)
 
 IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl)
 {
-    sal_Bool bEnable = m_pMirrorHorzBox->IsChecked();
+    bool bEnable = m_pMirrorHorzBox->IsChecked();
 
     m_pBmpWin->MirrorHorz( m_pMirrorVertBox->IsChecked() );
     m_pBmpWin->MirrorVert( bEnable );
@@ -2754,7 +2753,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet )
 
 bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet)
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(rSet, RES_URL);
     SwFmtURL* pFmtURL;
     if(pOldURL)
@@ -2771,20 +2770,20 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet)
         {
             pFmtURL->SetURL( sText, pServerCB->IsChecked() );
             pFmtURL->SetName( pNameED->GetText() );
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
     if(!pClientCB->IsChecked() && pFmtURL->GetMap() != 0)
     {
         pFmtURL->SetMap(0);
-        bModified = sal_True;
+        bModified = true;
     }
 
     if(pFmtURL->GetTargetFrameName() != pFrameCB->GetText())
     {
         pFmtURL->SetTargetFrameName(pFrameCB->GetText());
-        bModified = sal_True;
+        bModified = true;
     }
     rSet.Put(*pFmtURL);
     delete pFmtURL;
@@ -2822,9 +2821,9 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl)
 SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", rSet)
     , pWrtSh(0)
-    , bHtmlMode(sal_False)
-    , bFormat(sal_False)
-    , bNew(sal_False)
+    , bHtmlMode(false)
+    , bFormat(false)
+    , bNew(false)
 {
     get(pNameFrame, "nameframe");
     get(pNameFT,"name_label");
@@ -2952,7 +2951,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
             ::std::vector< OUString > aThisPageFrames;
             ::std::vector< OUString > aNextPageFrames;
             ::std::vector< OUString > aRemainFrames;
-            pWrtSh->GetConnectableFrmFmts(*pFmt, sNextChain, sal_False,
+            pWrtSh->GetConnectableFrmFmts(*pFmt, sNextChain, false,
                             aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
             lcl_InsertVectors(*pPrevLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
             if(!sPrevChain.isEmpty())
@@ -2968,7 +2967,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
             aThisPageFrames.erase(aThisPageFrames.begin(), aThisPageFrames.end());
             aRemainFrames.erase(aRemainFrames.begin(), aRemainFrames.end());
 
-            pWrtSh->GetConnectableFrmFmts(*pFmt, sPrevChain, sal_True,
+            pWrtSh->GetConnectableFrmFmts(*pFmt, sPrevChain, true,
                             aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
             lcl_InsertVectors(*pNextLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
             if(!sNextChain.isEmpty())
@@ -3061,11 +3060,11 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
                 aProt != *pOldItem )
         bRet |= 0 != rSet.Put( aProt);
 
-    sal_Bool bChecked;
-    if ( (bChecked = pEditInReadonlyCB->IsChecked()) != pEditInReadonlyCB->GetSavedValue() )
+    bool bChecked;
+    if ( (bChecked = pEditInReadonlyCB->IsChecked()) != (pEditInReadonlyCB->GetSavedValue() == 1) )
         bRet |= 0 != rSet.Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, bChecked));
 
-    if ( (bChecked = pPrintFrameCB->IsChecked()) != pPrintFrameCB->GetSavedValue() )
+    if ( (bChecked = pPrintFrameCB->IsChecked()) != (pPrintFrameCB->GetSavedValue() == 1) )
         bRet |= 0 != rSet.Put( SvxPrintItem( RES_PRINT, bChecked));
 
     // textflow
@@ -3127,14 +3126,14 @@ const sal_uInt16* SwFrmAddPage::GetRanges()
 
 IMPL_LINK_NOARG(SwFrmAddPage, EditModifyHdl)
 {
-    sal_Bool bEnable = !pNameED->GetText().isEmpty();
+    bool bEnable = !pNameED->GetText().isEmpty();
     pAltNameED->Enable(bEnable);
     pAltNameFT->Enable(bEnable);
 
     return 0;
 }
 
-void SwFrmAddPage::SetFormatUsed(sal_Bool bFmt)
+void SwFrmAddPage::SetFormatUsed(bool bFmt)
 {
     bFormat = bFmt;
     if (bFormat)
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index f5079d749eaf..03d6384c063d 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -57,7 +57,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD
 {
     // create TabPage
     SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), rSet);
-    pNewPage->SetFormatUsed(sal_False, bDrawMode);
+    pNewPage->SetFormatUsed(false, bDrawMode);
     pNewPage->SetShell(pWrtShell);
     SetTabPage(pNewPage);
 }
@@ -149,14 +149,14 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
     }
     else
     {
-        sal_Bool bShowCB = bFormat;
+        bool bShowCB = bFormat;
         if( !bFormat )
         {
             int nSelType = pWrtSh->GetSelectionType();
             if( ( nSelType & nsSelectionType::SEL_GRF ) ||
                 ( nSelType & nsSelectionType::SEL_OLE && GRAPHIC_NONE !=
                             pWrtSh->GetIMapGraphic().GetType() ))
-                bShowCB = sal_True;
+                bShowCB = true;
         }
         if( bShowCB )
         {
@@ -190,7 +190,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
         m_pWrapAnchorOnlyCB->Enable( false );
     }
 
-    sal_Bool bContour = rSurround.IsContour();
+    bool bContour = rSurround.IsContour();
     m_pWrapOutlineCB->Check( bContour );
     m_pWrapOutsideCB->Check( rSurround.IsOutside() );
     m_pWrapThroughRB->Enable(!m_pWrapOutlineCB->IsChecked());
@@ -302,7 +302,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
         aSur.SetSurround(SURROUND_IDEAL);
 
     aSur.SetAnchorOnly( m_pWrapAnchorOnlyCB->IsChecked() );
-    sal_Bool bContour = m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled();
+    bool bContour = m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled();
     aSur.SetContour( bContour );
 
     if ( bContour )
@@ -325,8 +325,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
         }
     }
 
-    sal_Bool bTopMod = m_pTopMarginED->IsValueModified();
-    sal_Bool bBottomMod = m_pBottomMarginED->IsValueModified();
+    bool bTopMod = m_pTopMarginED->IsValueModified();
+    bool bBottomMod = m_pBottomMarginED->IsValueModified();
 
     SvxULSpaceItem aUL( RES_UL_SPACE );
     aUL.SetUpper((sal_uInt16)m_pTopMarginED->Denormalize(m_pTopMarginED->GetValue(FUNIT_TWIP)));
@@ -342,8 +342,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
         }
     }
 
-    sal_Bool bLeftMod = m_pLeftMarginED->IsValueModified();
-    sal_Bool bRightMod = m_pRightMarginED->IsValueModified();
+    bool bLeftMod = m_pLeftMarginED->IsValueModified();
+    bool bRightMod = m_pRightMarginED->IsValueModified();
 
     SvxLRSpaceItem aLR( RES_LR_SPACE );
     aLR.SetLeft((sal_uInt16)m_pLeftMarginED->Denormalize(m_pLeftMarginED->GetValue(FUNIT_TWIP)));
@@ -361,8 +361,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
 
     if ( bDrawMode )
     {
-        sal_Bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled();
-        if (m_pWrapTransparentCB->GetSavedValue() != bChecked)
+        bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled();
+        if ((m_pWrapTransparentCB->GetSavedValue() == 1) != bChecked)
             bModified |= 0 != rSet.Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1));
     }
 
@@ -377,7 +377,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
     // anchor
     const SwFmtAnchor &rAnch = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR);
     nAnchorId = rAnch.GetAnchorId();
-    sal_Bool bEnable = (nAnchorId != FLY_AS_CHAR);
+    bool bEnable = (nAnchorId != FLY_AS_CHAR);
 
     if (!bDrawMode)
     {
@@ -612,7 +612,7 @@ IMPL_LINK( SwWrapTabPage, WrapTypeHdl, RadioButton *, pBtn )
 
 IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl)
 {
-    sal_Bool bEnable = !(m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled());
+    bool bEnable = !(m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled());
 
     m_pWrapOutsideCB->Enable(!bEnable);
 
@@ -643,7 +643,7 @@ void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 void SwWrapTabPage::ApplyImageList()
 {
     m_pWrapThroughRB->SetModeRadioImage(get<FixedImage>("imgthrough")->GetImage());
-    sal_Bool bWrapOutline =  !m_pWrapOutlineCB->IsChecked();
+    bool bWrapOutline =  !m_pWrapOutlineCB->IsChecked();
     if(bWrapOutline)
     {
         m_pNoWrapRB->SetModeRadioImage(get<FixedImage>("imgnone")->GetImage());
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 094ea5f793eb..adb42c3853a7 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -88,7 +88,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
 static void lcl_SetBOOLProp(
                 uno::Reference< beans::XPropertySetInfo > & xInfo,
                 uno::Reference< beans::XPropertySet > & xProps,
-                OUString const & aPropName, sal_Bool bValue )
+                OUString const & aPropName, bool bValue )
 {
     if(xInfo->hasPropertyByName(aPropName))
     {
@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl)
         SwXTextDocument* pDoc = reinterpret_cast<SwXTextDocument*>(xDocTunnel->getSomething(SwXTextDocument::getUnoTunnelId()));
 
         if( pDoc )
-            pDoc->GetDocShell()->_LoadStyles( *rSh.GetView().GetDocShell(), sal_True );
+            pDoc->GetDocShell()->_LoadStyles( *rSh.GetView().GetDocShell(), true );
 
          uno::Reference< lang::XMultiServiceFactory >  xFact(
                                              xModel, uno::UNO_QUERY);
@@ -167,10 +167,10 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
                         pxIndexSectionsArr[nTOXIndex]->xContainerSection.is(),
                             "Section not created");
          uno::Reference< frame::XModel > & xModel = pExampleFrame->GetModel();
-        sal_Bool bInitialCreate = sal_True;
+        bool bInitialCreate = true;
         if(!pxIndexSectionsArr[nTOXIndex]->xDocumentIndex.is())
         {
-            bInitialCreate = sal_True;
+            bInitialCreate = true;
             if(!pxIndexSectionsArr[nTOXIndex]->xContainerSection.is())
                 throw uno::RuntimeException();
             uno::Reference< text::XTextRange >  xAnchor = pxIndexSectionsArr[nTOXIndex]->xContainerSection->getAnchor();
@@ -214,7 +214,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
             sal_uInt16  nContentOptions = rDesc.GetContentOptions();
             if(xInfo->hasPropertyByName(UNO_NAME_LEVEL_PARAGRAPH_STYLES))
             {
-                sal_Bool bOn = 0!=(nContentOptions&nsSwTOXElement::TOX_TEMPLATE    );
+                bool bOn = 0!=(nContentOptions&nsSwTOXElement::TOX_TEMPLATE    );
                 uno::Any aStyleNames(xIdxProps->getPropertyValue(UNO_NAME_LEVEL_PARAGRAPH_STYLES));
                 uno::Reference< container::XIndexReplace >  xAcc;
                 aStyleNames >>= xAcc;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 31bcf3707c0e..9934fb5f01c5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -126,12 +126,12 @@ struct AutoMarkEntry
     OUString sPrimKey;
     OUString sSecKey;
     OUString sComment;
-    sal_Bool    bCase;
-    sal_Bool    bWord;
+    bool     bCase;
+    bool     bWord;
 
     AutoMarkEntry() :
-        bCase(sal_False),
-        bWord(sal_False){}
+        bCase(false),
+        bWord(false){}
 };
 typedef boost::ptr_vector<AutoMarkEntry> AutoMarkEntryArr;
 
@@ -213,7 +213,7 @@ sal_uInt16 CurTOXType::GetFlatIndex() const
 SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet,
                     SwWrtShell &rShell,
                     SwTOXBase* pCurTOX,
-                    sal_uInt16 nToxType, sal_Bool bGlobal)
+                    sal_uInt16 nToxType, bool bGlobal)
     : SfxTabDialog(pParent, "TocDialog",
         "modules/swriter/ui/tocdialog.ui", &rSet)
     , pMgr( new SwTOXMgr( &rShell ) )
@@ -245,7 +245,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
     //all user user indexes follow after position TOX_AUTHORITIES
     if(pCurTOX)
     {
-        bEditTOX = sal_True;
+        bEditTOX = true;
     }
     for(int i = nTypeCount - 1; i > -1; i--)
     {
@@ -468,7 +468,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
     {
         if(!pExampleFrame && !bExampleCreated)
         {
-            bExampleCreated = sal_True;
+            bExampleCreated = true;
             OUString sTemplate("internal/idxexample.odt");
 
             SvtPathOptions aOpt;
@@ -496,7 +496,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
             m_pShowExampleCB->Show(pExampleFrame && pExampleFrame->IsServiceAvailable());
         }
     }
-    sal_Bool bSetViewWindow = m_pShowExampleCB->IsChecked()
+    bool bSetViewWindow = m_pShowExampleCB->IsChecked()
         && pExampleFrame && pExampleFrame->IsServiceAvailable();
 
     m_pExampleContainerWIN->Show( bSetViewWindow );
@@ -507,19 +507,19 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
     return 0;
 }
 
-sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const OUString& rName)
+bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const OUString& rName)
 {
     SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
     if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle())
-        return sal_True;
+        return true;
 
     const sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(
         rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
     if(nId != USHRT_MAX &&
         ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle())
-        return sal_True;
+        return true;
 
-    return sal_False;
+    return false;
 }
 
 class SwIndexTreeLB : public SvSimpleTable
@@ -559,7 +559,7 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
 {
     SvTreeListEntry* pEntry = FirstSelected();
     KeyCode aCode = rKEvt.GetKeyCode();
-    sal_Bool bChanged = sal_False;
+    bool bChanged = false;
     if(pEntry)
     {
         sal_IntPtr nLevel = (sal_IntPtr)pEntry->GetUserData();
@@ -569,7 +569,7 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
                 nLevel++;
             else if(nLevel == USHRT_MAX)
                 nLevel = 0;
-            bChanged = sal_True;
+            bChanged = true;
         }
         else if(aCode.GetCode() == KEY_SUBTRACT)
         {
@@ -577,7 +577,7 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
                 nLevel = USHRT_MAX;
             else if(nLevel != USHRT_MAX)
                 nLevel--;
-            bChanged = sal_True;
+            bChanged = true;
         }
         if(bChanged)
         {
@@ -740,7 +740,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl)
 
 IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn)
 {
-    sal_Bool bLeft = pBtn == m_pLeftPB;
+    bool bLeft = pBtn == m_pLeftPB;
     SvTreeListEntry* pEntry = m_pHeaderTree->FirstSelected();
     if(pEntry)
     {
@@ -987,12 +987,12 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
     sal_uInt16 nCreateType = rDesc.GetContentOptions();
 
     //user + content
-    sal_Bool bHasStyleNames = sal_False;
+    bool bHasStyleNames = false;
 
     for( sal_uInt16 i = 0; i < MAXLEVEL; i++)
         if(!rDesc.GetStyleNames(i).isEmpty())
         {
-            bHasStyleNames = sal_True;
+            bHasStyleNames = true;
             break;
         }
     m_pAddStylesCB->Check(bHasStyleNames && (nCreateType & nsSwTOXElement::TOX_TEMPLATE));
@@ -1360,7 +1360,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl,  CheckBox*, pBox )
 
 IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl)
 {
-    sal_Bool bEnable = m_pFromCaptionsRB->IsChecked();
+    bool bEnable = m_pFromCaptionsRB->IsChecked();
     m_pCaptionSequenceFT->Enable(bEnable);
     m_pCaptionSequenceLB->Enable(bEnable);
     m_pDisplayTypeFT->Enable(bEnable);
@@ -1646,7 +1646,7 @@ void SwTOXButton::KeyInput( const KeyEvent& rKEvt )
     }
     else if(aCode.GetCode() == KEY_DELETE)
     {
-        m_pParent->RemoveControl(this, sal_True);
+        m_pParent->RemoveControl(this, true);
         //this is invalid here
         return;
     }
@@ -1832,7 +1832,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
     m_pCommaSeparatedCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl));
     m_pRelToStyleCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl));
 
-    FieldUnit aMetric = ::GetDfltMetric(sal_False);
+    FieldUnit aMetric = ::GetDfltMetric(false);
     SetMetric(*m_pTabPosMF, aMetric);
 
     m_pSortDocPosRB->Check();
@@ -1933,10 +1933,10 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
     m_pCurrentForm = pTOXDlg->GetForm(aCurType);
     if( !( aLastTOXType == aCurType ))
     {
-        sal_Bool bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType;
-        sal_Bool bToxIsIndex =       TOX_INDEX == aCurType.eType;
-        sal_Bool bToxIsContent =     TOX_CONTENT == aCurType.eType;
-        sal_Bool bToxIsSequence =    TOX_ILLUSTRATIONS == aCurType.eType;
+        bool bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType;
+        bool bToxIsIndex =       TOX_INDEX == aCurType.eType;
+        bool bToxIsContent =     TOX_CONTENT == aCurType.eType;
+        bool bToxIsSequence =    TOX_ILLUSTRATIONS == aCurType.eType;
 
         m_pLevelLB->Clear();
         for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++)
@@ -2336,7 +2336,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
         m_pNumberFormatLB->SelectEntryPos(nFormat);
     }
 
-    sal_Bool bTabStop = TOKEN_TAB_STOP == pToken->eTokenType;
+    bool bTabStop = TOKEN_TAB_STOP == pToken->eTokenType;
     m_pFillCharFT->Show(bTabStop);
     m_pFillCharCB->Show(bTabStop);
     m_pTabPosFT->Show(bTabStop);
@@ -2356,8 +2356,8 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
         m_pTabPosMF->Enable(false);
     }
 
-    sal_Bool bIsChapterInfo = pToken->eTokenType == TOKEN_CHAPTER_INFO;
-    sal_Bool bIsEntryNumber = pToken->eTokenType == TOKEN_ENTRY_NO;
+    bool bIsChapterInfo = pToken->eTokenType == TOKEN_CHAPTER_INFO;
+    bool bIsEntryNumber = pToken->eTokenType == TOKEN_ENTRY_NO;
     m_pChapterEntryFT->Show( bIsChapterInfo );
     m_pChapterEntryLB->Show( bIsChapterInfo );
     m_pEntryOutlineLevelFT->Show( bIsChapterInfo || bIsEntryNumber );
@@ -2519,7 +2519,7 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox)
             "no style::TabStop selected!");
 
     const SwFormToken& rToken = ((SwTOXButton*)pCurCtrl)->GetFormToken();
-    sal_Bool bChecked = pBox->IsChecked();
+    bool bChecked = pBox->IsChecked();
     if(rToken.eTokenType == TOKEN_TAB_STOP)
         ((SwTOXButton*)pCurCtrl)->SetTabAlign(
             bChecked ? SVX_TAB_ADJUST_END : SVX_TAB_ADJUST_LEFT);
@@ -3024,7 +3024,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
     AdjustPositions();
 }
 
-void SwTokenWindow::RemoveControl(SwTOXButton* pDel, sal_Bool bInternalCall )
+void SwTokenWindow::RemoveControl(SwTOXButton* pDel, bool bInternalCall )
 {
     if(bInternalCall && TOX_AUTHORITIES == pForm->GetTOXType())
         m_pParent->PreTokenButtonRemoved(pDel->GetFormToken());
@@ -3265,7 +3265,7 @@ OUString SwTokenWindow::GetPattern() const
 }
 
 // Check if a control of the specified TokenType is already contained in the list
-sal_Bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
+bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
 {
     bool bRet = false;
 
@@ -3287,14 +3287,14 @@ sal_Bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
     return bRet;
 }
 
-sal_Bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
+bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
             const SwFormToken& rToken,
             const HelpEvent& rHEvt)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
-        sal_Bool bBalloon = Help::IsBalloonHelpEnabled();
+        bool bBalloon = Help::IsBalloonHelpEnabled();
         OUString sEntry;
         if(bBalloon || rToken.eTokenType != TOKEN_AUTHORITY)
             sEntry = (aButtonHelpTexts[rToken.eTokenType]);
@@ -3321,7 +3321,7 @@ sal_Bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
         else
             Help::ShowQuickHelp( this, aItemRect, sEntry,
                 QUICKHELP_LEFT|QUICKHELP_VCENTER );
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
@@ -3857,7 +3857,7 @@ bool SwEntryBrowseBox::SaveModified()
     const sal_uInt16 nCol = GetCurColumnId();
 
     OUString sNew;
-    sal_Bool bVal = sal_False;
+    bool bVal = false;
     ::svt::CellController* pController = 0;
     if(nCol < ITEM_CASE)
     {
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 6cc70867a795..1a837d001822 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -79,17 +79,17 @@ using namespace ::com::sun::star;
 /*--------------------------------------------------------------------
      Description:   dialog to insert a directory selection
  --------------------------------------------------------------------*/
-SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, sal_Bool bNewDlg,
+SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg,
     SwWrtShell& rWrtShell)
     : m_rDialog(rDialog)
     , bDel(false)
     , bNewMark(bNewDlg)
-    , bSelected(sal_False)
-    , bPhoneticED0_ChangedByUser(sal_False)
-    , bPhoneticED1_ChangedByUser(sal_False)
-    , bPhoneticED2_ChangedByUser(sal_False)
+    , bSelected(false)
+    , bPhoneticED0_ChangedByUser(false)
+    , bPhoneticED1_ChangedByUser(false)
+    , bPhoneticED2_ChangedByUser(false)
     , nLangForPhoneticReading(LANGUAGE_CHINESE_SIMPLIFIED)
-    , bIsPhoneticReadingEnabled(sal_False)
+    , bIsPhoneticReadingEnabled(false)
     , xExtendedIndexEntrySupplier(NULL)
     , pTOXMgr(0)
     , pSh(&rWrtShell)
@@ -271,7 +271,7 @@ void SwIndexMarkPane::InitControls()
 
             //to include all equal entries may only be allowed in the body and even there
             //only when a simple selection exists
-            const sal_uInt16 nFrmType = pSh->GetFrmType(0,sal_True);
+            const sal_uInt16 nFrmType = pSh->GetFrmType(0,true);
             m_pApplyToAllCB->Show();
             m_pSearchCaseSensitiveCB->Show();
             m_pSearchCaseWordOnlyCB->Show();
@@ -295,10 +295,10 @@ void    SwIndexMarkPane::UpdateLanguageDependenciesForPhoneticReading()
     //no phonetic reading if no global cjk support
     if( !xExtendedIndexEntrySupplier.is() )
     {
-        bIsPhoneticReadingEnabled = sal_False;
+        bIsPhoneticReadingEnabled = false;
         return;
     }
-    bIsPhoneticReadingEnabled = sal_True;
+    bIsPhoneticReadingEnabled = true;
 
     //get the current language
     if(!bNewMark) //if dialog is opened to iterate existing marks
@@ -361,7 +361,7 @@ void    SwIndexMarkPane::Activate()
 
             //to include all equal entries may only be allowed in the body and even there
             //only when a simple selection exists
-            const sal_uInt16 nFrmType = pSh->GetFrmType(0,sal_True);
+            const sal_uInt16 nFrmType = pSh->GetFrmType(0,true);
             m_pApplyToAllCB->Show();
             m_pSearchCaseSensitiveCB->Show();
             m_pSearchCaseWordOnlyCB->Show();
@@ -380,7 +380,7 @@ void SwIndexMarkPane::Apply()
 {
     InsertUpdate();
     if(bSelected)
-        pSh->ResetSelect(0, sal_False);
+        pSh->ResetSelect(0, false);
 }
 
 /*--------------------------------------------------------------------
@@ -425,7 +425,7 @@ void SwIndexMarkPane::InsertUpdate()
 /*--------------------------------------------------------------------
      Description:   insert mark
  --------------------------------------------------------------------*/
-static void lcl_SelectSameStrings(SwWrtShell& rSh, sal_Bool bWordOnly, sal_Bool bCaseSensitive)
+static void lcl_SelectSameStrings(SwWrtShell& rSh, bool bWordOnly, bool bCaseSensitive)
 {
     rSh.Push();
 
@@ -440,12 +440,12 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, sal_Bool bWordOnly, sal_Bool
                             : static_cast<int>(TransliterationModules_IGNORE_CASE)) );
 
     rSh.ClearMark();
-    sal_Bool bCancel;
+    bool bCancel;
 
     //todo/mba: assuming that notes should not be searched
-    sal_Bool bSearchInNotes = sal_False;
+    bool bSearchInNotes = false;
     rSh.Find( aSearchOpt,  bSearchInNotes, DOCPOS_START, DOCPOS_END, bCancel,
-                        (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), sal_False );
+                        (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), false );
 }
 
 void SwIndexMarkPane::InsertMark()
@@ -478,9 +478,9 @@ void SwIndexMarkPane::InsertMark()
     }
     if (aOrgStr != m_pEntryED->GetText())
         aDesc.SetAltStr(m_pEntryED->GetText());
-    sal_Bool bApplyAll = m_pApplyToAllCB->IsChecked();
-    sal_Bool bWordOnly = m_pSearchCaseWordOnlyCB->IsChecked();
-    sal_Bool bCaseSensitive = m_pSearchCaseSensitiveCB->IsChecked();
+    bool bApplyAll = m_pApplyToAllCB->IsChecked();
+    bool bWordOnly = m_pSearchCaseWordOnlyCB->IsChecked();
+    bool bCaseSensitive = m_pSearchCaseSensitiveCB->IsChecked();
 
     pSh->StartAllAction();
     // all equal strings have to be selected here so that the
@@ -493,7 +493,7 @@ void SwIndexMarkPane::InsertMark()
     SwTOXMgr aMgr(pSh);
     aMgr.InsertTOXMark(aDesc);
     if(bApplyAll)
-        pSh->Pop(sal_False);
+        pSh->Pop(false);
 
     pSh->EndAllAction();
 }
@@ -612,7 +612,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl)
 
 IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, CheckBox*, pBox)
 {
-    sal_Bool bEnable = pBox->IsChecked() && pBox->IsEnabled();
+    bool bEnable = pBox->IsChecked() && pBox->IsEnabled();
     m_pSearchCaseWordOnlyCB->Enable(bEnable);
     m_pSearchCaseSensitiveCB->Enable(bEnable);
     return 0;
@@ -651,37 +651,37 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
     {
         // set index type
         sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry());
-        sal_Bool bLevelEnable = sal_False,
-             bKeyEnable   = sal_False,
-             bSetKey2     = sal_False,
-             bKey2Enable  = sal_False,
-            bEntryHasText   = sal_False,
-            bKey1HasText    = sal_False,
-            bKey2HasText    = sal_False;
+        bool bLevelEnable = false,
+             bKeyEnable   = false,
+             bSetKey2     = false,
+             bKey2Enable  = false,
+             bEntryHasText   = false,
+             bKey1HasText    = false,
+             bKey2HasText    = false;
         if(nPos == POS_INDEX)
         {
             if(!m_pEntryED->GetText().isEmpty())
-                bEntryHasText = sal_True;
+                bEntryHasText = true;
             m_pPhoneticED0->SetText(GetDefaultPhoneticReading(m_pEntryED->GetText()));
 
-            bKeyEnable = sal_True;
+            bKeyEnable = true;
             m_pKey1DCB->SetText(m_pKey1DCB->GetEntry(nKey1Pos));
             m_pPhoneticED1->SetText(GetDefaultPhoneticReading(m_pKey1DCB->GetText()));
             if(!m_pKey1DCB->GetText().isEmpty())
             {
-                bKey1HasText = bSetKey2 = bKey2Enable = sal_True;
+                bKey1HasText = bSetKey2 = bKey2Enable = true;
                 m_pKey2DCB->SetText(m_pKey2DCB->GetEntry(nKey2Pos));
                 m_pPhoneticED2->SetText(GetDefaultPhoneticReading(m_pKey2DCB->GetText()));
                 if(!m_pKey2DCB->GetText().isEmpty())
-                    bKey2HasText = sal_True;
+                    bKey2HasText = true;
             }
         }
         else
         {
-            bLevelEnable = sal_True;
+            bLevelEnable = true;
             m_pLevelNF->SetMax(MAXLEVEL);
             m_pLevelNF->SetValue(m_pLevelNF->Normalize(0));
-            bSetKey2 = sal_True;
+            bSetKey2 = true;
         }
         m_pLevelFT->Show(bLevelEnable);
         m_pLevelNF->Show(bLevelEnable);
@@ -707,7 +707,7 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
         if(!bHasText)
         {
             m_pPhoneticED0->SetText(OUString());
-            bPhoneticED0_ChangedByUser = sal_False;
+            bPhoneticED0_ChangedByUser = false;
         }
         else if(!bPhoneticED0_ChangedByUser)
             m_pPhoneticED0->SetText(GetDefaultPhoneticReading(m_pEntryED->GetText()));
@@ -716,7 +716,7 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
         m_pPhoneticED0->Enable(bHasText&&bIsPhoneticReadingEnabled);
     }
     m_pOKBT->Enable(!pSh->HasReadonlySel() &&
-        (!m_pEntryED->GetText().isEmpty() || pSh->GetCrsrCnt(sal_False)));
+        (!m_pEntryED->GetText().isEmpty() || pSh->GetCrsrCnt(false)));
     return 0;
 }
 
@@ -732,7 +732,7 @@ IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, NextHdl)
 IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, NextSameHdl)
 {
     InsertUpdate();
-    pTOXMgr->NextTOXMark(sal_True);
+    pTOXMgr->NextTOXMark(true);
     UpdateDialog();
     return 0;
 }
@@ -750,7 +750,7 @@ IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, PrevHdl)
 IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevSameHdl)
 {
     InsertUpdate();
-    pTOXMgr->PrevTOXMark(sal_True);
+    pTOXMgr->PrevTOXMark(true);
     UpdateDialog();
 
     return 0;
@@ -759,9 +759,9 @@ IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, PrevSameHdl)
 
 IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl)
 {
-    bDel = sal_True;
+    bDel = true;
     InsertUpdate();
-    bDel = sal_False;
+    bDel = false;
 
     if(pTOXMgr->GetCurTOXMark())
         UpdateDialog();
@@ -790,18 +790,18 @@ void SwIndexMarkPane::UpdateDialog()
     m_pEntryED->SetText(aOrgStr);
 
     // set index type
-    sal_Bool bLevelEnable = sal_True,
-         bKeyEnable   = sal_False,
-         bKey2Enable  = sal_False,
-         bEntryHasText  = sal_False,
-         bKey1HasText   = sal_False,
-         bKey2HasText   = sal_False;
+    bool bLevelEnable = true,
+         bKeyEnable   = false,
+         bKey2Enable  = false,
+         bEntryHasText  = false,
+         bKey1HasText   = false,
+         bKey2HasText   = false;
 
     TOXTypes eCurType = pMark->GetTOXType()->GetType();
     if(TOX_INDEX == eCurType)
     {
-        bLevelEnable = sal_False;
-        bKeyEnable = sal_True;
+        bLevelEnable = false;
+        bKeyEnable = true;
         bKey1HasText = bKey2Enable = !pMark->GetPrimaryKey().isEmpty();
         bKey2HasText = !pMark->GetSecondaryKey().isEmpty();
         bEntryHasText = !pMark->GetText().isEmpty();
@@ -862,7 +862,7 @@ void SwIndexMarkPane::UpdateDialog()
         m_pNextSameBT->Enable( pMoveMark != pMark );
     }
 
-    sal_Bool bEnable = !pSh->HasReadonlySel();
+    bool bEnable = !pSh->HasReadonlySel();
     m_pOKBT->Enable( bEnable );
     m_pDelBT->Enable( bEnable );
     m_pEntryED->SetReadOnly( !bEnable );
@@ -904,21 +904,21 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
 {
     if (m_pKey1DCB == pBox)
     {
-        sal_Bool bEnable = !pBox->GetText().isEmpty();
+        bool bEnable = !pBox->GetText().isEmpty();
         if(!bEnable)
         {
             m_pKey2DCB->SetText(OUString());
             m_pPhoneticED1->SetText(OUString());
             m_pPhoneticED2->SetText(OUString());
-            bPhoneticED1_ChangedByUser = sal_False;
-            bPhoneticED2_ChangedByUser = sal_False;
+            bPhoneticED1_ChangedByUser = false;
+            bPhoneticED2_ChangedByUser = false;
         }
         else
         {
             if(pBox->IsInDropDown())
             {
                 //reset bPhoneticED1_ChangedByUser if a completely new string is selected
-                bPhoneticED1_ChangedByUser = sal_False;
+                bPhoneticED1_ChangedByUser = false;
             }
             if(!bPhoneticED1_ChangedByUser)
                 m_pPhoneticED1->SetText(GetDefaultPhoneticReading(pBox->GetText()));
@@ -931,14 +931,14 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
         if(pBox->GetText().isEmpty())
         {
             m_pPhoneticED2->SetText(OUString());
-            bPhoneticED2_ChangedByUser = sal_False;
+            bPhoneticED2_ChangedByUser = false;
         }
         else
         {
             if(pBox->IsInDropDown())
             {
                 //reset bPhoneticED1_ChangedByUser if a completely new string is selected
-                bPhoneticED2_ChangedByUser = sal_False;
+                bPhoneticED2_ChangedByUser = false;
             }
             if(!bPhoneticED2_ChangedByUser)
                 m_pPhoneticED2->SetText(GetDefaultPhoneticReading(pBox->GetText()));
@@ -983,7 +983,7 @@ void    SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark
 
 SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings,
     SfxChildWindow* pChild, Window *pParent,
-    SfxChildWinInfo* pInfo, sal_Bool bNew)
+    SfxChildWinInfo* pInfo, bool bNew)
     : SfxModelessDialog(_pBindings, pChild, pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui")
     , m_aContent(*this, bNew, *::GetActiveWrtShell())
 {
@@ -1004,7 +1004,7 @@ void SwIndexMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell)
 
 SwIndexMarkModalDlg::SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark)
     : SvxStandardDialog(pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui")
-    , m_aContent(*this, sal_False, rSh)
+    , m_aContent(*this, false, rSh)
 {
     m_aContent.ReInitDlg(rSh, pCurTOXMark);
 }
@@ -1027,8 +1027,8 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog
 
     SwWrtShell&     rWrtSh;
 
-    sal_Bool            m_bNewEntryMode;
-    sal_Bool            m_bNameAllowed;
+    bool            m_bNewEntryMode;
+    bool            m_bNameAllowed;
 
     DECL_LINK(IdentifierHdl, ComboBox*);
     DECL_LINK(ShortNameHdl, Edit*);
@@ -1038,7 +1038,7 @@ public:
     SwCreateAuthEntryDlg_Impl(Window* pParent,
                             const OUString pFields[],
                             SwWrtShell& rSh,
-                            sal_Bool bNewEntry,
+                            bool bNewEntry,
                             bool bCreate);
     virtual ~SwCreateAuthEntryDlg_Impl();
 
@@ -1089,12 +1089,12 @@ static const TextInfo aTextInfoArr[] =
     {AUTH_FIELD_CUSTOM5,         HID_AUTH_FIELD_CUSTOM5         }
 };
 
-sal_Bool SwAuthorMarkPane::bIsFromComponent = sal_True;
+bool SwAuthorMarkPane::bIsFromComponent = true;
 
-SwAuthorMarkPane::SwAuthorMarkPane(Dialog &rDialog, sal_Bool bNewDlg)
+SwAuthorMarkPane::SwAuthorMarkPane(Dialog &rDialog, bool bNewDlg)
     : m_rDialog(rDialog)
     , bNewEntry(bNewDlg)
-    , bBibAccessInitialized(sal_False)
+    , bBibAccessInitialized(false)
     , pSh(0)
 {
     m_rDialog.get(m_pFromComponentRB, "frombibliography");
@@ -1315,7 +1315,7 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton)
 
 IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
 {
-    sal_Bool bFromComp = (pButton == m_pFromComponentRB);
+    bool bFromComp = (pButton == m_pFromComponentRB);
     bIsFromComponent = bFromComp;
     m_pCreateEntryPB->Enable(!bIsFromComponent);
     m_pEntryLB->Clear();
@@ -1344,7 +1344,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
                     }
                 }
             }
-            bBibAccessInitialized = sal_True;
+            bBibAccessInitialized = true;
         }
         if(xBibAccess.is())
         {
@@ -1392,7 +1392,7 @@ IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit*, pEdit)
 IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
 {
     OUString sEntry = pEdit->GetText();
-    sal_Bool bAllowed = sal_False;
+    bool bAllowed = false;
     if(!sEntry.isEmpty())
     {
         if(m_pEntryLB->GetEntryPos(sEntry) != LISTBOX_ENTRY_NOTFOUND)
@@ -1408,7 +1408,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
             bAllowed = !xBibAccess.is() || !xBibAccess->hasByName(sEntry);
         }
     }
-    return bAllowed;
+    return bAllowed ? 1 : 0;
 }
 
 void SwAuthorMarkPane::InitControls()
@@ -1449,7 +1449,7 @@ void SwAuthorMarkPane::Activate()
 SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
         const OUString pFields[],
         SwWrtShell& rSh,
-        sal_Bool bNewEntry,
+        bool bNewEntry,
         bool bCreate)
     : ModalDialog(pParent, "CreateAuthorEntryDialog", "modules/swriter/ui/createauthorentry.ui")
 
@@ -1459,7 +1459,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
     pIdentifierBox(0),
     rWrtSh(rSh),
     m_bNewEntryMode(bNewEntry),
-    m_bNameAllowed(sal_True)
+    m_bNameAllowed(true)
 {
     get(m_pOKBT, "ok");
 
@@ -1619,7 +1619,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit*, pEdit)
 {
     if(aShortNameCheckLink.IsSet())
     {
-        sal_Bool bEnable = 0 != aShortNameCheckLink.Call(pEdit);
+        bool bEnable = 0 != aShortNameCheckLink.Call(pEdit);
         m_bNameAllowed |= bEnable;
         m_pOKBT->Enable(pTypeListBox->GetSelectEntryCount() && bEnable);
     }
@@ -1635,8 +1635,8 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox*, pBox)
 SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings,
                                    SfxChildWindow* pChild,
                                    Window *pParent,
-                                SfxChildWinInfo* pInfo,
-                                   sal_Bool bNew)
+                                   SfxChildWinInfo* pInfo,
+                                   bool bNew)
     : SfxModelessDialog(_pBindings, pChild, pParent,
         "BibliographyEntryDialog", "modules/swriter/ui/bibliographyentry.ui")
     , m_aContent(*this, bNew)
@@ -1661,7 +1661,7 @@ void SwAuthMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell)
 SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh)
     : SvxStandardDialog(pParent, "BibliographyEntryDialog",
         "modules/swriter/ui/bibliographyentry.ui")
-    , m_aContent(*this, sal_False)
+    , m_aContent(*this, false)
 {
     m_aContent.ReInitDlg(rSh);
 }
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index e612bd2247e4..8405492215f5 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -34,7 +34,7 @@ const OUString BookmarkCombo::aForbiddenChars("/\\@:*?\";,.#");
 
 IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
 {
-    sal_Bool bSelEntries = pBox->GetSelectEntryCount() != 0;
+    bool bSelEntries = pBox->GetSelectEntryCount() != 0;
     // if a string has been pasted from the clipboard then
     // there may be illegal characters in the box
     if(!bSelEntries)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 76ee933e26e2..04d223afa9c2 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -298,10 +298,10 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl)
 
 IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl)
 {
-    sal_Bool bEnable = sal_True;
+    bool bEnable = true;
     if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectEntryPos() )
     {
-        bEnable = sal_False;
+        bEnable = false;
         m_pOffsetFld->SetValue(1);
     }
     m_pOffsetLbl->Enable(bEnable);
@@ -380,7 +380,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
 
     // page template
     pInf->ChgPageDesc( pSh->FindPageDescByName(
-                                m_pPageTemplBox->GetSelectEntry(), sal_True ) );
+                                m_pPageTemplBox->GetSelectEntry(), true ) );
 
     if ( bEndNote )
     {
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index c7e16f9cedcf..8a6762f8c675 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -315,14 +315,14 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl)
 IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
 {
     OUString sEntry(m_pNameED->GetText());
-    sal_Bool bEnableNew = sal_True;
-    sal_Bool bEnableDel = sal_False;
+    bool bEnableNew = true;
+    bool bEnableDel = false;
     sal_uLong nCaseReadonly =
             (sal_uLong)m_pPathLB->GetEntryData(m_pPathLB->GetSelectEntryPos());
     bool bDirReadonly = 0 != (nCaseReadonly&PATH_READONLY);
 
     if(sEntry.isEmpty() || bDirReadonly)
-        bEnableNew = sal_False;
+        bEnableNew = false;
     else if(!sEntry.isEmpty())
     {
         sal_uLong nPos = m_pGroupTLB->GetEntryPos(sEntry, 0);
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
         }
         if( 0xffffffff > nPos)
         {
-            bEnableNew = sal_False;
+            bEnableNew = false;
             m_pGroupTLB->Select(m_pGroupTLB->GetEntry( nPos ));
             m_pGroupTLB->MakeVisible(m_pGroupTLB->GetEntry( nPos ));
         }
@@ -364,9 +364,9 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
     return 0;
 }
 
-sal_Bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
+bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
 {
-    sal_Bool bDel = (!pGlosHdl->IsReadOnly(&rGroup));
+    bool bDel = (!pGlosHdl->IsReadOnly(&rGroup));
 
     // OM: if the name is among the new region name, it is deletable
     // as well! Because for non existing region names ReadOnly issues
@@ -377,7 +377,7 @@ sal_Bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
     {
         if (*it == rGroup)
         {
-            bDel = sal_True;
+            bDel = true;
             break;
         }
     }
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index cec5ce2baea6..c45df95a09c4 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -301,7 +301,7 @@ void SwGlossaryDlg::Apply()
     }
 }
 
-void SwGlossaryDlg::EnableShortName(sal_Bool bOn)
+void SwGlossaryDlg::EnableShortName(bool bOn)
 {
     m_pShortNameLbl->Enable(bOn);
     m_pShortNameEdit->Enable(bOn);
@@ -435,7 +435,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
             m_pShortNameEdit->GrabFocus();
             return 1;
         }
-        if(pGlossaryHdl->NewGlossary(aStr, aShortName, sal_False, bNoAttr ))
+        if(pGlossaryHdl->NewGlossary(aStr, aShortName, false, bNoAttr ))
         {
             SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected();
             if(m_pCategoryBox->GetParent(pEntry))
@@ -698,7 +698,7 @@ void SwGlossaryDlg::Init()
 
         // fill entries for the groups
         {
-            pGlossaryHdl->SetCurGroup(sGroupName, sal_False, sal_True);
+            pGlossaryHdl->SetCurGroup(sGroupName, false, true);
             const sal_uInt16 nCount = pGlossaryHdl->GetGlossaryCnt();
             for(sal_uInt16 i = 0; i < nCount; ++i)
             {
@@ -761,7 +761,7 @@ IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
     if (m_pEditBtn->GetCurItemIdent() == "edit")
     {
         SwTextBlocks *pGroup = ::GetGlossaries()->GetGroupDoc (  GetCurrGrpName () );
-        sal_Bool bRet = pGlossaryHdl->ConvertToNew ( *pGroup );
+        bool bRet = pGlossaryHdl->ConvertToNew ( *pGroup );
         delete pGroup;
         if ( bRet )
             EndDialog(RET_EDIT);
@@ -781,7 +781,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
     if (pBox == m_pNewName)
         m_pNewShort->SetText( lcl_GetValidShortCut( aName ) );
 
-    sal_Bool bEnable = !aName.isEmpty() && !m_pNewShort->GetText().isEmpty() &&
+    bool bEnable = !aName.isEmpty() && !m_pNewShort->GetText().isEmpty() &&
         (!pDlg->DoesBlockExist(aName, m_pNewShort->GetText())
             || aName == m_pOldName->GetText());
     m_pOk->Enable(bEnable);
@@ -969,7 +969,7 @@ TriState SwGlTreeListBox::NotifyCopyingOrMoving(
     SvTreeListEntry* pSrcParent = GetParent(pEntry);
     SvTreeListEntry* pDestParent =
         GetParent(pTarget) ? GetParent(pTarget) : pTarget;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(pDestParent != pSrcParent)
     {
         SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
@@ -1033,7 +1033,7 @@ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn )
             if(sTmp != sGlosPath)
             {
                 aPathOpt.SetAutoTextPath( sTmp );
-                ::GetGlossaries()->UpdateGlosPath( sal_True );
+                ::GetGlossaries()->UpdateGlosPath( true );
                 Init();
             }
         }
@@ -1072,7 +1072,7 @@ void SwGlossaryDlg::ShowAutoText(const OUString& rGroup, const OUString& rShortN
     {
         SetResumeData(rGroup, rShortName);
         //try to make an Undo()
-        pExampleFrame->ClearDocument( sal_True );
+        pExampleFrame->ClearDocument( true );
     }
 }
 
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 308512077dab..de9b9bfc45fa 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -40,7 +40,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
-static sal_Bool bFootnote = sal_True;
+static bool bFootnote = true;
 
 /*------------------------------------------------------------------------
  Description:   inserting a footnote with OK
@@ -56,14 +56,14 @@ void SwInsFootNoteDlg::Apply()
     if ( bEdit )
     {
         rSh.StartAction();
-        rSh.Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+        rSh.Left(CRSR_SKIP_CHARS, false, 1, false );
         rSh.StartUndo( UNDO_START );
         SwFmtFtn aNote( m_pEndNoteBtn->IsChecked() );
         aNote.SetNumStr( aStr );
 
         if( rSh.SetCurFtn( aNote ) && bExtCharAvailable )
         {
-            rSh.Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+            rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
             SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
             rSh.GetCurAttr( aSet );
             SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
@@ -72,8 +72,8 @@ void SwInsFootNoteDlg::Apply()
                                eCharSet, RES_CHRATR_FONT );
             aSet.Put( aFont );
             rSh.SetAttrSet( aSet, nsSetAttrMode::SETATTR_DONTEXPAND );
-            rSh.ResetSelect(0, sal_False);
-            rSh.Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+            rSh.ResetSelect(0, false);
+            rSh.Left(CRSR_SKIP_CHARS, false, 1, false );
         }
         rSh.EndUndo( UNDO_END );
         rSh.EndAction();
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl)
                 m_pNumberCharEdit->SetFont( aFont  );
             }
 
-            bExtCharAvailable = sal_True;
+            bExtCharAvailable = true;
             m_pOkBtn->Enable(!m_pNumberCharEdit->GetText().isEmpty());
         }
     }
@@ -156,7 +156,7 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
     Apply();
 
     // go to the next foot/endnote here
-    rSh.ResetSelect(0, sal_False);
+    rSh.ResetSelect(0, false);
     if (pBtn == m_pNextBT)
         rSh.GotoNextFtnAnchor();
     else
@@ -167,10 +167,10 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
     return 0;
 }
 
-SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, sal_Bool bEd) :
+SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, bool bEd) :
     SvxStandardDialog(pParent, "InsertFootnoteDialog", "modules/swriter/ui/insertfootnote.ui"),
     rSh(rShell),
-    bExtCharAvailable(sal_False),
+    bExtCharAvailable(false),
     bEdit(bEd)
 {
     get(m_pNumberFrame, "numberingframe");
@@ -210,7 +210,7 @@ SwInsFootNoteDlg::~SwInsFootNoteDlg()
     rSh.SetCareWin(0);
 
     if (bEdit)
-        rSh.ResetSelect(0, sal_False);
+        rSh.ResetSelect(0, false);
 }
 
 void SwInsFootNoteDlg::Init()
@@ -218,7 +218,7 @@ void SwInsFootNoteDlg::Init()
     SwFmtFtn aFtnNote;
     OUString sNumStr;
     Font aFont;
-    bExtCharAvailable = sal_False;
+    bExtCharAvailable = false;
 
     rSh.StartAction();
 
@@ -228,7 +228,7 @@ void SwInsFootNoteDlg::Init()
         {
             sNumStr = aFtnNote.GetNumStr();
 
-            rSh.Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+            rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
             SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
             rSh.GetCurAttr( aSet );
             const SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
@@ -238,8 +238,8 @@ void SwInsFootNoteDlg::Init()
             eCharSet = rFont.GetCharSet();
             aFont.SetName(m_aFontName);
             aFont.SetCharSet(eCharSet);
-            bExtCharAvailable = sal_True;
-            rSh.Left( CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+            bExtCharAvailable = true;
+            rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
         }
         bFootnote = !aFtnNote.IsEndNote();
     }
@@ -258,12 +258,12 @@ void SwInsFootNoteDlg::Init()
     else
         m_pEndNoteBtn->Check();
 
-    sal_Bool bNext = rSh.GotoNextFtnAnchor();
+    bool bNext = rSh.GotoNextFtnAnchor();
 
     if (bNext)
         rSh.GotoPrevFtnAnchor();
 
-    sal_Bool bPrev = rSh.GotoPrevFtnAnchor();
+    bool bPrev = rSh.GotoPrevFtnAnchor();
 
     if (bPrev)
         rSh.GotoNextFtnAnchor();
@@ -271,7 +271,7 @@ void SwInsFootNoteDlg::Init()
     m_pPrevBT->Enable(bPrev);
     m_pNextBT->Enable(bNext);
 
-    rSh.Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+    rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
 
     rSh.EndAction();
 }
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 02cf75d6ee06..9890ee088ecb 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -54,7 +54,7 @@
 #include <svl/aeitem.hxx>
 #include <svl/slstitm.hxx>
 
-static sal_Bool bLastRelative = sal_False;
+static bool bLastRelative = false;
 
 //See cui/uiconfig/ui/numberingpositionpage.ui for effectively a duplicate
 //dialog to this one, except with a different preview window impl.
@@ -68,8 +68,8 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
     , pSaveNum(0)
     , pWrtSh(0)
     , pOutlineDlg(0)
-    , bPreset( sal_False )
-    , bInInintControl(sal_False)
+    , bPreset( false )
+    , bInInintControl(false)
     , bLabelAlignmentPosAndSpaceModeActive( false )
 {
     get(m_pLevelLB, "levellb");
@@ -166,7 +166,7 @@ SwNumPositionTabPage::~SwNumPositionTabPage()
 
 void SwNumPositionTabPage::InitControls()
 {
-    bInInintControl = sal_True;
+    bInInintControl = true;
     const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
                            m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked();
     const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 &&
@@ -355,7 +355,7 @@ void SwNumPositionTabPage::InitControls()
     if(bSetDistEmpty)
         m_pDistBorderMF->SetText(aEmptyOUStr);
 
-    bInInintControl = sal_False;
+    bInInintControl = false;
 }
 
 void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
@@ -454,7 +454,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet )
     InitPosAndSpaceMode();
     ShowControlsDependingOnPosAndSpaceMode();
     InitControls();
-    bModified = sal_False;
+    bModified = false;
 }
 
 void SwNumPositionTabPage::InitPosAndSpaceMode()
@@ -690,7 +690,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
 
 IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
 {
-    sal_Bool bOn = pBox->IsChecked();
+    bool bOn = pBox->IsChecked();
     bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
     bool bSetValue = false;
     long nValue = 0;
@@ -900,9 +900,9 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl)
 }
 
 #ifdef DBG_UTIL
-void SwNumPositionTabPage::SetModified(sal_Bool bRepaint)
+void SwNumPositionTabPage::SetModified(bool bRepaint)
 {
-    bModified = sal_True;
+    bModified = true;
     if(bRepaint)
     {
         m_pPreviewWIN->SetLevel(nActNumLvl);
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6a19d904dfc8..6110b650cddd 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -336,7 +336,7 @@ short SwOutlineTabDialog::Ok()
         if( !rTxtColl.IsDefault() )
         {
             const SfxPoolItem & rItem =
-                rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, sal_False);
+                rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, false);
 
            if ((sal_uInt8)GetLevel(rTxtColl.GetName()) == MAXLEVEL)
             {
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index ec6a4f0275d3..60add9d67454 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -125,7 +125,7 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet)
     get(m_pLineDistEdit, "spacingtocontents");
 
     SetExchangeSupport();
-    FieldUnit aMetric = ::GetDfltMetric(sal_False);
+    FieldUnit aMetric = ::GetDfltMetric(false);
     SetMetric(*m_pMaxHeightEdit, aMetric);
     SetMetric(*m_pDistEdit, aMetric);
     SetMetric(*m_pLineDistEdit, aMetric);
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 1060896e61b1..96c7669d5fc0 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -43,12 +43,12 @@
 SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
     SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", rSet),
     m_nRubyUserValue(0),
-    m_bRubyUserValue(sal_False),
+    m_bRubyUserValue(false),
     m_aPageSize(MM50, MM50),
     m_bVertical(false),
-    m_bSquaredMode(sal_False),
-    m_bHRulerChanged( sal_False ),
-    m_bVRulerChanged( sal_False )
+    m_bSquaredMode(false),
+    m_bHRulerChanged( false ),
+    m_bVRulerChanged( false )
 {
     get(m_pNoGridRB,"radioRB_NOGRID");
     get(m_pLinesGridRB,"radioRB_LINESGRID");
@@ -160,7 +160,7 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet)
 
 bool    SwTextGridPage::FillItemSet(SfxItemSet &rSet)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if(m_pNoGridRB->GetSavedValue() != m_pNoGridRB->IsChecked()||
         m_pLinesGridRB->GetSavedValue() != m_pLinesGridRB->IsChecked()||
         m_pLinesPerPageNF->GetSavedValue().toInt32()
@@ -177,7 +177,7 @@ bool    SwTextGridPage::FillItemSet(SfxItemSet &rSet)
         m_pColorLB->GetSavedValue() != m_pColorLB->GetSelectEntryPos())
     {
         PutGridItem(rSet);
-        bRet = sal_True;
+        bRet = true;
     }
 
     // draw ticks of ruler
@@ -208,7 +208,7 @@ void    SwTextGridPage::Reset(const SfxItemSet &rSet)
         m_pLinesPerPageNF->SetValue(rGridItem.GetLines());
         SetLinesOrCharsRanges( *m_pLinesRangeFT , m_pLinesPerPageNF->GetMax() );
         m_nRubyUserValue = rGridItem.GetBaseHeight();
-        m_bRubyUserValue = sal_True;
+        m_bRubyUserValue = true;
         m_pTextSizeMF->SetValue(m_pTextSizeMF->Normalize(m_nRubyUserValue), FUNIT_TWIP);
         m_pRubySizeMF->SetValue(m_pRubySizeMF->Normalize(rGridItem.GetRubyHeight()), FUNIT_TWIP);
         m_pCharWidthMF->SetValue(m_pCharWidthMF->Normalize(rGridItem.GetBaseWidth()), FUNIT_TWIP);
@@ -270,9 +270,9 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet)
         {
             if ( aGridItem.GetGridType() == GRID_LINES_CHARS )
             {
-                m_bHRulerChanged = sal_True;
+                m_bHRulerChanged = true;
             }
-            m_bVRulerChanged = sal_True;
+            m_bVRulerChanged = true;
             pView->GetHRuler().SetCharWidth((long)(m_pCharWidthMF->GetValue(FUNIT_TWIP)/56.7));
             pView->GetVRuler().SetLineHeight((long)(m_pTextSizeMF->GetValue(FUNIT_TWIP)/56.7));
         }
@@ -372,7 +372,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField)
             m_pTextSizeMF->SetValue(m_pTextSizeMF->Normalize(nWidth), FUNIT_TWIP);
             //prevent rounding errors in the MetricField by saving the used value
             m_nRubyUserValue = nWidth;
-            m_bRubyUserValue = sal_True;
+            m_bRubyUserValue = true;
 
         }
         //set maximum line per page
@@ -395,7 +395,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField)
             SetLinesOrCharsRanges( *m_pLinesRangeFT , m_pLinesPerPageNF->GetMax() );
 
             m_nRubyUserValue = nHeight;
-            m_bRubyUserValue = sal_True;
+            m_bRubyUserValue = true;
         }
         else if (m_pCharsPerLineNF == pField)
         {
@@ -415,7 +415,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
     {
         if (m_pTextSizeMF == pField)
         {
-            m_bRubyUserValue = sal_False;
+            m_bRubyUserValue = false;
 
             // fdo#50941: set maximum characters per line
             sal_Int32 nTextSize = static_cast< sal_Int32 >(m_pTextSizeMF->Denormalize(m_pTextSizeMF->GetValue(FUNIT_TWIP)));
@@ -442,7 +442,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
         {
             sal_Int32 nTextSize = static_cast< sal_Int32 >(m_pTextSizeMF->Denormalize(m_pTextSizeMF->GetValue(FUNIT_TWIP)));
             m_pLinesPerPageNF->SetValue(m_aPageSize.Height() / nTextSize);
-            m_bRubyUserValue = sal_False;
+            m_bRubyUserValue = false;
             SetLinesOrCharsRanges( *m_pLinesRangeFT , m_pLinesPerPageNF->GetMax() );
         }
         else if (m_pCharWidthMF == pField)
@@ -462,7 +462,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
 
 IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton)
 {
-    sal_Bool bEnable = m_pNoGridRB != pButton;
+    bool bEnable = m_pNoGridRB != pButton;
     m_pLayoutFL->Enable(bEnable);
     m_pDisplayFL->Enable(bEnable);
 
@@ -489,7 +489,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton)
 
 IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl)
 {
-    sal_Bool bChecked = m_pDisplayCB->IsChecked();
+    bool bChecked = m_pDisplayCB->IsChecked();
     m_pPrintCB->Enable(bChecked);
     m_pPrintCB->Check(bChecked);
     return 0;
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 6c6bf518df81..a4e78417e704 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -40,9 +40,9 @@
 #include <tblsel.hxx>
 #include <sfx2/request.hxx>
 
-static sal_Bool bCheck1 = sal_True;
-static sal_Bool bCheck2 = sal_False;
-static sal_Bool bCheck3 = sal_False;
+static bool bCheck1 = true;
+static bool bCheck2 = false;
+static bool bCheck3 = false;
 
 static sal_uInt16 nCol1 = 1;
 static sal_uInt16 nCol2 = 1;
@@ -54,11 +54,11 @@ static sal_uInt16 nType3 = 0;
 
 static sal_uInt16 nLang = LANGUAGE_NONE;
 
-static sal_Bool   bAsc1  = sal_True;
-static sal_Bool   bAsc2  = sal_True;
-static sal_Bool   bAsc3  = sal_True;
-static sal_Bool   bCol   = sal_False;
-static sal_Bool   bCsSens= sal_False;
+static bool   bAsc1  = true;
+static bool   bAsc2  = true;
+static bool   bAsc3  = true;
+static bool   bCol   = false;
+static bool   bCsSens= false;
 
 static sal_Unicode    cDeli  = '\t';
 
@@ -346,11 +346,11 @@ void SwSortDlg::Apply()
     aOptions.bTable = rSh.IsTableMode();
     aOptions.bIgnoreCase = !bCsSens;
 
-    sal_Bool bRet;
+    bool bRet;
     {
         SwWait aWait( *rSh.GetView().GetDocShell(), true );
         rSh.StartAllAction();
-        if( 0 != (bRet = rSh.Sort( aOptions )))
+        if( (bRet = rSh.Sort( aOptions )))
             rSh.SetModified();
         rSh.EndAllAction();
     }
@@ -361,7 +361,7 @@ void SwSortDlg::Apply()
 
 IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton )
 {
-    sal_Bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled();
+    bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled();
     m_pDelimEdt->Enable( bEnable );
     m_pDelimPB->Enable( bEnable );
     return 0;
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 81d3c18c6623..67d0f03d07fd 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -46,7 +46,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent)
     : SfxModalDialog(pParent,
         "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui")
 {
-    pImplDlg = new SwRedlineAcceptDlg(this, sal_True);
+    pImplDlg = new SwRedlineAcceptDlg(this, true);
 
     pImplDlg->Initialize(GetExtraData());
     pImplDlg->Activate();   // for data's initialisation
@@ -54,7 +54,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent)
 
 SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg()
 {
-    AcceptAll(sal_False);   // refuse everything remaining
+    AcceptAll(false);   // refuse everything remaining
     pImplDlg->FillInfo(GetExtraData());
 
     delete pImplDlg;
@@ -64,7 +64,7 @@ void SwModalRedlineAcceptDlg::Activate()
 {
 }
 
-void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept )
+void SwModalRedlineAcceptDlg::AcceptAll( bool bAccept )
 {
     SvxTPFilter* pFilterTP = pImplDlg->GetChgCtrl()->GetFilterPage();
 
@@ -78,7 +78,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept )
         pImplDlg->FilterChangedHdl();
     }
 
-    pImplDlg->CallAcceptReject( sal_False, bAccept );
+    pImplDlg->CallAcceptReject( false, bAccept );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 70ce11bf5c24..b31cba9504b5 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -104,16 +104,16 @@ namespace
 
     void lcl_PushCursor(SwWrtShell *pSh)
     {
-        pSh->LockView( sal_True );
+        pSh->LockView( true );
         pSh->StartAllAction();
         pSh->SwCrsrShell::Push();
     }
 
     void lcl_PopCursor(SwWrtShell *pSh)
     {
-        pSh->SwCrsrShell::Pop( sal_False );
+        pSh->SwCrsrShell::Pop( false );
         pSh->EndAllAction();
-        pSh->LockView( sal_False );
+        pSh->LockView( false );
     }
 
     sal_uInt16 lcl_GetCurrentPage(SwWrtShell *pSh)
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 16207f89191e..434872fca3c0 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -48,10 +48,9 @@ SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc )
     get(m_pColNF, "column");
     get(m_pWidthMF, "width");
 
-    sal_Bool bIsWeb = rTableFnc.GetShell()
-                    ? static_cast< sal_Bool >(0 != PTR_CAST( SwWebDocShell,
-                            rTableFnc.GetShell()->GetView().GetDocShell()) )
-                    : sal_False;
+    bool bIsWeb = rTableFnc.GetShell()
+                  && (0 != PTR_CAST( SwWebDocShell,
+                                     rTableFnc.GetShell()->GetView().GetDocShell()) );
     FieldUnit eFieldUnit = SW_MOD()->GetUsrPref( bIsWeb )->GetMetric();
     ::SetFieldUnit(*m_pWidthMF, eFieldUnit);
 
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index fd2e827fbdb0..96d2ae1d6097 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -42,7 +42,7 @@ namespace swui
 
 //keep the state of the buttons on runtime
 static int nSaveButtonState = -1; // 0: tab, 1: semicolon, 2: paragraph, 3: other, -1: not yet used
-static sal_Bool bIsKeepColumn = sal_True;
+static bool bIsKeepColumn = true;
 static sal_Unicode uOther = ',';
 
 void SwConvertTableDlg::GetValues(  sal_Unicode& rDelim,
@@ -159,7 +159,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
 
     const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-    sal_Bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
+    bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
 
     SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
     sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
@@ -185,7 +185,7 @@ IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton )
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    AbstractSwAutoFormatDlg* pDlg = pFact->CreateSwAutoFormatDlg(pButton, pShell, sal_False, pTAutoFmt);
+    AbstractSwAutoFormatDlg* pDlg = pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFmt);
     OSL_ENSURE(pDlg, "Dialogdiet fail!");
     if( RET_OK == pDlg->Execute())
         pDlg->FillAutoFmtOfIndex( pTAutoFmt );
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 097ad74b0d56..fd4f34afb173 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -97,7 +97,7 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
 
     m_pInsertBtn->SetClickHdl(LINK(this, SwInsTableDlg, OKHdl));
 
-    sal_Bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
+    bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
     const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
     SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
@@ -190,7 +190,7 @@ IMPL_LINK( SwInsTableDlg, AutoFmtHdl, PushButton*, pButton )
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    AbstractSwAutoFormatDlg* pDlg = pFact->CreateSwAutoFormatDlg(pButton,pShell, sal_False, pTAutoFmt);
+    AbstractSwAutoFormatDlg* pDlg = pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFmt);
     OSL_ENSURE(pDlg, "Dialogdiet fail!");
     if( RET_OK == pDlg->Execute())
         pDlg->FillAutoFmtOfIndex( pTAutoFmt );
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index bafb3fc14134..851244f3e85e 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -20,7 +20,7 @@
 #include <swtypes.hxx>
 #include <mergetbl.hxx>
 
-SwMergeTblDlg::SwMergeTblDlg( Window *pParent, sal_Bool& rWithPrev )
+SwMergeTblDlg::SwMergeTblDlg( Window *pParent, bool& rWithPrev )
     : SvxStandardDialog(pParent, "MergeTableDialog", "modules/swriter/ui/mergetabledialog.ui")
     , m_rMergePrev(rWithPrev)
 {
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index d5c6fa22f2e0..9c4dce4dcbb0 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -67,9 +67,9 @@ SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet)
     , nSaveWidth(0)
     , nMinTableWidth(MINLAY)
     , nOldAlign(0)
-    , bModified(sal_False)
-    , bFull(0)
-    , bHtmlMode(sal_False)
+    , bModified(false)
+    , bFull(false)
+    , bHtmlMode(false)
 {
     get(m_pNameED, "name");
     get(m_pWidthFT, "widthft");
@@ -142,7 +142,7 @@ void  SwFormatTablePage::Init()
 IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
 {
     OSL_ENSURE(pTblData, "table data not available?");
-    sal_Bool bIsChecked = pBtn->IsChecked();
+    bool bIsChecked = pBtn->IsChecked();
     sal_Int64 nLeft  = m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue(FUNIT_TWIP ));
     sal_Int64 nRight = m_aRightMF.DenormalizePercent(m_aRightMF.GetValue(FUNIT_TWIP ));
     m_aWidthMF.ShowPercent(bIsChecked);
@@ -166,56 +166,56 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
 
     if(m_pFreeBtn->IsChecked())
     {
-        sal_Bool bEnable = !pBtn->IsChecked();
+        bool bEnable = !pBtn->IsChecked();
         m_aRightMF.Enable(bEnable);
         m_pRightFT->Enable(bEnable);
     }
-    bModified = sal_True;
+    bModified = true;
 
     return 0;
 }
 
 IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
 {
-    sal_Bool bRestore = sal_True,
-         bLeftEnable = sal_False,
-         bRightEnable= sal_False,
-         bWidthEnable= sal_False,
-         bOthers = sal_True;
+    bool bRestore = true,
+         bLeftEnable = false,
+         bRightEnable= false,
+         bWidthEnable= false,
+         bOthers = true;
     if ((RadioButton *)pBox == m_pFullBtn)
     {
         m_aLeftMF.SetPrcntValue(0);
         m_aRightMF.SetPrcntValue(0);
         nSaveWidth = static_cast< SwTwips >(m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue(FUNIT_TWIP )));
         m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(pTblData->GetSpace() ), FUNIT_TWIP );
-        bFull = sal_True;
-        bRestore = sal_False;
+        bFull = true;
+        bRestore = false;
     }
     else if ((RadioButton *)pBox == m_pLeftBtn)
     {
-        bRightEnable = bWidthEnable = sal_True;
+        bRightEnable = bWidthEnable = true;
         m_aLeftMF.SetPrcntValue(0);
     }
     else if ((RadioButton *) pBox == m_pFromLeftBtn)
     {
-        bLeftEnable = bWidthEnable = sal_True;
+        bLeftEnable = bWidthEnable = true;
         m_aRightMF.SetPrcntValue(0);
     }
     else if ((RadioButton *) pBox == m_pRightBtn)
     {
-        bLeftEnable = bWidthEnable = sal_True;
+        bLeftEnable = bWidthEnable = true;
         m_aRightMF.SetPrcntValue(0);
     }
     else if ((RadioButton *) pBox == m_pCenterBtn)
     {
-        bLeftEnable = bWidthEnable = sal_True;
+        bLeftEnable = bWidthEnable = true;
     }
     else if ((RadioButton *) pBox == m_pFreeBtn)
     {
         RightModify();
-        bLeftEnable = sal_True;
-        bWidthEnable = sal_True;
-        bOthers = sal_False;
+        bLeftEnable = true;
+        bWidthEnable = true;
+        bOthers = false;
     }
     m_aLeftMF.Enable(bLeftEnable);
     m_pLeftFT->Enable(bLeftEnable);
@@ -232,11 +232,11 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
     {
         //After being switched on automatic, the width was pinned
         //in order to restore the width while switching back to.
-        bFull = sal_False;
+        bFull = false;
         m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(nSaveWidth ), FUNIT_TWIP );
     }
     ModifyHdl(m_aWidthMF.get());
-    bModified = sal_True;
+    bModified = true;
     return 0;
 }
 
@@ -244,7 +244,7 @@ void SwFormatTablePage::RightModify()
 {
     if(m_pFreeBtn->IsChecked())
     {
-        sal_Bool bEnable = m_aRightMF.GetValue() == 0;
+        bool bEnable = m_aRightMF.GetValue() == 0;
         m_pRelWidthCB->Enable(bEnable);
         if ( !bEnable )
         {
@@ -340,7 +340,7 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
     {
         if(!m_pFromLeftBtn->IsChecked())
         {
-            sal_Bool bCenter = m_pCenterBtn->IsChecked();
+            bool bCenter = m_pCenterBtn->IsChecked();
             if( bCenter )
                 nRight = nLeft;
             if(nRight + nLeft > pTblData->GetSpace() - MINLAY )
@@ -365,7 +365,7 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
         m_aWidthMF.SetPrcntValue( m_aWidthMF.NormalizePercent( nCurWidth ), FUNIT_TWIP );
     m_aRightMF.SetPrcntValue( m_aRightMF.NormalizePercent( nRight ), FUNIT_TWIP );
     m_aLeftMF.SetPrcntValue( m_aLeftMF.NormalizePercent( nLeft ), FUNIT_TWIP );
-    bModified = sal_True;
+    bModified = true;
 }
 
 SfxTabPage*  SwFormatTablePage::Create( Window* pParent,
@@ -403,7 +403,7 @@ bool  SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
     if(m_pNameED->GetText() != m_pNameED->GetSavedValue())
     {
         rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText()));
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( m_pTextDirectionLB->IsVisible() )
@@ -414,7 +414,7 @@ bool  SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
             const sal_uInt32 nDirection =
                              (sal_uInt32)(sal_uIntPtr)m_pTextDirectionLB->GetEntryData( nPos );
             rCoreSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR));
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
@@ -804,7 +804,7 @@ void  SwTableColumnPage::Reset( const SfxItemSet& )
 
 }
 
-void  SwTableColumnPage::Init(sal_Bool bWeb)
+void  SwTableColumnPage::Init(bool bWeb)
 {
     FieldUnit aMetric = ::GetDfltMetric(bWeb);
     Link aLkUp = LINK( this, SwTableColumnPage, UpHdl );
@@ -869,7 +869,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
 
 IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
 {
-    bModified = sal_True;
+    bModified = true;
     ModifyHdl( pEdit );
     return 0;
 }
@@ -877,7 +877,7 @@ IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
 
 IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
 {
-    bModified = sal_True;
+    bModified = true;
     ModifyHdl( pEdit );
     return 0;
 }
@@ -887,7 +887,7 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
 {
     if (pEdit->IsModified())
     {
-        bModified = sal_True;
+        bModified = true;
         ModifyHdl( pEdit );
     }
     return 0;
@@ -896,7 +896,7 @@ IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
 
 IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
 {
-    sal_Bool bCheck = pBox->IsChecked();
+    bool bCheck = pBox->IsChecked();
     if (pBox == m_pProportionalCB)
     {
         if(bCheck)
@@ -959,8 +959,8 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
     }
     SwTwips nDiff = nSum - nTableWidth;
 
-    sal_Bool bModifyTable = m_pModifyTableCB->IsChecked();
-    sal_Bool bProp =    m_pProportionalCB->IsChecked();
+    bool bModifyTable = m_pModifyTableCB->IsChecked();
+    bool bProp =    m_pProportionalCB->IsChecked();
 
     if(!bModifyTable && !bProp )
     {
@@ -1018,7 +1018,7 @@ void   SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
             nTableWidth += nDiff;
         }
     }
-    else if(bModifyTable & bProp)
+    else if(bModifyTable && bProp)
     {
         //All columns will be changed proportionally with,
         //the table width is adjusted accordingly.
@@ -1080,11 +1080,11 @@ void    SwTableColumnPage::ActivatePage( const SfxItemSet& )
                                         pTblData->GetWidth();
         UpdateCols(0);
     }
-    bModifyTbl = sal_True;
+    bModifyTbl = true;
     if(pTblData->GetWidthPercent() ||
                 text::HoriOrientation::FULL == nTblAlign ||
                         pTblData->IsLineSelected()  )
-        bModifyTbl = sal_False;
+        bModifyTbl = false;
     if(bPercentMode)
     {
         m_pModifyTableCB->Check(false);
@@ -1237,7 +1237,7 @@ void  SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     else if (nId == m_nTextFlowId)
     {
         ((SwTextFlowPage&)rPage).SetShell(pShell);
-        const sal_uInt16 eType = pShell->GetFrmType(0,sal_True);
+        const sal_uInt16 eType = pShell->GetFrmType(0,true);
         if( !(FRMTYPE_BODY & eType) )
             ((SwTextFlowPage&)rPage).DisablePageBreak();
     }
@@ -1344,11 +1344,11 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
     const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK );
     const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( rSet, RES_PAGEDESC );
 
-    sal_Bool bState = m_pPageCollCB->IsChecked();
+    bool bState = m_pPageCollCB->IsChecked();
 
     //If we have a page style, then there's no break
-    sal_Bool bPageItemPut = sal_False;
-    if ( bState != m_pPageCollCB->GetSavedValue() ||
+    bool bPageItemPut = false;
+    if ( bState != (m_pPageCollCB->GetSavedValue() == 1) ||
          ( bState &&
            m_pPageCollLB->GetSelectEntryPos() != m_pPageCollLB->GetSavedValue() )
            || (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()) )
@@ -1364,16 +1364,16 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
             ( pDesc->GetPageDesc() && ((pDesc->GetPageDesc()->GetName() != sPage) ||
                     !comphelper::string::equals(m_pPageNoNF->GetSavedValue(), nPgNum))))
         {
-            SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, sal_True ) );
+            SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, true ) );
             aFmt.SetNumOffset(bState ? nPgNum : 0);
             bModified |= 0 != rSet.Put( aFmt );
             bPageItemPut = bState;
         }
     }
-    sal_Bool bIsChecked = m_pPgBrkCB->IsChecked();
+    bool bIsChecked = m_pPgBrkCB->IsChecked();
     if ( !bPageItemPut &&
-        (   bState != m_pPageCollCB->GetSavedValue() ||
-            bIsChecked != m_pPgBrkCB->GetSavedValue()              ||
+        (   bState != (m_pPageCollCB->GetSavedValue() == 1) ||
+            bIsChecked != (m_pPgBrkCB->GetSavedValue() ==1) ||
             m_pPgBrkBeforeRB->IsChecked() != m_pPgBrkBeforeRB->GetSavedValue()    ||
             m_pPgBrkRB->IsChecked() != m_pPgBrkRB->GetSavedValue() ))
     {
@@ -1382,7 +1382,7 @@ bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
 
         if(bIsChecked)
         {
-            sal_Bool bBefore = m_pPgBrkBeforeRB->IsChecked();
+            bool bBefore = m_pPgBrkBeforeRB->IsChecked();
 
             if ( m_pPgBrkRB->IsChecked() )
             {
@@ -1650,7 +1650,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl)
             {
                 m_pPageCollCB->Enable();
 
-                sal_Bool bEnable = m_pPageCollCB->IsChecked() &&
+                bool bEnable = m_pPageCollCB->IsChecked() &&
                                             m_pPageCollLB->GetEntryCount();
                 m_pPageCollLB->Enable(bEnable);
                 if(!bHtmlMode)
@@ -1677,11 +1677,11 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl)
 
 IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl)
 {
-    sal_Bool bEnable = sal_False;
+    bool bEnable = false;
     if ( m_pPageCollCB->IsChecked() &&
          m_pPageCollLB->GetEntryCount() )
     {
-        bEnable = sal_True;
+        bEnable = true;
         m_pPageCollLB->SelectEntryPos( 0 );
     }
     else
@@ -1705,7 +1705,7 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
         {
             m_pPageCollCB->Enable();
 
-            sal_Bool bEnable = m_pPageCollCB->IsChecked()  &&
+            bool bEnable = m_pPageCollCB->IsChecked()  &&
                                         m_pPageCollLB->GetEntryCount();
 
             m_pPageCollLB->Enable(bEnable);
@@ -1763,7 +1763,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl)
 
 void SwTextFlowPage::DisablePageBreak()
 {
-    bPageBreak = sal_False;
+    bPageBreak = false;
     m_pPgBrkCB->Disable();
     m_pPgBrkRB->Disable();
     m_pColBrkRB->Disable();
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 75ddf1658b4d..0efd198edcdb 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -62,7 +62,7 @@ private:
     VirtualDevice           aVD;
     SvtScriptedTextHelper   aScriptedText;
     svx::frame::Array       maArray;            /// Implementation to draw the frame borders.
-    sal_Bool                    bFitWidth;
+    bool                    bFitWidth;
     bool                    mbRTL;
     Size                    aPrvSize;
     long                    nLabelColWidth;
@@ -82,7 +82,7 @@ private:
 
     void    Init            ();
     void    DoPaint         ( const Rectangle& rRect );
-    void    CalcCellArray   ( sal_Bool bFitWidth );
+    void    CalcCellArray   ( bool bFitWidth );
     void    CalcLineMap     ();
     void    PaintCells      ();
 
@@ -134,7 +134,7 @@ SwStringInputDlg::~SwStringInputDlg()
 // AutoFormat-Dialogue:
 
 SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell,
-                    sal_Bool bSetAutoFormat, const SwTableAutoFmt* pSelFmt )
+                    bool bSetAutoFormat, const SwTableAutoFmt* pSelFmt )
     : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui")
     , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE))
     , aStrLabel(SW_RES(STR_ADD_AUTOFORMAT_LABEL))
@@ -146,7 +146,7 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell,
     , pShell(pWrtShell)
     , nIndex(0)
     , nDfltStylePos(0)
-    , bCoreDataChanged(sal_False)
+    , bCoreDataChanged(false)
     , bSetAutoFmt(bSetAutoFormat)
 {
     get(m_pLbFormat, "formatlb");
@@ -217,7 +217,7 @@ void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
     SelFmtHdl( 0 );
 }
 
-void SwAutoFormatDlg::UpdateChecks( const SwTableAutoFmt& rFmt, sal_Bool bEnable )
+void SwAutoFormatDlg::UpdateChecks( const SwTableAutoFmt& rFmt, bool bEnable )
 {
     m_pBtnNumFormat->Enable( bEnable );
     m_pBtnNumFormat->Check( rFmt.IsValueFormat() );
@@ -253,7 +253,7 @@ void SwAutoFormatDlg::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const
 IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
 {
     SwTableAutoFmt* pData  = &(*pTableTbl)[nIndex];
-    sal_Bool bCheck = ((CheckBox*)pBtn)->IsChecked(), bDataChgd = sal_True;
+    bool bCheck = ((CheckBox*)pBtn)->IsChecked(), bDataChgd = true;
 
     if( pBtn == m_pBtnNumFormat )
         pData->SetValueFormat( bCheck );
@@ -266,14 +266,14 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
     else if ( pBtn == m_pBtnAlignment )
         pData->SetJustify( bCheck );
     else
-        bDataChgd = sal_False;
+        bDataChgd = false;
 
     if( bDataChgd )
     {
         if( !bCoreDataChanged )
         {
             m_pBtnCancel->SetText( aStrClose );
-            bCoreDataChanged = sal_True;
+            bCoreDataChanged = true;
         }
 
         m_pWndPreview->NotifyChange( *pData );
@@ -321,7 +321,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl)
                     if ( !bCoreDataChanged )
                     {
                         m_pBtnCancel->SetText( aStrClose );
-                        bCoreDataChanged = sal_True;
+                        bCoreDataChanged = true;
                     }
 
                     SelFmtHdl( 0 );
@@ -369,7 +369,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl)
         if( !bCoreDataChanged )
         {
             m_pBtnCancel->SetText( aStrClose );
-            bCoreDataChanged = sal_True;
+            bCoreDataChanged = true;
         }
     }
     delete pBox;
@@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
                     if ( !bCoreDataChanged )
                     {
                         m_pBtnCancel->SetText( aStrClose );
-                        bCoreDataChanged = sal_True;
+                        bCoreDataChanged = true;
                     }
 
                     SelFmtHdl( 0 );
@@ -446,30 +446,30 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl)
 
 IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
 {
-    sal_Bool bBtnEnable = sal_False;
+    bool bBtnEnable = false;
     sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectEntryPos(), nOldIdx = nIndex;
     if( nSelPos >= nDfltStylePos )
     {
         nIndex = nSelPos - nDfltStylePos;
         m_pWndPreview->NotifyChange( (*pTableTbl)[nIndex] );
         bBtnEnable = 0 != nIndex;
-        UpdateChecks( (*pTableTbl)[nIndex], sal_True );
+        UpdateChecks( (*pTableTbl)[nIndex], true );
     }
     else
     {
         nIndex = 255;
 
         SwTableAutoFmt aTmp( SwViewShell::GetShellRes()->aStrNone );
-        aTmp.SetFont( sal_False );
-        aTmp.SetJustify( sal_False );
-        aTmp.SetFrame( sal_False );
-        aTmp.SetBackground( sal_False );
-        aTmp.SetValueFormat( sal_False );
-        aTmp.SetWidthHeight( sal_False );
+        aTmp.SetFont( false );
+        aTmp.SetJustify( false );
+        aTmp.SetFrame( false );
+        aTmp.SetBackground( false );
+        aTmp.SetValueFormat( false );
+        aTmp.SetWidthHeight( false );
 
         if( nOldIdx != nIndex )
             m_pWndPreview->NotifyChange( aTmp );
-        UpdateChecks( aTmp, sal_False );
+        UpdateChecks( aTmp, false );
     }
 
     m_pBtnRemove->Enable( bBtnEnable );
@@ -494,7 +494,7 @@ AutoFmtPreview::AutoFmtPreview(Window* pParent) :
         aCurData        ( OUString() ),
         aVD             ( *this ),
         aScriptedText   ( aVD ),
-        bFitWidth       ( sal_False ),
+        bFitWidth       ( false ),
         mbRTL           ( false ),
         aStrJan         ( SW_RES( STR_JAN ) ),
         aStrFeb         ( SW_RES( STR_FEB ) ),
@@ -789,11 +789,11 @@ void AutoFmtPreview::Init()
     SetBorderStyle( GetBorderStyle() | WINDOW_BORDER_MONO );
     maArray.Initialize( 5, 5 );
     maArray.SetUseDiagDoubleClipping( false );
-    CalcCellArray( sal_False );
+    CalcCellArray( false );
     CalcLineMap();
 }
 
-void AutoFmtPreview::CalcCellArray( sal_Bool _bFitWidth )
+void AutoFmtPreview::CalcCellArray( bool _bFitWidth )
 {
     maArray.SetXOffset( 2 );
     maArray.SetAllColWidths( _bFitWidth ? nDataColWidth2 : nDataColWidth1 );
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 69b7d9ee42fb..f0b253fe6981 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -89,11 +89,11 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
     // opening as template is done when a parameter tells to do so and a template filter can be detected
     // (otherwise no valid filter would be found) or if the detected filter is a template filter and
     // there is no parameter that forbids to open as template
-    sal_Bool bOpenAsTemplate = sal_False;
-    sal_Bool bWasReadOnly = sal_False, bReadOnly = sal_False;
+    bool bOpenAsTemplate = false;
+    bool bWasReadOnly = false, bReadOnly = false;
 
-    sal_Bool bRepairPackage = sal_False;
-    sal_Bool bRepairAllowed = sal_False;
+    bool bRepairPackage = false;
+    bool bRepairAllowed = false;
     bool bDeepDetection = false;
 
     // now some parameters that can already be in the array, but may be overwritten or new inserted here
@@ -188,7 +188,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
                 xContent = aMedium.GetContent();
                 bReadOnly = aMedium.IsReadOnly();
 
-                sal_Bool bIsStorage = aMedium.IsStorage();
+                bool bIsStorage = aMedium.IsStorage();
                 if ( bIsStorage )
                 {
                     Reference< embed::XStorage > xStorage = aMedium.GetStorage( false );
@@ -384,7 +384,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
         lDescriptor[nPropertyCount].Name = "RepairPackage";
         lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
         nPropertyCount++;
-        bOpenAsTemplate = sal_True;
+        bOpenAsTemplate = true;
         // TODO/LATER: set progress bar that should be used
     }
 
@@ -427,7 +427,7 @@ sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** pp
         OUString aPrefFlt = (*ppFilter)->GetUserData();
 
         // detection for TextFilter needs an additional checking
-        sal_Bool bDetected = SwIoSystem::IsFileFilter(rMedium, aPrefFlt);
+        bool bDetected = SwIoSystem::IsFileFilter(rMedium, aPrefFlt);
         return bDetected ? nRet : ERRCODE_ABORT;
     }
 
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 319dea512e90..2153b5800ca3 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( uno::RuntimeException ) :
+SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL, bool bAutoload ) throw ( uno::RuntimeException ) :
     SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbAutoload( bAutoload ), mbInstalled( bAutoload )
 {
 }
@@ -67,7 +67,7 @@ sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException, std::
 
 void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed ) throw (uno::RuntimeException, std::exception)
 {
-    if( _installed != mbInstalled )
+    if( _installed != (mbInstalled ? 1 : 0) )
     {
         mbInstalled = _installed;
         // TODO: should call AutoExec and AutoExit etc.
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index 9dd8ad8cd876..2573ee0c583a 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -29,11 +29,11 @@ class SwVbaAddin : public SwVbaAddin_BASE
 {
 private:
     OUString msFileURL;
-    sal_Bool mbAutoload;
-    sal_Bool mbInstalled;
+    bool mbAutoload;
+    bool mbInstalled;
 
 public:
-    SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, sal_Bool bAutoload ) throw ( css::uno::RuntimeException );
+    SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL, bool bAutoload ) throw ( css::uno::RuntimeException );
     virtual ~SwVbaAddin();
 
     // Attributes
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index cb199e55ae9a..0531edbf8512 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -46,7 +46,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
             OUString sUrl = sEntries[ index ];
             if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
             {
-                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, sal_True ) ) );
+                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl, true ) ) );
             }
         }
     }
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index e6bf8707b043..44c0ca61681d 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -50,7 +50,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R
         xTC->goRight( 1, sal_True );
         xTC->setString( OUString("") ); // remove marker
         // remove the blank paragraph if it is a rich text
-        sal_Bool bRich = sal_False;
+        bool bRich = false;
         _richtext >>= bRich;
         if( bRich )
         {
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 9c6bdd2c0165..8e8e65f4f56a 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -200,7 +200,7 @@ SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeEx
 sal_Bool SAL_CALL
 SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bExist = m_xNameAccess->hasByName( rName );
+    bool bExist = m_xNameAccess->hasByName( rName );
     return bExist;
 }
 
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 75d0aa6cd2cd..35ea653e51e0 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -77,7 +77,7 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
     uno::Reference< text::XTextRange > xEnd;
-    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) );
+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, true ) );
 }
 
 uno::Reference< word::XRange > SAL_CALL
@@ -325,7 +325,7 @@ void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonop
 sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() throw (uno::RuntimeException, std::exception)
 {
     // check this property only in default paragraph style
-    sal_Bool IsAutoHyphenation = sal_False;
+    bool IsAutoHyphenation = false;
     uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
     xParaProps->getPropertyValue("ParaIsHyphenation") >>= IsAutoHyphenation;
     return IsAutoHyphenation;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 9dddd9467a98..4c931e5e24c7 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -310,7 +310,7 @@ public:
                 SwFEShell* pFEShell = mpDocShell->GetFEShell();
                 if(pFEShell)
                 {
-                    aReturn <<= pFEShell->GetLineCount(sal_False);
+                    aReturn <<= pFEShell->GetLineCount(false);
                 }
             }
         }
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 62f41724d97a..aa3e5df97c99 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -117,9 +117,9 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt
     return xFoundOne;
 }
 
-sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
+bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
 {
-    sal_Bool result = sal_False;
+    bool result = false;
 
     // TODO: map wildcards in area to OOo wildcards
 
@@ -129,7 +129,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
         {
             case word::WdReplace::wdReplaceNone:
             {
-                result = sal_True;
+                result = true;
                 break;
             }
             case word::WdReplace::wdReplaceOne:
@@ -153,7 +153,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
                         if( mnWrap == word::WdFindWrap::wdFindContinue || mnWrap == word::WdFindWrap::wdFindAsk || InRange( xTextRange ) )
                         {
                             xTextRange->setString( GetReplaceWith() );
-                            result = sal_True;
+                            result = true;
                         }
                     }
                 }
@@ -161,7 +161,7 @@ sal_Bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
             }
             default:
             {
-                result = sal_False;
+                result = false;
             }
         }
     }
@@ -197,14 +197,14 @@ void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) thr
 
 sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bBackward = sal_False;
+    bool bBackward = false;
     mxPropertyReplace->getPropertyValue("SearchBackwards") >>= bBackward;
     return !bBackward;
 }
 
 void SAL_CALL SwVbaFind::setForward( sal_Bool _forward ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bBackward = !_forward;
+    bool bBackward = !_forward;
     mxPropertyReplace->setPropertyValue("SearchBackwards", uno::makeAny( bBackward ) );
 }
 
@@ -232,7 +232,7 @@ void SAL_CALL SwVbaFind::setFormat( sal_Bool _format ) throw (uno::RuntimeExcept
 
 sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchCaseSensitive") >>= value;
     return value;
 }
@@ -244,7 +244,7 @@ void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase ) throw (uno::Runtime
 
 sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchWords") >>= value;
     return value;
 }
@@ -256,7 +256,7 @@ void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword ) throw (un
 
 sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchRegularExpression") >>= value;
     return value;
 }
@@ -268,7 +268,7 @@ void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards ) throw (un
 
 sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
     return value;
 }
@@ -281,7 +281,7 @@ void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (
 
 sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool value = sal_False;
+    bool value = false;
     mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
     if( value )
         mxPropertyReplace->getPropertyValue("SearchSimilarityRelax") >>= value;
@@ -308,7 +308,7 @@ void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::Run
 sal_Bool SAL_CALL
 SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool result = sal_False;
+    bool result = false;
     if( FindText.hasValue() )
     {
         OUString sText;
@@ -316,7 +316,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
         setText( sText );
     }
 
-    sal_Bool bValue = sal_False;
+    bool bValue = false;
     if( MatchCase.hasValue() )
     {
         MatchCase >>= bValue;
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index d2b69ce35a06..f2ff6bbbc141 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -51,7 +51,7 @@ private:
     void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException );
     OUString GetReplaceWith() throw ( css::uno::RuntimeException );
     css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException );
-    sal_Bool SearchReplace() throw ( css::uno::RuntimeException );
+    bool SearchReplace() throw ( css::uno::RuntimeException );
 
 public:
     SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index fd2922f44ba5..d75b5226c4f8 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -163,7 +163,7 @@ SwVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
 uno::Any SAL_CALL
 SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getSubscript() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -173,7 +173,7 @@ SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
 uno::Any SAL_CALL
 SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getSuperscript() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -183,7 +183,7 @@ SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
 uno::Any SAL_CALL
 SwVbaFont::getBold() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getBold() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -193,7 +193,7 @@ SwVbaFont::getBold() throw (uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getItalic() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -203,7 +203,7 @@ SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getStrikethrough() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
@@ -213,7 +213,7 @@ SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 SwVbaFont::getShadow() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     SwVbaFont_BASE::getShadow() >>= bRes;
     if ( bRes )
         return aLongAnyTrue;
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index 66d0e3afae0d..f12ce3d9f7bf 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -29,7 +29,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, sal_Bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
+SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
 {
 }
 
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index eef807ee25a6..382f7bfb31d1 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -31,11 +31,11 @@ class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE
 private:
     css::uno::Reference< css::frame::XModel > mxModel;
     css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
-    sal_Bool mbHeader;
+    bool mbHeader;
     sal_Int32 mnIndex;
 
 public:
-    SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
+    SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
     virtual ~SwVbaHeaderFooter(){}
 
     // Attributes
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index d68162cdf5f7..271334503b75 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -34,31 +34,31 @@ using namespace ::ooo::vba;
 #define FIRST_PAGE 1
 
 // Class HeaderFooterHelper
-sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     return isHeaderFooter( word::getCurrentXText( xModel ) );
 }
 
-sal_Bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
     OUString aImplName = xServiceInfo->getImplementationName();
     if ( aImplName == "SwXHeadFootText" )
-        return sal_True;
-    return sal_False;
+        return true;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel );
     if( !isHeaderFooter( xCurrentText ) )
-        return sal_False;
+        return false;
 
     OUString aPropIsShared = "HeaderIsShared";
     OUString aPropText = "HeaderText";
     uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel );
     uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW );
-    sal_Bool isShared = sal_True;
+    bool isShared = true;
     xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
     if( !isShared )
     {
@@ -76,17 +76,17 @@ sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xM
     try
     {
         if( xTRC->compareRegionStarts( xTR1, xTR2 ) == 0 )
-            return sal_True;
+            return true;
     }
     catch (const lang::IllegalArgumentException&)
     {
-        return sal_False;
+        return false;
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isHeader( xModel ) )
     {
@@ -95,15 +95,15 @@ sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XMo
         sal_Int32 nPage = xPageCursor->getPage();
         return nPage == FIRST_PAGE;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isHeader( xModel ) )
     {
         uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-        sal_Bool isShared = sal_False;
+        bool isShared = false;
         xStyleProps->getPropertyValue("HeaderIsShared") >>= isShared;
         if( !isShared )
         {
@@ -111,20 +111,20 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo
             return ( 0 == xPageCursor->getPage() % 2 );
         }
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel );
     if( !isHeaderFooter( xCurrentText ) )
-        return sal_False;
+        return false;
 
     OUString aPropIsShared = "FooterIsShared";
     OUString aPropText = "FooterText";
     uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle( xModel );
     uno::Reference< beans::XPropertySet > xPageProps( xPageStyle, uno::UNO_QUERY_THROW );
-    sal_Bool isShared = sal_True;
+    bool isShared = true;
     xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
     if( !isShared )
     {
@@ -142,17 +142,17 @@ sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xM
     try
     {
         if( xTRC->compareRegionStarts( xTR1, xTR2 ) == 0 )
-            return sal_True;
+            return true;
     }
     catch (const lang::IllegalArgumentException&)
     {
-        return sal_False;
+        return false;
     }
 
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isFooter( xModel ) )
     {
@@ -160,15 +160,15 @@ sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XMo
         sal_Int32 nPage = xPageCursor->getPage();
         return nPage == FIRST_PAGE;
     }
-    return sal_False;
+    return false;
 }
 
-sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
     if( isFooter( xModel ) )
     {
         uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
-        sal_Bool isShared = sal_False;
+        bool isShared = false;
         xStyleProps->getPropertyValue("FooterIsShared") >>= isShared;
         if( !isShared )
         {
@@ -176,7 +176,7 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo
             return ( 0 == xPageCursor->getPage() % 2 );
         }
     }
-    return sal_False;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
index dbcdbe3da8cc..28a12b4d4b71 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
@@ -28,16 +28,16 @@
 class HeaderFooterHelper
 {
 public:
-    static sal_Bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
-    static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
-    static sal_Bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
+    static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
 };
 
 #endif
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 613e31050e88..d46b91407bad 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -32,10 +32,10 @@ private:
     uno::Reference< uno::XComponentContext > mxContext;
     uno::Reference< frame::XModel > mxModel;
     uno::Reference< beans::XPropertySet > mxPageStyleProps;
-    sal_Bool mbHeader;
+    bool mbHeader;
 
 public:
-    HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, sal_Bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
+    HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
     virtual ~HeadersFootersIndexAccess(){}
 
     // XIndexAccess
@@ -79,7 +79,7 @@ public:
     }
 };
 
-SwVbaHeadersFooters::SwVbaHeadersFooters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, sal_Bool isHeader ): SwVbaHeadersFooters_BASE( xParent, xContext, new HeadersFootersIndexAccess( xParent, xContext, xModel, xPageStyleProps, isHeader ) ),  mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( isHeader )
+SwVbaHeadersFooters::SwVbaHeadersFooters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool isHeader ): SwVbaHeadersFooters_BASE( xParent, xContext, new HeadersFootersIndexAccess( xParent, xContext, xModel, xPageStyleProps, isHeader ) ),  mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( isHeader )
 {
 }
 
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index 8d8253dfa2b2..7e62f1ab3b39 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -30,10 +30,10 @@ class SwVbaHeadersFooters : public SwVbaHeadersFooters_BASE
 private:
     css::uno::Reference< css::frame::XModel > mxModel;
     css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps;
-    sal_Bool mbHeader;
+    bool mbHeader;
 
 public:
-    SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, sal_Bool isHeader );
+    SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader );
     virtual ~SwVbaHeadersFooters() {}
 
     virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 8121296a7e8e..e749b78f29e3 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -39,7 +39,7 @@ SwVbaListFormat::~SwVbaListFormat()
 
 void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bContinuePreviousList = sal_True;
+    bool bContinuePreviousList = true;
     if( ContinuePreviousList.hasValue() )
         ContinuePreviousList >>= bContinuePreviousList;
 
@@ -61,20 +61,20 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
 
     uno::Reference< container::XEnumerationAccess > xEnumAccess( mxTextRange, uno::UNO_QUERY_THROW );
     uno::Reference< container::XEnumeration > xEnum = xEnumAccess->createEnumeration();
-    sal_Bool isFirstElement = sal_True;
+    bool isFirstElement = true;
     while( xEnum->hasMoreElements() )
     {
         uno::Reference< beans::XPropertySet > xProps( xEnum->nextElement(), uno::UNO_QUERY_THROW );
         if( isFirstElement )
         {
-            sal_Bool isNumberingRestart = !bContinuePreviousList;
+            bool isNumberingRestart = !bContinuePreviousList;
             xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( isNumberingRestart ) );
             if( isNumberingRestart )
             {
                 sal_Int16 nStartValue = 1;
                 xProps->setPropertyValue("NumberingStartValue", uno::makeAny( nStartValue ) );
             }
-            isFirstElement = sal_False;
+            isFirstElement = false;
         }
         else
         {
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 9654618de899..8c75691e9509 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -58,7 +58,7 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc
 
 double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool isHeaderOn = sal_False;
+    bool isHeaderOn = false;
     mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
     if( !isHeaderOn )
         mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_True ) );
@@ -77,7 +77,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException
 void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance );
-    sal_Bool isHeaderOn = sal_False;
+    bool isHeaderOn = false;
     sal_Int32 aktTopMargin = 0;
     sal_Int32 aktSpacing = 0;
     sal_Int32 aktHeaderHeight = 0;
@@ -101,7 +101,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw
 
 double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool isFooterOn = sal_False;
+    bool isFooterOn = false;
     mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn;
     if( !isFooterOn )
         mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_True ) );
@@ -111,7 +111,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException
 void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance );
-    sal_Bool isFooterOn = sal_False;
+    bool isFooterOn = false;
     sal_Int32 aktBottomMargin = 0;
     sal_Int32 aktSpacing = 0;
     sal_Int32 aktFooterHeight = 0;
@@ -167,7 +167,7 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status
     sal_Int32 nFooterHeight = 0;
     xStyleProps->getPropertyValue("FooterHeight") >>= nFooterHeight;
 
-    sal_Bool isHeaderOn = sal_False;
+    bool isHeaderOn = false;
     xStyleProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
     if( isHeaderOn )
     {
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 4ade338a7328..8ae1ef4b5b51 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -37,7 +37,7 @@ SwVbaParagraph::~SwVbaParagraph()
 uno::Reference< word::XRange > SAL_CALL
 SwVbaParagraph::getRange( ) throw ( uno::RuntimeException, std::exception )
 {
-    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) );
+    return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), true ) );
 }
 
 uno::Any SAL_CALL
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index aa5d0c9b12ba..60ac894f6399 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -72,14 +72,14 @@ void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent )
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     mxParaProps->getPropertyValue("ParaKeepTogether") >>= bKeep;
     return uno::makeAny ( bKeep );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     if( _keeptogether >>= bKeep )
     {
         mxParaProps->setPropertyValue("ParaKeepTogether", uno::makeAny( bKeep ) );
@@ -92,14 +92,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     mxParaProps->getPropertyValue("ParaSplit") >>= bKeep;
     return uno::makeAny ( bKeep );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bKeep = sal_False;
+    bool bKeep = false;
     if( _keepwithnext >>= bKeep )
     {
         mxParaProps->setPropertyValue("ParaSplit", uno::makeAny( bKeep ) );
@@ -112,14 +112,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bHypn = sal_False;
+    bool bHypn = false;
     mxParaProps->getPropertyValue("ParaIsHyphenation") >>= bHypn;
     return uno::makeAny ( bHypn );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bHypn = sal_False;
+    bool bHypn = false;
     if( _hyphenation >>= bHypn )
     {
         mxParaProps->setPropertyValue("ParaIsHyphenation", uno::makeAny( bHypn ) );
@@ -160,14 +160,14 @@ void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingru
 
 uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool noLineNum = sal_False;
+    bool noLineNum = false;
     mxParaProps->getPropertyValue("ParaLineNumberCount") >>= noLineNum;
     return uno::makeAny ( noLineNum );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool noLineNum = sal_False;
+    bool noLineNum = false;
     if( _nolinenumber >>= noLineNum )
     {
         mxParaProps->setPropertyValue("ParaLineNumberCount", uno::makeAny( noLineNum ) );
@@ -204,13 +204,13 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::Runtime
 {
     style::BreakType aBreakType;
     mxParaProps->getPropertyValue("BreakType") >>= aBreakType;
-    sal_Bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
+    bool bBreakBefore = ( aBreakType == style::BreakType_PAGE_BEFORE || aBreakType == style::BreakType_PAGE_BOTH );
     return uno::makeAny( bBreakBefore );
 }
 
 void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bBreakBefore = sal_False;
+    bool bBreakBefore = false;
     if( _breakbefore >>= bBreakBefore )
     {
         style::BreakType aBreakType;
@@ -307,7 +307,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeExc
     mxParaProps->getPropertyValue("ParaOrphans") >>= nOrphan;
     // if the amount of single lines on one page > 1 and the same of start and end of the paragraph,
     // true is retured.
-    sal_Bool bWidow = ( nWidow > 1 && nOrphan == nWidow );
+    bool bWidow = ( nWidow > 1 && nOrphan == nWidow );
     return uno::makeAny( bWidow );
 }
 
@@ -315,7 +315,7 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr
 {
     // if we get true, the part of the paragraph on one page has to be
     // at least two lines
-    sal_Bool bWidow = sal_False;
+    bool bWidow = false;
     if( _widowcontrol >>= bWidow )
     {
         sal_Int8 nControl = bWidow? 2:1;
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 7457d0dc6f6f..3bd95e21ad08 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -43,18 +43,18 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     uno::Reference< text::XTextRange > xEnd;
     initialize( rStart, xEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     initialize( rStart, rEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
 {
     initialize( rStart, rEnd );
 }
@@ -147,7 +147,7 @@ SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException, std:
     {
         mxTextCursor->setString( OUString() );
         // process CR in strings
-        SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True );
+        SwVbaRangeHelper::insertString( xRange, mxText, rText, true );
     }
     else
     {
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 7d695bbd5153..408c47cd2ed1 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -38,15 +38,15 @@ private:
     css::uno::Reference< css::text::XTextDocument > mxTextDocument;
     css::uno::Reference< css::text::XTextCursor > mxTextCursor;
     css::uno::Reference< css::text::XText > mxText;
-    sal_Bool mbMaySpanEndOfDocument;
+    bool mbMaySpanEndOfDocument;
 
 private:
     void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException);
     void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException );
 public:
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False ) throw (css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
     virtual ~SwVbaRange();
    css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; }
 
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 57cb19602cde..78ef5fec9ba7 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -43,7 +43,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
         sal_Int32 nPos = 0;
         uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
         xCursor->collapseToStart();
-        sal_Bool bCanGo = sal_True;
+        bool bCanGo = true;
         while( !xRange.is() && bCanGo )
         {
             if( _position == nPos )
@@ -60,7 +60,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
     return xRange;
 }
 
-void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
+void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( uno::RuntimeException )
 {
     sal_Int32 nlastIndex = 0;
     sal_Int32 nIndex = 0;
@@ -143,7 +143,7 @@ sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rT
         uno::Reference< text::XTextRangeCompare > xCompare( rText, uno::UNO_QUERY_THROW );
         // compareValue is 0 if the ranges are equal
         sal_Int32 nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange );
-        sal_Bool canGo = sal_True;
+        bool canGo = true;
 
         while( nCompareValue !=0 && canGo )
         {
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index 85f7b067a8f5..417f9c7c93a6 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -29,7 +29,7 @@ class SwVbaRangeHelper
 {
 public:
     static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
-    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
+    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( css::uno::RuntimeException );
     static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
     static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
     static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index f764c4d0ceec..27db78bd8cfd 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -62,14 +62,14 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru
 
 ::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool isAutoHeight = sal_False;
+    bool isAutoHeight = false;
     mxRowProps->getPropertyValue("IsAutoHeight") >>= isAutoHeight;
     return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly;
 }
 
 void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto );
+    bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto );
     mxRowProps->setPropertyValue("IsAutoHeight", uno::makeAny( isAutoHeight ) );
 }
 
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 96dc412c246a..b21b64b90c08 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -127,12 +127,12 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt
 
 uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bAllowBreak = sal_False;
+    bool bAllowBreak = false;
     uno::Reference< container::XIndexAccess > xRowsAccess( mxTableRows, uno::UNO_QUERY_THROW );
     for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index )
     {
         uno::Reference< beans::XPropertySet > xRowProps( xRowsAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
-        sal_Bool bSplit = sal_False;
+        bool bSplit = false;
         xRowProps->getPropertyValue("IsSplitAllowed") >>= bSplit;
         if( index == 0 )
         {
@@ -149,7 +149,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep
 
 void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages ) throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool bAllowBreak = sal_False;
+    bool bAllowBreak = false;
     _allowbreakacrosspages >>= bAllowBreak;
     uno::Reference< container::XIndexAccess > xRowsAccess( mxTableRows, uno::UNO_QUERY_THROW );
     for( sal_Int32 index = mnStartRowIndex; index <= mnEndRowIndex; ++index )
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 3a09874a6f76..3995c5f705a0 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -45,7 +45,7 @@ void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*
 
 uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
 {
-    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, sal_True ) );
+    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, true ) );
     if ( index.hasValue() )
         return xCol->Item( index, uno::Any() );
     return uno::makeAny( xCol );
@@ -53,7 +53,7 @@ uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::Run
 
 uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
 {
-    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, sal_False ) );
+    uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, false ) );
     if ( index.hasValue() )
         return xCol->Item( index, uno::Any() );
     return uno::makeAny( xCol );
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index bba8cf7f06c5..ef5ad0622cbd 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -131,7 +131,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw
     sal_Int32 nExtend = word::WdMovementType::wdMove;
     _unit >>= nUnit;
     _extend >>= nExtend;
-    sal_Bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
+    bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
 
     switch( nUnit )
     {
@@ -166,7 +166,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw (
     sal_Int32 nExtend = word::WdMovementType::wdMove;
     _unit >>= nUnit;
     _extend >>= nExtend;
-    sal_Bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
+    bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False;
 
     switch( nUnit )
     {
@@ -240,7 +240,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
     if( nCount == 0 )
         return;
 
-    sal_Bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True;
+    bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True;
 
     switch( nUnit )
     {
@@ -482,7 +482,7 @@ SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException, std::exception )
 {
     // #FIXME: if the selection is an entire paragraph, it's replaced
     // by the new paragraph
-    sal_Bool isCollapsed = mxTextViewCursor->isCollapsed();
+    bool isCollapsed = mxTextViewCursor->isCollapsed();
     InsertParagraph();
     if( isCollapsed )
         mxTextViewCursor->collapseToStart();
@@ -840,7 +840,7 @@ SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException, std::exception
     {
         uno::Reference< beans::XPropertySet > xPageStyleProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
         sal_Int32 nIndex = word::WdHeaderFooterIndex::wdHeaderFooterPrimary;
-        sal_Bool isHeader = HeaderFooterHelper::isHeader( mxModel );
+        bool isHeader = HeaderFooterHelper::isHeader( mxModel );
         if( HeaderFooterHelper::isEvenPagesHeader( mxModel ) || HeaderFooterHelper::isEvenPagesFooter( mxModel ) )
             nIndex = word::WdHeaderFooterIndex::wdHeaderFooterEvenPages;
         else if( HeaderFooterHelper::isFirstPageHeader( mxModel ) || HeaderFooterHelper::isFirstPageFooter( mxModel ) )
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index 7b889ea2044d..8ca495d78805 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -139,7 +139,7 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat
 
 sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException, std::exception)
 {
-    sal_Bool isAutoUpdate = sal_False;
+    bool isAutoUpdate = false;
     mxStyleProps->getPropertyValue("IsAutoUpdate") >>= isAutoUpdate;
     return isAutoUpdate;
 }
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 9f659b1757b0..8dda034c0f7d 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -123,7 +123,7 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
 sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException)
 {
     sal_Int32 nWidth = 0;
-    sal_Bool isWidthRelatvie = sal_False;
+    bool isWidthRelatvie = false;
     uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
     xTableProps->getPropertyValue("IsWidthRelative") >>= isWidthRelatvie;
     if( isWidthRelatvie )
@@ -163,7 +163,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart,
     rCols.SetLeft    ( 0 );
     rCols.SetRight   ( UNO_TABLE_COLUMN_SUM );
     rCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
-    pTable->GetTabCols( rCols, pStart, sal_False, sal_False );
+    pTable->GetTabCols( rCols, pStart, false, false );
 }
 
 sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) const
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index 0c6ab3cf781d..2f0c69e35d6c 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -59,7 +59,7 @@ void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) t
 
 sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bUseFields = sal_False;
+    bool bUseFields = false;
     mxTocProps->getPropertyValue("CreateFromMarks") >>= bUseFields;
     return bUseFields;
 }
@@ -71,7 +71,7 @@ void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields ) throw (c
 
 sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bUseOutlineLevels = sal_False;
+    bool bUseOutlineLevels = false;
     mxTocProps->getPropertyValue("CreateFromOutline") >>= bUseOutlineLevels;
     return bUseOutlineLevels;
 }
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 0fd9c8efe5cb..9827666d7566 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -115,7 +115,7 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
     uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance("com.sun.star.text.ContentIndex"), uno::UNO_QUERY_THROW );
 
     uno::Reference< beans::XPropertySet > xTocProps( xDocumentIndex, uno::UNO_QUERY_THROW );
-    sal_Bool isProtected = sal_False;
+    bool isProtected = false;
     xTocProps->setPropertyValue("IsProtected", uno::makeAny( isProtected ) );
 
     uno::Reference< word::XTableOfContents > xToc( new SwVbaTableOfContents( this, mxContext, mxTextDocument, xDocumentIndex ) );
@@ -125,12 +125,12 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
         LowerHeadingLevel >>= nLowerHeadingLevel;
     xToc->setLowerHeadingLevel( nLowerHeadingLevel );
 
-    sal_Bool bUseFields = sal_False;
+    bool bUseFields = false;
     if( UseFields.hasValue() )
         UseFields >>= bUseFields;
     xToc->setUseFields( bUseFields );
 
-    sal_Bool bUseOutlineLevels = sal_True;
+    bool bUseOutlineLevels = true;
     xToc->setUseOutlineLevels( bUseOutlineLevels );
 
     SwVbaRange* pVbaRange = dynamic_cast<SwVbaRange*>( Range.get() );
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 666d2aab65a3..af40d8ea7870 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -192,7 +192,7 @@ SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::Run
 sal_Bool SAL_CALL
 SwVbaView::getTableGridLines() throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bShowTableGridLine = sal_False;
+    bool bShowTableGridLine = false;
     mxViewSettings->getPropertyValue("ShowTableBoundaries") >>= bShowTableGridLine;
     return bShowTableGridLine;
 }
@@ -207,7 +207,7 @@ SwVbaView::setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::Runtim
 SwVbaView::getType() throw (css::uno::RuntimeException, std::exception)
 {
     // FIXME: handle wdPrintPreview type
-    sal_Bool bOnlineLayout = sal_False;
+    bool bOnlineLayout = false;
     mxViewSettings->getPropertyValue("ShowOnlineLayout") >>= bOnlineLayout;
     return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
 }
@@ -307,7 +307,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
             if ( aPageStyleName == "First Page" )
             {
                 // go to the beginning of where the next style is used
-                sal_Bool hasNextPage = sal_False;
+                bool hasNextPage = false;
                 xStyle = word::getCurrentPageStyle( mxModel );
                 do
                 {
@@ -328,9 +328,9 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
 
     xStyle = word::getCurrentPageStyle( mxModel );
     uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
-    sal_Bool isOn = sal_False;
+    bool isOn = false;
     xPageProps->getPropertyValue( aPropIsOn ) >>= isOn;
-    sal_Bool isShared =  sal_False;
+    bool isShared =  false;
     xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
     if( !isOn )
     {
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index cc9ffec06050..a08cf9c6359b 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -99,7 +99,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
         }
         case text::WrapTextMode_PARALLEL:
         {
-            sal_Bool bContour = sal_False;
+            bool bContour = false;
             m_xPropertySet->getPropertyValue("SurroundContour") >>= bContour;
             if( bContour )
                 nType = word::WdWrapType::wdWrapTight;