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 /sc/source/ui | |
parent | 40da065f7e6c96821a4fda2f60ae1a75f174f5a3 (diff) |
Convert FormulaHelper::GetNextFunc xub_StrLen->salInt32
Change-Id: Ief8c4b4699b3f6ffe1cb02d3dae43ad5a0c4c89e
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 766271fdb475..9e06c6bf80bf 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -822,8 +822,7 @@ void ScInputHandler::ShowTipCursor() return; xub_StrLen nPos = aSel.nEndPos; OUString aSelText = aFormula.copy( 0, nPos ); - xub_StrLen nNextFStart = 0; - xub_StrLen nNextFEnd = 0; + sal_Int32 nNextFStart = 0; xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; ::std::vector< OUString> aArgs; @@ -841,7 +840,7 @@ void ScInputHandler::ShowTipCursor() if( !(comphelper::string::isalphaAscii(c)) ) continue; nNextFStart = aHelper.GetFunctionStart( aSelText, nLeftParentPos, true); - if( aHelper.GetNextFunc( aSelText, false, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) ) + if( aHelper.GetNextFunc( aSelText, false, nNextFStart, NULL, &ppFDesc, &aArgs ) ) { if( !ppFDesc->getFunctionName().isEmpty() ) { @@ -1059,8 +1058,7 @@ void ScInputHandler::UseFormulaData() xub_StrLen nPos = aSel.nEndPos; OUString aFormula = aTotal.copy( 0, nPos );; sal_Int32 nLeftParentPos = 0; - xub_StrLen nNextFStart = 0; - xub_StrLen nNextFEnd = 0; + sal_Int32 nNextFStart = 0; xub_StrLen nArgPos = 0; const IFunctionDescription* ppFDesc; ::std::vector< OUString> aArgs; @@ -1093,7 +1091,7 @@ void ScInputHandler::UseFormulaData() if( !(comphelper::string::isalphaAscii(c)) ) continue; nNextFStart = aHelper.GetFunctionStart( aFormula, nLeftParentPos, true); - if( aHelper.GetNextFunc( aFormula, false, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) ) + if( aHelper.GetNextFunc( aFormula, false, nNextFStart, NULL, &ppFDesc, &aArgs ) ) { if( !ppFDesc->getFunctionName().isEmpty() ) { diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 593b5e0238ad..f3b05d55a783 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -150,8 +150,8 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, { bMatrix = CheckMatrix(aFormula); - xub_StrLen nFStart = 0; - xub_StrLen nFEnd = 0; + sal_Int32 nFStart = 0; + sal_Int32 nFEnd = 0; if ( GetFormulaHelper().GetNextFunc( aFormula, false, nFStart, &nFEnd) ) { pScMod->InputReplaceSelection( aFormula ); |