mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix iOS build breakage

Browse Source 
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 <noel.grandin@collabora.co.uk>
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
This commit is contained in:
Patrick Luby
2025-02-18 20:10:25 -05:00
committed by Patrick Luby
parent 934f40d2b5
commit d59011736e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vcl/quartz/salvd.cxx
View File

@@ -45,7 +45,8 @@ std::unique_ptr<SalVirtualDevice> AquaSalInstance::CreateVirtualDevice( SalGraph
SalData::ensureThreadAutoreleasePool(); SalData::ensureThreadAutoreleasePool();
#ifdef IOS #ifdef IOS
std::unique_ptr<SalVirtualDevice> pNew(new AquaSalVirtualDevice( NULL, nDX, nDY, eFormat, NULL )); (void)rGraphics;
std::unique_ptr<SalVirtualDevice> pNew(new AquaSalVirtualDevice( nullptr, nDX, nDY, eFormat ));
pNew->SetSize( nDX, nDY ); pNew->SetSize( nDX, nDY );
return pNew; return pNew;
#else #else
@@ -62,13 +63,8 @@ std::unique_ptr<SalVirtualDevice> AquaSalInstance::CreateVirtualDevice( SalGraph
// #i92075# can be called first in a thread // #i92075# can be called first in a thread
SalData::ensureThreadAutoreleasePool(); SalData::ensureThreadAutoreleasePool();
#ifdef IOS
return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice( return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice(
nDX, nDY, eFormat, rData )); nDX, nDY, eFormat, rData ));
#else
return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice(
nDX, nDY, eFormat, rData ));
#endif
} }
AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalVirtualDevice::AquaSalVirtualDevice(
@@ -97,7 +93,9 @@ AquaSalVirtualDevice::AquaSalVirtualDevice(
mnBitmapDepth = 0; mnBitmapDepth = 0;
break; break;
} }
#ifdef MACOSX #ifdef IOS
(void)pGraphic;
#else
// inherit resolution from reference device // inherit resolution from reference device
if( pGraphic ) if( pGraphic )
{ {