diff options
| author | 4k5h1t <ask160203@gmail.com> | 2021-08-30 21:43:48 +0530 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-10-26 11:19:43 +0200 |
| commit | 31ded6f8718a90c7b3b9eb36909c2b7a0c6e9b68 (patch) | |
| tree | 7623f01b81ec581f8c3dc930bc981b3af8989aea /sd | |
| parent | 69424f0fd66a74dbabba66c9c7fb1420aa1ff4e9 (diff) | |
tdf#141908 - CppUnittests: replace usage of sal_Int32 with color
Change-Id: Iaff808a86a8b3ea8f760402faded81d8b8081ce4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121316
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 84c7ed4bb596..07c0011bec40 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -424,7 +424,7 @@ void SdOOXMLExportTest1::testBnc870233_2() const SdrObjGroup *pObjGroup = dynamic_cast<SdrObjGroup *>(pPage->GetObj(1)); CPPUNIT_ASSERT(pObjGroup); const SdrTextObj *pObj = dynamic_cast<SdrTextObj *>(pObjGroup->GetSubList()->GetObj(1)); - checkFontAttributes<Color, SvxColorItem>( pObj, Color(0x1F497D), EE_CHAR_COLOR ); + checkFontAttributes<Color, SvxColorItem>( pObj, Color(0x1f497d), EE_CHAR_COLOR ); } // Third smart art has white font color (style) @@ -1052,26 +1052,26 @@ void SdOOXMLExportTest1::testTableCellBorder() sal_Int32 nLeftBorder = aBorderLine.LineWidth * 2; nLeftBorder = oox::drawingml::convertHmmToEmu( nLeftBorder ); CPPUNIT_ASSERT(nLeftBorder); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0xb0f0), aBorderLine.Color); + CPPUNIT_ASSERT_EQUAL(Color(0x00b0f0), Color(ColorTransparency, aBorderLine.Color)); xCellPropSet->getPropertyValue("RightBorder") >>= aBorderLine; sal_Int32 nRightBorder = aBorderLine.LineWidth * 2; nRightBorder = oox::drawingml::convertHmmToEmu( nRightBorder ); CPPUNIT_ASSERT(nRightBorder); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffff), aBorderLine.Color); + CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(ColorTransparency, aBorderLine.Color)); xCellPropSet->getPropertyValue("TopBorder") >>= aBorderLine; sal_Int32 nTopBorder = aBorderLine.LineWidth * 2; nTopBorder = oox::drawingml::convertHmmToEmu( nTopBorder ); CPPUNIT_ASSERT(nTopBorder); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0xb0f0), aBorderLine.Color); + CPPUNIT_ASSERT_EQUAL(Color(0x00b0f0), Color(ColorTransparency, aBorderLine.Color)); xCellPropSet->getPropertyValue("BottomBorder") >>= aBorderLine; sal_Int32 nBottomBorder = aBorderLine.LineWidth * 2; nBottomBorder = oox::drawingml::convertHmmToEmu( nBottomBorder ); CPPUNIT_ASSERT(nBottomBorder); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0xb0f0), aBorderLine.Color); + CPPUNIT_ASSERT_EQUAL(Color(0x00b0f0), Color(ColorTransparency, aBorderLine.Color)); xDocShRef->DoClose(); } @@ -1496,8 +1496,8 @@ void SdOOXMLExportTest1::testTdf128345GradientAxial() awt::Gradient aTransparenceGradient; xShapePropSet->getPropertyValue("FillTransparenceGradient") >>= aTransparenceGradient; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0x000000), aTransparenceGradient.StartColor); - CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffff), aTransparenceGradient.EndColor); + CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(ColorTransparency, aTransparenceGradient.StartColor)); + CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(ColorTransparency, aTransparenceGradient.EndColor)); CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aTransparenceGradient.Style); xDocShRef->DoClose(); |