diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/extras/new_cond_format.cxx | 12 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx index b6587e6059e7..e3bf1e2a44ad 100644 --- a/sc/qa/extras/new_cond_format.cxx +++ b/sc/qa/extras/new_cond_format.cxx @@ -201,26 +201,26 @@ void testUseGradient(uno::Reference<beans::XPropertySet> const & xPropSet, bool void testPositiveColor(uno::Reference<beans::XPropertySet> const & xPropSet, Color aColor) { - sal_Int32 nColor = 0; + ::Color nColor; uno::Any aAny = xPropSet->getPropertyValue("Color"); CPPUNIT_ASSERT(aAny >>= nColor); - CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), sal_uInt32(nColor)); + CPPUNIT_ASSERT_EQUAL(aColor, nColor); } void testNegativeColor(uno::Reference<beans::XPropertySet> const & xPropSet, Color aColor) { - sal_Int32 nColor = 0; + ::Color nColor; uno::Any aAny = xPropSet->getPropertyValue("NegativeColor"); CPPUNIT_ASSERT(aAny >>= nColor); - CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), sal_uInt32(nColor)); + CPPUNIT_ASSERT_EQUAL(aColor, nColor); } void testAxisColor(uno::Reference<beans::XPropertySet> const & xPropSet, Color aColor) { - sal_Int32 nColor = 0; + ::Color nColor; uno::Any aAny = xPropSet->getPropertyValue("AxisColor"); CPPUNIT_ASSERT(aAny >>= nColor); - CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), sal_uInt32(nColor)); + CPPUNIT_ASSERT_EQUAL(aColor, nColor); } void testDataBarEntryValue(uno::Reference<sheet::XDataBarEntry> const & xEntry, diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index fe073203818b..688378166014 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -2691,7 +2691,7 @@ void ScExportTest::testSheetTabColorsXLSX() for (size_t i = 0; i < SAL_N_ELEMENTS(aXclColors); ++i) { - if (aXclColors[i] != rDoc.GetTabBgColor(i).GetColor()) + if (aXclColors[i] != rDoc.GetTabBgColor(i)) { cerr << "wrong sheet color for sheet " << i << endl; return false; |