config_host.mk.in | 1 - configure.ac | 1 - fpicker/source/aqua/SalAquaFilePicker.mm | 8 -------- fpicker/source/aqua/SalAquaFolderPicker.mm | 8 -------- solenv/gbuild/platform/macosx.mk | 1 - vcl/osx/salframeview.mm | 3 --- 6 files changed, 22 deletions(-)
New commits: commit 7fa4845a6f30fb1f49d00c62f97be425b06e48f4 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Sep 12 12:29:09 2018 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Sep 12 14:32:01 2018 +0200 No more use of MACOSX_SDK_VERSION outside configure.ac ...after <https://gerrit.libreoffice.org/60376> "Remove Library_avmediaQuickTime, which is dead" and <https://gerrit.libreoffice.org/60377> "Remove MACOSX_SDK_VERSION < 101200 code, which is dead". (This commit can be reverted if MACOSX_SDK_VERSION ever needs to be used again in makefiles or source code.) Change-Id: Iaff300d325e357f96c329cc84b3b37d91863d4b0 Reviewed-on: https://gerrit.libreoffice.org/60378 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/config_host.mk.in b/config_host.mk.in index 691ec809bbab..a7fc587c5570 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -381,7 +381,6 @@ export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ -export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@ export MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=@MAC_OS_X_VERSION_MIN_REQUIRED_DOTS@ diff --git a/configure.ac b/configure.ac index 489ec023a120..c4130db293f5 100644 --- a/configure.ac +++ b/configure.ac @@ -2920,7 +2920,6 @@ if test $_os = Darwin -o $_os = iOS; then AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER]) fi AC_SUBST(MACOSX_SDK_PATH) -AC_SUBST(MACOSX_SDK_VERSION) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index be107371f123..4deed67e7d05 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -40,7 +40,6 @@ gb_OSDEFS := \ -DNO_PTHREAD_PRIORITY \ -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \ -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \ - -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \ $(LFS_CFLAGS) \ commit 9bc7194ebb20969b0097a242eedeae64c6d6e2d2 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Sep 12 12:24:49 2018 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Sep 12 14:31:52 2018 +0200 Remove MACOSX_SDK_VERSION < 101200 code, which is dead ...as a consequence of <https://gerrit.libreoffice.org/#/c/60375/> "Support for building with macOS SDK < 10.12 is long gone" Change-Id: Ic87a9608b4defbeb5cf066d61f6819226dd58c1b Reviewed-on: https://gerrit.libreoffice.org/60377 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 57d30cfa8a30..ec55964971ba 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -170,19 +170,11 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() switch( nStatus ) { -#if MACOSX_SDK_VERSION >= 101000 case NSModalResponseOK: -#else - case NSOKButton: -#endif retVal = ExecutableDialogResults::OK; break; -#if MACOSX_SDK_VERSION >= 101000 case NSModalResponseCancel: -#else - case NSCancelButton: -#endif retVal = ExecutableDialogResults::CANCEL; break; diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index 68cb69c11c4d..f9de585be0d3 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -85,19 +85,11 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() switch( nResult ) { -#if MACOSX_SDK_VERSION >= 101000 case NSModalResponseOK: -#else - case NSOKButton: -#endif retVal = ExecutableDialogResults::OK; break; -#if MACOSX_SDK_VERSION >= 101000 case NSModalResponseCancel: -#else - case NSCancelButton: -#endif retVal = ExecutableDialogResults::CANCEL; break; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 769170f206b5..d78bcffed3be 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -173,9 +173,6 @@ static AquaSalFrame* getMouseContainerFrame() { static_cast<CGFloat>(pFrame->maGeometry.nWidth), static_cast<CGFloat>(pFrame->maGeometry.nHeight) } }; pFrame->VCLToCocoa( aRect ); NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ]; -#if MACOSX_SDK_VERSION < 101000 - [pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver -#endif // Disallow full-screen mode on macOS >= 10.11 where it is enabled by default. We don't want it // for now as it will just be confused with LibreOffice's home-grown full-screen concept, with _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
