sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 43feacd5330b5652b58e8a75a0f41a78ee6ebe1c Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sat Feb 8 12:23:57 2014 +0100 sw: fix build 1edca1fe0aaadbd48ea23b691dc244ad2a6b6f73 (fdo#74499: - FILESAVE:System throws a segmentation fault while saving files, 2014-02-06) added a unit test to make sure a crash doesn't occur, except that it forgot to fix the problem itself. Disable that for now till the real fix arrives. Change-Id: I2dd2e2f2bb6f518acf082534bb048fb2d13e58e8 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 27fba45..1de987d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2860,6 +2860,7 @@ DECLARE_OOXMLEXPORT_TEST(testPageref, "testPageref.docx") CPPUNIT_ASSERT(contents.match("PAGEREF _Toc355095261 \\h")); } +/* FIXME this still crashes DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave, "test_segfault_while_save.docx") { // fdo#74499 @@ -2867,7 +2868,7 @@ DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave, "test_segfault_while_save.docx") if (!pXmlDoc) return; CPPUNIT_ASSERT(getXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").match("6138")); -} +}*/ DECLARE_OOXMLEXPORT_TEST(testDMLTextFrameVertAdjust, "dml-textframe-vertadjust.docx") { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits