summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2013-11-20 13:39:18 +0100
committerAndras Timar <andras.timar@collabora.com>2013-12-03 20:50:58 +0100
commit7418a5ab18955a76b38512ef757c873d149d6c02 (patch)
treea301c3369ba98df453cb5ac987cf6189e112f60c /sw
parent6837d5ef4120c964735ba1a5d4f47c5ba76d5c1c (diff)
Related bnc#837302: Don't introduce a redlined delete and the end of doc.
Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec Reviewed-on: https://gerrit.libreoffice.org/6898 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Signed-off-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d7a5c8bc5527..1372151e1c93 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -800,6 +800,17 @@ void Test::testBnc837302()
getRun(xParagraph, 3, "AAA");
// interestingly the 'Insert' is set on the _previous_ run
CPPUNIT_ASSERT_EQUAL(OUString("Insert"), getProperty<OUString>(getRun(xParagraph, 2), "RedlineType"));
+
+ // make sure we don't introduce a redlined delete in the 2nd paragraph
+ xParagraph = getParagraph(2);
+ OUString aProperty;
+ try
+ {
+ // throws when not present
+ aProperty = getProperty<OUString>(getRun(xParagraph, 1), "RedlineType");
+ }
+ catch (const beans::UnknownPropertyException&) {}
+ CPPUNIT_ASSERT_EQUAL(OUString(), aProperty);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);