sal_Bool to bool

Change-Id: I427e9bb30cab4698a2495de7445a4a4982abd7b4

4 files changed, 42 insertions, 42 deletions

diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index ea27e63cbfb5..5ca13e5c9734 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -68,7 +68,7 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, bool bStatic, bool bConst )
 // Resolving of a AS-Type-Declaration
 // The data type were inserted into the handed over variable
 
-void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed )
+void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed )
 {
     SbxDataType eType = rDef.GetType();
     if( bAsNewAlreadyParsed || Peek() == AS )
@@ -239,7 +239,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
                 bNewGblDefs = false;
             }
             Next();
-            DefProc( sal_False, bPrivate );
+            DefProc( false, bPrivate );
             return;
         }
         else if( eCurTok == ENUM )
@@ -547,10 +547,10 @@ void SbiParser::Erase()
 
 void SbiParser::Type()
 {
-    DefType( sal_False );
+    DefType( false );
 }
 
-void SbiParser::DefType( sal_Bool bPrivate )
+void SbiParser::DefType( bool bPrivate )
 {
     // TODO: Use bPrivate
     (void)bPrivate;
@@ -671,10 +671,10 @@ void SbiParser::DefType( sal_Bool bPrivate )
 
 void SbiParser::Enum()
 {
-    DefEnum( sal_False );
+    DefEnum( false );
 }
 
-void SbiParser::DefEnum( sal_Bool bPrivate )
+void SbiParser::DefEnum( bool bPrivate )
 {
     // Read a the new Token. It had to be a symbol
     if (!TestSymbol())
@@ -937,10 +937,10 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
 
 void SbiParser::Declare()
 {
-    DefDeclare( sal_False );
+    DefDeclare( false );
 }
 
-void SbiParser::DefDeclare( sal_Bool bPrivate )
+void SbiParser::DefDeclare( bool bPrivate )
 {
     Next();
     if( eCurTok != SUB && eCurTok != FUNCTION )
@@ -1071,12 +1071,12 @@ void SbiParser::Call()
 
 void SbiParser::SubFunc()
 {
-    DefProc( sal_False, sal_False );
+    DefProc( false, false );
 }
 
 // Read in of a procedure
 
-void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
+void SbiParser::DefProc( bool bStatic, bool bPrivate )
 {
     sal_uInt16 l1 = nLine, l2 = nLine;
     bool bSub = ( eCurTok == SUB );
@@ -1181,10 +1181,10 @@ void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
 
 void SbiParser::Static()
 {
-    DefStatic( sal_False );
+    DefStatic( false );
 }
 
-void SbiParser::DefStatic( sal_Bool bPrivate )
+void SbiParser::DefStatic( bool bPrivate )
 {
     switch( Peek() )
     {
@@ -1199,7 +1199,7 @@ void SbiParser::DefStatic( sal_Bool bPrivate )
                 bNewGblDefs = false;
             }
             Next();
-            DefProc( sal_True, bPrivate );
+            DefProc( true, bPrivate );
             break;
         default: {
             if( !pProc )
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 2d503da77979..2fb50913cea3 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -22,9 +22,9 @@
 
 // test if there's an I/O channel
 
-sal_Bool SbiParser::Channel( sal_Bool bAlways )
+bool SbiParser::Channel( bool bAlways )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     Peek();
     if( IsHash() )
     {
@@ -33,7 +33,7 @@ sal_Bool SbiParser::Channel( sal_Bool bAlways )
             Next();
         aExpr.Gen();
         aGen.Gen( _CHANNEL );
-        bRes = sal_True;
+        bRes = true;
     }
     else if( bAlways )
         Error( SbERR_EXPECTED, "#" );
@@ -45,7 +45,7 @@ sal_Bool SbiParser::Channel( sal_Bool bAlways )
 
 void SbiParser::Print()
 {
-    sal_Bool bChan = Channel();
+    bool bChan = Channel();
 
     while( !bAbort )
     {
@@ -76,7 +76,7 @@ void SbiParser::Print()
 
 void SbiParser::Write()
 {
-    sal_Bool bChan = Channel();
+    bool bChan = Channel();
 
     while( !bAbort )
     {
@@ -128,7 +128,7 @@ void SbiParser::Line()
 
 void SbiParser::LineInput()
 {
-    Channel( sal_True );
+    Channel( true );
     SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
     if( !pExpr->IsVariable() )
         Error( SbERR_VAR_EXPECTED );
@@ -145,7 +145,7 @@ void SbiParser::LineInput()
 void SbiParser::Input()
 {
     aGen.Gen( _RESTART );
-    Channel( sal_True );
+    Channel( true );
     SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
     while( !bAbort )
     {
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 470f239be5f7..f6421823287f 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -242,49 +242,49 @@ void SbiParser::Exit()
         Error( SbERR_BAD_EXIT );
 }
 
-sal_Bool SbiParser::TestSymbol( sal_Bool bKwdOk )
+bool SbiParser::TestSymbol( bool bKwdOk )
 {
     Peek();
     if( eCurTok == SYMBOL || ( bKwdOk && IsKwd( eCurTok ) ) )
     {
-        Next(); return sal_True;
+        Next(); return true;
     }
     Error( SbERR_SYMBOL_EXPECTED );
-    return sal_False;
+    return false;
 }
 
 
 
-sal_Bool SbiParser::TestToken( SbiToken t )
+bool SbiParser::TestToken( SbiToken t )
 {
     if( Peek() == t )
     {
-        Next(); return sal_True;
+        Next(); return true;
     }
     else
     {
         Error( SbERR_EXPECTED, t );
-        return sal_False;
+        return false;
     }
 }
 
 
 
-sal_Bool SbiParser::TestComma()
+bool SbiParser::TestComma()
 {
     SbiToken eTok = Peek();
     if( IsEoln( eTok ) )
     {
         Next();
-        return sal_False;
+        return false;
     }
     else if( eTok != COMMA )
     {
         Error( SbERR_EXPECTED, COMMA );
-        return sal_False;
+        return false;
     }
     Next();
-    return sal_True;
+    return true;
 }
 
 
@@ -315,9 +315,9 @@ void SbiParser::StmntBlock( SbiToken eEnd )
 
 
 
-sal_Bool SbiParser::Parse()
+bool SbiParser::Parse()
 {
-    if( bAbort ) return sal_False;
+    if( bAbort ) return false;
 
     EnableErrors();
 
@@ -333,13 +333,13 @@ sal_Bool SbiParser::Parse()
         // can be another nGblChain, so ask for it before.
         if( bNewGblDefs && nGblChain == 0 )
             nGblChain = aGen.Gen( _JUMP, 0 );
-        return sal_False;
+        return false;
     }
 
 
     if( IsEoln( eCurTok ) )
     {
-        Next(); return sal_True;
+        Next(); return true;
     }
 
     if( !bSingleLineIf && MayBeLabel( sal_True ) )
@@ -353,7 +353,7 @@ sal_Bool SbiParser::Parse()
 
         if( IsEoln( eCurTok ) )
         {
-            Next(); return sal_True;
+            Next(); return true;
         }
     }
 
@@ -366,13 +366,13 @@ sal_Bool SbiParser::Parse()
         Next();
         if( eCurTok != NIL )
             aGen.Statement();
-        return sal_False;
+        return false;
     }
 
     // comment?
     if( eCurTok == REM )
     {
-        Next(); return sal_True;
+        Next(); return true;
     }
 
         // In vba it's possible to do Error.foobar ( even if it results in
@@ -458,7 +458,7 @@ sal_Bool SbiParser::Parse()
     }
     // The parser aborts at the end, the
     // next token has not been fetched yet!
-    return sal_True;
+    return true;
 }
 
 
@@ -772,9 +772,9 @@ void SbiParser::Option()
         {
             SbiToken eTok = Next();
             if( eTok == BINARY )
-                bText = sal_False;
+                bText = false;
             else if( eTok == SYMBOL && GetSym().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("text")) )
-                bText = sal_True;
+                bText = true;
             else
                 Error( SbERR_EXPECTED, "Text/Binary" );
             break;
@@ -784,7 +784,7 @@ void SbiParser::Option()
             break;
 
         case CLASSMODULE:
-            bClassModule = sal_True;
+            bClassModule = true;
             aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
             break;
         case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 08f938238976..fe47cbc3b910 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -384,7 +384,7 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
     nLine1  =
     nLine2  = 0;
     mePropMode = PROPERTY_MODE_NONE;
-    bPublic = sal_True;
+    bPublic = true;
     bCdecl  = sal_False;
     bStatic = sal_False;
     // For return values the first element of the parameter