diff options
| author | László Németh <nemeth@numbertext.org> | 2019-01-07 21:28:29 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-01-16 21:06:03 +0100 |
| commit | 7798ce2e8c938b9d05a3f39e50a2737e64957197 (patch) | |
| tree | a1f3904004d8c9726b8305ad11cb1838e47884e0 /writerfilter | |
| parent | 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772 (diff) | |
tdf#122224 DOCX import: fix formula field syntax
by removing the DOCX custom number format string
which caused a syntax error message here instead
of the formula calculation.
Change-Id: Ia643e966440117871f6b4ddceab610100ac34138
Reviewed-on: https://gerrit.libreoffice.org/65945
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 7209feef41c3c858476a2ae9795a7d2264c0ffc0)
Reviewed-on: https://gerrit.libreoffice.org/65959
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit b095e8f3b27331f0d646b1d33e51e17c37e43e2c)
Reviewed-on: https://gerrit.libreoffice.org/66470
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8114600a68aa..82db1031bc88 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3217,6 +3217,15 @@ void DomainMapper_Impl::handleFieldFormula uno::Reference< beans::XPropertySet > const& xFieldProperties) { OUString command = pContext->GetCommand().trim(); + + // Remove number formatting from \# to end of command + // TODO: handle custom number formatting + sal_Int32 delimPos = command.indexOf("\\#"); + if (delimPos != -1) + { + command = command.replaceAt(delimPos, command.getLength() - delimPos, "").trim(); + } + // command must contains = and at least another char if (command.getLength() < 2) return; |