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

[David Tardon]

 sw/qa/extras/uiwriter/uiwriter.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit eba4d3b5a0667185e5a51a6e9996efbdbb51435d
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 31 19:39:29 2018 +0100

    the test is declared uncond., so define it so too
    
    Change-Id: Idd107c0eebd0f2782c25fb17e3756cde88c5f4dc
    Reviewed-on: https://gerrit.libreoffice.org/49054
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e175d53a26e4..ffd2d4bba18d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5467,13 +5467,6 @@ void SwUiWriterTest::testSectionInTableInTable()
     createDoc("tdf112109.fodt");
 }
 
-void SwUiWriterTest::testTdf114536()
-{
-    // This crashed in SwTextFormatter::MergeCharacterBorder() due to a
-    // use after free.
-    createDoc("tdf114536.odt");
-}
-
 void SwUiWriterTest::testSectionInTableInTable2()
 {
     createDoc("split-section-in-nested-table.fodt");
@@ -5624,6 +5617,13 @@ void SwUiWriterTest::testTdf113790()
     CPPUNIT_ASSERT(dynamic_cast<SwXTextDocument *>(mxComponent.get()));
 }
 
+void SwUiWriterTest::testTdf114536()
+{
+    // This crashed in SwTextFormatter::MergeCharacterBorder() due to a
+    // use after free.
+    createDoc("tdf114536.odt");
+}
+
 void SwUiWriterTest::testTdf115065()
 {
     // In the document, the tables have table style assigned