diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2013-12-24 08:05:58 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2013-12-24 08:07:51 +0100 |
| commit | 75e7d6f12e914b63e66968890533b2a56d0b1a7e (patch) | |
| tree | d63d1ab71ae2d4928d8a715a4f1b0d588844e29c /sw/qa/extras/ooxmlimport | |
| parent | 55c6dade042eff373b8b8c9ed383b751c035fc80 (diff) | |
DOCX import: close rPrChange properly.
Call endtrackchanges when rPrChange ends so the
corresponding redline will be removed.
Change-Id: I4091d7b54e0a74f3158cc979f210577a2dc29783
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/rprchange_closed.docx | bin | 0 -> 24695 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/rprchange_closed.docx b/sw/qa/extras/ooxmlimport/data/rprchange_closed.docx Binary files differnew file mode 100644 index 000000000000..ff53871e91ae --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/rprchange_closed.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 9198cc61753d..e91de29f226b 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1652,6 +1652,14 @@ DECLARE_OOXMLIMPORT_TEST(testFdo72560, "fdo72560.docx") CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getProperty<sal_Int16>( xParaRightLTR, "WritingMode" )); CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT), getProperty< sal_Int32 >( xParaRightLTR, "ParaAdjust" )); } + +DECLARE_OOXMLIMPORT_TEST(testRPrChangeClosed, "rprchange_closed.docx") +{ + // Redline defined by rPrChanged wasn't removed. + // First paragraph has an rPrChange element, make sure it doesn't appear in the second paragraph. + CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(2), 1), "RedlineType")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |