ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sd: Fix no matching function for call on armhf

Browse Source 
sd/qa/unit/tiledrendering/tiledrendering.cxx: In member function ‘void testSlideshowLayeredRendering::TestBody()’:
sd/qa/unit/tiledrendering/tiledrendering.cxx:3033:5: error: no matching function for call to ‘assertEquals(int, sal_Int32&, CppUnit::SourceLine, const char [1])’
 3033 |     CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
      |     ^
/usr/include/cppunit/TestAssert.h:161:6: note: candidate: ‘template<class T> void CppUnit::assertEquals(const T&, const T&, SourceLine, const std::string&)’
  161 | void assertEquals( const T& expected,
      |      ^~~~~~~~~~~~
/usr/include/cppunit/TestAssert.h:161:6: note:   template argument deduction/substitution failed:
sd/qa/unit/tiledrendering/tiledrendering.cxx:3033:5: note:   deduced conflicting types for parameter ‘const T’ (‘int’ and ‘sal_Int32’ {aka ‘long int’})
 3033 |     CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
      |     ^

Change-Id: Ie6c0f59207a9e953b491f4a1ac8a8a201efcea76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188371
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Rico Tzschichholz
2025-08-05 12:37:59 +02:00
committed by Christian Lohmaier
parent e4dc378991
commit 0e55a77778
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/qa/unit/tiledrendering/tiledrendering.cxx
+14 -14
View File
@@ -3037,8 +3037,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering)
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1125), nViewHeight);
const Color aTransparentColor(ColorAlpha, 0x00000000);
const tools::Long nLeft = 20;
@@ -3155,8 +3155,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_WithFie
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1125), nViewHeight);
const Color aTransparentColor(ColorAlpha, 0x00000000);
const tools::Long nLeft = 20;
@@ -3535,8 +3535,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1125), nViewHeight);
{
std::vector<sal_uInt8> pBuffer(nViewWidth * nViewHeight * 4);
@@ -3707,8 +3707,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
sal_Int32 nViewHeight = 2000;
std::string sHash = GetInterfaceHash(GetXDrawPageForSdrPage(pPage));
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1125), nViewHeight);
{
std::vector<sal_uInt8> pBuffer(nViewWidth * nViewHeight * 4);
@@ -3969,8 +3969,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
std::string sHash = GetInterfaceHash(GetXDrawPageForSdrPage(pPage));
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1125), nViewHeight);
{
std::vector<sal_uInt8> pBuffer(nViewWidth * nViewHeight * 4);
@@ -4136,8 +4136,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
std::string sHash = GetInterfaceHash(GetXDrawPageForSdrPage(pPage));
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1125), nViewHeight);
{
std::vector<sal_uInt8> pBuffer(nViewWidth * nViewHeight * 4);
@@ -4241,8 +4241,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
std::string sHash = GetInterfaceHash(GetXDrawPageForSdrPage(pPage));
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(sHash.c_str(), 0, nViewWidth, nViewHeight, true, true));
CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
CPPUNIT_ASSERT_EQUAL(1500, nViewHeight);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nViewWidth);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1500), nViewHeight);
std::vector<std::string> aBufferHashes;