diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx index 5613724786b9..ea46ff778575 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx @@ -48,10 +48,10 @@ void XAccessibleComponentTester::testBounds() auto bounds = mxComponent->getBounds(); std::cout << "bounds: " << bounds.Width << "x" << bounds.Height << std::showpos << bounds.X << bounds.Y << std::noshowpos << std::endl; - CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X); - CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.Y); - CPPUNIT_ASSERT_GREATER(0, bounds.Width); - CPPUNIT_ASSERT_GREATER(0, bounds.Height); + CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.X); + CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.Y); + CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Width); + CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Height); } /** diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx index 3a7eb70e9dd5..b8c7898f963f 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx @@ -57,7 +57,7 @@ void XAccessibleContextTester::testGetAccessibleChildCount() { auto childCount = mxContext->getAccessibleChildCount(); std::cout << childCount << " children found." << std::endl; - CPPUNIT_ASSERT_GREATEREQUAL(0, childCount); + CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), childCount); } /** @@ -130,10 +130,10 @@ void XAccessibleContextTester::testGetAccessibleRelationSet() */ void XAccessibleContextTester::testGetAccessibleRole() { - sal_Int16 role = mxContext->getAccessibleRole(); + sal_Int32 role = mxContext->getAccessibleRole(); std::cout << "The role is " << role << " (" << AccessibilityTools::getRoleName(role) << ")" << std::endl; - CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role); + CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role); } /** @@ -157,8 +157,8 @@ void XAccessibleContextTester::testGetLocale() { auto loc = mxContext->getLocale(); std::cout << "The locale is " << loc.Language << "," << loc.Country << std::endl; - CPPUNIT_ASSERT_GREATER(0, loc.Language.getLength()); - CPPUNIT_ASSERT_GREATER(0, loc.Country.getLength()); + CPPUNIT_ASSERT_GREATER(static_cast(0), loc.Language.getLength()); + CPPUNIT_ASSERT_GREATER(static_cast(0), loc.Country.getLength()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */