sw/qa/extras/htmlexport/htmlexport.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e722a9a4ab5bd2dd51c40802c8daffe8e0b0c79b
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 29 10:32:44 2014 +0200
Fixup for OS X after cd85ff0a814ce38d4704b4b808269d89cdaf0d11
We want to bypass all of this test on OS X and Windows in this branch,
still. So the test added must be inside the #if !defined(MACOSX) &&
!defined(WNT).
Change-Id: I39aa7459bf6a67d445b50be2ad1ca2cdc9022d85
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index faa3d4f..1f766b2 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -162,8 +162,6 @@ DECLARE_HTMLEXPORT_TEST(testSkipImageEmbeddedDocument,
"skipimage-embedded-docum
assertXPathContent(pDoc, "/html/body/p/span/p/span", "Inner.");
}
-#endif
-
DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState,
"checkbox-radiobutton.doc")
{
htmlDocPtr pDoc = parseHtml(maTempFile);
@@ -184,6 +182,8 @@ DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState,
"checkbox-radiobutto
// FIXME not in 4.3 assertXPathNoAttribute(pDoc,
"/html/body/form/p[4]/input", "checked");
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
