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

Stephan Bergmann sbergman at redhat.com
Wed Dec 13 17:38:13 UTC 2017


 svl/qa/unit/svl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac863696a697b8007a7ee525127fb571d84d1b88
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 13 18:35:20 2017 +0100

    Blind fix for ambiguous CPPUNIT_ASSERT_EQUAL
    
    Change-Id: Ia0730cfd2293c374ec8b8f4aa69fef5d319642e4

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 7ff1d23dcca8..defc53df056d 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1506,7 +1506,7 @@ void Test::testColorNamesConversion()
     {
         aFormatCode = "[" + aGermanKeywords[i] + "]0";
         aFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType, nKey, LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US);
-        CPPUNIT_ASSERT_EQUAL_MESSAGE("CheckPos should be 0.", 0, nCheckPos);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("CheckPos should be 0.", sal_Int32(0), nCheckPos);
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Type should be NUMBER.", css::util::NumberFormat::NUMBER, nType);
         CPPUNIT_ASSERT_EQUAL( OUString("[" + rEnglishKeywords[i] + "]0"), aFormatCode);
     }


More information about the Libreoffice-commits mailing list