From d59011736e78f87c5f21ec01a9cf5e83d7996070 Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Tue, 18 Feb 2025 20:10:25 -0500 Subject: [PATCH] Fix iOS build breakage Although I think this is a safe commit, I cannot test it since the Collabora Online master branch is currently paired with the LibreOffice distro/collabora/co-24.04 branch and so the Collabora Online code fails to build against the LibreOffice master branch. Change-Id: Ie7497974dfa53b27ced616fc8f958bb31d915d38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181858 Tested-by: Jenkins Reviewed-by: Noel Grandin Reviewed-by: Patrick Luby --- vcl/quartz/salvd.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index 66bccc3524b8..b813f7c0421d 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -45,7 +45,8 @@ std::unique_ptr AquaSalInstance::CreateVirtualDevice( SalGraph SalData::ensureThreadAutoreleasePool(); #ifdef IOS - std::unique_ptr pNew(new AquaSalVirtualDevice( NULL, nDX, nDY, eFormat, NULL )); + (void)rGraphics; + std::unique_ptr pNew(new AquaSalVirtualDevice( nullptr, nDX, nDY, eFormat )); pNew->SetSize( nDX, nDY ); return pNew; #else @@ -62,13 +63,8 @@ std::unique_ptr AquaSalInstance::CreateVirtualDevice( SalGraph // #i92075# can be called first in a thread SalData::ensureThreadAutoreleasePool(); -#ifdef IOS return std::unique_ptr(new AquaSalVirtualDevice( nDX, nDY, eFormat, rData )); -#else - return std::unique_ptr(new AquaSalVirtualDevice( - nDX, nDY, eFormat, rData )); -#endif } AquaSalVirtualDevice::AquaSalVirtualDevice( @@ -97,7 +93,9 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( mnBitmapDepth = 0; break; } -#ifdef MACOSX +#ifdef IOS + (void)pGraphic; +#else // inherit resolution from reference device if( pGraphic ) {