diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-07-07 08:38:37 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-07-07 08:52:50 +0200 |
| commit | 919b6958dbb1c17c060ba9a58fe245b825b271c2 (patch) | |
| tree | b35983093d6c7e0286cfa790dd489947c8c4102e /writerfilter | |
| parent | e0002e1b3836820cb63f81fd724c8aaf0e1f209c (diff) | |
tdf#108714: Also support paragraph-level (line) breaks
Change-Id: Ida55015363cac3ae29b82a60a9b9a5f1b39086a2
Reviewed-on: https://gerrit.libreoffice.org/39675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f95f0ce163743706a3670c6e33593023c22af2ff)
Reviewed-on: https://gerrit.libreoffice.org/39677
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLParserState.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLParserState.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index a655488e3194..3e4d3a7bcc0a 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -214,17 +214,17 @@ void OOXMLParserState::setTableProperties(const OOXMLPropertySet::Pointer_t& pPr // tdf#108714 void OOXMLParserState::resolvePostponedBreak(Stream & rStream) { - if (mpPostponedBreak) + for (const auto & rBreak: mvPostponedBreaks) { OOXMLBreakHandler aBreakHandler(rStream); - mpPostponedBreak->resolve(aBreakHandler); - mpPostponedBreak.reset(); + rBreak->resolve(aBreakHandler); } + mvPostponedBreaks.clear(); } void OOXMLParserState::setPostponedBreak(const OOXMLPropertySet::Pointer_t & pProps) { - mpPostponedBreak = pProps; + mvPostponedBreaks.push_back(pProps); } void OOXMLParserState::startTable() diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx index d328b07b2835..f2895e9b9274 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.hxx +++ b/writerfilter/source/ooxml/OOXMLParserState.hxx @@ -59,7 +59,7 @@ class OOXMLParserState final bool savedInCharacterGroup; bool savedLastParagraphInSection; std::vector<SavedAlternateState> maSavedAlternateStates; - OOXMLPropertySet::Pointer_t mpPostponedBreak; + std::vector<OOXMLPropertySet::Pointer_t> mvPostponedBreaks; public: typedef std::shared_ptr<OOXMLParserState> Pointer_t; diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 5318d7d3c819..56aff376c8f9 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -14178,6 +14178,11 @@ <attribute name="rsidRDefault"> <data type="string"/> </attribute> + <!-- tdf#108714 : allow <w:br> at paragraph level (despite this is illegal according to ECMA-376-1:2016) - bug-to-bug compatibility with Word --> + <element name="br"> + <ref name="CT_Br_OutOfOrder"/> + </element> + <!-- end tdf#108714 --> </define> <define name="ST_TblWidth"> <choice> |