diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-27 07:50:12 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-27 20:10:50 +0200 |
| commit | 1beebea6376d9a6b4c0a854f8403799659b73bae (patch) | |
| tree | 868c7b653a50ab9f5f4b3493c323f3c0866cdfd7 /writerfilter | |
| parent | 304dcd15d5ea5bac750249d5688372123565f9df (diff) | |
tdf#108806: convert CRLF into space in OOXML text
Change-Id: I8e2e108a705ecdb55c096a589d83d51c48b0b83c
Reviewed-on: https://gerrit.libreoffice.org/39286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/39322
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index cd79f2c0454b..042998559336 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -623,9 +623,14 @@ void OOXMLFastContextHandler::endTxbxContent() void OOXMLFastContextHandler::text(const OUString & sText) { if (isForwardEvents()) + { + // tdf#108806: CRLFs in XML were converted to \n before this point. + // These must be converted to spaces before further processing. + OUString sNormalizedText = sText.replaceAll("\n", " "); mpStream->utext(reinterpret_cast < const sal_uInt8 * > - (sText.getStr()), - sText.getLength()); + (sNormalizedText.getStr()), + sNormalizedText.getLength()); + } } void OOXMLFastContextHandler::positionOffset(const OUString& rText) |