diff options
| author | Eike Rathke <erack@redhat.com> | 2019-10-02 12:41:07 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-08 11:41:41 +0200 |
| commit | a4b84a25f6e921a166cb70cf1e440853bce63642 (patch) | |
| tree | 02c031c858a4da7122279abf0ec57d4243584020 | |
| parent | filter: XHTML: make "calc-heading-digit" a little faster (diff) | |
| download | core-a4b84a25f6e921a166cb70cf1e440853bce63642.tar.gz core-a4b84a25f6e921a166cb70cf1e440853bce63642.zip | |
Resolves: tdf#127873 accept ',' comma group separator in number entities again
Existing documents unwittingly may have used that as decimal
separator in such locales (though it never was as this is always
the en-US locale).
"Regression" from
commit 9336286a7ea5385541344f444e6f8702c85bdacb
CommitDate: Fri Nov 30 22:15:22 2018 +0100
[API CHANGE] Resolves: tdf#42518 new KParseTokens::GROUP_SEPARATOR_IN_NUMBER
Change-Id: I0ffc1b8ec7c1820fccd8277036c64093dddf82fe
Reviewed-on: https://gerrit.libreoffice.org/80023
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 2caa9d7ddcff3f6e380c306b737e9b5e9cdaf4c2)
Reviewed-on: https://gerrit.libreoffice.org/80046
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | starmath/source/parse.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 3cd64af729db..90e356505cbf 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -376,8 +376,13 @@ void SmParser::NextToken() KParseTokens::IGNORE_LEADING_WS; // Continuing characters for numbers, may be any numeric or dot. + // tdf#127873: additionally accept ',' comma group separator as too many + // existing documents unwittingly may have used that as decimal separator + // in such locales (though it never was as this is always the en-US locale + // and the group separator is only parsed away). static const sal_Int32 coNumContFlags = - coNumStartFlags & ~KParseTokens::IGNORE_LEADING_WS; + (coNumStartFlags & ~KParseTokens::IGNORE_LEADING_WS) | + KParseTokens::GROUP_SEPARATOR_IN_NUMBER; sal_Int32 nBufLen = m_aBufferString.getLength(); ParseResult aRes; |