diff options
| author | László Németh <nemeth@numbertext.org> | 2020-09-18 09:28:06 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-09-18 20:20:46 +0200 |
| commit | 782700c6940341d489eabf00a531cb184941484e (patch) | |
| tree | 1d27be87bc715426119565458249b71b28b688ce /writerfilter | |
| parent | 10bb02efd8afd42e633e370480104e2575546d8e (diff) | |
tdf#122648 DOCX import: fix table formula in all tables
Table formula import worked only in the first table,
because of using bad fallback table for cell references
without table names during formula conversion to internal
formula.
Set table of the text field as the correct fallback table.
Follow-up of commit 68e74bdf63e992666016c790e8e4cfd5b28d6abe
(tdf133647 tdf123386 tdf123389 Improved .docx table formula import).
Change-Id: Ib080f12426c57c8c74fe919eb45637a655875d1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102989
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, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 000a0f50a238..dd13f18c7011 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4285,7 +4285,9 @@ OUString DomainMapper_Impl::convertFieldFormula(const OUString& input) { icu::RegexMatcher rmatch2("\\b([A-Z]{1,3}[0-9]+)\\b(?![(])", usInput, rMatcherFlags, status); usInput = rmatch2.replaceAll(icu::UnicodeString("<$1>"), status); - /* Cell references must be upper case */ + /* Cell references must be upper case + * TODO: convert reference to other tables, e.g. SUM(Table1 A1:B2), where "Table1" is a bookmark of the table, + * TODO: also column range A:A */ icu::RegexMatcher rmatch3("(<[a-z]{1,3}[0-9]+>|\\b(above|below|left|right)\\b)", usInput, rMatcherFlags, status); icu::UnicodeString replacedCellRefs; while (rmatch3.find(status) && status.isSuccess()) { |