From e2cb154195fdc2ffccdb6f5e87cae8b29640b3eb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Feb 2018 17:13:01 +0200 Subject: convert COL_ constants to be of type Color Change-Id: I0e25c8950ac26b851ff42f71e1471fcbe4770d48 Reviewed-on: https://gerrit.libreoffice.org/50373 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sw/qa/extras/mailmerge/mailmerge.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/qa/extras/mailmerge') diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 0a0f40bb4cf3..d961216fb8a8 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -401,7 +401,7 @@ DECLARE_FILE_MAILMERGE_TEST(testMissingDefaultLineColor, "missing-default-line-c CPPUNIT_ASSERT( xDefaults.is()); uno::Reference< beans::XPropertySetInfo > xInfo( xDefaults->getPropertySetInfo()); CPPUNIT_ASSERT( xInfo->hasPropertyByName( "LineColor" )); - sal_uInt32 lineColor; + Color lineColor; xDefaults->getPropertyValue( "LineColor" ) >>= lineColor; // And the default value is black (wasn't copied properly by mailmerge). CPPUNIT_ASSERT_EQUAL( COL_BLACK, lineColor ); -- cgit