sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 0e3e0b04395de673e0cc9709de360e5cf95c1cc7
Author: Daniel Arato (NISZ) <arato.dan...@nisz.hu>
AuthorDate: Mon Aug 31 13:25:43 2020 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Sep 3 09:22:38 2020 +0200
tdf#129423 sw: export-only tests, part 5
Convert some unit tests from "export" tests to "export only".
Remove nullptr checks on parseExport's return value to make
the tests fail if parsing fails for any reason.
Change-Id: I85caa7c9f88316d733826fdc839dd7d33ec845a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101716
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 88f86f57da67..bcd96e2491cc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1234,7 +1234,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf108505,
"tdf108505.docx")
getProperty<OUString>(xText, "CharFontName"));
}
-DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromTopMarginHasHeader,
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testRelativeAnchorHeightFromTopMarginHasHeader,
"tdf123324_testRelativeAnchorHeightFromTopMarginHasHeader.docx")
{
// tdf#123324 The height was set relative to page print area top,
@@ -1242,12 +1242,10 @@
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromTopMarginHasHeader,
// Note: page print area top = margin + header height.
// In this case the header exists.
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
- if (!pXmlDoc)
- return;
assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "height", "2551");
}
-DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromTopMarginNoHeader,
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testRelativeAnchorHeightFromTopMarginNoHeader,
"tdf123324_testRelativeAnchorHeightFromTopMarginNoHeader.docx")
{
// tdf#123324 The height was set relative from top margin, but this was
handled relative from page height.
@@ -1259,8 +1257,6 @@
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromTopMarginNoHeader,
// Note: page print area top = margin + header height.
// In this case the header does not exist, so OpenDocument and OOXML
margins are the same.
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
- if (!pXmlDoc)
- return;
assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "height", "2551");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
