diff options
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 5a5019d12e7c..b3fae53899e7 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -2408,21 +2408,18 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) bDecSep = true; nTypeArray[i] = NF_SYMBOLTYPE_DIGIT; OUString& rStr = sStrArray[i]; + nPos = nPos + sStrArray[i].getLength(); + nCounter++; i++; - if (i < nAnzStrings) + while (i < nAnzStrings && + sStrArray[i][0] == '0') { + rStr += sStrArray[i]; nPos = nPos + sStrArray[i].getLength(); + nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; + nAnzResStrings--; nCounter++; - while (i < nAnzStrings && - sStrArray[i][0] == '0') - { - rStr += sStrArray[i]; - nPos = nPos + sStrArray[i].getLength(); - nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; - nAnzResStrings--; - nCounter++; - i++; - } + i++; } } else @@ -2561,21 +2558,18 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) bDecSep = true; nTypeArray[i] = NF_SYMBOLTYPE_DIGIT; OUString& rStr = sStrArray[i]; + nPos = nPos + sStrArray[i].getLength(); i++; - if (i < nAnzStrings) + nCounter++; + while (i < nAnzStrings && + sStrArray[i][0] == '0') { + rStr += sStrArray[i]; nPos = nPos + sStrArray[i].getLength(); + nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; + nAnzResStrings--; nCounter++; - while (i < nAnzStrings && - sStrArray[i][0] == '0') - { - rStr += sStrArray[i]; - nPos = nPos + sStrArray[i].getLength(); - nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; - nAnzResStrings--; - nCounter++; - i++; - } + i++; } } else |