formula: sal_Bool->bool

Change-Id: I3280b4d4b02e6a6fa22bc250e56a3c6ae77fc675

formula/source/ui/dlg/ControlHelper.hxx

@@ -50,7 +50,7 @@ private:
     MultiLineEdit*  pMEdit;
     Link            aSelChangedLink;
     Selection       aOldSel;
-    sal_Bool            bMouseFlag;
+    bool            bMouseFlag;
                     DECL_LINK(ChangedHdl, void *);
 
 protected:

formula/source/ui/dlg/FormulaHelper.cxx

@@ -130,7 +130,7 @@ void FormulaHelper::FillArgStrings( const OUString&   rFormula,
     sal_Int32       nStart  = 0;
     sal_Int32       nEnd    = 0;
     sal_uInt16      i;
-    sal_Bool        bLast   = sal_False;
+    bool        bLast   = false;
 
     for ( i=0; i<nArgs && !bLast; i++ )
     {
@@ -143,7 +143,7 @@ void FormulaHelper::FillArgStrings( const OUString&   rFormula,
             if ( nEnd != nStart )
                 _rArgs.push_back(rFormula.copy( nStart, nEnd-1-nStart ));
             else
-                _rArgs.push_back(OUString()), bLast = sal_True;
+                _rArgs.push_back(OUString()), bLast = true;
         }
         else
         {
@@ -175,10 +175,10 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
 
 
 
-inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos )
+inline bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos )
 {
     if( _pCharClass->isLetterNumeric( rStr, nPos ) )
-        return sal_True;
+        return true;
     else
     {   // In internationalized versions function names may contain a dot
         //  and in every version also an underscore... ;-)
@@ -201,11 +201,11 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
     sal_Int32  nFStart = FUNC_NOTFOUND;
     sal_Int32  nParPos = nStart;
 
-    sal_Bool bRepeat, bFound;
+    bool bRepeat, bFound;
     do
     {
-        bFound  = sal_False;
-        bRepeat = sal_False;
+        bFound  = false;
+        bRepeat = false;
 
         if ( bBack )
         {
@@ -219,7 +219,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
                     if (nParPos > 0)
                         nParPos--;
                 }
-                else if ( (bFound = ( rFormula[nParPos] == '(' ) ) == sal_False )
+                else if ( (bFound = ( rFormula[nParPos] == '(' ) ) == false )
                     nParPos--;
             }
         }
@@ -234,7 +234,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
                         nParPos++;
                     nParPos++;
                 }
-                else if ( (bFound = ( rFormula[nParPos] == '(' ) ) == sal_False )
+                else if ( (bFound = ( rFormula[nParPos] == '(' ) ) == false )
                     nParPos++;
             }
         }
@@ -259,13 +259,13 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
             }
             else                    // Brackets without function -> keep searching
             {
-                bRepeat = sal_True;
+                bRepeat = true;
                 if ( !bBack )
                     nParPos++;
                 else if (nParPos > 0)
                     nParPos--;
                 else
-                    bRepeat = sal_False;
+                    bRepeat = false;
             }
         }
         else                        // No brackets found
@@ -291,7 +291,7 @@ sal_Int32  FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart
 
     short   nParCount = 0;
     bool    bInArray = false;
-    sal_Bool    bFound = sal_False;
+    bool    bFound = false;
 
     while ( !bFound && (nStart < nStrLen) )
     {
@@ -309,10 +309,10 @@ sal_Int32  FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart
         {
             nParCount--;
             if ( nParCount == 0 )
-                bFound = sal_True;
+                bFound = true;
             else if ( nParCount < 0 )
             {
-                bFound = sal_True;
+                bFound = true;
                 nStart--;   // read one too far
             }
         }
@@ -328,7 +328,7 @@ sal_Int32  FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart
         {
             if ( !bInArray && nParCount == 0 )
             {
-                bFound = sal_True;
+                bFound = true;
                 nStart--;   // read one too far
             }
         }
@@ -349,7 +349,7 @@ sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sa
 
     short   nParCount   = 0;
     bool    bInArray    = false;
-    sal_Bool    bFound      = sal_False;
+    bool    bFound      = false;
 
     while ( !bFound && (nStart < nStrLen) )
     {

formula/source/ui/dlg/funcutl.cxx

@@ -102,8 +102,8 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
 void ArgEdit::KeyInput( const KeyEvent& rKEvt )
 {
     KeyCode     aCode   = rKEvt.GetKeyCode();
-    sal_Bool        bUp     = (aCode.GetCode() == KEY_UP);
-    sal_Bool        bDown   = (aCode.GetCode() == KEY_DOWN);
+    bool        bUp     = (aCode.GetCode() == KEY_UP);
+    bool        bDown   = (aCode.GetCode() == KEY_DOWN);
 
     if (   pSlider
         && ( !aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
@@ -113,8 +113,8 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
         {
             ArgEdit* pEd = NULL;
             long nThumb = pSlider->GetThumbPos();
-            sal_Bool bDoScroll = sal_False;
-            sal_Bool bChangeFocus = sal_False;
+            bool bDoScroll = false;
+            bool bChangeFocus = false;
 
             if ( bDown )
             {
@@ -128,13 +128,13 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
                     else
                     {
                         pEd = pEdNext;
-                        bChangeFocus = sal_True;
+                        bChangeFocus = true;
                     }
                 }
                 else if ( pEdNext )
                 {
                     pEd = pEdNext;
-                    bChangeFocus = sal_True;
+                    bChangeFocus = true;
                 }
             }
             else // if ( bUp )
@@ -149,13 +149,13 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
                     else
                     {
                         pEd = pEdPrev;
-                        bChangeFocus = sal_True;
+                        bChangeFocus = true;
                     }
                 }
                 else if ( pEdPrev )
                 {
                     pEd = pEdPrev;
-                    bChangeFocus = sal_True;
+                    bChangeFocus = true;
                 }
             }
 
@@ -376,7 +376,7 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
 // class EditBox
 EditBox::EditBox( Window* pParent, const ResId& rResId )
         :Control(pParent,rResId),
-        bMouseFlag(sal_False)
+        bMouseFlag(false)
 {
     WinBits nStyle=GetStyle();
     SetStyle( nStyle| WB_DIALOGCONTROL);
@@ -456,7 +456,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
 
         if(nSwitch==EVENT_MOUSEBUTTONDOWN || nSwitch==EVENT_MOUSEBUTTONUP)
         {
-            bMouseFlag=sal_True;
+            bMouseFlag=true;
             Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ) );
         }
     }

formula/source/ui/dlg/parawin.cxx

@@ -67,7 +67,7 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aSlider         ( this, ModuleRes( WND_SLIDER ) ),
     m_sOptional     ( ModuleRes( STR_OPTIONAL ) ),
     m_sRequired     ( ModuleRes( STR_REQUIRED ) ),
-    bRefMode        (sal_False)
+    bRefMode        (false)
 {
     FreeResource();
     aDefaultString=aFtEditDesc.GetText();

formula/source/ui/dlg/parawin.hxx

@@ -83,7 +83,7 @@ private:
         ScrollBar       aSlider;
         OUString        m_sOptional;
         OUString        m_sRequired;
-        sal_Bool        bRefMode;
+        bool        bRefMode;
 
         sal_uInt16      nEdFocus;
         sal_uInt16      nActiveLine;
@@ -132,8 +132,8 @@ public:
         void            UpdateParas();
         void            ClearAll();
 
-        sal_Bool            IsRefMode() {return bRefMode;}
-        void            SetRefMode(sal_Bool bFlag) {bRefMode=bFlag;}
+        bool            IsRefMode() {return bRefMode;}
+        void            SetRefMode(bool bFlag) {bRefMode=bFlag;}
 
         sal_uInt16          GetActiveLine();
         void            SetActiveLine(sal_uInt16 no);

formula/source/ui/dlg/structpg.cxx

@@ -35,7 +35,7 @@ namespace formula
 StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
     SvTreeListBox(pParent,rResId )
 {
-    bActiveFlag=sal_False;
+    bActiveFlag=false;
 
     Font aFont( GetFont() );
     Size aSize = aFont.GetSize();
@@ -53,31 +53,31 @@ SvTreeListEntry* StructListBox::InsertStaticEntry(
     return pEntry;
 }
 
-void StructListBox::SetActiveFlag(sal_Bool bFlag)
+void StructListBox::SetActiveFlag(bool bFlag)
 {
     bActiveFlag=bFlag;
 }
 
-sal_Bool StructListBox::GetActiveFlag()
+bool StructListBox::GetActiveFlag()
 {
     return bActiveFlag;
 }
 
 void StructListBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    bActiveFlag=sal_True;
+    bActiveFlag=true;
     SvTreeListBox::MouseButtonDown(rMEvt);
 }
 
 void StructListBox::GetFocus()
 {
-    bActiveFlag=sal_True;
+    bActiveFlag=true;
     SvTreeListBox::GetFocus();
 }
 
 void StructListBox::LoseFocus()
 {
-    bActiveFlag=sal_False;
+    bActiveFlag=false;
     SvTreeListBox::LoseFocus();
 }
 
@@ -105,14 +105,14 @@ StructPage::StructPage(Window* pParent):
 
 void StructPage::ClearStruct()
 {
-    aTlbStruct.SetActiveFlag(sal_False);
+    aTlbStruct.SetActiveFlag(false);
     aTlbStruct.Clear();
 }
 
 SvTreeListEntry* StructPage::InsertEntry( const OUString& rText, SvTreeListEntry* pParent,
                                        sal_uInt16 nFlag,sal_uLong nPos,IFormulaToken* pIFormulaToken)
 {
-    aTlbStruct.SetActiveFlag( sal_False );
+    aTlbStruct.SetActiveFlag( false );
 
     SvTreeListEntry* pEntry = NULL;
     switch( nFlag )

formula/source/ui/dlg/structpg.hxx

@@ -41,7 +41,7 @@ class   StructListBox : public SvTreeListBox
 {
 private:
 
-    sal_Bool            bActiveFlag;
+    bool            bActiveFlag;
 
 protected:
                     virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -58,8 +58,8 @@ public:
                         sal_uLong nPos = TREELIST_APPEND,
                         IFormulaToken* pToken = NULL );
 
-    void            SetActiveFlag(sal_Bool bFlag=sal_True);
-    sal_Bool            GetActiveFlag();
+    void            SetActiveFlag(bool bFlag=true);
+    bool            GetActiveFlag();
     void            GetFocus() SAL_OVERRIDE;
     void            LoseFocus() SAL_OVERRIDE;
 };