diff options
| author | Eike Rathke <erack@redhat.com> | 2013-03-18 18:24:24 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-03-18 18:25:58 +0100 |
| commit | ca0074829af6b68ee8f00ce0231de4fcd17b7b2b (patch) | |
| tree | fa0d3725a794d77336c69b1924254c79dd09b1a8 /svl | |
| parent | adfb7ecb4f77c4ccb70156044a41505648df0ad4 (diff) | |
make empty subformat code work again
Broken with 842c95519a35174238c728784662f854031993d7 were things like
;;;@ or _;0
Change-Id: Idf99378beedacf97a0376d1cd11ee78d3f7c9aff
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 889f394b5fb0..87b7740f17ff 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1292,10 +1292,10 @@ sal_Unicode toUniChar(sal_uInt8 n) return sal_Unicode(c); } -bool IsSingleSymbol(OUStringBuffer& rStringBuffer, xub_StrLen nPos) +bool IsSingleSymbol(OUStringBuffer& rStringBuffer, sal_Int32 nPos) { bool ret = false; - while(nPos > 0) + while (nPos >= 0) { if(rStringBuffer[nPos] == '*' || rStringBuffer[nPos] == '\\' || rStringBuffer[nPos] == '_') { @@ -1556,7 +1556,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, } break; case SsGetString: - if (cToken == ';' && (nPos>=2) && !IsSingleSymbol(rString, nPos-2)) + if (cToken == ';' && (nPos < 2 || !IsSingleSymbol(rString, nPos-2))) { eState = SsStop; } |