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

David Ostrovsky david at ostrovsky.org
Thu Jan 8 02:38:47 PST 2015


 sw/qa/extras/htmlexport/htmlexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b5b918626c4210d1472db17a080460e7ca3d7c9
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Dec 26 14:10:12 2014 +0100

    Disable html tests on x86_64 on windows
    
    Change-Id: Idae98f65bd87d08c62b27c5c604e4d98fcacbe1e
    Reviewed-on: https://gerrit.libreoffice.org/13660
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index d8c673c..e83c807 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -203,7 +203,7 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt")
     //
     // It would make sense to switch to use CSS and use "real world" units instead
     // i.e. (style="margin: 0cm 1.5cm; width: 1cm; height: 1cm")
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(_WIN64)
     assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38");
     assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19");
     assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222");


More information about the Libreoffice-commits mailing list