summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2015-11-01 10:03:50 +1000
committerCaolán McNamara <caolanm@redhat.com>2015-11-10 12:34:42 +0000
commita6ae84cc296d4d28e9a48a57406e955138c87a80 (patch)
tree063b41de6b566f80742d6a1b057417d7c7fb479d /sw/qa
parent96a6b7bb1a073b6d2a5c01712b2c9a818c53c77a (diff)
tdf#70318: Prevent extra empty paragraph in clipboard RTF content
Change-Id: Icbd163bac65cbb9e4ad59697b87f6c979ecb41cc Reviewed-on: https://gerrit.libreoffice.org/19718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index b9b3e93b6add..3049531915de 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -527,6 +527,8 @@ void SwUiWriterTest::testExportRTF()
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf("aaa"));
CPPUNIT_ASSERT(aData.indexOf("bbb") != -1);
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aData.indexOf("ccc"));
+ // Ensure there's no extra newline
+ CPPUNIT_ASSERT(aData.endsWith(OString("bbb}") + OString(SAL_NEWLINE_STRING) + OString("}")));
}
void SwUiWriterTest::testFdo74981()