summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-22 11:21:29 +0200
committerNoel Grandin <noel@peralex.com>2014-04-23 11:10:08 +0200
commit32efd885e5a36f3146f6f7d7b6cd6f2f5531e920 (patch)
treecd217776ed8bb7a2396a2f767f9cf59ddab1ba26
parent206e224fa78795f8e8f9a6a0362dbc973ec81386 (diff)
formula: sal_Bool->bool
Change-Id: I3280b4d4b02e6a6fa22bc250e56a3c6ae77fc675
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx2
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx32
-rw-r--r--formula/source/ui/dlg/formula.cxx92
-rw-r--r--formula/source/ui/dlg/funcutl.cxx20
-rw-r--r--formula/source/ui/dlg/parawin.cxx2
-rw-r--r--formula/source/ui/dlg/parawin.hxx6
-rw-r--r--formula/source/ui/dlg/structpg.cxx16
-rw-r--r--formula/source/ui/dlg/structpg.hxx6
8 files changed, 88 insertions, 88 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index f7ce5ecf12b1..3d753d0d081b 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/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:
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 2de6be937413..5805778a8eac 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/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) )
{
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index d58e5f4f4882..6c6fc7b3331f 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -76,8 +76,8 @@ namespace formula
RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton );
void RefInputDoneAfter( bool bForced );
- sal_Bool CalcValue( const OUString& rStrExp, OUString& rStrResult );
- sal_Bool CalcStruct( const OUString& rStrExp);
+ bool CalcValue( const OUString& rStrExp, OUString& rStrResult );
+ bool CalcStruct( const OUString& rStrExp);
void UpdateValues();
void DeleteArgs();
sal_Int32 GetFunctionPos(sal_Int32 nPos);
@@ -87,8 +87,8 @@ namespace formula
void fillTree(IStructHelper* _pTree);
void UpdateTokenArray( const OUString& rStrExp);
OUString RepairFormula(const OUString& aFormula);
- void FillDialog(sal_Bool nFlag=sal_True);
- void EditNextFunc( sal_Bool bForward, sal_Int32 nFStart=NOT_FOUND );
+ void FillDialog(bool nFlag=true);
+ void EditNextFunc( bool bForward, sal_Int32 nFStart=NOT_FOUND );
void EditThisFunc(sal_Int32 nFStart);
void StoreFormEditData(FormEditData* pEditData);
@@ -100,7 +100,7 @@ namespace formula
void UpdateSelection();
void DoEnter( bool bOk );
void FillListboxes();
- void FillControls(sal_Bool &rbNext, sal_Bool &rbPrev);
+ void FillControls(bool &rbNext, bool &rbPrev);
FormulaDlgMode SetMeText(const OUString& _sText, sal_Int32 PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate);
void SetMeText(const OUString& _sText);
@@ -180,9 +180,9 @@ namespace formula
FuncPage* pFuncPage;
StructPage* pStructPage;
OUString aOldFormula;
- sal_Bool bStructUpdate;
+ bool bStructUpdate;
MultiLineEdit* pMEdit;
- sal_Bool bUserMatrixFlag;
+ bool bUserMatrixFlag;
Timer aTimer;
const OUString aTitle1;
@@ -196,12 +196,12 @@ namespace formula
OString aOldHelp;
OString aOldUnique;
OString aActivWinId;
- sal_Bool bIsShutDown;
+ bool bIsShutDown;
Font aFntBold;
Font aFntLight;
sal_uInt16 nEdFocus;
- sal_Bool bEditFlag;
+ bool bEditFlag;
const IFunctionDescription* pFuncDesc;
sal_Int32 nArgs;
::std::vector< OUString > m_aArguments;
@@ -257,13 +257,13 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pTheRefEdit (NULL),
pTheRefButton (NULL),
pMEdit (NULL),
- bUserMatrixFlag (sal_False),
+ bUserMatrixFlag (false),
aTitle1 ( ModuleRes( STR_TITLE1 ) ), // local resource
aTitle2 ( ModuleRes( STR_TITLE2 ) ), // local resource
aTxtEnd ( ModuleRes( STR_END ) ), // local resource
aTxtOk ( aBtnEnd.GetText() ),
m_aFormulaHelper(_pFunctionMgr),
- bIsShutDown (sal_False),
+ bIsShutDown (false),
nEdFocus (0),
pFuncDesc (NULL),
nArgs (0)
@@ -283,8 +283,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_aEditHelpId = pMEdit->GetHelpId();
pMEdit->SetUniqueId( m_aEditHelpId );
- bEditFlag=sal_False;
- bStructUpdate=sal_True;
+ bEditFlag=false;
+ bStructUpdate=true;
Point aPos=aGEdit.GetPosPixel();
pParaWin->SetPosPixel(aPos);
pParaWin->SetArgModifiedHdl(LINK( this, FormulaDlg_Impl, ModifyHdl ) );
@@ -343,7 +343,7 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
aTimer.SetTimeoutHdl(Link());
aTimer.Stop();
}// if(aTimer.IsActive())
- bIsShutDown=sal_True;// Set it in order to PreNotify not to save GetFocus.
+ bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus.
aTabCtrl.RemovePage(TP_FUNCTION);
aTabCtrl.RemovePage(TP_STRUCT);
@@ -456,7 +456,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
const sal_Unicode sep = m_pHelper->getFunctionManager()->getSingleToken(IFunctionManager::eSep);
sal_Int32 nFuncPos = SAL_MAX_INT32;
- sal_Bool bFlag = sal_False;
+ bool bFlag = false;
OUString aFormString = m_aFormulaHelper.GetCharClass()->uppercase(pMEdit->GetText());
const uno::Reference< sheet::XFormulaParser > xParser(m_pHelper->getFormulaParser());
@@ -514,12 +514,12 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
if( eOp == m_aSeparatorsOpCodes[TOKEN_OPEN].OpCode )
{
nBracketCount++;
- bFlag = sal_True;
+ bFlag = true;
}
else if( eOp == m_aSeparatorsOpCodes[TOKEN_CLOSE].OpCode )
{
nBracketCount--;
- bFlag = sal_False;
+ bFlag = false;
nFuncPos = nPrevFuncPos;
}
bool bIsFunction = ::std::find_if(m_aFunctionOpCodes.getConstArray(),m_pFunctionOpCodesEnd,::std::bind2nd(OpCodeCompare(),boost::cref(eOp))) != m_pFunctionOpCodesEnd;
@@ -558,9 +558,9 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
return nFuncPos;
}
-sal_Bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult )
+bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult )
{
- sal_Bool bResult = sal_True;
+ bool bResult = true;
if ( !rStrExp.isEmpty() )
{
@@ -571,7 +571,7 @@ sal_Bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResu
bResult = m_pHelper->calculateValue(rStrExp,rStrResult);
}
else
- bResult = sal_False;
+ bResult = false;
}
return bResult;
@@ -595,9 +595,9 @@ void FormulaDlg_Impl::UpdateValues()
CalcStruct(pMEdit->GetText());
}
-sal_Bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
+bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
{
- sal_Bool bResult = sal_True;
+ bool bResult = true;
sal_Int32 nLength = rStrExp.getLength();
if ( !rStrExp.isEmpty() && aOldFormula!=rStrExp && bStructUpdate)
@@ -628,7 +628,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
UpdateTokenArray(rStrExp);
}
else
- bResult = sal_False;
+ bResult = false;
}
return bResult;
}
@@ -744,9 +744,9 @@ void FormulaDlg_Impl::UpdateTokenArray( const OUString& rStrExp)
aCompiler.CompileTokenArray();
}
-void FormulaDlg_Impl::FillDialog(sal_Bool nFlag)
+void FormulaDlg_Impl::FillDialog(bool nFlag)
{
- sal_Bool bNext=sal_True, bPrev=sal_True;
+ bool bNext=true, bPrev=true;
if(nFlag)
FillControls(bNext, bPrev);
FillListboxes();
@@ -800,7 +800,7 @@ void FormulaDlg_Impl::FillListboxes()
m_pParent->SetUniqueId( aOldUnique );
}
-void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
+void FormulaDlg_Impl::FillControls(bool &rbNext, bool &rbPrev)
{
// Switch between the "Pages"
FormEditData* pData = m_pHelper->getFormEditData();
@@ -816,7 +816,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
DeleteArgs();
const IFunctionDescription* pOldFuncDesc = pFuncDesc;
- sal_Bool bTestFlag = sal_False;
+ bool bTestFlag = false;
if ( m_aFormulaHelper.GetNextFunc( aFormula, false,
nNextFStart, &nNextFEnd, &pFuncDesc, &m_aArguments ) )
@@ -863,7 +863,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
sal_uInt16 nActiv=0;
sal_Int32 nArgPos = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
sal_Int32 nEditPos = pMEdit->GetSelection().Min();
- sal_Bool bFlag = sal_False;
+ bool bFlag = false;
for(sal_uInt16 i=0;i<nArgs;i++)
{
@@ -872,7 +872,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength)
{
nActiv=i;
- bFlag=sal_True;
+ bFlag=true;
}
nArgPos = nArgPos + nLength;
}
@@ -983,7 +983,7 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
- EditNextFunc( sal_True );
+ EditNextFunc( true );
else
{
DblClkHdl(pFuncPage); //new
@@ -992,9 +992,9 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
}
else if ( pBtn == &aBtnBackward )
{
- bEditFlag=sal_False;
+ bEditFlag=false;
aBtnForward.Enable(true);
- EditNextFunc( sal_False );
+ EditNextFunc( false );
aMEFormula.Invalidate();
aMEFormula.Update();
}
@@ -1094,7 +1094,7 @@ void FormulaDlg_Impl::EditThisFunc(sal_Int32 nFStart)
sal_Int32 nNextFStart = nFStart;
sal_Int32 nNextFEnd = 0;
- sal_Bool bFound;
+ bool bFound;
bFound = m_aFormulaHelper.GetNextFunc( aFormula, false, nNextFStart, &nNextFEnd);
if ( bFound )
@@ -1109,7 +1109,7 @@ void FormulaDlg_Impl::EditThisFunc(sal_Int32 nFStart)
}
}
-void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, sal_Int32 nFStart )
+void FormulaDlg_Impl::EditNextFunc( bool bForward, sal_Int32 nFStart )
{
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData)
@@ -1129,7 +1129,7 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, sal_Int32 nFStart )
sal_Int32 nNextFStart = 0;
sal_Int32 nNextFEnd = 0;
- sal_Bool bFound;
+ bool bFound;
if ( bForward )
{
nNextFStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
@@ -1205,7 +1205,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
pData->SetUndoStr( aUndoStr );
ClearAllParas();
- FillDialog(sal_False);
+ FillDialog(false);
pFuncPage->SetFocus(); //There Parawin is not visible anymore
}
return 0;
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl)
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData) return 0;
- bEditFlag=sal_True;
+ bEditFlag=true;
OUString aInputFormula=m_pHelper->getCurrentFormula();
OUString aString=pMEdit->GetText();
@@ -1277,7 +1277,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl)
if(nPos<aSel.Min()-1)
{
sal_Int32 nPos1 = aString.indexOf('(',nPos);
- EditNextFunc( sal_False, nPos1);
+ EditNextFunc( false, nPos1);
}
else
{
@@ -1285,7 +1285,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl)
}
m_pHelper->setSelection(aSel.Min(), aSel.Max());
- bEditFlag=sal_False;
+ bEditFlag=false;
return 0;
}
@@ -1295,7 +1295,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl)
if (!pData) return 0;
sal_Int32 nFStart = pData->GetFStart();
- bEditFlag=sal_True;
+ bEditFlag=true;
OUString aString=pMEdit->GetText();
@@ -1353,7 +1353,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl)
}
m_pHelper->setSelection(aSel.Min(), aSel.Max());
- bEditFlag=sal_False;
+ bEditFlag=false;
return 0;
}
@@ -1517,15 +1517,15 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
}
IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl)
{
- bStructUpdate=sal_False;
+ bStructUpdate=false;
if(pStructPage->IsVisible()) aBtnForward.Enable(false); //@New
- bStructUpdate=sal_True;
+ bStructUpdate=true;
return 0;
}
IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl)
{
- bUserMatrixFlag=sal_True;
+ bUserMatrixFlag=true;
return 0;
}
@@ -1580,11 +1580,11 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection, const OUString
if( pEd != NULL )
pEd->SetSelection( theSel );
- pParaWin->SetRefMode(sal_False);
+ pParaWin->SetRefMode(false);
}
bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
{
- pParaWin->SetRefMode(sal_True);
+ pParaWin->SetRefMode(true);
OUString aStrEd;
Edit* pEd = GetCurrRefEdit();
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 64813cc64aaf..484ce8cf3eb8 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/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 ) );
}
}
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index ee4e63f5750c..68939ba17aba 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/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();
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 9e6d78fd71bc..70858e3fa9d0 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/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);
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 559c9d004bf8..d3e02709612b 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/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 )
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 147513a10a39..85829ae00e4c 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/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;
};