diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-09-29 14:19:43 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-10-01 15:55:55 +0200 |
| commit | 53c27f66fcb5a624ef27d2480b0f3e584a1ba1ef (patch) | |
| tree | 04c77c6a5668d15564e867243829bc426d45897b | |
| parent | abe09b45da5002a0011f7289a26e7971e4ea8f06 (diff) | |
Fix iOS build breakages when building on macOS Sonoma
Change-Id: I347e48e9da69c8c9b15581a5afa5c61cdd1d380d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157411
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Patrick Luby <plubius@neooffice.org>
| -rw-r--r-- | sal/osl/unx/process.cxx | 4 | ||||
| -rw-r--r-- | vcl/inc/ios/iosinst.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/quartz/SystemFontList.hxx | 3 | ||||
| -rw-r--r-- | vcl/ios/iosinst.cxx | 9 |
4 files changed, 13 insertions, 5 deletions
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index d54864042465..cebdc6f35fdb 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -45,6 +45,10 @@ #include <machine/param.h> #endif +#ifdef IOS +#include <signal.h> +#endif + #include "system.hxx" #include "unixerrnostring.hxx" #if defined(__sun) diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx index 6ba433eed104..63182bcd0c0a 100644 --- a/vcl/inc/ios/iosinst.hxx +++ b/vcl/inc/ios/iosinst.hxx @@ -44,7 +44,7 @@ public: css::uno::Reference<css::uno::XInterface> CreateClipboard(const css::uno::Sequence<css::uno::Any>& i_rArguments) override; - void GetWorkArea(tools::Rectangle& rRect); + void GetWorkArea(AbsoluteScreenPixelRectangle& rRect); SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override; SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags nStyle) override; }; diff --git a/vcl/inc/quartz/SystemFontList.hxx b/vcl/inc/quartz/SystemFontList.hxx index f923b47998a7..4f623804702c 100644 --- a/vcl/inc/quartz/SystemFontList.hxx +++ b/vcl/inc/quartz/SystemFontList.hxx @@ -33,6 +33,9 @@ #include <postmac.h> #include <font/PhysicalFontFace.hxx> +#ifdef IOS +#include <font/PhysicalFontCollection.hxx> +#endif #include <unordered_map> diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 533fef269a07..371d5c246ca1 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -26,16 +26,17 @@ #include "headless/svpdata.hxx" #include "headless/svpdummies.hxx" #include "quartz/utils.h" +#include "quartz/SystemFontList.hxx" #include <vcl/layout.hxx> #include <vcl/settings.hxx> // Totally wrong of course but doesn't seem to harm much in the iOS app. static int viewWidth = 1, viewHeight = 1; -void IosSalInstance::GetWorkArea( tools::Rectangle& rRect ) +void IosSalInstance::GetWorkArea( AbsoluteScreenPixelRectangle& rRect ) { - rRect = tools::Rectangle( Point( 0, 0 ), - Size( viewWidth, viewHeight ) ); + rRect = AbsoluteScreenPixelRectangle( AbsoluteScreenPixelPoint( 0, 0 ), + AbsoluteScreenPixelSize( viewWidth, viewHeight ) ); } IosSalInstance *IosSalInstance::getInstance() @@ -80,7 +81,7 @@ public: SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT); } - virtual void GetWorkArea( tools::Rectangle& rRect ) override + virtual void GetWorkArea( AbsoluteScreenPixelRectangle& rRect ) override { IosSalInstance::getInstance()->GetWorkArea( rRect ); } |