summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-09-28 10:30:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-09-28 11:28:53 +0200
commit01c9e8808bdee7ee355a037fda2889150f21f6fe (patch)
treeaa6fe7bc9bf7b7db16fb7ce0da218c31c098e0ab /formula
parenta1d6ec66ce4b8dd84f0962f9b749b831cbb05baf (diff)
use more string_view in formula
Change-Id: I3d9feafb0e2010f284a1700becbe9b701edc9849 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140697 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'formula')
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 15d3b411a4a2..85799c40ecc2 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -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;