summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx14
-rw-r--r--formula/source/ui/dlg/formula.cxx18
-rw-r--r--include/formula/formulahelper.hxx12
-rw-r--r--sc/source/ui/app/inputhdl.cxx10
-rw-r--r--sc/source/ui/formdlg/formula.cxx4
5 files changed, 28 insertions, 30 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 )
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index 737550d055f8..becaa07f20a5 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -46,12 +46,12 @@ namespace formula
inline const CharClass* GetCharClass() const { return m_pCharClass; }
- sal_Bool GetNextFunc( const OUString& rFormula,
- sal_Bool bBack,
- xub_StrLen& rFStart, // Ein- und Ausgabe
- xub_StrLen* pFEnd = NULL,
- const IFunctionDescription** ppFDesc = NULL,
- ::std::vector< OUString>* pArgs = NULL ) const;
+ 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;
xub_StrLen GetFunctionStart( const OUString& rFormula, xub_StrLen nStart,
sal_Bool bBack, OUString* pFuncName = NULL ) const;
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 );
generated by cgit (git 2.34.1) at 2024-07-26 15:27:45 +0000