sal_Bool to bool

Change-Id: I3ba3a2074495d01f7877f449ed9b8723161fdd2f

sc/source/ui/dbgui/asciiopt.cxx

@@ -155,7 +155,7 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
 }
 
 
-sal_Bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
+bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
 {
     if ( bFixedLen       == rCmp.bFixedLen &&
          aFieldSeps      == rCmp.aFieldSeps &&
@@ -174,7 +174,7 @@ sal_Bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
                  pColFormat[i] != rCmp.pColFormat[i] )
                 return false;
 
-        return sal_True;
+        return true;
     }
     return false;
 }
@@ -203,13 +203,13 @@ void ScAsciiOptions::ReadFromString( const String& rString )
 
         aToken = rString.GetToken(0,',');
         if ( aToken.EqualsAscii(pStrFix) )
-            bFixedLen = sal_True;
+            bFixedLen = true;
         nSub = comphelper::string::getTokenCount(aToken, '/');
         for ( i=0; i<nSub; i++ )
         {
             String aCode = aToken.GetToken( i, '/' );
             if ( aCode.EqualsAscii(pStrMrg) )
-                bMergeFieldSeps = sal_True;
+                bMergeFieldSeps = true;
             else
             {
                 sal_Int32 nVal = aCode.ToInt32();
@@ -300,7 +300,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
         bDetectSpecialNumber = aToken.EqualsAscii("true") ? true : false;
     }
     else
-        bDetectSpecialNumber = sal_True;    // default of versions that didn't add the parameter
+        bDetectSpecialNumber = true;    // default of versions that didn't add the parameter
 
     // 9th token is used for "Save as shown" in export options
     // 10th token is used for "Save cell formulas" in export options

sc/source/ui/inc/asciiopt.hxx

@@ -39,15 +39,15 @@
 class ScAsciiOptions
 {
 private:
-    sal_Bool        bFixedLen;
+    bool        bFixedLen;
     String      aFieldSeps;
-    sal_Bool        bMergeFieldSeps;
+    bool        bMergeFieldSeps;
     bool        bQuotedFieldAsText;
     bool        bDetectSpecialNumber;
     sal_Unicode cTextSep;
     CharSet     eCharSet;
     LanguageType eLang;
-    sal_Bool        bCharSetSystem;
+    bool        bCharSetSystem;
     long        nStartRow;
     sal_uInt16      nInfoCount;
     sal_Int32* pColStart;  //! TODO replace with vector
@@ -62,7 +62,7 @@ public:
 
     ScAsciiOptions& operator=( const ScAsciiOptions& rCpy );
 
-    sal_Bool            operator==( const ScAsciiOptions& rCmp ) const;
+    bool            operator==( const ScAsciiOptions& rCmp ) const;
 
     void            ReadFromString( const String& rString );
     String          WriteToString() const;
@@ -70,24 +70,24 @@ public:
     void            InterpretColumnList( const String& rString );
 
     CharSet             GetCharSet() const      { return eCharSet; }
-    sal_Bool                GetCharSetSystem() const    { return bCharSetSystem; }
+    bool                GetCharSetSystem() const    { return bCharSetSystem; }
     const String&       GetFieldSeps() const    { return aFieldSeps; }
-    sal_Bool                IsMergeSeps() const     { return bMergeFieldSeps; }
+    bool                IsMergeSeps() const     { return bMergeFieldSeps; }
     bool                IsQuotedAsText() const  { return bQuotedFieldAsText; }
     bool                IsDetectSpecialNumber() const { return bDetectSpecialNumber; }
     sal_Unicode         GetTextSep() const      { return cTextSep; }
-    sal_Bool                IsFixedLen() const      { return bFixedLen; }
-    sal_uInt16              GetInfoCount() const    { return nInfoCount; }
-    const sal_Int32*   GetColStart() const     { return pColStart; }
-    const sal_uInt8*            GetColFormat() const    { return pColFormat; }
+    bool                IsFixedLen() const      { return bFixedLen; }
+    sal_uInt16          GetInfoCount() const    { return nInfoCount; }
+    const sal_Int32*    GetColStart() const     { return pColStart; }
+    const sal_uInt8*    GetColFormat() const    { return pColFormat; }
     long                GetStartRow() const     { return nStartRow; }
     LanguageType        GetLanguage() const     { return eLang; }
 
     void    SetCharSet( CharSet eNew )          { eCharSet = eNew; }
-    void    SetCharSetSystem( sal_Bool bSet )       { bCharSetSystem = bSet; }
-    void    SetFixedLen( sal_Bool bSet )            { bFixedLen = bSet; }
+    void    SetCharSetSystem( bool bSet )       { bCharSetSystem = bSet; }
+    void    SetFixedLen( bool bSet )            { bFixedLen = bSet; }
     void    SetFieldSeps( const String& rStr )  { aFieldSeps = rStr; }
-    void    SetMergeSeps( sal_Bool bSet )           { bMergeFieldSeps = bSet; }
+    void    SetMergeSeps( bool bSet )           { bMergeFieldSeps = bSet; }
     void    SetQuotedAsText(bool bSet)          { bQuotedFieldAsText = bSet; }
     void    SetDetectSpecialNumber(bool bSet)   { bDetectSpecialNumber = bSet; }
     void    SetTextSep( sal_Unicode c )         { cTextSep = c; }