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

Stephan Bergmann sbergman at redhat.com
Tue Sep 23 06:50:58 PDT 2014


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

New commits:
commit 26967802e6f4912c5e004b9b223bfbd54d2d9b68
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 23 15:49:05 2014 +0200

    Not only hspace, vspace but also width, height
    
    cf.
    <http://lists.freedesktop.org/archives/libreoffice/2014-September/063550.html>
    "CppunitTest_sw_htmlexport failures on Mac (was: Tinderbox failure, MacOSX-10.8
    at 21-10.7SDK, MASTER, last success: 2014-09-21 21:55:50)"
    
    Change-Id: Iab5123a6b0b91d23c5caf4083279de55d1148cfc

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index 39ceb2b..d04e34c 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -187,9 +187,9 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt")
 #ifndef MACOSX // For some reason the hspace is "28" on OSX - disable this check for now
     assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38");
     assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19");
-#endif
     assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222");
     assertXPath(pDoc, "/html/body/p/a/font/img", "height", "222");
+#endif
     assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3");
     assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1");
 }


More information about the Libreoffice-commits mailing list