diff options
| -rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 8 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 14 | ||||
| -rw-r--r-- | include/formula/formulahelper.hxx | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index b7e4ce279839..19b0abf96226 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -66,8 +66,8 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) m_pCharClass = m_pSysLocale->GetCharClassPtr(); } -sal_Bool FormulaHelper::GetNextFunc( const OUString& rFormula, - sal_Bool bBack, +bool FormulaHelper::GetNextFunc( const OUString& rFormula, + bool bBack, sal_Int32& rFStart, // Input and output sal_Int32* pFEnd, // = NULL const IFunctionDescription** ppFDesc, // = NULL @@ -77,7 +77,7 @@ sal_Bool FormulaHelper::GetNextFunc( const OUString& rFormula, OUString aFname; rFStart = GetFunctionStart( rFormula, rFStart, bBack, ppFDesc ? &aFname : NULL ); - sal_Bool bFound = ( rFStart != FUNC_NOTFOUND ); + bool bFound = ( rFStart != FUNC_NOTFOUND ); if ( bFound ) { @@ -190,7 +190,7 @@ inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula, sal_Int32 nStart, - sal_Bool bBack, + bool bBack, OUString* pFuncName ) const { sal_Int32 nStrLen = rFormula.getLength(); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index b9f44dec5f6f..a81d20a47dbd 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -830,7 +830,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) const IFunctionDescription* pOldFuncDesc = pFuncDesc; sal_Bool bTestFlag = sal_False; - if ( m_aFormulaHelper.GetNextFunc( aFormula, sal_False, + if ( m_aFormulaHelper.GetNextFunc( aFormula, false, nNextFStart, &nNextFEnd, &pFuncDesc, &m_aArguments ) ) { bTestFlag = (pOldFuncDesc != pFuncDesc); @@ -905,10 +905,10 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) // Test, ob vorne/hinten noch mehr Funktionen sind sal_Int32 nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); - rbNext = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nTempStart ); + rbNext = m_aFormulaHelper.GetNextFunc( aFormula, false, nTempStart ); nTempStart = pMEdit->GetSelection().Min(); pData->SetFStart(nTempStart); - rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nTempStart ); + rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, true, nTempStart ); } // ----------------------------------------------------------------------------- @@ -1108,7 +1108,7 @@ void FormulaDlg_Impl::EditThisFunc(sal_Int32 nFStart) sal_Bool bFound; - bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd); + bFound = m_aFormulaHelper.GetNextFunc( aFormula, false, nNextFStart, &nNextFEnd); if ( bFound ) { sal_Int32 PrivStart, PrivEnd; @@ -1145,12 +1145,12 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, sal_Int32 nFStart ) if ( bForward ) { nNextFStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); - bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd); + bFound = m_aFormulaHelper.GetNextFunc( aFormula, false, nNextFStart, &nNextFEnd); } else { nNextFStart = nFStart; - bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nNextFStart, &nNextFEnd); + bFound = m_aFormulaHelper.GetNextFunc( aFormula, true, nNextFStart, &nNextFEnd); } if ( bFound ) @@ -1349,7 +1349,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl) } if(nCount==0) { - nFStart=m_aFormulaHelper.GetFunctionStart(aString,n,sal_True); + nFStart=m_aFormulaHelper.GetFunctionStart(aString, n, true); EditThisFunc(nFStart); } else diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index 84dbcfdd9000..3985f6896601 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -46,15 +46,15 @@ namespace formula inline const CharClass* GetCharClass() const { return m_pCharClass; } - sal_Bool GetNextFunc( const OUString& rFormula, - sal_Bool bBack, - sal_Int32& rFStart, // Ein- und Ausgabe - sal_Int32* pFEnd = NULL, - const IFunctionDescription** ppFDesc = NULL, - ::std::vector< OUString>* pArgs = NULL ) const; + bool GetNextFunc( const OUString& rFormula, + bool bBack, + sal_Int32& rFStart, // Ein- und Ausgabe + sal_Int32* pFEnd = NULL, + const IFunctionDescription** ppFDesc = NULL, + ::std::vector< OUString>* pArgs = NULL ) const; sal_Int32 GetFunctionStart( const OUString& rFormula, sal_Int32 nStart, - sal_Bool bBack, OUString* pFuncName = NULL ) const; + bool bBack, OUString* pFuncName = NULL ) const; sal_Int32 GetFunctionEnd ( const OUString& rFormula, sal_Int32 nStart ) const; |