diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-29 16:23:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-12-03 11:34:47 +0200 |
| commit | d9b4c8ea811da36f8e0f38b481700f5a0406790d (patch) | |
| tree | b032d4aad1ded7da7af1e3e6e69576357aec790b /formula | |
| parent | 40da065f7e6c96821a4fda2f60ae1a75f174f5a3 (diff) | |
Convert FormulaHelper::GetNextFunc xub_StrLen->salInt32
Change-Id: Ief8c4b4699b3f6ffe1cb02d3dae43ad5a0c4c89e
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 14 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 6ca380f744e3..ff90337efbd2 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -67,14 +67,14 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) } sal_Bool FormulaHelper::GetNextFunc( const OUString& rFormula, - sal_Bool bBack, - xub_StrLen& rFStart, // Input and output - xub_StrLen* pFEnd, // = NULL - const IFunctionDescription** ppFDesc, // = NULL - ::std::vector< OUString>* pArgs ) const // = NULL + sal_Bool bBack, + sal_Int32& rFStart, // Input and output + sal_Int32* pFEnd, // = NULL + const IFunctionDescription** ppFDesc, // = NULL + ::std::vector< OUString>* pArgs ) const // = NULL { - xub_StrLen nOldStart = rFStart; - OUString aFname; + sal_Int32 nOldStart = rFStart; + OUString aFname; rFStart = GetFunctionStart( rFormula, rFStart, bBack, ppFDesc ? &aFname : NULL ); sal_Bool bFound = ( rFStart != FUNC_NOTFOUND ); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 4f1a66b4b032..d16e4fe25a24 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -822,9 +822,9 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) // 2. Page or Edit: show selected function xub_StrLen nFStart = pData->GetFStart(); - OUString aFormula = m_pHelper->getCurrentFormula() + " )"; - xub_StrLen nNextFStart = nFStart; - xub_StrLen nNextFEnd = 0; + OUString aFormula = m_pHelper->getCurrentFormula() + " )"; + sal_Int32 nNextFStart = nFStart; + sal_Int32 nNextFEnd = 0; DeleteArgs(); const IFunctionDescription* pOldFuncDesc = pFuncDesc; @@ -904,9 +904,9 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) } // Test, ob vorne/hinten noch mehr Funktionen sind - xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); + sal_Int32 nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 ); rbNext = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nTempStart ); - nTempStart=(xub_StrLen)pMEdit->GetSelection().Min(); + nTempStart = pMEdit->GetSelection().Min(); pData->SetFStart(nTempStart); rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nTempStart ); } @@ -1103,8 +1103,8 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart) pData->SetFStart(nFStart); } - xub_StrLen nNextFStart = nFStart; - xub_StrLen nNextFEnd = 0; + sal_Int32 nNextFStart = nFStart; + sal_Int32 nNextFEnd = 0; sal_Bool bFound; @@ -1138,8 +1138,8 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart ) pData->SetFStart(nFStart); } - xub_StrLen nNextFStart = 0; - xub_StrLen nNextFEnd = 0; + sal_Int32 nNextFStart = 0; + sal_Int32 nNextFEnd = 0; sal_Bool bFound; if ( bForward ) |