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

Xisco Fauli (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 10 10:42:27 UTC 2021


 sw/qa/extras/rtfexport/rtfexport5.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ef3329a520b11782c441ee6c2805bed622047407
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Sep 10 11:02:48 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Sep 10 12:41:52 2021 +0200

    CppunitTest_sw_rtfexport5: simplify asserts
    
    Directly get the properties as Color
    Follow-up of 7b3a681a867eeb2d68abd4ce33b07cabfff224ef
    < tdf#141908: replace usage of sal_Int32 with colors >
    
    Change-Id: I23da21b88dad7758856c719ebebaef9ed6fe7ca9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121868
    Tested-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 44b969c9a6ff..b1d11df3a0f8 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -392,14 +392,12 @@ DECLARE_RTFEXPORT_TEST(testNestedTable, "rhbz1065629.rtf")
     table::BorderLine2 halfPtSolid(sal_Int32(COL_BLACK), 0, 18, 0, table::BorderLineStyle::SOLID,
                                    18);
     CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid, getProperty<table::BorderLine2>(xCell, "LeftBorder"));
-    CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT,
-                         Color(ColorTransparency, getProperty<sal_Int32>(xCell, "BackColor")));
+    CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, getProperty<Color>(xCell, "BackColor"));
     xCell.set(xTable->getCellByName("B2"), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xCell.is());
     CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid, getProperty<table::BorderLine2>(xCell, "LeftBorder"));
     CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid, getProperty<table::BorderLine2>(xCell, "RightBorder"));
-    CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT,
-                         Color(ColorTransparency, getProperty<sal_Int32>(xCell, "BackColor")));
+    CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT, getProperty<Color>(xCell, "BackColor"));
 
     // \sect at the end resulted in spurious page break
     CPPUNIT_ASSERT_EQUAL(1, getPages());


More information about the Libreoffice-commits mailing list