Skip to content

C
core
Kaydet (Commit) b882c046 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert FormulaHelper from xub_StrLen to sal_Int32 

Change-Id: Ib866c39b2bb5a3cf81b899dc38ea548e3762fc9e
üst d9b4c8ea
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
formula/source/ui/dlg/FormulaHelper.cxx
Dosyayı görüntüle @ b882c046
...@@ -123,12 +123,12 @@ sal_Bool FormulaHelper::GetNextFunc( const OUString& rFormula, ...@@ -123,12 +123,12 @@ sal_Bool FormulaHelper::GetNextFunc( const OUString& rFormula,
//------------------------------------------------------------------------ //------------------------------------------------------------------------
void FormulaHelper::FillArgStrings( const OUString& rFormula, void FormulaHelper::FillArgStrings( const OUString& rFormula,
xub_StrLen nFuncPos, sal_Int32 nFuncPos,
sal_uInt16 nArgs, sal_uInt16 nArgs,
::std::vector< OUString >& _rArgs ) const ::std::vector< OUString >& _rArgs ) const
{ {
xub_StrLen nStart = 0; sal_Int32 nStart = 0;
xub_StrLen nEnd = 0; sal_Int32 nEnd = 0;
sal_uInt16 i; sal_uInt16 i;
sal_Bool bLast = sal_False; sal_Bool bLast = sal_False;
...@@ -164,7 +164,7 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula, ...@@ -164,7 +164,7 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula,
void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
const OUString& rFormula, const OUString& rFormula,
xub_StrLen nFuncPos, sal_Int32 nFuncPos,
sal_uInt16 nArgs ) const sal_uInt16 nArgs ) const
{ {
if (nArgs) if (nArgs)
...@@ -175,7 +175,7 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, ...@@ -175,7 +175,7 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
//------------------------------------------------------------------------ //------------------------------------------------------------------------
inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, xub_StrLen nPos ) inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos )
{ {
if( _pCharClass->isLetterNumeric( rStr, nPos ) ) if( _pCharClass->isLetterNumeric( rStr, nPos ) )
return sal_True; return sal_True;
...@@ -188,8 +188,8 @@ inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr ...@@ -188,8 +188,8 @@ inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr
} }
xub_StrLen FormulaHelper::GetFunctionStart( const OUString& rFormula, sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula,
xub_StrLen nStart, sal_Int32 nStart,
sal_Bool bBack, sal_Bool bBack,
OUString* pFuncName ) const OUString* pFuncName ) const
{ {
...@@ -198,8 +198,8 @@ xub_StrLen FormulaHelper::GetFunctionStart( const OUString& rFormula, ...@@ -198,8 +198,8 @@ xub_StrLen FormulaHelper::GetFunctionStart( const OUString& rFormula,
if ( nStrLen < nStart ) if ( nStrLen < nStart )
return nStart; return nStart;
xub_StrLen nFStart = FUNC_NOTFOUND; sal_Int32 nFStart = FUNC_NOTFOUND;
xub_StrLen nParPos = nStart; sal_Int32 nParPos = nStart;
sal_Bool bRepeat, bFound; sal_Bool bRepeat, bFound;
do do
...@@ -282,7 +282,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const OUString& rFormula, ...@@ -282,7 +282,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const OUString& rFormula,
//------------------------------------------------------------------------ //------------------------------------------------------------------------
xub_StrLen FormulaHelper::GetFunctionEnd( const OUString& rStr, xub_StrLen nStart ) const sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart ) const
{ {
sal_Int32 nStrLen = rStr.getLength(); sal_Int32 nStrLen = rStr.getLength();
...@@ -340,7 +340,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const OUString& rStr, xub_StrLen nSta ...@@ -340,7 +340,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const OUString& rStr, xub_StrLen nSta
//------------------------------------------------------------------ //------------------------------------------------------------------
xub_StrLen FormulaHelper::GetArgStart( const OUString& rStr, xub_StrLen nStart, sal_uInt16 nArg ) const sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sal_uInt16 nArg ) const
{ {
sal_Int32 nStrLen = rStr.getLength(); sal_Int32 nStrLen = rStr.getLength();
......
include/formula/formulahelper.hxx
Dosyayı görüntüle @ b882c046
...@@ -53,21 +53,21 @@ namespace formula ...@@ -53,21 +53,21 @@ namespace formula
const IFunctionDescription** ppFDesc = NULL, const IFunctionDescription** ppFDesc = NULL,
::std::vector< OUString>* pArgs = NULL ) const; ::std::vector< OUString>* pArgs = NULL ) const;
xub_StrLen GetFunctionStart( const OUString& rFormula, xub_StrLen nStart, sal_Int32 GetFunctionStart( const OUString& rFormula, sal_Int32 nStart,
sal_Bool bBack, OUString* pFuncName = NULL ) const; sal_Bool bBack, OUString* pFuncName = NULL ) const;
xub_StrLen GetFunctionEnd ( const OUString& rFormula, xub_StrLen nStart ) const; sal_Int32 GetFunctionEnd ( const OUString& rFormula, sal_Int32 nStart ) const;
xub_StrLen GetArgStart ( const OUString& rFormula, xub_StrLen nStart, sal_Int32 GetArgStart ( const OUString& rFormula, sal_Int32 nStart,
sal_uInt16 nArg ) const; sal_uInt16 nArg ) const;
void GetArgStrings ( ::std::vector< OUString >& _rArgs, void GetArgStrings ( ::std::vector< OUString >& _rArgs,
const OUString& rFormula, const OUString& rFormula,
xub_StrLen nFuncPos, sal_Int32 nFuncPos,
sal_uInt16 nArgs ) const; sal_uInt16 nArgs ) const;
void FillArgStrings ( const OUString& rFormula, void FillArgStrings ( const OUString& rFormula,
xub_StrLen nFuncPos, sal_Int32 nFuncPos,
sal_uInt16 nArgs, sal_uInt16 nArgs,
::std::vector< OUString >& _rArgs ) const; ::std::vector< OUString >& _rArgs ) const;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment