desktop/source/lib/init.cxx | 2 +- sc/source/core/data/formulacell.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 2d6b520c6cf70ea60e53ae939a4bbde881a64ace Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Dec 9 18:51:01 2024 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Dec 2 08:54:16 2025 +0100 Fix build on Windows with --disable-opencl Change-Id: Ie85150aca1f4896e4e1d265a38dbeb19e92e53fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194564 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 832c0db8843c..16c585fe5364 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -5134,7 +5134,7 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a int nMaxGroupLength = INT_MAX; -#ifdef _WIN32 +#if defined(_WIN32) && HAVE_FEATURE_OPENCL // Heuristic: Certain old low-end OpenCL implementations don't // work for us with too large group lengths. 1000 was determined // empirically to be a good compromise. commit 284c351a81296c8914d23fd50932990808c3e1a1 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Nov 27 13:48:02 2024 +0100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Dec 2 08:54:05 2025 +0100 coda-m: Don't skip the tile painting on macOS Change-Id: Iecbb24f2bc4b3824cd556baa864327c0c52b1475 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194563 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 8278b98f550e..1d4281a9c281 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -4277,7 +4277,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis, return; } -#if defined(UNX) && !defined(MACOSX) || defined(_WIN32) +#if defined(UNX) || defined(_WIN32) // Painting of zoomed or HiDPI spreadsheets is special, we actually draw everything at 100%, // and only set cairo's (or CoreGraphic's, in the iOS case) scale factor accordingly, so that
