[Libreoffice-commits] core.git: sw/qa

[Mike Kaganski]

 sw/qa/extras/ww8export/data/tdf91083.odt |binary
 sw/qa/extras/ww8export/ww8export.cxx     |    2 ++
 2 files changed, 2 insertions(+)

New commits:
commit 1eda8cbe464ff33e4babf30327612836963c6956
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date:   Wed May 30 11:06:20 2018 +0100

    Revert "ww8export: Fix testTableKeep"
    
    Seems that the fix is not complete: e.g.
    https://ci.libreoffice.org/job/gerrit_windows/7272/console
    
    This reverts commit b7da22a63dcf09fdcbb3fe62c82af699d8546d3b.
    
    Change-Id: Ib174cdde18765d2efa3446d7116e95d6759a431f
    Reviewed-on: https://gerrit.libreoffice.org/55054
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/qa/extras/ww8export/data/tdf91083.odt 
b/sw/qa/extras/ww8export/data/tdf91083.odt
index 482a2dc4d5d1..e4f55e58acf0 100644
Binary files a/sw/qa/extras/ww8export/data/tdf91083.odt and 
b/sw/qa/extras/ww8export/data/tdf91083.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 6659749b3c80..d5a84b2b1ded 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1293,6 +1293,7 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, 
"comment-export.odt")
     }
 }
 
+#if !defined(MACOSX) && !defined(_WIN32)
 #if !TEST_FONTS_MISSING
 DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
 {
@@ -1301,6 +1302,7 @@ DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
     CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), 
parseDump("/root/page[6]/body/tab[1]/row[2]/cell[1]/txt[1]") );
 }
 #endif
+#endif
 
 DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins, 
"tdf76349_textboxMargins.doc")
 {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits