src/lib/CDRParser.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 878c3b55c3aef12b5b1d8ad2619644a0e062368e
Author: Fridrich Štrba <fridrich.st...@bluewin.ch>
AuthorDate: Tue Mar 23 06:32:15 2021 +0100
Commit: Fridrich Štrba <fridrich.st...@bluewin.ch>
CommitDate: Tue Mar 23 06:32:15 2021 +0100
Fix the spirit grammar to cater for more cases
Change-Id: I8dd86e35c71e7657128ebd63a7cafe730c0daf47
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index c71cae5..d141591 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -153,8 +153,10 @@ static int parseColourString(const char *colourString,
libcdr::CDRColor &colour,
>> (cpalette | omit[+iso8859_1::alnum]) >> lit(',')
>> *(uint_ >> lit(','))
>> omit[(repeat(8)[iso8859_1::xdigit] >> '-' >>
repeat(3)[repeat(4)[iso8859_1::xdigit] >> '-'] >>
repeat(12)[iso8859_1::xdigit])]
- >> -(lit(",~,") >> omit[+(iso8859_1::char_ -
lit(','))] >> lit(',') >> omit[uint_] >> lit(',')
- >> repeat[+(iso8859_1::char_ - lit(",~,")) >>
lit(",~,")] >> omit[*iso8859_1::char_])
+ >> -(lit(',')
+ >> -(lit("~,") >> omit[+(iso8859_1::char_ -
lit(','))] >> lit(',') >> omit[uint_] >> lit(',')
+ >> repeat[+(iso8859_1::char_ - lit(",~,"))
>> lit(",~,")])
+ >> omit[*iso8859_1::char_])
),
// End grammar
iso8859_1::space,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
