diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2013-12-05 18:22:56 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-09 08:50:52 +0100 |
| commit | 0c61ffc15ecd8122cb9102d2591561e1d4e37327 (patch) | |
| tree | 1547707e02c6afc321af6c71ff27dbd5280fa931 /writerfilter/inc/dmapper | |
| parent | 496ae60435db1c7b508cbdf85bd5cc00c351cf88 (diff) | |
Fix for Column Break if it appears in w:r which is not the first run.
Explicitly ended paragraph when the column break appears in a run
(which is not the first run in the paragraph), as Writer adds a
column break only for new paragraph. Also the created paragraph
must have the same para properties as the earlier one. Hence avoided
pushing new para properties if paragraph is split to adjust a col break.
Added UT for the same.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6953
Change-Id: If7d503b7a4bfab31f40ceb0119876e5909252b2f
Diffstat (limited to 'writerfilter/inc/dmapper')
| -rw-r--r-- | writerfilter/inc/dmapper/DomainMapper.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index d6b5d379517a..78067fcbe173 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -164,6 +164,7 @@ private: sal_Int32 mnBackgroundColor; bool mbIsHighlightSet; bool mbIsBIDI; + bool mbIsSplitPara; boost::scoped_ptr< GraphicZOrderHelper > zOrderHelper; }; |