diff options
| -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 19802d95121b..a970a5b3a232 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2355,6 +2355,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 cab16efb7f97..34b84654e929 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1374,12 +1374,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); } } |