summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2019-10-02 12:41:07 +0200
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2019-10-03 10:54:56 +0200
commit3c55f6570833509b548968c050ed4a87b742e7b0 (patch)
treea20edac041009e934a7af7108744f99bafd6f6f3
parentb02252f1c8213bb0a01086c6eb58e3fdb957d6ad (diff)
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/80044 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org>
-rw-r--r--starmath/source/parse.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 84c8508d4fe2..76ab7b37f77b 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -393,8 +393,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;