sc/common_unoapi_tests.mk | 4 ++++ sc/qa/extras/scsolverobj.cxx | 2 ++ sw/qa/extras/unowriter/unowriter.cxx | 10 +++++----- 3 files changed, 11 insertions(+), 5 deletions(-)
New commits: commit 6856a9c179fedef8cb99315a4e22ec858233a375 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 12 14:56:40 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 12 20:32:19 2025 +0100 use 🐱 and DejaVu Sans known to already work in: https://gerrit.libreoffice.org/c/core/+/193497 where Noto Sans in Debian might be problematic Change-Id: I506fc673951e6ff515da9fb2120b748e2c00bd91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195565 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx index 7592ee22dee0..ab6005562dc0 100644 --- a/sw/qa/extras/unowriter/unowriter.cxx +++ b/sw/qa/extras/unowriter/unowriter.cxx @@ -1368,7 +1368,7 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf160278) { createSwDoc(); uno::Reference<beans::XPropertySet> xParaProps(getParagraph(1), uno::UNO_QUERY); - xParaProps->setPropertyValue(u"CharFontName"_ustr, uno::Any(u"Noto Sans"_ustr)); + xParaProps->setPropertyValue(u"CharFontName"_ustr, uno::Any(u"DejaVu Sans"_ustr)); auto xTextDocument(mxComponent.queryThrow<css::text::XTextDocument>()); auto xText(xTextDocument->getText()); xText->setString(u"123"_ustr); @@ -1376,11 +1376,11 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf160278) auto xCursor = xText->createTextCursorByRange(xText->getEnd()); xCursor->goLeft(1, true); CPPUNIT_ASSERT_EQUAL(u"3"_ustr, xCursor->getString()); - // Insert an SMP character U+1df1e (so it's two UTF-16 code units, 0xd837 0xdf1e): - xCursor->setString(u"𝼞"_ustr); + // Insert an SMP character U+1f431 (so it's two UTF-16 code units, 0xd83d 0xdc31): + xCursor->setString(u"🐱"_ustr); // Without the fix, the replacement would expand the cursor one too many characters to the left, - // and the cursor text would become "2𝼞", failing the next test: - CPPUNIT_ASSERT_EQUAL(u"𝼞"_ustr, xCursor->getString()); + // and the cursor text would become "2🐱", failing the next test: + CPPUNIT_ASSERT_EQUAL(u"🐱"_ustr, xCursor->getString()); xCursor->setString(u"test"_ustr); CPPUNIT_ASSERT_EQUAL(u"test"_ustr, xCursor->getString()); // This test would fail, too; the text would be "1test": commit 099079a094cdbf4fa105b073b3bc50723534ff60 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 12 15:12:35 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 12 20:32:10 2025 +0100 this test needs lpsolve Change-Id: Ic2abc9dc6724d05b41428091c52027ca66c4e843 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195570 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sc/common_unoapi_tests.mk b/sc/common_unoapi_tests.mk index 025639a4de20..7a8fc75a1673 100644 --- a/sc/common_unoapi_tests.mk +++ b/sc/common_unoapi_tests.mk @@ -18,6 +18,10 @@ $(eval $(call gb_CppunitTest_use_external,sc_$(1),boost_headers)) $(eval $(call gb_Library_use_common_precompiled_header,sc_$(1))) +$(eval $(call gb_CppunitTest_add_defs,sc_$(1),\ + $(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \ +)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_$(1), \ sc/qa/extras/sc$(1) \ )) diff --git a/sc/qa/extras/scsolverobj.cxx b/sc/qa/extras/scsolverobj.cxx index 2572fcc070c8..b7735a7e8711 100644 --- a/sc/qa/extras/scsolverobj.cxx +++ b/sc/qa/extras/scsolverobj.cxx @@ -74,6 +74,7 @@ void ScSolverSettingsObj::testCellRangeAddress(const uno::Any& rExpected, const // Creates a model using the XSolverSettings API checks if it is accessible via the API void ScSolverSettingsObj::testXSolverSettings() { +#ifdef ENABLE_LPSOLVE uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); @@ -203,6 +204,7 @@ void ScSolverSettingsObj::testXSolverSettings() CPPUNIT_ASSERT_EQUAL(uno::Any(true), aEngProps2[4].Value); CPPUNIT_ASSERT_EQUAL(u"Timeout"_ustr, aEngProps2[5].Name); CPPUNIT_ASSERT_EQUAL(uno::Any(static_cast<sal_Int32>(10)), aEngProps2[5].Value); +#endif } void ScSolverSettingsObj::setUp()
