diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-28 10:50:28 +0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-06-28 11:13:09 +0200 |
commit | 11a98f5bb553606d05d86a143a1e11b78a23f29f (patch) | |
tree | 4f209b788951444d090c62174bb761b999202818 /writerfilter/source | |
parent | tdf#108806: convert CRLF into space in OOXML text (diff) | |
download | core-11a98f5bb553606d05d86a143a1e11b78a23f29f.tar.gz core-11a98f5bb553606d05d86a143a1e11b78a23f29f.zip |
tdf#108714 follow-up: handle deferred break in character group
If an out-of-order break happens immediately after a table, then
in following paragraph group (before character group start) the
table level is > 0, and break is ignored.
Since out-of-order break only happens at top level, the following
character group necessarily designates a new paragraph group, so
it's OK to handle that at the character group level, where table
level is already updated.
Change-Id: Ic1b1bb89e12407b050c2e880ad971794311845a5
Reviewed-on: https://gerrit.libreoffice.org/39347
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 553204015f954d20db65e6adcda68b823a8ef235)
Reviewed-on: https://gerrit.libreoffice.org/39352
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 042998559336..84d2a65ad6e0 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -371,6 +371,10 @@ void OOXMLFastContextHandler::startCharacterGroup() mpParserState->setInCharacterGroup(true); mpParserState->resolveCharacterProperties(*mpStream); } + + // tdf#108714 : if we have a postponed break information, + // then apply it now, before any other paragraph content. + mpParserState->resolvePostponedBreak(*mpStream); } } @@ -397,10 +401,6 @@ void OOXMLFastContextHandler::startParagraphGroup() { mpStream->startParagraphGroup(); mpParserState->setInParagraphGroup(true); - - // tdf#108714 : if we have a postponed break information, - // then apply it now, before any other paragraph content. - mpParserState->resolvePostponedBreak(*mpStream); } } } |