core.git: Branch 'distro/collabora/co-24.04' - xmloff/qa

[Mike Kaganski (via logerrit)]

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

New commits:
commit 94bd63cc8ba2882d023cf8b3aa610d917e42665d
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Feb 27 11:35:26 2025 +0500
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 27 14:19:31 2025 +0100

    Fix Win64 build
    
      C:/lo/core2/xmloff/qa/unit/draw.cxx(856): error C2672: 
'CppUnit::assertEquals': no matching overloaded function found
      C:/lo/core2/xmloff/qa/unit/draw.cxx(856): error C2782: 'void 
CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string 
&)': template parameter 'T' is ambiguous
      C:\louild2\workdir\UnpackedTarball      
C:/lo/core2/xmloff/qa/unit/draw.cxx(856): note: could be 'sal_Int32'
      C:/lo/core2/xmloff/qa/unit/draw.cxx(856): note: or       'int'
      C:/lo/core2/xmloff/qa/unit/draw.cxx(856): error C2784: 'void 
CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string 
&)': could not deduce template argument for 'const T &' from 'sal_Int32'
      C:\louild2\workdir\UnpackedTarball    
    after commit d197333db0fbf6647dce19e20bee265885224a74 "[API CHANGE]
    sd pdfium: add page number when saving/loading pdf pages as images",
    2025-01-29.
    
    This is not needed in master, where the posted original change was
    fixed after a failure in CI.
    
    Change-Id: Icaeeaf2f91b3e400f19499e7cd65667a16420266
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182269
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
index 028a76171de3..2ef5d1db15ba 100644
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@@ -853,7 +853,7 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testPdfExportAsOdg)
     // Without the accompanying fix in place, this test would have failed with:
     // - Expected: 1
     // - Actual  : -1
-    CPPUNIT_ASSERT_EQUAL(1, aGraphic.getPageNumber());
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aGraphic.getPageNumber());
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();