sc/qa/unit/subsequent_export-test.cxx | 2 ++ sc/qa/unit/subsequent_filters-test.cxx | 2 ++ sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit 5eeb1af1ca22129a7ee630de4d2a596d372b26bc Author: Noel Grandin <n...@peralex.com> AuthorDate: Fri Dec 4 09:25:49 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Dec 4 09:34:47 2020 +0100 exclude some more tests for !IsDefaultDPI Change-Id: Ic0eab5c2a78b3bd40caf0521ca8fb6e5cdebff51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107186 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index e46d356d677b..e2f783c30bfc 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -5405,6 +5405,8 @@ void ScExportTest::testHeaderFontStyleXLSX() void ScExportTest::testTdf135828_Shape_Rect() { + if (!IsDefaultDPI()) + return; // tdf#135828 Check that the width and the height of rectangle of the shape // is correct. ScDocShellRef xShell = loadDoc("tdf135828_Shape_Rect.", FORMAT_XLSX); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index a00e756bcbc8..593c12c3e27a 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -4997,6 +4997,8 @@ void ScFiltersTest::testPreviewMissingObjLink() void ScFiltersTest::testShapeRotationImport() { + if (!IsDefaultDPI()) + return; // tdf#83593 Incorrectly calculated bounding rectangles caused shapes to appear as if there // were extra or missing rotations. Hence, we check the sizes of these rectangles. ScDocShellRef xDocSh = loadDoc("testShapeRotationImport.", FORMAT_XLSX); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 1670d11cfeca..3601d735f717 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -220,6 +220,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130814model, "tdf130814.docx") DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf107020, "tdf107020.docx") { + if (!IsDefaultDPI()) + return; xmlDocUniquePtr p_XmlDoc = parseExport("word/document.xml"); CPPUNIT_ASSERT(p_XmlDoc); assertXPath( _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits