diff options
| author | László Németh <nemeth@numbertext.org> | 2020-08-26 12:49:12 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-27 09:18:53 +0200 |
| commit | 3e6f5176bf433a3f1b543b3bb9fc10d6ad72545f (patch) | |
| tree | 8582d39c81382dd362e25b15dfaf304b4395ff82 /writerfilter | |
| parent | 305c8993788b32685a1e6bfc8999fd8a43fcfdaf (diff) | |
Revert "tdf#123354 DOCX import: fix ABS formula"
This reverts commit e1aea22f3f4fbf0cc412a8867165a85a3c55f49c,
except some clean-up associated to the patch.
Change-Id: Id9f87b5a02a14ad304c755b10ab157ff0577e249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101401
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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index d720e53a2a53..ce3fd3fbe3a8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4264,10 +4264,6 @@ 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 */ - icu::RegexMatcher rmatch6("\\bABS\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, rMatcherFlags, status); - usInput = rmatch6.replaceAll(icu::UnicodeString("SQRT($1 POW 2)"), status); - return OUString(usInput.getTerminatedBuffer()); } |