sd/qa/unit/export-tests-ooxml3.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
New commits: commit bbfce0b49fb11997af8eb03d40431b6a78f2aebe Author: VaibhavMalik4187 <vaibhavmalik2...@gmail.com> AuthorDate: Sat Dec 25 23:39:12 2021 +0530 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Mon Dec 27 15:42:41 2021 +0100 tdf#141908 replaced sal_Int32 with Color Change-Id: Icb9aa78035087e62c132b82bd8ab3023f31d42d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127494 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 1650680a2c30..8f150f702770 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -1769,15 +1769,16 @@ void SdOOXMLExportTest3::testTdf96061_textHighlight() uno::Reference<text::XTextRange> const xParagraph1(getParagraphFromShape(0, xShape)); uno::Reference<text::XTextRange> xRun1(getRunFromParagraph(0, xParagraph1)); uno::Reference<beans::XPropertySet> xPropSet1(xRun1, uno::UNO_QUERY_THROW); - sal_Int32 aColor; + + Color aColor; xPropSet1->getPropertyValue("CharBackColor") >>= aColor; - CPPUNIT_ASSERT_EQUAL(sal_Int32(16776960), aColor); + CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aColor); uno::Reference<text::XTextRange> const xParagraph2(getParagraphFromShape(1, xShape)); uno::Reference<text::XTextRange> xRun2(getRunFromParagraph(0, xParagraph2)); uno::Reference<beans::XPropertySet> xPropSet2(xRun2, uno::UNO_QUERY_THROW); xPropSet2->getPropertyValue("CharBackColor") >>= aColor; - CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aColor); + CPPUNIT_ASSERT_EQUAL(COL_AUTO, aColor); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); @@ -1786,13 +1787,13 @@ void SdOOXMLExportTest3::testTdf96061_textHighlight() uno::Reference<text::XTextRange> xRun3(getRunFromParagraph(0, xParagraph3)); uno::Reference<beans::XPropertySet> xPropSet3(xRun3, uno::UNO_QUERY_THROW); xPropSet3->getPropertyValue("CharBackColor") >>= aColor; - CPPUNIT_ASSERT_EQUAL(sal_Int32(16776960), aColor); + CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aColor); uno::Reference<text::XTextRange> const xParagraph4(getParagraphFromShape(1, xShape2)); uno::Reference<text::XTextRange> xRun4(getRunFromParagraph(0, xParagraph4)); uno::Reference<beans::XPropertySet> xPropSet4(xRun4, uno::UNO_QUERY_THROW); xPropSet4->getPropertyValue("CharBackColor") >>= aColor; - CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), aColor); + CPPUNIT_ASSERT_EQUAL(COL_AUTO, aColor); } void SdOOXMLExportTest3::testTdf143222_embeddedWorksheet()