diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-05 09:16:19 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-17 23:23:17 +0200 |
| commit | f307b1303b79e106d34d8bd2f0cc1f469081217e (patch) | |
| tree | bbfddf73fbc3253c5122bcf2ef4af51074cd3fd8 /writerfilter | |
| parent | Don't re-read the same glsl files over and over again (diff) | |
| download | core-f307b1303b79e106d34d8bd2f0cc1f469081217e.tar.gz core-f307b1303b79e106d34d8bd2f0cc1f469081217e.zip | |
tdf#94435 RTF import: \ltrpar should not override \qc
Change-Id: I342191cd8cf8b3998089236aea5743ea7cdd26f1
(cherry picked from commit 92fd894ea18672cba4cf961bdc4c0bc98f168102)
Reviewed-on: https://gerrit.libreoffice.org/19274
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d5db91d310de658631f4cb85d1335fbe55c82453)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index d264dc4b69f1..4b11157430c4 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1376,12 +1376,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) if (nIntValue != 0) { rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB )); - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT )); + rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false); } else { rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::LR_TB )); - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT )); + rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false); } } |