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

[Miklos Vajna (via logerrit)]

 sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx                     |binary
 sw/qa/core/objectpositioning/objectpositioning.cxx                                   |    4 ++--
 sw/qa/extras/layout/data/tdf116486.docx                                              |binary
 sw/qa/extras/ooxmlexport/data/effectextent-margin.docx                               |binary
 sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx |binary
 sw/qa/extras/ooxmlexport/data/textframe-gradient.docx                                |binary
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx                                            |    6 +++---
 7 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0fc76a646233bebebbca3f86144f30eb32a5d60c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Mar 12 18:12:11 2021 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Mar 12 19:40:15 2021 +0100

    CppunitTest_sw_ooxmlexport: clean up testEffectExtentMargin
    
    The shape had line information, but the intent was to test what happens
    when the shape has some non-zero effect extent, line information is not
    needed for that.
    
    And do the same for a bunch of other tests: a test document should
    ideally have line information only if it's relevant for a test.
    
    Change-Id: I9ea1f38841a30e7e61088d347443e37948b1a9d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112401
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx b/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx
index 15d2dca0775e..1308e1f6a8a5 100644
Binary files a/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx and b/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx differ
diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx
index 7b9a3eca2831..9817b9b05233 100644
--- a/sw/qa/core/objectpositioning/objectpositioning.cxx
+++ b/sw/qa/core/objectpositioning/objectpositioning.cxx
@@ -227,9 +227,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testInsideOutsideVertAlignBott
         = getXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "top").toInt32(); //15694
 
     // Verify that the distance between the bottom of page and bottom of first shape is around 0cm. (align=outside)
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(23), nPageBottom - nFirstShapeOutside);
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), nPageBottom - nFirstShapeOutside);
     // Verify that the distance between the bottom of body and top of second shape is around 0cm. (align=inside)
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(10), nBodyBottom - nSecondShapeInside);
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nBodyBottom - nSecondShapeInside);
 }
 
 CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVMLVertAlignBottomMargin)
diff --git a/sw/qa/extras/layout/data/tdf116486.docx b/sw/qa/extras/layout/data/tdf116486.docx
index c6a4891b0cf4..825b0ef33a55 100644
Binary files a/sw/qa/extras/layout/data/tdf116486.docx and b/sw/qa/extras/layout/data/tdf116486.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx b/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx
index 22db162a78b0..5dccf967fe7a 100644
Binary files a/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx and b/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx b/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx
index 2cd299ff211a..aa976e7cc925 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx and b/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx b/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx
index e5ed0689d251..edbfe53b1627 100644
Binary files a/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx and b/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 72dc978a4c8e..935c047dad21 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -1008,9 +1008,9 @@ DECLARE_OOXMLEXPORT_TEST(testRelativeAlignmentFromTopMargin,
         return;
 
     xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-    assertXPath(pXmlDoc, "//SwAnchoredDrawObject[1]/bounds", "top", "1487"); // center
-    assertXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "top", "2668"); // bottom
-    assertXPath(pXmlDoc, "//SwAnchoredDrawObject[3]/bounds", "top", "298");  // top
+    assertXPath(pXmlDoc, "//SwAnchoredDrawObject[1]/bounds", "top", "1502"); // center
+    assertXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "top", "2683"); // bottom
+    assertXPath(pXmlDoc, "//SwAnchoredDrawObject[3]/bounds", "top", "313");  // top
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();