diff options
| author | László Németh <nemeth@numbertext.org> | 2020-08-13 12:05:20 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-08-14 09:13:03 +0200 |
| commit | cf596c43315bb96b5e7256a82256f1ccb8c9c4d0 (patch) | |
| tree | aa81fa39cefaeb670db98fc5278ea0bdadecc9d3 /sw/source/filter/ww8/docxattributeoutput.cxx | |
| parent | 6457d46967f8dbb41199b750d59edde839f24b5d (diff) | |
tdf#133163 DOCX: export formula cells
as formula fields instead of exporting only cell
text content.
Only unmodified formula fields were exported from
commit d42776e01b87f12fddbcf78101bca1e10a6e4f97
(tdf#118682 DOCX: export formula fields).
Now newly added Writer formula cells or modified
table formula fields imported from DOCX (which are
converted to formula cells after formula editing)
are exported.
Change-Id: Iecec75b2a36b94c2d3aa998603ac10ea2f2b8d4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100667
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 09bbad7e6e8b..5b44aec3c2c9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2153,8 +2153,8 @@ void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos UErrorCode nErr(U_ZERO_ERROR); icu::UnicodeString sInput(sToken.getStr()); // remove < and > around cell references, e.g. <A1> to A1, <A1:B2> to A1:B2 - icu::RegexMatcher xMatch("<([A-Z]{1,3}[0-9]+(:[A-Z]{1,3}[0-9]+)?)>", sInput, 0, nErr); - sToken = xMatch.replaceAll(icu::UnicodeString("$1"), nErr).getTerminatedBuffer(); + icu::RegexMatcher aMatcher("<([A-Z]{1,3}[0-9]+(:[A-Z]{1,3}[0-9]+)?)>", sInput, 0, nErr); + sToken = aMatcher.replaceAll(icu::UnicodeString("$1"), nErr).getTerminatedBuffer(); } // Write the Field command |