sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit c4e73335b4c9e1a98b9b14d1e4309ead689b177c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Thu Mar 20 12:00:04 2014 +0100
Revert "CppunitTest_sw_ooxmlexport: disable failing check on Mac for now"
Re-enable the unit test with the fixed xPath expression.
This reverts commit 0e5f9958a57a68a3707db5b1eb9f82e0326327c1.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Ibc848b2ae89b3fb7f009cd984d0ecc5fc165673a
Reviewed-on: https://gerrit.libreoffice.org/8679
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 00deeb3..360c502 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2872,11 +2872,7 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM,
"fdo76098.docx")
if (!pXmlDoc)
return;
- // FIXME why does this fail on Mac?
-#if !defined(MACOSX)
assertXPath(pXmlDoc,
"/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/Microsoft_Excel_Macro-Enabled_Worksheet1.xlsm']",
"ContentType", "application/vnd.ms-excel.sheet.macroEnabled.12");
-#endif
-
}
DECLARE_OOXMLEXPORT_TEST(test76108, "test76108.docx")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
