svtools: sal_Bool->bool

Change-Id: I22d8869551f46d2a0607f670f937853f394b6acf

5 files changed, 116 insertions, 117 deletions

diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 20f6cfc6fcb7..4b952c35f0d9 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -89,7 +89,7 @@ namespace svt
     }
 
 
-    sal_Bool ComboBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
+    bool ComboBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
         ComboBoxControl& rBox = GetComboBox();
         switch (rEvt.GetKeyCode().GetCode())
@@ -109,25 +109,25 @@ namespace svt
             case KEY_UP:
             case KEY_DOWN:
                 if (rBox.IsInDropDown())
-                    return sal_False;
+                    return false;
                 if (!rEvt.GetKeyCode().IsShift() &&
                      rEvt.GetKeyCode().IsMod1())
-                    return sal_False;
+                    return false;
                 // drop down the list box
                 else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
-                    return sal_False;
+                    return false;
             case KEY_PAGEUP:
             case KEY_PAGEDOWN:
             case KEY_RETURN:
                 if (rBox.IsInDropDown())
-                    return sal_False;
+                    return false;
             default:
-                return sal_True;
+                return true;
         }
     }
 
 
-    sal_Bool ComboBoxCellController::IsModified() const
+    bool ComboBoxCellController::IsModified() const
     {
         return GetComboBox().GetSavedValue() != GetComboBox().GetText();
     }
@@ -199,7 +199,7 @@ namespace svt
     }
 
 
-    sal_Bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
+    bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
         ListBoxControl& rBox = GetListBox();
         switch (rEvt.GetKeyCode().GetCode())
@@ -208,22 +208,22 @@ namespace svt
             case KEY_DOWN:
                 if (!rEvt.GetKeyCode().IsShift() &&
                      rEvt.GetKeyCode().IsMod1())
-                    return sal_False;
+                    return false;
                 // drop down the list box
                 else
                     if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN)
-                        return sal_False;
+                        return false;
             case KEY_PAGEUP:
             case KEY_PAGEDOWN:
                 if (rBox.IsTravelSelect())
-                    return sal_False;
+                    return false;
             default:
-                return sal_True;
+                return true;
         }
     }
 
 
-    sal_Bool ListBoxCellController::IsModified() const
+    bool ListBoxCellController::IsModified() const
     {
         return GetListBox().GetSelectEntryPos() != GetListBox().GetSavedValue();
     }
@@ -339,9 +339,9 @@ namespace svt
     //= CheckBoxCellController
 
 
-    sal_Bool CheckBoxCellController::WantMouseEvent() const
+    bool CheckBoxCellController::WantMouseEvent() const
     {
-        return sal_True;
+        return true;
     }
 
 
@@ -351,7 +351,7 @@ namespace svt
     }
 
 
-    sal_Bool CheckBoxCellController::IsModified() const
+    bool CheckBoxCellController::IsModified() const
     {
         return GetCheckBox().GetSavedValue() != GetCheckBox().GetState();
     }
@@ -390,7 +390,7 @@ namespace svt
     EditCellController::EditCellController( Edit* _pEdit )
         :CellController( _pEdit )
         ,m_pEditImplementation( new EditImplementation( *_pEdit ) )
-        ,m_bOwnImplementation( sal_True )
+        ,m_bOwnImplementation( true )
     {
     }
 
@@ -398,7 +398,7 @@ namespace svt
     EditCellController::EditCellController( IEditImplementation* _pImplementation )
         :CellController( &_pImplementation->GetControl() )
         ,m_pEditImplementation( _pImplementation )
-        ,m_bOwnImplementation( sal_False )
+        ,m_bOwnImplementation( false )
     {
     }
 
@@ -422,9 +422,9 @@ namespace svt
     }
 
 
-    sal_Bool EditCellController::MoveAllowed(const KeyEvent& rEvt) const
+    bool EditCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
-        sal_Bool bResult;
+        bool bResult;
         switch (rEvt.GetKeyCode().GetCode())
         {
             case KEY_END:
@@ -440,13 +440,13 @@ namespace svt
                 bResult = !aSel && aSel.Min() == 0;
             }   break;
             default:
-                bResult = sal_True;
+                bResult = true;
         }
         return bResult;
     }
 
 
-    sal_Bool EditCellController::IsModified() const
+    bool EditCellController::IsModified() const
     {
         return m_pEditImplementation->IsModified();
     }
@@ -479,9 +479,9 @@ namespace svt
     }
 
 
-    sal_Bool SpinCellController::MoveAllowed(const KeyEvent& rEvt) const
+    bool SpinCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
-        sal_Bool bResult;
+        bool bResult;
         switch (rEvt.GetKeyCode().GetCode())
         {
             case KEY_END:
@@ -497,13 +497,13 @@ namespace svt
                 bResult = !aSel && aSel.Min() == 0;
             }   break;
             default:
-                bResult = sal_True;
+                bResult = true;
         }
         return bResult;
     }
 
 
-    sal_Bool SpinCellController::IsModified() const
+    bool SpinCellController::IsModified() const
     {
         return GetSpinWindow().IsModified();
     }
@@ -540,16 +540,16 @@ namespace svt
     }
 
 
-    sal_Bool MultiLineTextCell::dispatchKeyEvent( const KeyEvent& _rEvent )
+    bool MultiLineTextCell::dispatchKeyEvent( const KeyEvent& _rEvent )
     {
         Selection aOldSelection( GetSelection() );
 
-        sal_Bool bWasModified = IsModified();
+        bool bWasModified = IsModified();
         ClearModifyFlag( );
 
-        sal_Bool bHandled = GetTextView()->KeyInput( _rEvent );
+        bool bHandled = GetTextView()->KeyInput( _rEvent );
 
-        sal_Bool bIsModified = IsModified();
+        bool bIsModified = IsModified();
         if ( bWasModified && !bIsModified )
             // not sure whether this can really happen
             SetModifyFlag();
@@ -562,9 +562,9 @@ namespace svt
             if  (  aNewSelection != aOldSelection   // selection changed
                 || bIsModified                      // or some other modification
                 )
-                return sal_True;
+                return true;
         }
-        return sal_False;
+        return false;
     }
 
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index fdaf88196f5b..d32da66e7771 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -97,7 +97,7 @@ namespace svt
     }
 
 
-    void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown)
+    void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* pEvt, bool bIsDown)
     {
         if (pEvt == pEvent)
         {
@@ -125,7 +125,7 @@ namespace svt
         SetCompoundControl(true);
         SetGridLineColor( Color( COL_LIGHTGRAY ) );
 
-        ImplInitSettings(sal_True, sal_True, sal_True);
+        ImplInitSettings(true, true, true);
 
         pCheckBoxPaint = new CheckBoxControl(&GetDataWindow());
         pCheckBoxPaint->SetPaintTransparent( true );
@@ -144,9 +144,9 @@ namespace svt
                   ,nOldEditRow(-1)
                   ,nEditCol(0)
                   ,nOldEditCol(0)
-                  ,bHasFocus(sal_False)
-                  ,bPaintStatus(sal_True)
-                  ,bActiveBeforeTracking( sal_False )
+                  ,bHasFocus(false)
+                  ,bPaintStatus(true)
+                  ,bActiveBeforeTracking( false )
                   ,m_nBrowserFlags(nBrowserFlags)
                   ,pHeader(NULL)
     {
@@ -165,9 +165,9 @@ namespace svt
                   ,nOldEditRow(-1)
                   ,nEditCol(0)
                   ,nOldEditCol(0)
-                  ,bHasFocus(sal_False)
-                  ,bPaintStatus(sal_True)
-                  ,bActiveBeforeTracking( sal_False )
+                  ,bHasFocus(false)
+                  ,bPaintStatus(true)
+                  ,bActiveBeforeTracking( false )
                   ,m_nBrowserFlags(nBrowserFlags)
                   ,pHeader(NULL)
     {
@@ -403,7 +403,7 @@ namespace svt
     {
         if ( bActiveBeforeTracking )
             ActivateCell();
-        bActiveBeforeTracking = sal_False;
+        bActiveBeforeTracking = false;
 
         BrowseBox::ImplEndTracking();
     }
@@ -413,7 +413,7 @@ namespace svt
     {
         if ( IsEditing() )
         {
-            Rectangle aRect( GetCellRect( nEditRow, nEditCol, sal_False ) );
+            Rectangle aRect( GetCellRect( nEditRow, nEditCol, false ) );
             CellControllerRef aCellController( Controller() );
             ResizeController( aCellController, aRect );
             aCellController->GetWindow().GrabFocus();
@@ -432,13 +432,13 @@ namespace svt
     void EditBrowseBox::KeyInput( const KeyEvent& rEvt )
     {
         sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
-        sal_Bool   bShift = rEvt.GetKeyCode().IsShift();
-        sal_Bool   bCtrl = rEvt.GetKeyCode().IsMod1();
+        bool   bShift = rEvt.GetKeyCode().IsShift();
+        bool   bCtrl = rEvt.GetKeyCode().IsMod1();
 
         switch (nCode)
         {
             case KEY_RETURN:
-                if (!bCtrl && !bShift && IsTabAllowed(sal_True))
+                if (!bCtrl && !bShift && IsTabAllowed(true))
                 {
                     Dispatch(BROWSER_CURSORRIGHT);
                 }
@@ -448,7 +448,7 @@ namespace svt
             case KEY_TAB:
                 if (!bCtrl && !bShift)
                 {
-                    if (IsTabAllowed(sal_True))
+                    if (IsTabAllowed(true))
                         Dispatch(BROWSER_CURSORRIGHT);
                     else
                         // do NOT call BrowseBox::KeyInput : this would handle the tab, but we already now
@@ -458,7 +458,7 @@ namespace svt
                 }
                 else if (!bCtrl && bShift)
                 {
-                    if (IsTabAllowed(sal_False))
+                    if (IsTabAllowed(false))
                         Dispatch(BROWSER_CURSORLEFT);
                     else
                         // do NOT call BrowseBox::KeyInput : this would handle the tab, but we already now
@@ -504,7 +504,7 @@ namespace svt
                 SaveModified();
         }
 
-        aMouseEvent.Set(&rEvt,sal_True);
+        aMouseEvent.Set(&rEvt,true);
         BrowseBox::MouseButtonDown(rEvt);
         aMouseEvent.Clear();
 
@@ -513,7 +513,7 @@ namespace svt
             // the base class does not travel upon MouseButtonDown, but implActivateCellOnMouseEvent assumes we traveled ...
             GoToRowColumnId( rEvt.GetRow(), rEvt.GetColumnId() );
             if (rEvt.GetRow() >= 0)
-                implActivateCellOnMouseEvent(rEvt, sal_False);
+                implActivateCellOnMouseEvent(rEvt, false);
         }
     }
 
@@ -524,17 +524,17 @@ namespace svt
         if (rEvt.GetClicks() > 1 && rEvt.GetRow() >= 0)
             return;
 
-        aMouseEvent.Set(&rEvt,sal_False);
+        aMouseEvent.Set(&rEvt,false);
         BrowseBox::MouseButtonUp(rEvt);
         aMouseEvent.Clear();
 
         if (0 == (m_nBrowserFlags & EBBF_ACTIVATE_ON_BUTTONDOWN))
             if (rEvt.GetRow() >= 0)
-                implActivateCellOnMouseEvent(rEvt, sal_True);
+                implActivateCellOnMouseEvent(rEvt, true);
     }
 
 
-    void EditBrowseBox::implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, sal_Bool _bUp)
+    void EditBrowseBox::implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp)
     {
         if (!IsEditing())
             ActivateCell();
@@ -620,11 +620,11 @@ namespace svt
                 {
                     const KeyEvent* pKeyEvent = rEvt.GetKeyEvent();
                     sal_uInt16 nCode  = pKeyEvent->GetKeyCode().GetCode();
-                    sal_Bool   bShift = pKeyEvent->GetKeyCode().IsShift();
-                    sal_Bool   bCtrl  = pKeyEvent->GetKeyCode().IsMod1();
-                    sal_Bool   bAlt =   pKeyEvent->GetKeyCode().IsMod2();
-                    sal_Bool   bLocalSelect=    sal_False;
-                    sal_Bool   bNonEditOnly =   sal_False;
+                    bool       bShift = pKeyEvent->GetKeyCode().IsShift();
+                    bool       bCtrl  = pKeyEvent->GetKeyCode().IsMod1();
+                    bool       bAlt =   pKeyEvent->GetKeyCode().IsMod2();
+                    bool       bLocalSelect = false;
+                    bool       bNonEditOnly = false;
                     sal_uInt16 nId = BROWSER_NONE;
 
                     if (!bAlt && !bCtrl && !bShift )
@@ -639,7 +639,7 @@ namespace svt
 
                             case KEY_TAB:
                                 // ask if traveling to the next cell is allowed
-                                if (IsTabAllowed(sal_True))
+                                if (IsTabAllowed(true))
                                     nId = BROWSER_CURSORRIGHT;
                                 break;
 
@@ -653,24 +653,24 @@ namespace svt
                                     return true;
                                 }
                                 // ask if traveling to the next cell is allowed
-                                if (IsTabAllowed(sal_True))
+                                if (IsTabAllowed(true))
                                     nId = BROWSER_CURSORRIGHT;
 
                                 break;
                             case KEY_RIGHT:         nId = BROWSER_CURSORRIGHT; break;
                             case KEY_LEFT:          nId = BROWSER_CURSORLEFT; break;
-                            case KEY_SPACE:         nId = BROWSER_SELECT; bNonEditOnly = bLocalSelect = sal_True;break;
+                            case KEY_SPACE:         nId = BROWSER_SELECT; bNonEditOnly = bLocalSelect = true; break;
                         }
 
                     if ( !bAlt && !bCtrl && bShift )
                         switch ( nCode )
                         {
-                            case KEY_DOWN:          nId = BROWSER_SELECTDOWN; bLocalSelect = sal_True;break;
-                            case KEY_UP:            nId = BROWSER_SELECTUP; bLocalSelect = sal_True;break;
-                            case KEY_HOME:          nId = BROWSER_SELECTHOME; bLocalSelect = sal_True;break;
-                            case KEY_END:           nId = BROWSER_SELECTEND; bLocalSelect = sal_True;break;
+                            case KEY_DOWN:          nId = BROWSER_SELECTDOWN; bLocalSelect = true; break;
+                            case KEY_UP:            nId = BROWSER_SELECTUP; bLocalSelect = true; break;
+                            case KEY_HOME:          nId = BROWSER_SELECTHOME; bLocalSelect = true; break;
+                            case KEY_END:           nId = BROWSER_SELECTEND; bLocalSelect = true; break;
                             case KEY_TAB:
-                                if (IsTabAllowed(sal_False))
+                                if (IsTabAllowed(false))
                                     nId = BROWSER_CURSORLEFT;
                                 break;
                         }
@@ -678,7 +678,7 @@ namespace svt
                     if ( !bAlt && bCtrl && bShift )
                         switch ( nCode )
                         {
-                            case KEY_SPACE:         nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break;
+                            case KEY_SPACE:         nId = BROWSER_SELECTCOLUMN; bLocalSelect = true; break;
                         }
 
 
@@ -691,7 +691,7 @@ namespace svt
                             case KEY_PAGEUP:        nId = BROWSER_CURSORTOPOFFILE; break;
                             case KEY_HOME:          nId = BROWSER_CURSORTOPOFSCREEN; break;
                             case KEY_END:           nId = BROWSER_CURSORENDOFSCREEN; break;
-                            case KEY_SPACE:         nId = BROWSER_ENHANCESELECTION; bLocalSelect = sal_True;break;
+                            case KEY_SPACE:         nId = BROWSER_ENHANCESELECTION; bLocalSelect = true; break;
                         }
 
 
@@ -727,9 +727,9 @@ namespace svt
     }
 
 
-    sal_Bool EditBrowseBox::IsTabAllowed(sal_Bool) const
+    bool EditBrowseBox::IsTabAllowed(bool) const
     {
-        return sal_True;
+        return true;
     }
 
 
@@ -760,22 +760,22 @@ namespace svt
         }
         else if ( nType == STATE_CHANGE_ZOOM )
         {
-            ImplInitSettings( sal_True, sal_False, sal_False );
+            ImplInitSettings( true, false, false );
             bNeedCellReActivation = true;
         }
         else if ( nType == STATE_CHANGE_CONTROLFONT )
         {
-            ImplInitSettings( sal_True, sal_False, sal_False );
+            ImplInitSettings( true, false, false );
             Invalidate();
         }
         else if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
         {
-            ImplInitSettings( sal_False, sal_True, sal_False );
+            ImplInitSettings( false, true, false );
             Invalidate();
         }
         else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
         {
-            ImplInitSettings( sal_False, sal_False, sal_True );
+            ImplInitSettings( false, false, true );
             Invalidate();
         }
         else if (nType == STATE_CHANGE_STYLE)
@@ -805,13 +805,13 @@ namespace svt
             ( rDCEvt.GetType() == DATACHANGED_DISPLAY   ))  &&
             ( rDCEvt.GetFlags() & SETTINGS_STYLE        ))
         {
-            ImplInitSettings( sal_True, sal_True, sal_True );
+            ImplInitSettings( true, true, true );
             Invalidate();
         }
     }
 
 
-    void EditBrowseBox::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
+    void EditBrowseBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
@@ -922,10 +922,9 @@ namespace svt
                 // status cell should be painted if and only if text is displayed
                 // note: bPaintStatus is mutable, but Solaris has problems with assigning
                 // probably because it is part of a bitfield
-                pTHIS->bPaintStatus = static_cast< sal_Bool >
-                    (( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT );
+                pTHIS->bPaintStatus = ( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT;
                 rWindow.Invalidate(aRect);
-                pTHIS->bPaintStatus = sal_True;
+                pTHIS->bPaintStatus = true;
             }
 
             // don't paint during row change
@@ -954,7 +953,7 @@ namespace svt
         BrowseBox::ColumnMoved(nId);
         if (IsEditing())
         {
-            Rectangle aRect( GetCellRect(nEditRow, nEditCol, sal_False));
+            Rectangle aRect( GetCellRect(nEditRow, nEditCol, false));
             CellControllerRef aControllerRef = Controller();
             ResizeController(aControllerRef, aRect);
             Controller()->GetWindow().GrabFocus();
@@ -962,16 +961,16 @@ namespace svt
     }
 
 
-    sal_Bool EditBrowseBox::SaveRow()
+    bool EditBrowseBox::SaveRow()
     {
-        return sal_True;
+        return true;
     }
 
 
-    sal_Bool EditBrowseBox::CursorMoving(long, sal_uInt16)
+    bool EditBrowseBox::CursorMoving(long, sal_uInt16)
     {
-        ((EditBrowseBox *) this)->DeactivateCell(sal_False);
-        return sal_True;
+        ((EditBrowseBox *) this)->DeactivateCell(false);
+        return true;
     }
 
 
@@ -995,7 +994,7 @@ namespace svt
     {
         if (IsEditing())
         {
-            Rectangle aRect = GetCellRect(nEditRow, nEditCol, sal_False);
+            Rectangle aRect = GetCellRect(nEditRow, nEditCol, false);
             ResizeController(aController,aRect);
             AsynchGetFocus();
         }
@@ -1003,7 +1002,7 @@ namespace svt
     }
 
 
-    void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bCellFocus)
+    void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, bool bCellFocus)
     {
         if (IsEditing())
             return;
@@ -1021,7 +1020,7 @@ namespace svt
             aController = GetController(nRow, nCol);
             if (aController.Is())
             {
-                Rectangle aRect( GetCellRect(nEditRow, nEditCol, sal_False));
+                Rectangle aRect( GetCellRect(nEditRow, nEditCol, false));
                 ResizeController(aController, aRect);
 
                 InitController(aController, nEditRow, nEditCol);
@@ -1053,7 +1052,7 @@ namespace svt
     }
 
 
-    void EditBrowseBox::DeactivateCell(sal_Bool bUpdate)
+    void EditBrowseBox::DeactivateCell(bool bUpdate)
     {
         if (IsEditing())
         {
@@ -1089,7 +1088,7 @@ namespace svt
     }
 
 
-    Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, sal_Bool bRel) const
+    Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, bool bRel) const
     {
         Rectangle aRect( GetFieldRectPixel(nRow, nColId, bRel));
         if ((GetMode()  & BROWSER_CURSOR_WO_FOCUS) == BROWSER_CURSOR_WO_FOCUS)
@@ -1135,7 +1134,7 @@ namespace svt
     {
         if (IsEditing())
         {
-            Rectangle aRect( GetCellRect(nEditRow, nEditCol, sal_False));
+            Rectangle aRect( GetCellRect(nEditRow, nEditCol, false));
             CellControllerRef aControllerRef = Controller();
             ResizeController(aControllerRef, aRect);
             Controller()->GetWindow().GrabFocus();
@@ -1226,9 +1225,9 @@ namespace svt
 
 
 
-    sal_Bool EditBrowseBox::SaveModified()
+    bool EditBrowseBox::SaveModified()
     {
-        return sal_True;
+        return true;
     }
 
 
@@ -1278,7 +1277,7 @@ namespace svt
     }
 
 
-    void EditBrowseBox::PaintTristate(OutputDevice&, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled) const
+    void EditBrowseBox::PaintTristate(OutputDevice&, const Rectangle& rRect, const TriState& eState, bool _bEnabled) const
     {
         pCheckBoxPaint->GetBox().SetState(eState);
         pCheckBoxPaint->SetPosSizePixel(rRect.TopLeft(), rRect.GetSize());
@@ -1314,7 +1313,7 @@ namespace svt
         if (m_nBrowserFlags == nFlags)
             return;
 
-        sal_Bool RowPicturesChanges = ((m_nBrowserFlags & EBBF_NO_HANDLE_COLUMN_CONTENT) !=
+        bool RowPicturesChanges = ((m_nBrowserFlags & EBBF_NO_HANDLE_COLUMN_CONTENT) !=
                                        (nFlags & EBBF_NO_HANDLE_COLUMN_CONTENT));
         m_nBrowserFlags = nFlags;
 
@@ -1381,9 +1380,9 @@ namespace svt
     }
 
 
-    sal_Bool CellController::WantMouseEvent() const
+    bool CellController::WantMouseEvent() const
     {
-        return sal_False;
+        return false;
     }
 
 
@@ -1392,9 +1391,9 @@ namespace svt
     }
 
 
-    sal_Bool CellController::MoveAllowed(const KeyEvent&) const
+    bool CellController::MoveAllowed(const KeyEvent&) const
     {
-        return sal_True;
+        return true;
     }
 
 }   // namespace svt
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index f8fb910d3839..b55404b65c90 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -135,7 +135,7 @@ void EditBrowseBox::GrabTableFocus()
 
 void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags )
 {
-    sal_Bool bFocus = sal_False;
+    bool bFocus = false;
     for (Window* pWindow = Application::GetFocusWindow();
          pWindow && !bFocus;
          pWindow = pWindow->GetParent())
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 3e14d99b7515..10dea024ee0c 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -621,7 +621,7 @@ void ExtendedColorConfig::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
 
 EditableExtendedColorConfig::EditableExtendedColorConfig() :
     m_pImpl(new ExtendedColorConfig_Impl),
-    m_bModified(sal_False)
+    m_bModified(false)
 {
     m_pImpl->LockBroadcast();
 }
@@ -646,17 +646,17 @@ void EditableExtendedColorConfig::AddScheme(const OUString& rScheme )
     m_pImpl->AddScheme(rScheme);
 }
 
-sal_Bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme )
+bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme )
 {
     if(m_bModified)
         m_pImpl->SetModified();
     if(m_pImpl->IsModified())
         m_pImpl->Commit();
-    m_bModified = sal_False;
+    m_bModified = false;
     m_pImpl->Load(rScheme);
     //the name of the loaded scheme has to be committed separately
     m_pImpl->CommitCurrentSchemeName();
-    return sal_True;
+    return true;
 }
 
 // Changes the name of the current scheme but doesn't load it!
@@ -671,12 +671,12 @@ void EditableExtendedColorConfig::SetColorValue(
 {
     m_pImpl->SetColorConfigValue(_sName, rValue);
     m_pImpl->ClearModified();
-    m_bModified = sal_True;
+    m_bModified = true;
 }
 
 void EditableExtendedColorConfig::SetModified()
 {
-    m_bModified = sal_True;
+    m_bModified = true;
 }
 
 void EditableExtendedColorConfig::Commit()
@@ -685,7 +685,7 @@ void EditableExtendedColorConfig::Commit()
         m_pImpl->SetModified();
     if(m_pImpl->IsModified())
         m_pImpl->Commit();
-    m_bModified = sal_False;
+    m_bModified = false;
 }
 
 void EditableExtendedColorConfig::DisableBroadcast()
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 75d82484dd23..1f650c94b58c 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -267,7 +267,7 @@ struct ErrorResource_Impl : private Resource
 };
 
 
-sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
+bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
 
 /*  [Description]
 
@@ -277,7 +277,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con
     */
 
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     ResMgr* pResMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() );
     if( pResMgr )
     {
@@ -286,7 +286,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con
         if(aEr)
         {
             rStr=((ResString)aEr).GetString();
-            bRet = sal_True;
+            bRet = true;
         }
     }
     delete pResMgr;
@@ -295,7 +295,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con
 
 
 
-sal_Bool SfxErrorHandler::GetMessageString(
+bool SfxErrorHandler::GetMessageString(
     sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
 
 /*  [Description]
@@ -305,7 +305,7 @@ sal_Bool SfxErrorHandler::GetMessageString(
     */
 
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     ResId *pResId= new ResId(nId, *pMgr);
 
     ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId);
@@ -316,7 +316,7 @@ sal_Bool SfxErrorHandler::GetMessageString(
         if( nResFlags )
             nFlags=aErrorString.GetFlags();
         rStr = aErrorString.GetString();
-        bRet = sal_True;
+        bRet = true;
     }
 
     delete pResId;
@@ -325,7 +325,7 @@ sal_Bool SfxErrorHandler::GetMessageString(
 
 
 
-sal_Bool SfxErrorHandler::GetErrorString(
+bool SfxErrorHandler::GetErrorString(
     sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
 
 /*  [Description]
@@ -338,8 +338,8 @@ sal_Bool SfxErrorHandler::GetErrorString(
 {
     SolarMutexGuard aGuard;
 
-    sal_Bool bRet = sal_False;
-    rStr=SvtResId(RID_ERRHDL_CLASS).toString();
+    bool bRet = false;
+    rStr = SvtResId(RID_ERRHDL_CLASS).toString();
     ResId aResId(nId, *pMgr);
 
     {
@@ -352,10 +352,10 @@ sal_Bool SfxErrorHandler::GetErrorString(
             if ( nResFlags )
                 nFlags = nResFlags;
             rStr = rStr.replaceAll(OUString("$(ERROR)"), aErrorString.GetString());
-            bRet = sal_True;
+            bRet = true;
         }
         else
-            bRet = sal_False;
+            bRet = false;
     }
 
     if( bRet )