diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-23 19:17:02 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-03-23 22:13:37 +0900 |
| commit | 772d8c5a2b46d7feca348723090e39aa235d05e0 (patch) | |
| tree | b40ecf251dcff795bf71831b1489b54c86a0043e | |
| parent | 9bce474064e876ced20a8e1f2f1cc189ab6ba989 (diff) | |
disable asserts for some HTML export image properties values
The values are DPI dependent and the test fails if the system DPI
is set to anything else than 96.
Change-Id: I548a193b3c98dc5181539eca40064a52ec15efe7
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 44cf0b993d5d..30e9263e0875 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -203,13 +203,15 @@ 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") -#if !defined(MACOSX) && !defined(_WIN64) + +#if 0 // disabled as it depends that the system DPI is set to 96 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"); assertXPath(pDoc, "/html/body/p/a/font/img", "height", "222"); assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3"); #endif + assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1"); } @@ -237,7 +239,7 @@ DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding, "tdf76291.odt") { htmlDocPtr pDoc = parseHtml(maTempFile); CPPUNIT_ASSERT(pDoc); - + // Test URI encoded hyperlink with Chinese characters assertXPath(pDoc, "/html/body/p/a", "href", "http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12"); } |