diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-12 12:24:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-12 14:31:52 +0200 |
| commit | 9bc7194ebb20969b0097a242eedeae64c6d6e2d2 (patch) | |
| tree | 25a16b053bcdb886bfd6a6e6983b124fe6837948 | |
| parent | 801cc9550b38778971a9b3ebf427a6a151c50033 (diff) | |
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 <sbergman@redhat.com>
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 8 | ||||
| -rw-r--r-- | fpicker/source/aqua/SalAquaFolderPicker.mm | 8 | ||||
| -rw-r--r-- | vcl/osx/salframeview.mm | 3 |
3 files changed, 0 insertions, 19 deletions
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 |