sal_Bool -> bool in mostly vcl module

Conflicts: include/vcl/settings.hxx svtools/source/table/tablecontrol_impl.cxx sw/source/core/frmedt/fecopy.cxx vcl/inc/canvasbitmap.hxx vcl/inc/headless/svpframe.hxx vcl/inc/unx/salframe.h vcl/inc/win/salframe.h vcl/inc/win/salprn.h vcl/inc/win/salvd.h vcl/osx/DragSource.cxx vcl/osx/DragSource.hxx vcl/osx/DropTarget.cxx vcl/osx/DropTarget.hxx vcl/osx/OSXTransferable.cxx vcl/osx/OSXTransferable.hxx vcl/osx/clipboard.cxx vcl/osx/clipboard.hxx vcl/osx/salprn.cxx vcl/qa/cppunit/canvasbitmaptest.cxx vcl/source/components/fontident.cxx vcl/source/control/edit.cxx vcl/source/control/spinfld.cxx vcl/source/gdi/gdimtf.cxx vcl/source/gdi/virdev.cxx vcl/source/helper/canvasbitmap.cxx vcl/source/window/dockwin.cxx vcl/unx/generic/dtrans/X11_selection.hxx vcl/unx/kde/UnxFilePicker.cxx vcl/unx/kde/UnxFilePicker.hxx vcl/unx/kde4/KDE4FilePicker.cxx vcl/unx/kde4/KDE4FilePicker.hxx vcl/unx/kde4/KDESalFrame.hxx Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0 Reviewed-on: https://gerrit.libreoffice.org/8219 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
author: Chris Sherlock <chris.sherlock79@gmail.com> 2014-02-24 01:53:13 +1100
committer: Caolán McNamara <caolanm@redhat.com> 2014-02-28 03:19:47 -0600
commit: 381f8a5673b70e31fda2739da25f3863895ae665 (patch)
tree: d9366671e0e2794164ef6cbffbf3e53242139efb /vcl/source
parent: cd56e54df1df9c9e1a455f81bd86457f1d832604 (diff)
57 files changed, 192 insertions, 192 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 379bc32a7062..1eab532d4d1a 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -905,8 +905,8 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
         aData.aInclFilter[sizeof( aData.aInclFilter )-1] = '\0';
         aData.aExclFilter[sizeof( aData.aExclFilter )-1] = '\0';
 
-        aData.bOverwrite = maOverwrite.IsChecked() ? sal_True : sal_False;
-        aData.bHookOSLAssert = maHookOSLBox.IsChecked() ? sal_True : sal_False;
+        aData.bOverwrite = maOverwrite.IsChecked() ? true : false;
+        aData.bHookOSLAssert = maHookOSLBox.IsChecked() ? true : false;
 
         if ( maXtorThis.IsChecked() )
             aData.nTestFlags |= DBG_TEST_XTOR_THIS;
@@ -973,7 +973,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
                 ) );
             aBox.Execute();
         }
-        EndDialog( sal_True );
+        EndDialog( true );
     }
     else if ( pButton == &maInfoButton )
     {
@@ -1491,8 +1491,8 @@ long SolarMessageBoxExecutor::doIt()
 
 #if ! defined USE_VCL_MSGBOX
 #ifdef WNT
-    sal_Bool bOldCallTimer = pSVData->mbNoCallTimer;
-    pSVData->mbNoCallTimer = sal_True;
+    bool bOldCallTimer = pSVData->mbNoCallTimer;
+    pSVData->mbNoCallTimer = true;
     nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.getStr(), L"Debug Output",
                                      MB_TASKMODAL | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_ICONSTOP );
     pSVData->mbNoCallTimer = bOldCallTimer;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index d3f377535091..3c0a0f526eb3 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -63,7 +63,7 @@ void SalInstance::FillFontPathList( std::list< OString >& )
     // do nothing
 }
 
-SalMenu* SalInstance::CreateMenu( sal_Bool, Menu* )
+SalMenu* SalInstance::CreateMenu( bool, Menu* )
 {
     // default: no native menus
     return NULL;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 123a0f505db3..6d449df9a398 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1636,7 +1636,7 @@ bool InitAccessBridge()
         // disable accessibility if the user chooses to continue
         AllSettings aSettings = Application::GetSettings();
         MiscSettings aMisc = aSettings.GetMiscSettings();
-        aMisc.SetEnableATToolSupport( sal_False );
+        aMisc.SetEnableATToolSupport( false );
         aSettings.SetMiscSettings( aMisc );
         Application::SetSettings( aSettings );
     }
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index c25668126900..a4d615424827 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -321,7 +321,7 @@ GenericDragSource::~GenericDragSource()
 
 sal_Bool GenericDragSource::isDragImageSupported() throw(std::exception)
 {
-    return sal_False;
+    return false;
 }
 
 sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception)
@@ -337,7 +337,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&,
 {
     datatransfer::dnd::DragSourceDropEvent aEv;
     aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_COPY;
-    aEv.DropSuccess = sal_False;
+    aEv.DropSuccess = false;
     listener->dragDropEnd( aEv );
 }
 
@@ -444,7 +444,7 @@ void GenericDropTarget::removeDropTargetListener( const Reference< ::com::sun::s
 
 sal_Bool GenericDropTarget::isActive() throw(std::exception)
 {
-    return sal_False;
+    return false;
 }
 
 void GenericDropTarget::setActive( sal_Bool ) throw(std::exception)
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 82254081e9e0..d6133ea65d57 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -106,8 +106,8 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep
     aFD.Underline           = 0;
     aFD.Strikeout           = 0;
     aFD.Orientation         = 0;
-    aFD.Kerning             = sal_False;
-    aFD.WordLineMode        = sal_False;
+    aFD.Kerning             = false;
+    aFD.WordLineMode        = false;
     aFD.Type                = 0;
     switch( m_aFont.GetFamily() )
     {
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 94fc477055c3..5c8859a24357 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1682,7 +1682,7 @@ void OKButton::Click()
             if ( pParent->IsDialog() )
             {
                 if ( ((Dialog*)pParent)->IsInExecute() )
-                    ((Dialog*)pParent)->EndDialog( sal_True );
+                    ((Dialog*)pParent)->EndDialog( true );
                 // prevent recursive calls
                 else if ( !((Dialog*)pParent)->IsInClose() )
                 {
@@ -1739,7 +1739,7 @@ void CancelButton::Click()
             if ( pParent->IsDialog() )
             {
                 if ( ((Dialog*)pParent)->IsInExecute() )
-                    ((Dialog*)pParent)->EndDialog( sal_False );
+                    ((Dialog*)pParent)->EndDialog( false );
                 // prevent recursive calls
                 else if ( !((Dialog*)pParent)->IsInClose() )
                 {
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 64a8e5f56dbc..6b806031d2b6 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -652,7 +652,7 @@ void ComboBox::StateChanged( StateChangedType nType )
     else if ( nType == STATE_CHANGE_STYLE )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
-        mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? sal_True : sal_False );
+        mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? true : false );
     }
     else if( nType == STATE_CHANGE_MIRRORING )
     {
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0e89eca8e9bb..0a2170e2040a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -353,7 +353,7 @@ void Edit::ImplInit( Window* pParent, WinBits nStyle )
         xDGR->addDragGestureListener( xDGL );
         uno::Reference< datatransfer::dnd::XDropTargetListener> xDTL( mxDnDListener, uno::UNO_QUERY );
         GetDropTarget()->addDropTargetListener( xDTL );
-        GetDropTarget()->setActive( sal_True );
+        GetDropTarget()->setActive( true );
         GetDropTarget()->setDefaultActions( datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE );
     }
 }
@@ -720,7 +720,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI
             if ( nMode == EDIT_DELMODE_RESTOFWORD )
             {
                 i18n::Boundary aBoundary = xBI->getWordBoundary( maText.toString(), aSelection.Min(),
-                        GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+                        GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
                 if ( aBoundary.startPos == aSelection.Min() )
                     aBoundary = xBI->previousWord( maText.toString(), aSelection.Min(),
                             GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES );
@@ -1356,7 +1356,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
         {
             uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator();
             i18n::Boundary aBoundary = xBI->getWordBoundary( maText.toString(), aSelection.Max(),
-                     GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+                     GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
             ImplSetSelection( Selection( aBoundary.startPos, aBoundary.endPos ) );
             ImplCopyToSelectionClipboard();
         }
@@ -1584,7 +1584,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
                         if ( bWord )
                         {
                             i18n::Boundary aBoundary = xBI->getWordBoundary( maText.toString(), aSel.Max(),
-                                    GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+                                    GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
                             if ( aBoundary.startPos == aSel.Max() )
                                 aBoundary = xBI->previousWord( maText.toString(), aSel.Max(),
                                         GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES );
@@ -1716,7 +1716,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
 
                     // Wurde nichts veraendert, dann TAB fuer DialogControl
                     if ( GetSelection().Len() )
-                        bDone = sal_True;
+                        bDone = true;
                 }
             }
             break;
@@ -2412,7 +2412,7 @@ void Edit::SetEchoChar( sal_Unicode c )
         mpSubEdit->SetEchoChar( c );
 }
 
-void Edit::SetReadOnly( sal_Bool bReadOnly )
+void Edit::SetReadOnly( bool bReadOnly )
 {
     if ( mbReadOnly != bool(bReadOnly) )
     {
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 0568ad4c9d1b..af2845cefc5e 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -158,38 +158,38 @@ static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
     {
         SAL_WARN( "vcl.control", "ImplIsPatternChar: Exception caught!" );
         DBG_UNHANDLED_EXCEPTION();
-        return sal_False;
+        return false;
     }
 
     if ( (cEditMask == EDITMASK_ALPHA) || (cEditMask == EDITMASK_UPPERALPHA) )
     {
         if( !CharClass::isLetterType( nType ) )
-            return sal_False;
+            return false;
     }
     else if ( cEditMask == EDITMASK_NUM )
     {
         if( !CharClass::isNumericType( nType ) )
-            return sal_False;
+            return false;
     }
     else if ( (cEditMask == EDITMASK_ALPHANUM) || (cEditMask == EDITMASK_UPPERALPHANUM) )
     {
         if( !CharClass::isLetterNumericType( nType ) )
-            return sal_False;
+            return false;
     }
     else if ( (cEditMask == EDITMASK_ALLCHAR) || (cEditMask == EDITMASK_UPPERALLCHAR) )
     {
         if ( cChar < 32 )
-            return sal_False;
+            return false;
     }
     else if ( cEditMask == EDITMASK_NUMSPACE )
     {
         if ( !CharClass::isNumericType( nType ) && ( cChar != ' ' ) )
-            return sal_False;
+            return false;
     }
     else
-        return sal_False;
+        return false;
 
-    return sal_True;
+    return true;
 }
 
 static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask )
@@ -212,12 +212,12 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask )
 static int ImplCommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
 {
     if ( c1 == c2 )
-        return sal_True;
+        return true;
     else if ( ((c1 == '.') || (c1 == ',')) &&
               ((c2 == '.') || (c2 == ',')) )
-        return sal_True;
+        return true;
     else
-        return sal_False;
+        return false;
 }
 
 static OUString ImplPatternReformat( const OUString& rStr,
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 6ece054b39df..ae3a58f514a6 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -443,7 +443,7 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const
 bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const
 {
     ImplEntryType* pImplEntry = GetEntry( nIndex );
-    return pImplEntry ? pImplEntry->mbIsSelected : sal_False;
+    return pImplEntry ? pImplEntry->mbIsSelected : false;
 }
 
 bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const
@@ -969,7 +969,7 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect )
                 sal_uInt16 nDeselect = GetEntryList()->GetSelectEntryPos( 0 );
                 if( nDeselect != LISTBOX_ENTRY_NOTFOUND )
                 {
-                    //SelectEntryPos( nDeselect, sal_False );
+                    //SelectEntryPos( nDeselect, false );
                     GetEntryList()->SelectEntry( nDeselect, false );
                     if ( IsUpdateMode() && IsReallyVisible() )
                         ImplPaint( nDeselect, true );
@@ -1047,7 +1047,7 @@ bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, b
             // Space for selection change
             if( !bShift && ( ( eLET == LET_KEYSPACE ) || ( eLET == LET_MBDOWN ) ) )
             {
-                bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? sal_True : !mpEntryList->IsEntryPosSelected( nSelect );
+                bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? true : !mpEntryList->IsEntryPosSelected( nSelect );
                 if ( mbStackMode )
                 {
                     sal_uInt16 n;
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index f77ffe074f2d..6d6474cfb400 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -863,8 +863,8 @@ void ListBox::StateChanged( StateChangedType nType )
     else if ( nType == STATE_CHANGE_STYLE )
     {
         SetStyle( ImplInitStyle( GetStyle() ) );
-        mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? sal_True : sal_False );
-        bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False;
+        mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? true : false );
+        bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? true : false;
         mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode );
     }
     else if( nType == STATE_CHANGE_MIRRORING )
@@ -1185,7 +1185,7 @@ void ListBox::EnableMultiSelection( bool bMulti, bool bStackSelection )
     // WB_SIMPLEMODE:
     // The MultiListBox behaves just like a normal ListBox
     // MultiSelection is possible via corresponding additional keys
-    bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False;
+    bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? true : false;
     mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode );
 
     // In a MultiSelection, we can't see us travelling without focus
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 2940d28a2518..c14df7b195df 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -196,7 +196,7 @@ void ProgressBar::StateChanged( StateChangedType nType )
     if ( (nType == STATE_CHANGE_ZOOM) ||
          (nType == STATE_CHANGE_CONTROLFONT) )
     {
-        ImplInitSettings( sal_True, sal_False, sal_False );
+        ImplInitSettings( true, false, false );
         Invalidate();
     }
     else
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index d270b241178c..fcd035cb27f8 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -991,7 +991,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
             }
             else if(bPage && (HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_AREA : PART_TRACK_VERT_AREA,
                                            aControlRegion, rMousePos, bIsInside ) ?
-                bIsInside : sal_True) )
+                bIsInside : true) )
             {
                 nTrackFlags = STARTTRACK_BUTTONREPEAT;
 
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 5c6c2028ff43..9091c1d93aa8 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -411,7 +411,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt )
         else if ( maDropDownRect.IsInside( rMEvt.GetPosPixel() ) )
         {
             // put DropDownButton to the right
-            mbInDropDown = ShowDropDown( mbInDropDown ? sal_False : sal_True );
+            mbInDropDown = ShowDropDown( mbInDropDown ? false : true );
             Paint( Rectangle( Point(), GetOutputSizePixel() ) );
         }
 
@@ -527,7 +527,7 @@ bool SpinField::Notify( NotifyEvent& rNEvt )
                     }
                     else if ( ( nMod == KEY_MOD2 ) && !mbInDropDown && ( GetStyle() & WB_DROPDOWN ) )
                     {
-                        mbInDropDown = ShowDropDown( sal_True );
+                        mbInDropDown = ShowDropDown( true );
                         Paint( Rectangle( Point(), GetOutputSizePixel() ) );
                         nDone = true;
                     }
@@ -911,7 +911,7 @@ void SpinField::EndDropDown()
     Paint( Rectangle( Point(), GetOutputSizePixel() ) );
 }
 
-bool SpinField::ShowDropDown( sal_Bool )
+bool SpinField::ShowDropDown( bool )
 {
     return false;
 }
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 30c8dc49db7e..9308728bb6f6 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -255,7 +255,7 @@ public:
 
     virtual void    CreateAnchor();
 
-    virtual bool    SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False );
+    virtual bool    SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false );
 
     virtual bool    IsSelectionAtPoint( const Point& rPointPixel );
     virtual void    DeselectAll();
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 46d0ad7ccd27..b6edd64a78ac 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -751,7 +751,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
     if ( IsUndoEnabled() && !IsInUndo() )
     {
         TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) );
-        bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False;
+        bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? true : false;
         InsertUndo( pNewUndo, bTryMerge );
     }
 
@@ -1694,9 +1694,9 @@ void TextEngine::ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion*,
     i18n::LineBreakUserOptions aUserOptions;
     aUserOptions.forbiddenBeginCharacters = ImpGetLocaleDataWrapper()->getForbiddenCharacters().beginLine;
     aUserOptions.forbiddenEndCharacters = ImpGetLocaleDataWrapper()->getForbiddenCharacters().endLine;
-    aUserOptions.applyForbiddenRules = sal_True;
-    aUserOptions.allowPunctuationOutsideMargin = sal_False;
-    aUserOptions.allowHyphenateEnglish = sal_False;
+    aUserOptions.applyForbiddenRules = true;
+    aUserOptions.allowPunctuationOutsideMargin = false;
+    aUserOptions.allowHyphenateEnglish = false;
 
     static const com::sun::star::lang::Locale aDefLocale;
     i18n::LineBreakResults aLBR = xBI->getLineBreak( pNode->GetText(), nMaxBreakPos, aDefLocale, pLine->GetStart(), aHyphOptions, aUserOptions );
@@ -2152,7 +2152,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
 
 bool TextEngine::CreateLines( sal_uLong nPara )
 {
-    // sal_Bool: changing Height of Paragraph Yes/No - sal_True/sal_False
+    // bool: changing Height of Paragraph Yes/No - true/false
 
     TextNode* pNode = mpDoc->GetNodes().GetObject( nPara );
     TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara );
@@ -2491,7 +2491,7 @@ OUString TextEngine::GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord )
         TextSelection aSel( rCursorPos );
         TextNode* pNode = mpDoc->GetNodes().GetObject(  rCursorPos.GetPara() );
         uno::Reference < i18n::XBreakIterator > xBI = GetBreakIterator();
-        i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rCursorPos.GetIndex(), GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+        i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rCursorPos.GetIndex(), GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
         aSel.GetStart().GetIndex() = (sal_uInt16)aBoundary.startPos;
         aSel.GetEnd().GetIndex() = (sal_uInt16)aBoundary.endPos;
         aWord = pNode->GetText().copy( aSel.GetStart().GetIndex(), aSel.GetEnd().GetIndex() - aSel.GetStart().GetIndex() );
@@ -2543,7 +2543,7 @@ bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel )
     SetUpdateMode( bUpdate );
     FormatAndUpdate( GetActiveView() );
 
-    return rInput.GetError() ? sal_False : sal_True;
+    return rInput.GetError() ? false : true;
 }
 
 bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML )
@@ -2631,7 +2631,7 @@ bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML
         rOutput.WriteLine( "</HTML>" );
     }
 
-    return rOutput.GetError() ? sal_False : sal_True;
+    return rOutput.GetError() ? false : true;
 }
 
 void TextEngine::RemoveAttribs( sal_uLong nPara, bool bIdleFormatAndUpdate )
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index d8b26df1a8e7..9caeba98aa5a 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -197,7 +197,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) :
     mpImpl->mbClickedInSelection = false;
     mpImpl->mbSupportProtectAttribute = false;
     mpImpl->mbCursorAtEndOfLine = false;
-//  mbInSelection = sal_False;
+//  mbInSelection = false;
 
     mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW;
 
@@ -227,7 +227,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) :
         pWindow->GetDragGestureRecognizer()->addDragGestureListener( xDGL );
         uno::Reference< datatransfer::dnd::XDropTargetListener> xDTL( xDGL, uno::UNO_QUERY );
         pWindow->GetDropTarget()->addDropTargetListener( xDTL );
-        pWindow->GetDropTarget()->setActive( sal_True );
+        pWindow->GetDropTarget()->setActive( true );
         pWindow->GetDropTarget()->setDefaultActions( datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE );
     }
 }
@@ -862,7 +862,7 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent )
                 HideSelection();
                 TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject(  mpImpl->maSelection.GetEnd().GetPara() );
                 uno::Reference < i18n::XBreakIterator > xBI = mpImpl->mpTextEngine->GetBreakIterator();
-                i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+                i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
                 TextSelection aNewSel( mpImpl->maSelection );
                 aNewSel.GetStart().GetIndex() = (sal_uInt16)aBoundary.startPos;
                 aNewSel.GetEnd().GetIndex() = (sal_uInt16)aBoundary.endPos;
@@ -1421,7 +1421,7 @@ TextPaM TextView::CursorWordLeft( const TextPaM& rPaM )
     {
         TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aPaM.GetPara() );
         uno::Reference < i18n::XBreakIterator > xBI = mpImpl->mpTextEngine->GetBreakIterator();
-        i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rPaM.GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+        i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rPaM.GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
         if ( aBoundary.startPos >= rPaM.GetIndex() )
             aBoundary = xBI->previousWord( pNode->GetText(), rPaM.GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES );
         aPaM.GetIndex() = ( aBoundary.startPos != -1 ) ? (sal_uInt16)aBoundary.startPos : 0;
@@ -1473,7 +1473,7 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode )
         {
             TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject(  aEndPaM.GetPara() );
             uno::Reference < i18n::XBreakIterator > xBI = mpImpl->mpTextEngine->GetBreakIterator();
-            i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
+            i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
             if ( aBoundary.startPos == mpImpl->maSelection.GetEnd().GetIndex() )
                 aBoundary = xBI->previousWord( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES );
             // #i63506# startPos is -1 when the paragraph starts with a tab
@@ -1855,7 +1855,7 @@ bool TextView::SetCursorAtPoint( const Point& rPosPixel )
         ShowSelection( aTmpNewSel );
     }
 
-    bool bForceCursor =  mpImpl->mpDDInfo ? sal_False : sal_True; // && !mbInSelection
+    bool bForceCursor =  mpImpl->mpDDInfo ? false : true; // && !mbInSelection
     ImpShowCursor( mpImpl->mbAutoScroll, bForceCursor, false );
     return true;
 }
@@ -1863,14 +1863,14 @@ bool TextView::SetCursorAtPoint( const Point& rPosPixel )
 bool TextView::IsSelectionAtPoint( const Point& rPosPixel )
 {
 //  if ( !Rectangle( Point(), mpImpl->mpWindow->GetOutputSizePixel() ).IsInside( rPosPixel ) && !mbInSelection )
-//      return sal_False;
+//      return false;
 
     Point aDocPos = GetDocPos( rPosPixel );
     TextPaM aPaM = mpImpl->mpTextEngine->GetPaM( aDocPos, false );
     // For Hyperlinks D&D also start w/o a selection.
     // BeginDrag is only called, however, if IsSelectionAtPoint()
     // Problem: IsSelectionAtPoint is not called by Command()
-    // if before MBDown returned sal_False.
+    // if before MBDown returned false.
     return ( IsInSelection( aPaM ) ||
             ( /* mpImpl->mpSelEngine->IsInCommand() && */ mpImpl->mpTextEngine->FindAttrib( aPaM, TEXTATTR_HYPERLINK ) ) );
 }
@@ -2058,7 +2058,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv
 
         bool bStarterOfDD = false;
         for ( sal_uInt16 nView = mpImpl->mpTextEngine->GetViewCount(); nView && !bStarterOfDD; )
-            bStarterOfDD = mpImpl->mpTextEngine->GetView( --nView )->mpImpl->mpDDInfo ? mpImpl->mpTextEngine->GetView( nView )->mpImpl->mpDDInfo->mbStarterOfDD : sal_False;
+            bStarterOfDD = mpImpl->mpTextEngine->GetView( --nView )->mpImpl->mpDDInfo ? mpImpl->mpTextEngine->GetView( nView )->mpImpl->mpDDInfo->mbStarterOfDD : false;
 
         HideSelection();
         ImpSetSelection( mpImpl->mpDDInfo->maDropPos );
@@ -2294,7 +2294,7 @@ void TextSelFunctionSet::CreateAnchor()
     mpView->ImpSetSelection( mpView->mpImpl->maSelection.GetEnd() );
 }
 
-bool TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool )
+bool TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, bool )
 {
     return mpView->SetCursorAtPoint( rPointPixel );
 }
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 97e6d99a4d5f..5300e9151956 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -337,7 +337,7 @@ IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar )
         nDiffX = mpTextWindow->GetTextView()->GetStartDocPos().X() - pCurScrollBar->GetThumbPos();
 
     mpTextWindow->GetTextView()->Scroll( nDiffX, nDiffY );
-    // mpTextWindow->GetTextView()->ShowCursor( sal_False, sal_True );
+    // mpTextWindow->GetTextView()->ShowCursor( false, true );
 
     return 0;
 }
@@ -843,7 +843,7 @@ void TextWindow::Command( const CommandEvent& rCEvt )
         }
 //      if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) )
 //      {
-//          pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, sal_False );
+//          pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, false );
 //      }
         if ( !Edit::GetGetSpecialCharsFunction() )
         {
@@ -1112,7 +1112,7 @@ void VclMultiLineEdit::EnableUpdateData( sal_uLong nTimeout )
     }
 }
 
-void VclMultiLineEdit::SetReadOnly( sal_Bool bReadOnly )
+void VclMultiLineEdit::SetReadOnly( bool bReadOnly )
 {
     pImpVclMEdit->SetReadOnly( bReadOnly );
     Edit::SetReadOnly( bReadOnly );
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 0f8f1342e277..04555e68acf5 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -249,7 +249,7 @@ bool ExtTextView::MatchGroup()
     if ( aMatchSel.HasRange() )
         SetSelection( aMatchSel );
 
-    return aMatchSel.HasRange() ? sal_True : sal_False;
+    return aMatchSel.HasRange() ? true : false;
 }
 
 bool ExtTextView::Search( const util::SearchOptions& rSearchOptions, bool bForward )
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index f950b6597d1c..978d927594e8 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -300,7 +300,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
         nSecondLong=(nSecondLong<<8)|(sal_uLong)sFirstBytes[i+4];
     }
 
-    // The following variable is used when bTest == true. It remains sal_False
+    // The following variable is used when bTest == true. It remains false
     // if the format (rFormatExtension) has not yet been set.
     bool bSomethingTested = false;
 
@@ -2119,7 +2119,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
 #endif
                 if( pFunc )
                 {
-                    if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem, sal_False ) )
+                    if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem, false ) )
                         nStatus = GRFILTER_FORMATERROR;
                     break;
                 }
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index b0495dc174fa..812c2430fdf7 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -56,7 +56,7 @@ GraphicDescriptor::~GraphicDescriptor()
         delete pFileStm;
 }
 
-bool GraphicDescriptor::Detect( sal_Bool bExtendedInfo )
+bool GraphicDescriptor::Detect( bool bExtendedInfo )
 {
     bool bRet = false;
     if ( pFileStm && !pFileStm->GetError() )
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index e473df1e7a7d..10697737d71b 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -60,7 +60,7 @@ extern "C" void init_source (j_decompress_ptr cinfo)
      * but we don't clear the input buffer.
      * This is correct behavior for reading a series of images from one source.
      */
-    source->start_of_file = sal_True;
+    source->start_of_file = true;
 }
 
 long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize )
@@ -108,9 +108,9 @@ extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
 
     source->pub.next_input_byte = source->buffer;
     source->pub.bytes_in_buffer = nbytes;
-    source->start_of_file = sal_False;
+    source->start_of_file = false;
 
-    return sal_True;
+    return true;
 }
 
 extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes)
@@ -128,7 +128,7 @@ extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes)
             numberOfBytes -= (long) source->pub.bytes_in_buffer;
             (void) fill_input_buffer(cinfo);
 
-            /* note we assume that fill_input_buffer will never return sal_False,
+            /* note we assume that fill_input_buffer will never return false,
              * so suspension need not be handled.
              */
         }
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index c7e28ab8bad1..0f7f52940034 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -67,7 +67,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
     destination->pub.next_output_byte = destination->buffer;
     destination->pub.free_in_buffer = BUFFER_SIZE;
 
-    return sal_True;
+    return true;
 }
 
 extern "C" void term_destination (j_compress_ptr cinfo)
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 79497fb344e1..6d557e77a92b 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -292,8 +292,8 @@ bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConf
     // don't work with pixel as destination map mode -> higher resolution preferrable
     maDestMapMode.SetMapUnit( MAP_100TH_MM );
     mpFilterConfigItem = pFilterConfigItem;
-    mpHandlesUsed = new sal_Bool[ MAXHANDLES ];
-    memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) );
+    mpHandlesUsed = new bool[ MAXHANDLES ];
+    memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( bool ) );
     mnHandleCount = mnLastPercent = mnRecordCount = mnRecordPos = mnRecordPlusPos = 0;
     mbRecordOpen = mbRecordPlusOpen = false;
     mbLineChanged = mbFillChanged = mbTextChanged = false;
@@ -378,7 +378,7 @@ sal_uLong EMFWriter::ImplAcquireHandle()
     {
         if( !mpHandlesUsed[ i ] )
         {
-            mpHandlesUsed[ i ] = sal_True;
+            mpHandlesUsed[ i ] = true;
 
             if( ( nHandle = i ) == mnHandleCount )
                 mnHandleCount++;
@@ -392,7 +392,7 @@ sal_uLong EMFWriter::ImplAcquireHandle()
 void EMFWriter::ImplReleaseHandle( sal_uLong nHandle )
 {
     DBG_ASSERT( nHandle && ( nHandle < MAXHANDLES ), "Handle out of range" );
-    mpHandlesUsed[ nHandle - 1 ] = sal_False;
+    mpHandlesUsed[ nHandle - 1 ] = false;
 }
 
 void EMFWriter::ImplBeginRecord( sal_uInt32 nType )
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
index 2bf365843de5..03b5225c5dcb 100644
--- a/vcl/source/filter/wmf/emfwr.hxx
+++ b/vcl/source/filter/wmf/emfwr.hxx
@@ -37,7 +37,7 @@ private:
     MapMode             maDestMapMode;
     FilterConfigItem*   mpFilterConfigItem;
     SvStream& m_rStm;
-    sal_Bool*               mpHandlesUsed;
+    bool*               mpHandlesUsed;
     sal_uLong               mnHandleCount;
     sal_uLong               mnLastPercent;
     sal_uLong               mnRecordCount;
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 09788f0430a1..c4e57194662c 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -865,7 +865,7 @@ bool EnhWMFReader::ReadEnhWMF()
                     if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
                     {
                         pWMF->ReadUInt32( nStyle );
-                        pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? sal_True : sal_False ) );
+                        pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? true : false ) );
                     }
                 }
                 break;
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 644cb4ee7372..52c34a4770e4 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -645,7 +645,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
             {
                 if ( nWinROP == PATCOPY )
                     pWMF->ReadUInt16( nUsage );    // i don't know anything of this parameter, so its called nUsage
-                                        // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), sal_False );
+                                        // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), false );
 
                 Size aDestSize( ReadYXExt() );
                 if ( aDestSize.Width() && aDestSize.Height() )  // #92623# do not try to read buggy bitmaps
@@ -814,7 +814,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
         {
             sal_uInt16  nStyle = 0;
             pWMF->ReadUInt16( nStyle );
-            pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? sal_True : sal_False ) );
+            pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? true : false ) );
         }
         break;
 
@@ -1490,7 +1490,7 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
                     {
                         if ( nWinROP == PATCOPY )
                             pStm->ReadUInt16( nUsage );    // i don't know anything of this parameter, so its called nUsage
-                                                // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), sal_False );
+                                                // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), false );
 
                         Size aDestSize( ReadYXExt() );
                         if ( aDestSize.Width() && aDestSize.Height() )  // #92623# do not try to read buggy bitmaps
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 9ecb8fa74865..af11af295b15 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -270,7 +270,7 @@ sal_uInt16 Bitmap::GetBitCount() const
 bool Bitmap::HasGreyPalette() const
 {
     const sal_uInt16    nBitCount = GetBitCount();
-    bool            bRet = nBitCount == 1 ? sal_True : sal_False;
+    bool            bRet = nBitCount == 1 ? true : false;
 
     BitmapReadAccess* pRAcc = ( (Bitmap*) this )->AcquireReadAccess();
 
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 1237c5338cd5..642d2010342e 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -935,7 +935,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 )
 
 bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ )
 {
-    bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : sal_True;
+    bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : true;
 
     if( bRet )
     {
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 840282eeee29..b9a6311e8945 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -143,7 +143,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
         aMask           ( rAlphaMask.ImplGetBitmap() ),
         aBitmapSize     ( aBitmap.GetSizePixel() ),
         eTransparent    ( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
-        bAlpha          ( !rAlphaMask ? sal_False : sal_True )
+        bAlpha          ( !rAlphaMask ? false : true )
 {
     if(!!aBitmap && !!aMask && aBitmap.GetSizePixel() != aMask.GetSizePixel())
     {
@@ -472,12 +472,12 @@ bool BitmapEx::Crop( const Rectangle& rRectPixel )
 
 bool BitmapEx::Convert( BmpConversion eConversion )
 {
-    return( !!aBitmap ? aBitmap.Convert( eConversion ) : sal_False );
+    return( !!aBitmap ? aBitmap.Convert( eConversion ) : false );
 }
 
 bool BitmapEx::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce )
 {
-    return( !!aBitmap ? aBitmap.ReduceColors( nNewColorCount, eReduce ) : sal_False );
+    return( !!aBitmap ? aBitmap.ReduceColors( nNewColorCount, eReduce ) : false );
 }
 
 bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, bool bExpandTransparent )
@@ -619,17 +619,17 @@ bool BitmapEx::Erase( const Color& rFillColor )
 
 bool BitmapEx::Dither( sal_uLong nDitherFlags )
 {
-    return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : sal_False );
+    return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : false );
 }
 
 bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol )
 {
-    return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : sal_False );
+    return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : false );
 }
 
 bool BitmapEx::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, const sal_uLong* pTols )
 {
-    return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uLong*) pTols ) : sal_False );
+    return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uLong*) pTols ) : false );
 }
 
 bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent,
@@ -638,12 +638,12 @@ bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent,
 {
     return( !!aBitmap ? aBitmap.Adjust( nLuminancePercent, nContrastPercent,
                                         nChannelRPercent, nChannelGPercent, nChannelBPercent,
-                                        fGamma, bInvert ) : sal_False );
+                                        fGamma, bInvert ) : false );
 }
 
 bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress )
 {
-    return( !!aBitmap ? aBitmap.Filter( eFilter, pFilterParam, pProgress ) : sal_False );
+    return( !!aBitmap ? aBitmap.Filter( eFilter, pFilterParam, pProgress ) : false );
 }
 
 void BitmapEx::Draw( OutputDevice* pOutDev, const Point& rDestPt ) const
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 75ea7eb39034..796036224427 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -66,7 +66,7 @@ void SettingsConfigItem::Commit()
     for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
     {
         OUString aKeyName( group->first );
-        /*sal_Bool bAdded =*/ AddNode( OUString(), aKeyName );
+        /*bool bAdded =*/ AddNode( OUString(), aKeyName );
         Sequence< PropertyValue > aValues( group->second.size() );
         PropertyValue* pValues = aValues.getArray();
         int nIndex = 0;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 8e952cea47c0..5698066e8ce2 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -307,7 +307,7 @@ void GDIMetaFile::Record( OutputDevice* pOut )
     nCurrentActionElement = aList.empty() ? 0 : (aList.size() - 1);
     pOutDev = pOut;
     bRecord = true;
-    Linker( pOut, sal_True );
+    Linker( pOut, true );
 }
 
 void GDIMetaFile::Play( GDIMetaFile& rMtf, size_t nPos )
@@ -597,12 +597,12 @@ void GDIMetaFile::Pause( bool _bPause )
         if( _bPause )
         {
             if( !bPause )
-                Linker( pOutDev, sal_False );
+                Linker( pOutDev, false );
         }
         else
         {
             if( bPause )
-                Linker( pOutDev, sal_True );
+                Linker( pOutDev, true );
         }
 
         bPause = _bPause;
@@ -616,7 +616,7 @@ void GDIMetaFile::Stop()
         bRecord = false;
 
         if( !bPause )
-            Linker( pOutDev, sal_False );
+            Linker( pOutDev, false );
         else
             bPause = false;
     }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 643b28311e4a..a118405827f2 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1517,7 +1517,7 @@ GfxLink ImpGraphic::ImplGetLink()
 
 bool ImpGraphic::ImplIsLink() const
 {
-    return ( mpGfxLink != NULL ) ? sal_True : sal_False;
+    return ( mpGfxLink != NULL ) ? true : false;
 }
 
 sal_uLong ImpGraphic::ImplGetChecksum() const
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index b2fa560e56ed..c4ae22e05467 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1147,7 +1147,7 @@ public:
     void setTextFillColor( const Color& rColor )
     {
         m_aGraphicsStack.front().m_aFont.SetFillColor( rColor );
-        m_aGraphicsStack.front().m_aFont.SetTransparent( ImplIsColorTransparent( rColor ) ? sal_True : sal_False );
+        m_aGraphicsStack.front().m_aFont.SetTransparent( ImplIsColorTransparent( rColor ) ? true : false );
         m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateFont;
     }
     void setTextFillColor()
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 79f36d49f38a..f8a712809701 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -161,7 +161,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
             }
             else
             {
-                mpAccess = aBmp.AcquireReadAccess();    // sal_True RGB with alphachannel
+                mpAccess = aBmp.AcquireReadAccess();    // true RGB with alphachannel
                 if( mpAccess )
                 {
                     if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) )
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index ea6780da3df0..968ebab50920 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -698,12 +698,12 @@ Printer::~Printer()
 sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const
 {
     if ( IsDisplayPrinter() )
-        return sal_False;
+        return false;
 
     if( mpInfoPrinter )
         return mpInfoPrinter->GetCapabilities( maJobSetup.ImplGetConstData(), nType );
     else
-        return sal_False;
+        return false;
 }
 
 
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 7ce25b7ccbda..350bfdc178a6 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -317,7 +317,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             aBox.Execute();
         }
         pController->setValue( OUString( "IsDirect" ),
-                               makeAny( sal_False ) );
+                               makeAny( false ) );
     }
 
     // setup printer
@@ -497,7 +497,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             else if( aDlg.isSingleJobs() )
             {
                 pController->setValue( OUString( "PrintCollateAsSingleJobs" ),
-                                       makeAny( sal_True ) );
+                                       makeAny( true ) );
             }
         }
         catch (const std::bad_alloc&)
@@ -865,7 +865,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
         {
             bool bVal = false;
             i_rProps[ nProperty ].Value >>= bVal;
-            aPageSize.bFullPaper = static_cast<bool>(bVal);
+            aPageSize.bFullPaper = bVal;
         }
         else if ( i_rProps[ nProperty ].Name == "PrinterPaperTray" )
         {
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 8e8ee1240caf..bdb9fb3ea09a 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -29,7 +29,7 @@
 /*
  * IsNativeControlSupported()
  *
- *  Returns sal_True if the platform supports native
+ *  Returns true if the platform supports native
  *  drawing of the control defined by nPart
  */
 bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart )
@@ -41,7 +41,7 @@ bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart )
 /*
  * HitTestNativeControl()
  *
- *  If the return value is sal_True, bIsInside contains information whether
+ *  If the return value is true, bIsInside contains information whether
  *  aPos was or was not inside the native widget specified by the
  *  nType/nPart combination.
  */
@@ -77,8 +77,8 @@ bool SalGraphics::drawNativeControl(    ControlType,
 /*
  * GetNativeControlRegion()
  *
- *  If the return value is sal_True, rNativeBoundingRegion
- *  contains the sal_True bounding region covered by the control
+ *  If the return value is true, rNativeBoundingRegion
+ *  contains the true bounding region covered by the control
  *  including any adornment, while rNativeContentRegion contains the area
  *  within the control that can be safely drawn into without drawing over
  *  the borders of the control.
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index ee9d63ce1071..82af07a555f3 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -127,7 +127,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
     m_aLayout.PlaneStride    = 0;
     m_aLayout.ColorSpace.clear();
     m_aLayout.Palette.clear();
-    m_aLayout.IsMsbFirst     = sal_False;
+    m_aLayout.IsMsbFirst     = false;
 
     if( m_pBmpAcc )
     {
@@ -142,42 +142,42 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = true;
                 m_nBitsPerInputPixel = 1;
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-                m_aLayout.IsMsbFirst = sal_True;
+                m_aLayout.IsMsbFirst = true;
                 break;
 
             case BMP_FORMAT_1BIT_LSB_PAL:
                 m_bPalette           = true;
                 m_nBitsPerInputPixel = 1;
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-                m_aLayout.IsMsbFirst = sal_False;
+                m_aLayout.IsMsbFirst = false;
                 break;
 
             case BMP_FORMAT_4BIT_MSN_PAL:
                 m_bPalette           = true;
                 m_nBitsPerInputPixel = 4;
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-                m_aLayout.IsMsbFirst = sal_True;
+                m_aLayout.IsMsbFirst = true;
                 break;
 
             case BMP_FORMAT_4BIT_LSN_PAL:
                 m_bPalette           = true;
                 m_nBitsPerInputPixel = 4;
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-                m_aLayout.IsMsbFirst = sal_False;
+                m_aLayout.IsMsbFirst = false;
                 break;
 
             case BMP_FORMAT_8BIT_PAL:
                 m_bPalette           = true;
                 m_nBitsPerInputPixel = 8;
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 break;
 
             case BMP_FORMAT_8BIT_TC_MASK:
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 8;
                 m_nEndianness        = util::Endianness::LITTLE; // doesn't matter
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
                                   m_pBmpAcc->GetColorMask().GetGreenMask(),
                                   m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -187,7 +187,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 16;
                 m_nEndianness        = util::Endianness::BIG;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
                                   m_pBmpAcc->GetColorMask().GetGreenMask(),
                                   m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -197,7 +197,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 16;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
                                   m_pBmpAcc->GetColorMask().GetGreenMask(),
                                   m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -207,7 +207,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 24;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( 0xff0000LL,
                                   0x00ff00LL,
                                   0x0000ffLL );
@@ -217,7 +217,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 24;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( 0x0000ffLL,
                                   0x00ff00LL,
                                   0xff0000LL );
@@ -227,7 +227,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 24;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
                                   m_pBmpAcc->GetColorMask().GetGreenMask(),
                                   m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -238,7 +238,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 32;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
 
                 m_aComponentTags.realloc(4);
                 sal_Int8* pTags = m_aComponentTags.getArray();
@@ -266,7 +266,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 32;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
 
                 m_aComponentTags.realloc(4);
                 sal_Int8* pTags = m_aComponentTags.getArray();
@@ -294,7 +294,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 32;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
 
                 m_aComponentTags.realloc(4);
                 sal_Int8* pTags = m_aComponentTags.getArray();
@@ -322,7 +322,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 32;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
 
                 m_aComponentTags.realloc(4);
                 sal_Int8* pTags = m_aComponentTags.getArray();
@@ -349,7 +349,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) :
                 m_bPalette           = false;
                 m_nBitsPerInputPixel = 32;
                 m_nEndianness        = util::Endianness::LITTLE;
-                m_aLayout.IsMsbFirst = sal_False; // doesn't matter
+                m_aLayout.IsMsbFirst = false; // doesn't matter
                 setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(),
                                   m_pBmpAcc->GetColorMask().GetGreenMask(),
                                   m_pBmpAcc->GetColorMask().GetBlueMask() );
@@ -438,7 +438,7 @@ geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeE
     return integerSize2DFromSize( m_aBitmap.GetSizePixel() );
 }
 
-::sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return m_aBmpEx.IsTransparent();
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index b5a35266415c..4376ab185fbf 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -293,11 +293,11 @@ OUString WhitespaceToSpace( const OUString& rLine, bool bProtect )
                     pRun++;
             }
             else if( bProtect && *pRun == '`' )
-                CopyUntil( pLeap, pRun, '`', sal_True );
+                CopyUntil( pLeap, pRun, '`', true );
             else if( bProtect && *pRun == '\'' )
-                CopyUntil( pLeap, pRun, '\'', sal_True );
+                CopyUntil( pLeap, pRun, '\'', true );
             else if( bProtect && *pRun == '"' )
-                CopyUntil( pLeap, pRun, '"', sal_True );
+                CopyUntil( pLeap, pRun, '"', true );
             else
             {
                 *pLeap = *pRun;
@@ -349,11 +349,11 @@ OString WhitespaceToSpace(const OString& rLine, bool bProtect)
                     pRun++;
             }
             else if( bProtect && *pRun == '`' )
-                CopyUntil( pLeap, pRun, '`', sal_True );
+                CopyUntil( pLeap, pRun, '`', true );
             else if( bProtect && *pRun == '\'' )
-                CopyUntil( pLeap, pRun, '\'', sal_True );
+                CopyUntil( pLeap, pRun, '\'', true );
             else if( bProtect && *pRun == '"' )
-                CopyUntil( pLeap, pRun, '"', sal_True );
+                CopyUntil( pLeap, pRun, '"', true );
             else
             {
                 *pLeap = *pRun;
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index c4aad9c36148..8c70510b111e 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -325,7 +325,7 @@ Accelerator::~Accelerator()
 
     // inform AccelManager about deleting the Accelerator
     if ( mpDel )
-        *mpDel = sal_True;
+        *mpDel = true;
 
     ImplDeleteData();
     delete mpData;
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 617fbf3c0caa..e3bccd74ca41 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -102,7 +102,7 @@ void ImplAccelManager::EndSequence( bool bCancel )
     for ( size_t i = 0, n = mpSequenceList->size(); i < n; ++i )
     {
         Accelerator* pTempAccel = (*mpSequenceList)[ i ];
-        sal_Bool bDel = sal_False;
+        bool bDel = false;
         pTempAccel->mbIsCancel = bCancel;
         pTempAccel->mpDel = &bDel;
         pTempAccel->Deactivate();
@@ -169,7 +169,7 @@ bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat )
 
                     // set accelerator of the actuel item
                     // and call the handler
-                    sal_Bool bDel = sal_False;
+                    bool bDel = false;
                     pAccel->maCurKeyCode    = rKeyCode;
                     pAccel->mnCurId         = pEntry->mnId;
                     pAccel->mnCurRepeat     = nRepeat;
@@ -240,7 +240,7 @@ bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat )
 
                     // define accelerator of the actual item
                     // and call the handler
-                    sal_Bool bDel = sal_False;
+                    bool bDel = false;
                     pAccel->maCurKeyCode    = rKeyCode;
                     pAccel->mnCurId         = pEntry->mnId;
                     pAccel->mnCurRepeat     = nRepeat;
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 9f7e85bef537..c88719ed2fe8 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -131,7 +131,7 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
             pWin->SetFillColor( pDev->GetSettings().GetStyleSettings().GetWindowColor() );
             pWin->SetLineColor();
             pWin->DrawRect( rRect );
-            pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? sal_True : sal_False,
+            pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? true : false,
                                             true, false );
         }
         aTempRect = rRect;
@@ -1881,7 +1881,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
         {
             mpWindowImpl->mbOverlapWin  = true;
             mpWindowImpl->mbFrame       = true;
-            mbFrameBorder   = (nOrgStyle & WB_NOBORDER) ? sal_False : sal_True;
+            mbFrameBorder   = (nOrgStyle & WB_NOBORDER) ? false : true;
         }
         else
         {
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a531bbde66ac..0d648a6a15d3 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -790,7 +790,7 @@ bool Dialog::Close()
 
     if ( IsInExecute() )
     {
-        EndDialog( sal_False );
+        EndDialog( false );
         mbInClose = false;
         return true;
     }
@@ -1078,7 +1078,7 @@ void Dialog::EndAllDialogs( Window* pParent )
      pTempModDialog = pModDialog->mpPrevExecuteDlg;
      if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, true ) ) )
      {
-        pModDialog->EndDialog( sal_False );
+        pModDialog->EndDialog( false );
         pModDialog->PostUserEvent( Link() );
      }
      pModDialog = pTempModDialog;
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 2ff6f0c79a6b..102547f8d0fa 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -339,7 +339,7 @@ bool DockingManager::IsDockable( const Window *pWindow )
 
     /*
     if( pWindow->HasDockingHandler() )
-        return sal_True;
+        return true;
     */
     return (pWrapper != NULL);
 }
@@ -891,7 +891,7 @@ void ImplDockingWindowWrapper::ImplInitData()
 {
     mpDockingWindow     = NULL;
 
-    //GetWindow()->mpWindowImpl->mbDockWin  = sal_True;     // TODO: must be eliminated
+    //GetWindow()->mpWindowImpl->mbDockWin  = true;     // TODO: must be eliminated
     mpFloatWin          = NULL;
     mbDockCanceled      = false;
     mbFloatPrevented    = false;
@@ -1049,7 +1049,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
 
 bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
 {
-    sal_Bool bFloating = sal_True;
+    bool bFloating = true;
     GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_PREPARETOGGLEFLOATING, &bFloating );
     return bFloating;
 }
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 9f029f62b6f1..4d0893509ac0 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -129,14 +129,14 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
     {
         // i43499 CTRL disables docking now
         mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking();
-        mpDockWin->EndDocking( maDockRect, sal_True );
+        mpDockWin->EndDocking( maDockRect, true );
         if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
             maDockTimer.Start();
     }
     else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) )
     {
         mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking();
-        mpDockWin->EndDocking( maDockRect, sal_False );
+        mpDockWin->EndDocking( maDockRect, false );
     }
     else
     {
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl)
         {
             mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking();
             maDockTimer.Stop();
-            mpDockWin->EndDocking( maDockRect, sal_True );
+            mpDockWin->EndDocking( maDockRect, true );
         }
     }
     mbInMove = false;
@@ -608,7 +608,7 @@ bool DockingWindow::Docking( const Point&, Rectangle& )
     return IsFloatingMode();
 }
 
-void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
+void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
 {
     if ( !IsDockingCanceled() )
     {
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e2f71b627387..65193d1d8584 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -980,7 +980,7 @@ void Menu::ImplInit()
     mpSalMenu       = NULL;
     nMenuFlags      = 0;
     nDefaultItem    = 0;
-    //bIsMenuBar      = sal_False;  // this is now set in the ctor, must not be changed here!!!
+    //bIsMenuBar      = false;  // this is now set in the ctor, must not be changed here!!!
     nSelectedId     = 0;
     pItemList       = new MenuItemList;
     pLogo           = NULL;
@@ -2179,7 +2179,7 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
             bVisible = false;
         else if ( pData->eType != MENUITEM_SEPARATOR ) // separators handled above
         {
-            // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( sal_True ) );
+            // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) );
             bVisible = pData->bEnabled; // do not check submenus as they might be filled at Activate().
         }
     }
@@ -3478,7 +3478,7 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const
 
 
 
-// sal_Bool PopupMenu::bAnyPopupInExecute = sal_False;
+// bool PopupMenu::bAnyPopupInExecute = false;
 
 PopupMenu::PopupMenu()
 {
@@ -3505,7 +3505,7 @@ PopupMenu::~PopupMenu()
 
 bool PopupMenu::IsInExecute()
 {
-    return GetActivePopupMenu() ? sal_True : sal_False;
+    return GetActivePopupMenu() ? true : false;
 }
 
 PopupMenu* PopupMenu::GetActivePopupMenu()
@@ -4161,7 +4161,7 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd)
         {
             //DBG_ASSERT( !pActivePopup->ImplGetWindow(), "PopupEnd, obwohl pActivePopup MIT Window!" );
             KillActivePopup(); // should be ok to just remove it
-            //pActivePopup->bCanceled = sal_True;
+            //pActivePopup->bCanceled = true;
         }
         bInExecute = false;
         pMenu->bInCallback = true;
@@ -4257,7 +4257,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer )
             Menu* pTest = pActivePopup;
             sal_uLong nOldFlags = GetPopupModeFlags();
             SetPopupModeFlags( GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
-            sal_uInt16 nRet = pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_RIGHT, pMenu, pTimer ? sal_False : sal_True  );
+            sal_uInt16 nRet = pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_RIGHT, pMenu, pTimer ? false : true  );
             SetPopupModeFlags( nOldFlags );
 
             // nRet != 0, wenn es waerend Activate() abgeschossen wurde...
@@ -4307,7 +4307,7 @@ void MenuFloatingWindow::Execute()
     pSVData->maAppData.mpActivePopupMenu = (PopupMenu*)pMenu;
 
     bInExecute = true;
-//  bCallingSelect = sal_False;
+//  bCallingSelect = false;
 
     while ( bInExecute )
         Application::Yield();
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index e30a4699fd24..e42cadaac73b 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -324,7 +324,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
 //            {
 //                maMnemonics[nMnemonicIndex] = 0;
 //                rKey.Insert( MNEMONIC_CHAR, nIndex );
-//                bChanged = sal_True;
+//                bChanged = true;
 //                break;
 //            }
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 8abf77fddbbf..7c1c5a2e22d4 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -788,7 +788,7 @@ bool PrintDialog::isPrintToFile()
 
 bool PrintDialog::isCollate()
 {
-    return maJobPage.mpCopyCountField->GetValue() > 1 ? maJobPage.mpCollateBox->IsChecked() : sal_False;
+    return maJobPage.mpCopyCountField->GetValue() > 1 ? maJobPage.mpCollateBox->IsChecked() : false;
 }
 
 bool PrintDialog::isSingleJobs()
@@ -1052,7 +1052,7 @@ void PrintDialog::setupOptionalUI()
                 pBtn->SetText( aChoices[m] );
                 pBtn->Check( m == nSelectVal );
                 pBtn->SetToggleHdl( LINK( this, PrintDialog, UIOption_RadioHdl ) );
-                if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] == sal_True )
+                if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] == true )
                     pBtn->Enable( false );
                 pBtn->Show();
                 maPropertyToWindowMap[ aPropertyName ].push_back( pBtn );
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 77448d15f921..5e215d7aa082 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -197,7 +197,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
                     pFunctionSet->DeselectAll();
                 else
                     pFunctionSet->DestroyAnchor();
-                   nFlags &= (~SELENG_HAS_ANCH); // bHasAnchor = sal_False;
+                   nFlags &= (~SELENG_HAS_ANCH); // bHasAnchor = false;
             }
             pFunctionSet->SetCursorAtPoint( aPos );
             // Sonderbehandlung Single-Selection, damit Select+Drag
@@ -246,7 +246,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
             if ( pFunctionSet->IsSelectionAtPoint( aPos ) )
             {
                 pFunctionSet->DeselectAtPoint( aPos );
-                pFunctionSet->SetCursorAtPoint( aPos, sal_True );
+                pFunctionSet->SetCursorAtPoint( aPos, true );
             }
             else
             {
@@ -261,7 +261,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
                 nFlags &= (~SELENG_IN_SEL);
                 return false;
             }
-            nFlags |= SELENG_IN_ADD; //bIsInAddMode = sal_True;
+            nFlags |= SELENG_IN_ADD; //bIsInAddMode = true;
             if ( !(nFlags & SELENG_HAS_ANCH) )
             {
                 pFunctionSet->CreateAnchor();
@@ -310,7 +310,7 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt )
             }
             pFunctionSet->DeselectAtPoint( aLastMove.GetPosPixel() );
             nFlags &= (~SELENG_HAS_ANCH); // nix Anker
-            pFunctionSet->SetCursorAtPoint( aLastMove.GetPosPixel(), sal_True );
+            pFunctionSet->SetCursorAtPoint( aLastMove.GetPosPixel(), true );
         }
         else
         {
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 16e06ab25ffa..0601c8b75dda 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2423,8 +2423,8 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
 
         if ( bSplit )
         {
-            bool    bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? sal_True : sal_False;
-            bool    bPropGreater = (mnMouseModifier & KEY_MOD1) ? sal_True : sal_False;
+            bool    bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? true : false;
+            bool    bPropGreater = (mnMouseModifier & KEY_MOD1) ? true : false;
             long    nDelta = mnMSplitPos-mnMStartPos;
 
             if ( (mnSplitTest & SPLIT_WINDOW) && !mpMainSet->mpItems )
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 3281e8a564da..6274cfc8883e 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -949,7 +949,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar )
             ImplToBottomChild();
             if ( pOldMenuBar )
             {
-                bool bDelete = (pMenuBar == 0) ? sal_True : sal_False;
+                bool bDelete = (pMenuBar == 0) ? true : false;
                 if( bDelete && pOldWindow )
                 {
                     if( mpImplData->mpTaskPaneList )
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index aa3910d8a86f..b43dd8453e75 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -932,7 +932,7 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis )
     {
         pWrapper->SetMinOutputSizePixel( aMinSize );
         pWrapper->SetMaxOutputSizePixel( aMaxSize );
-        pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( pThis->GetMenuType() & TOOLBOX_MENUTYPE_CUSTOMIZE) ? sal_True : sal_False );
+        pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( pThis->GetMenuType() & TOOLBOX_MENUTYPE_CUSTOMIZE) ? true : false );
     }
     else
     {
@@ -1319,10 +1319,10 @@ void ImplTBDragMgr::EndDragging( bool bOK )
         if ( !bOK )
         {
             mpDragBox->mnDockLines = mnStartLines;
-            mpDragBox->EndDocking( maStartRect, sal_False );
+            mpDragBox->EndDocking( maStartRect, false );
         }
         else
-            mpDragBox->EndDocking( maRect, sal_False );
+            mpDragBox->EndDocking( maRect, false );
         mnLineMode = 0;
         mnStartLines = 0;
     }
@@ -1412,7 +1412,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel )
     else
         EndDragging( true );
 
-    return sal_True;
+    return true;
 }
 
 
@@ -3003,7 +3003,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect )
 static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow )
 {
     // draws toolbar button background either native or using a coloured selection
-    // if bIsWindow is sal_True, the corresponding item is a control and only a selection border will be drawn
+    // if bIsWindow is true, the corresponding item is a control and only a selection border will be drawn
 
     bool bNativeOk = false;
     if( !bIsWindow && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
@@ -3247,7 +3247,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
             if( bHasOpenPopup )
                 ImplDrawFloatwinBorder( pItem );
             else
-                ImplDrawButton( this, aButtonRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False );
+                ImplDrawButton( this, aButtonRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? true : false );
 
             if( nHighlight != 0 )
             {
@@ -3301,7 +3301,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
             if( bHasOpenPopup )
                 ImplDrawFloatwinBorder( pItem );
             else
-                ImplDrawButton( this, pItem->maRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False );
+                ImplDrawButton( this, pItem->maRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? true : false );
         }
 
         sal_uInt16 nTextStyle = 0;
@@ -4422,7 +4422,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
 
                 if( bNoTabCycling &&  ! (GetStyle() & WB_FORCETABCYCLE) )
                     return DockingWindow::Notify( rNEvt );
-                else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? sal_True : sal_False , bNoTabCycling ) )
+                else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? true : false , bNoTabCycling ) )
                     return false;
                 else
                     return DockingWindow::Notify( rNEvt );
@@ -4639,7 +4639,7 @@ void ToolBox::ToggleFloatingMode()
     }
     else
     {
-        mbScroll = (mnWinStyle & WB_SCROLL) ? sal_True : sal_False;
+        mbScroll = (mnWinStyle & WB_SCROLL) ? true : false;
         if ( (meAlign == WINDOWALIGN_TOP) || (meAlign == WINDOWALIGN_BOTTOM) )
             mbHorz = true;
         else
@@ -4799,7 +4799,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
 
 
 
-void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
+void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode )
 {
     if ( !IsDockingCanceled() )
     {
@@ -5051,7 +5051,7 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl )
 
 
 // calls the button's action handler
-// returns sal_True if action was called
+// returns true if action was called
 bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
 {
     bool bRet = true;
@@ -5133,7 +5133,7 @@ bool ImplCloseLastPopup( Window *pParent )
 }
 
 // opens a drop down toolbox item
-// returns sal_True if item was opened
+// returns true if item was opened
 bool ToolBox::ImplOpenItem( KeyCode aKeyCode )
 {
     sal_uInt16 nCode = aKeyCode.GetCode();
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index be9926ca86d9..b8db7789a1a1 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -226,7 +226,7 @@ Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, cons
         if ( mpWindow && bHorz )
         {
             // get size of item window and check if it fits
-            // no windows in vertical toolbars (the default is mbShowWindow=sal_False)
+            // no windows in vertical toolbars (the default is mbShowWindow=false)
             Size aWinSize = mpWindow->GetSizePixel();
             if ( !bCheckMaxWidth || (aWinSize.Width() <= maxWidth) )
             {
@@ -1489,7 +1489,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease )
             if ( nPos != mnCurPos )
             {
                 mnCurPos = nPos;
-                ImplDrawItem( mnCurPos, sal_True );
+                ImplDrawItem( mnCurPos, true );
                 Flush();
             }
         }
@@ -1497,7 +1497,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease )
         {
             if ( nPos == mnCurPos )
             {
-                ImplDrawItem( mnCurPos, sal_False );
+                ImplDrawItem( mnCurPos, false );
                 Flush();
                 mnCurPos = TOOLBOX_ITEM_NOTFOUND;
             }
@@ -1799,7 +1799,7 @@ void ToolBox::ImplFillLayoutData() const
 
         // only draw, if the rectangle is within PaintRectangle
         if ( !pItem->maRect.IsEmpty() )
-            const_cast<ToolBox*>(this)->ImplDrawItem( i, sal_False, false, true );
+            const_cast<ToolBox*>(this)->ImplDrawItem( i, false, false, true );
     }
 }
 
@@ -1871,7 +1871,7 @@ void ToolBox::SetMenuType( sal_uInt16 aType )
             // the menu button may have to be moved into the decoration which changes the layout
             ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this );
             if( pWrapper )
-                pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( aType & TOOLBOX_MENUTYPE_CUSTOMIZE) ? sal_True : sal_False );
+                pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( aType & TOOLBOX_MENUTYPE_CUSTOMIZE) ? true : false );
 
             mbFormat = true;
             ImplFormat();
@@ -2145,7 +2145,7 @@ bool ToolBox::AlwaysLocked()
         }
     }
 
-    return nAlwaysLocked == 1 ? sal_True : sal_False;
+    return nAlwaysLocked == 1 ? true : false;
 }
 
 bool ToolBox::WillUsePopupMode() const
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5eb217c7737e..0c517104baa7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8127,7 +8127,7 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::
     {
         UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
         if ( pWrapper )
-            mpWindowImpl->mxWindowPeer = pWrapper->GetWindowInterface( this, sal_True );
+            mpWindowImpl->mxWindowPeer = pWrapper->GetWindowInterface( this, true );
     }
     return mpWindowImpl->mxWindowPeer;
 }
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 003795a7da3e..17f745d291c0 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -107,7 +107,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos,
                         pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL );
 // Erstmal ausgebaut als Hack fuer Bug 53378
 //                        if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK )
-//                            return sal_False;
+//                            return false;
 //                        else
                             return true;
                     }
@@ -518,7 +518,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
                                     nMouseX,
                                     nMouseY,
                                     nClicks,
-                                    sal_False );
+                                    false );
 
                                 sal_uLong nCount = Application::ReleaseSolarMutex();
 
@@ -903,7 +903,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
     sal_uInt16      nEvCode = aKeyCode.GetCode();
 
     // allow application key listeners to remove the key event
-    // but make sure we're not forwarding external KeyEvents, (ie where bForward is sal_False)
+    // but make sure we're not forwarding external KeyEvents, (ie where bForward is false)
     // because those are coming back from the listener itself and MUST be processed
     KeyEvent aKeyEvent( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
     if( bForward )
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index ba18b541f0ac..9c2060c77a50 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -195,10 +195,10 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s
         if ( !mbSysChild )
         {
             if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS )
-                mpWindowImpl->mpFrame->SetAlwaysOnTop( sal_True );
+                mpWindowImpl->mpFrame->SetAlwaysOnTop( true );
             if ( !(mnPresentationFlags & PRESENTATION_NOAUTOSHOW) )
                 ToTop();
-            mpWindowImpl->mpFrame->StartPresentation( sal_True );
+            mpWindowImpl->mpFrame->StartPresentation( true );
         }
 
         if ( !(mnPresentationFlags & PRESENTATION_NOAUTOSHOW) )
@@ -209,9 +209,9 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s
         Show( mbPresentationVisible );
         if ( !mbSysChild )
         {
-            mpWindowImpl->mpFrame->StartPresentation( sal_False );
+            mpWindowImpl->mpFrame->StartPresentation( false );
             if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS )
-                mpWindowImpl->mpFrame->SetAlwaysOnTop( sal_False );
+                mpWindowImpl->mpFrame->SetAlwaysOnTop( false );
         }
         ShowFullScreenMode( mbPresentationFull, nDisplayScreen );
author	Chris Sherlock <chris.sherlock79@gmail.com>	2014-02-24 01:53:13 +1100
committer	Caolán McNamara <caolanm@redhat.com>	2014-02-28 03:19:47 -0600
commit	381f8a5673b70e31fda2739da25f3863895ae665 (patch)
tree	d9366671e0e2794164ef6cbffbf3e53242139efb /vcl/source
parent	cd56e54df1df9c9e1a455f81bd86457f1d832604 (diff)