sd/qa/unit/export-tests.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 633e0ee29b5ab7b8d62e68ffb504f00640f5ebe4 Author: Mike Kaganski <[email protected]> AuthorDate: Mon Nov 10 19:29:04 2025 +0500 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Nov 11 08:33:00 2025 +0100 Fix build on Windows C:/lo/core2/sd/qa/unit/export-tests.cxx(1096): error C2672: 'CppUnit::assertEquals': no matching overloaded function found C:/lo/core2/sd/qa/unit/export-tests.cxx(1096): 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/sd/qa/unit/export-tests.cxx(1096): note: could be 'sal_Int32' C:/lo/core2/sd/qa/unit/export-tests.cxx(1096): note: or 'int' As usual: not building tests on Windows in CI allows these problems where 'sal_Int32' is 'int' on Linux, but it is 'long' on Windows. Change-Id: I2331c4d2378cb0e4f8ea2c71a3332a3d5293af6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193753 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index da0afc2f6890..8158ec8a38bf 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1093,7 +1093,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont) OUString sFontName = getXPath(pXml, "//font[2]", "name"); CPPUNIT_ASSERT_EQUAL(u"Liberation Serif"_ustr, sFontName); sal_Int32 nFontHeight = getXPath(pXml, "//font[2]", "height").toInt32(); - CPPUNIT_ASSERT_EQUAL(494, nFontHeight); + CPPUNIT_ASSERT_EQUAL(sal_Int32(494), nFontHeight); } { OUString sWeight = getXPath(pXml, "//font[3]", "weight"); @@ -1103,7 +1103,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont) OUString sFontName = getXPath(pXml, "//font[3]", "name"); CPPUNIT_ASSERT_EQUAL(u"Liberation Sans"_ustr, sFontName); sal_Int32 nFontHeight = getXPath(pXml, "//font[3]", "height").toInt32(); - CPPUNIT_ASSERT_EQUAL(564, nFontHeight); + CPPUNIT_ASSERT_EQUAL(sal_Int32(564), nFontHeight); } }
