Kaydet (Commit) 1353be80 authored tarafından Matteo Casalin's avatar Matteo Casalin

Use getToken with start position in lcl_decodeSepString

Change-Id: I16fba233346b807a4c216da70a71e66f2bb0e0a3
üst 6b520a33
...@@ -171,10 +171,13 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const ...@@ -171,10 +171,13 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeFieldSeps ) static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeFieldSeps )
{ {
OUString aFieldSeps; OUString aFieldSeps;
sal_Int32 nSub = comphelper::string::getTokenCount( rSepNums, '/'); if ( rSepNums.isEmpty() )
for (sal_Int32 i=0; i<nSub; ++i) return aFieldSeps;
sal_Int32 nPos = 0;
do
{ {
OUString aCode = rSepNums.getToken( i, '/' ); const OUString aCode = rSepNums.getToken( 0, '/', nPos );
if ( aCode == pStrMrg ) if ( aCode == pStrMrg )
o_bMergeFieldSeps = true; o_bMergeFieldSeps = true;
else else
...@@ -184,6 +187,8 @@ static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeF ...@@ -184,6 +187,8 @@ static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeF
aFieldSeps += OUString((sal_Unicode) nVal); aFieldSeps += OUString((sal_Unicode) nVal);
} }
} }
while ( nPos >= 0 );
return aFieldSeps; return aFieldSeps;
} }
......
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