[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa

Xisco Fauli (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 30 09:33:08 UTC 2020


 sw/qa/extras/uiwriter/uiwriter.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 51f567576cc2431c050527cf4353c4915e556cb3
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Tue Jul 28 11:43:26 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Jul 30 11:32:32 2020 +0200

    CppunitTest_sw_uiwriter: reset the redline author after using it
    
    See http://document-foundation-mail-archive.969070.n3.nabble.com/CppunitTest-different-results-depending-on-execution-command-td4283987.html
    
    Change-Id: I16f07232611d3d2cec675f34f0f93aee9618d80f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99585
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 720b3c133cc6348537b4d013b4531856f73b392d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99666

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 2f22be303d35..e5f7de2c1052 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5415,6 +5415,10 @@ void SwUiWriterTest::testRedlineViewAuthor()
     uno::Reference<beans::XPropertySet> xField(xFields->nextElement(), uno::UNO_QUERY);
     // This was 'Unknown Author' instead of 'A U. Thor'.
     CPPUNIT_ASSERT_EQUAL(aAuthor, xField->getPropertyValue("Author").get<OUString>());
+
+    //Reset the redline author after using it, otherwise, it might interfere with other unittests
+    pView->SetRedlineAuthor("Unknown Author");
+    pDocShell->SetView(pView);
 }
 
 void SwUiWriterTest::testTdf91292()


More information about the Libreoffice-commits mailing list