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 | |
| parent | 7b6654dfa923e73714eb24512b6d9e8445f804b0 (diff) | |
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)
| -rw-r--r-- | sw/qa/extras/rtfimport/data/tdf94435.rtf | 7 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf94435.rtf b/sw/qa/extras/rtfimport/data/tdf94435.rtf new file mode 100644 index 000000000000..c1dbf0e3c08f --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf94435.rtf @@ -0,0 +1,7 @@ +{\rtf1\ansi\deff3\adeflang1025 +\paperh15840\paperw12240\margl1260\margr720\margt180\margb67\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1260\margrsxn720\margtsxn180\margbsxn67\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc +{\*\ftnsep\chftnsep} +\pgndec\pard\plain \s0\ql\widctlpar\ltrpar\hyphpar0\cf0\dbch\af0\dbch\af0\afs24\alang1025\langfe2052\loch\f0\fs24\lang1033\qc\li0\ri720\lin0\rin720\fi0 +{\cf17\b\afs32\fs22\lang1049\rtlch \ltrch\loch\fs32\lang1049 +xxx} +\par} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 616986d74649..c7f34c2c95e3 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2338,6 +2338,12 @@ DECLARE_RTFIMPORT_TEST(testTdf94456, "tdf94456.rtf") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-762), getProperty<sal_Int32>(getParagraph(1), "ParaFirstLineIndent")); } +DECLARE_RTFIMPORT_TEST(testTdf94435, "tdf94435.rtf") +{ + // This was style::ParagraphAdjust_LEFT, \ltrpar undone the effect of \qc. + CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(getParagraph(1), "ParaAdjust"))); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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); } } |