diff options
| author | László Németh <nemeth@numbertext.org> | 2020-08-26 11:13:48 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-27 09:16:52 +0200 |
| commit | 894a0f77c12f3ac4029bdeb671943f32bcad875c (patch) | |
| tree | 2dd23d3c6a28459821730462ba2d1b5e033bf1e2 /writerfilter | |
| parent | 8a2136443929ac0215b3aa4008de272b6d576050 (diff) | |
Revert "tdf#123356 DOCX import: fix COUNT formula"
This reverts commit f1f27b2487ccfb7a03190ff68eadbfb611dd9749.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
Change-Id: Ic5c920fd70f350890c4b696797152be9307b4eee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101394
Tested-by: László Németh <nemeth@numbertext.org>
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 a482a3231551..b5a8f124c142 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4272,10 +4272,6 @@ OUString DomainMapper_Impl::convertFieldFormula(const OUString& input) { icu::RegexMatcher rmatch7("\\bSIGN\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, rMatcherFlags, status); usInput = rmatch7.replaceAll(icu::UnicodeString("((0 L $1) - ($1 L 0))"), status); - /* Fix up COUNT(x) using SUM(x)/MEAN(x) (it supports only 1-level nesting) */ - icu::RegexMatcher rmatch8("\\bCOUNT\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput, rMatcherFlags, status); - usInput = rmatch8.replaceAll(icu::UnicodeString("(SUM$1/MEAN$1)"), status); - return OUString(usInput.getTerminatedBuffer()); } |