mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use more string_view in formula

Browse Source 
Change-Id: I3d9feafb0e2010f284a1700becbe9b701edc9849
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140697
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2022-09-28 10:30:43 +02:00
parent a1d6ec66ce
commit 01c9e8808b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
formula/source/ui/dlg/FormulaHelper.cxx
View File

@ -131,7 +131,7 @@ bool FormulaHelper::GetNextFunc( const OUString& rFormula,
}
void FormulaHelper::FillArgStrings( const OUString& rFormula,
void FormulaHelper::FillArgStrings( std::u16string_view rFormula,
sal_Int32 nFuncPos,
sal_uInt16 nArgs,
::std::vector< OUString >& _rArgs ) const
@ -150,7 +150,7 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula,
nEnd = GetArgStart( rFormula, nFuncPos, i+1 );
if ( nEnd != nStart )
_rArgs.push_back(rFormula.copy( nStart, nEnd-1-nStart ));
_rArgs.push_back(OUString(rFormula.substr( nStart, nEnd-1-nStart )));
else
{
_rArgs.emplace_back();
@ -161,7 +161,7 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula,
{
nEnd = GetFunctionEnd( rFormula, nFuncPos )-1;
if ( nStart < nEnd )
_rArgs.push_back( rFormula.copy( nStart, nEnd-nStart ) );
_rArgs.push_back( OUString(rFormula.substr( nStart, nEnd-nStart )) );
else
_rArgs.emplace_back();
}
@ -174,7 +174,7 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula,
void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
const OUString& rFormula,
std::u16string_view rFormula,
sal_Int32 nFuncPos,
sal_uInt16 nArgs ) const
{
@ -299,9 +299,9 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula,
}
sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart ) const
sal_Int32 FormulaHelper::GetFunctionEnd( std::u16string_view rStr, sal_Int32 nStart ) const
{
sal_Int32 nStrLen = rStr.getLength();
sal_Int32 nStrLen = rStr.size();
if ( nStrLen < nStart )
return nStart;
@ -358,9 +358,9 @@ sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart
}
sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sal_uInt16 nArg ) const
sal_Int32 FormulaHelper::GetArgStart( std::u16string_view rStr, sal_Int32 nStart, sal_uInt16 nArg ) const
{
sal_Int32 nStrLen = rStr.getLength();
sal_Int32 nStrLen = rStr.size();
if ( nStrLen < nStart )
return nStart;

8
include/formula/formulahelper.hxx
View File

@ -62,17 +62,17 @@ namespace formula
sal_Int32 GetFunctionStart( const OUString& rFormula, sal_Int32 nStart,
bool bBack, OUString* pFuncName = nullptr ) const;
sal_Int32 GetFunctionEnd ( const OUString& rFormula, sal_Int32 nStart ) const;
sal_Int32 GetFunctionEnd ( std::u16string_view rFormula, sal_Int32 nStart ) const;
sal_Int32 GetArgStart ( const OUString& rFormula, sal_Int32 nStart,
sal_Int32 GetArgStart ( std::u16string_view rFormula, sal_Int32 nStart,
sal_uInt16 nArg ) const;
void GetArgStrings ( ::std::vector< OUString >& _rArgs,
const OUString& rFormula,
std::u16string_view rFormula,
sal_Int32 nFuncPos,
sal_uInt16 nArgs ) const;
void FillArgStrings ( const OUString& rFormula,
void FillArgStrings ( std::u16string_view rFormula,
sal_Int32 nFuncPos,
sal_uInt16 nArgs,
::std::vector< OUString >& _rArgs ) const;