diff options
| author | László Németh <nemeth@numbertext.org> | 2020-08-26 11:51:41 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-27 09:17:45 +0200 |
| commit | a2b48254e4ce731edcdbd2f3fa9f6720ae676ae8 (patch) | |
| tree | 42bdbd9e4f67f4bf4672f4c5473be47a8fb4a3bd /writerfilter | |
| parent | 79681f6a35ebf70293136034d675d312c5b6cdee (diff) | |
Revert "tdf#123390 DOCX import: fix SIGN formula"
This reverts commit 4d9b72d1c3929eca04c7a2e363ab6214676b0f64.
Change-Id: Icd342121c375b26ad9c95631ee118de5e0a5f585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101397
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b5a8f124c142..d720e53a2a53 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4264,14 +4264,10 @@ OUString DomainMapper_Impl::convertFieldFormula(const OUString& input) { icu::RegexMatcher rmatch5("\\bDEFINED\\s*\\(<([A-Z]+[0-9]+)>\\)", usInput, rMatcherFlags, status); usInput = rmatch5.replaceAll(icu::UnicodeString("DEFINED($1)"), status); - /* Fix up ABS(x) using SQRT(x POW 2) (it supports only 1-level nesting) */ + /* Fix up ABS(x) using SQRT(x POW 2) - it supports only 1-level nesting */ icu::RegexMatcher rmatch6("\\bABS\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, rMatcherFlags, status); usInput = rmatch6.replaceAll(icu::UnicodeString("SQRT($1 POW 2)"), status); - /* Fix up SIGN(x) using (0 < x) - (x < 0) (it supports only 1-level nesting) */ - icu::RegexMatcher rmatch7("\\bSIGN\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, rMatcherFlags, status); - usInput = rmatch7.replaceAll(icu::UnicodeString("((0 L $1) - ($1 L 0))"), status); - return OUString(usInput.getTerminatedBuffer()); } |