sal/osl/unx/process.cxx | 4 ----
vcl/inc/ios/iosinst.hxx | 2 +-
vcl/inc/quartz/ctfonts.hxx | 3 ---
vcl/ios/iosinst.cxx | 9 ++++-----
4 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit a65607eb4667af7c7e508fefcdb1b02ef8526ff9
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Oct 6 15:10:53 2023 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Oct 6 16:16:02 2023 +0200
Revert "Fix iOS build breakages when building on macOS Sonoma"
This reverts commit 24d41f7e965ca0dab19bfde1570419c15508ee5d.
Reason: pushed by mistake, not needed.
Change-Id: I9f5278ab15687b8410fe6cfa8e0249531bd9f281
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157645
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 5ad579ae0f72..f75534fdc311 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -40,10 +40,6 @@
#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 63182bcd0c0a..6ba433eed104 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(AbsoluteScreenPixelRectangle& rRect);
+ void GetWorkArea(tools::Rectangle& rRect);
SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
override;
SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags
nStyle) override;
};
diff --git a/vcl/inc/quartz/ctfonts.hxx b/vcl/inc/quartz/ctfonts.hxx
index dcf0dbff843c..be68dea71c9a 100644
--- a/vcl/inc/quartz/ctfonts.hxx
+++ b/vcl/inc/quartz/ctfonts.hxx
@@ -24,9 +24,6 @@
#include <sallayout.hxx>
std::unique_ptr<SystemFontList> GetCoretextFontList();
-#ifdef IOS
-#include <font/PhysicalFontCollection.hxx>
-#endif
FontAttributes DevFontFromCTFontDescriptor(CTFontDescriptorRef, bool*);
#endif // INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 371d5c246ca1..533fef269a07 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -26,17 +26,16 @@
#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( AbsoluteScreenPixelRectangle& rRect )
+void IosSalInstance::GetWorkArea( tools::Rectangle& rRect )
{
- rRect = AbsoluteScreenPixelRectangle( AbsoluteScreenPixelPoint( 0, 0 ),
- AbsoluteScreenPixelSize( viewWidth, viewHeight ) );
+ rRect = tools::Rectangle( Point( 0, 0 ),
+ Size( viewWidth, viewHeight ) );
}
IosSalInstance *IosSalInstance::getInstance()
@@ -81,7 +80,7 @@ public:
SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH |
SAL_FRAME_POSSIZE_HEIGHT);
}
- virtual void GetWorkArea( AbsoluteScreenPixelRectangle& rRect ) override
+ virtual void GetWorkArea( tools::Rectangle& rRect ) override
{
IosSalInstance::getInstance()->GetWorkArea( rRect );
}
