diff options
| author | Laurent BP <laurent.balland-poirier@laposte.net> | 2018-06-23 13:03:08 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-07-10 14:53:52 +0200 |
| commit | c290f692dd28094d41dff686f3faa1c4e14b556e (patch) | |
| tree | 93b1d746ac3d550e54a1831eacf96fb470182fd1 /svl | |
| parent | 1f66bd9cbd961d1923c260b2d74249e363a0c217 (diff) | |
tdf#118324 Extend ODF for blank in integer
Following resolution of tdf#117575, this commit add
disambiguation between '0' and '?' in integer part
XML_MAX_BLANK_INTEGER_DIGITS is added for the number of '?'
XML_MIN_INTEGER_DIGITS is the number of '?' and '0'
This preserve compatibility with previous versions:
in previous versions '?' will be transformed in '0'
It also applies to scientific and fraction numbers.
Change-Id: I6e1185bbece9c615240425cc973d59052b22aa34
Reviewed-on: https://gerrit.libreoffice.org/56352
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 53e7a02e9acf..9b4ef9da027e 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -4755,9 +4755,10 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, SvNumFormatType& rScanne { p++; } - while ( *p++ == '0' ) + while ( *p == '0' || *p == '?' ) { nLeadingCnt++; + p++; } } else if (nType == NF_SYMBOLTYPE_DECSEP |