diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-28 10:50:28 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-28 10:59:05 +0200 |
commit | 553204015f954d20db65e6adcda68b823a8ef235 (patch) | |
tree | eb5ff47ad316c1b6533e0ac2482f3331e0ab1fc9 /writerfilter | |
parent | 5f53dfc5058b76756ab18143aeb5ca695da674af (diff) |
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>
Diffstat (limited to 'writerfilter')
-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 e208e60b4920..6ec8820f5293 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -345,6 +345,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); } } @@ -371,10 +375,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); } } } |