external/curl/ExternalProject_curl.mk | 2 external/nss/ExternalPackage_nss.mk | 1 external/nss/ExternalProject_nss.mk | 2 external/python3/ExternalProject_python3.mk | 4 fpicker/source/aqua/FilterHelper.mm | 4 fpicker/source/aqua/NSURL_OOoAdditions.mm | 20 ---- fpicker/source/aqua/SalAquaFilePicker.mm | 8 - fpicker/source/aqua/SalAquaPicker.mm | 29 ------ lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 4 sal/osl/unx/memory.c | 11 -- sal/osl/unx/system.c | 51 ----------- sal/osl/unx/uunxapi.cxx | 4 vcl/inc/osx/salframe.h | 4 vcl/inc/osx/salframeview.h | 12 -- vcl/inc/quartz/salgdi.h | 9 -- vcl/osx/DropTarget.cxx | 8 - vcl/osx/salframe.cxx | 38 -------- vcl/osx/salframeview.mm | 53 ------------ vcl/osx/salinst.cxx | 5 - vcl/osx/salmenu.cxx | 4 vcl/osx/salprn.cxx | 4 vcl/quartz/ctfonts.cxx | 6 - vcl/quartz/ctlayout.cxx | 20 ---- vcl/quartz/salgdi.cxx | 16 --- 24 files changed, 10 insertions(+), 309 deletions(-)
New commits: commit fe25090e992eefd0c43ca73b656632a650793b1a Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 16 10:38:48 2014 +0300 MAC_OS_X_VERSION_MIN_REQUIRED is always >= 1080 now Change-Id: I40d03ab9acb67ab72b9047017452f069ce88fd4b diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index e8e1345..1a0a0a3 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ $(if $(filter IOS,$(OS)),--with-darwinssl) \ $(if $(filter MACOSX,$(OS)),\ - $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,--with-darwinssl)) \ + --with-darwinssl) \ --without-ssl \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk index 5dbe1d0..c6d8953fd 100644 --- a/external/nss/ExternalPackage_nss.mk +++ b/external/nss/ExternalPackage_nss.mk @@ -26,7 +26,6 @@ $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ dist/out/lib/libsmime3.dylib \ dist/out/lib/libsoftokn3.dylib \ dist/out/lib/libssl3.dylib \ - $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),dist/out/lib/libsqlite3.dylib) \ )) else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index c12c24a..6d2ab45 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ - $(if $(filter-out 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ + NSS_USE_SYSTEM_SQLITE=1) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 70b12f0..045892e 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -69,8 +69,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \ - $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--with-universal-archs=32-bit,--with-universal-archs=intel) \ - ) \ + --with-universal-archs=intel \ + ) \ --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ --enable-shared \ ) \ diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 588baa6..11e5ee6 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -307,7 +307,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno:: SolarMutexGuard aGuard; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX +#if HAVE_FEATURE_MACOSX_SANDBOX static NSUserDefaults *userDefaults; static bool triedUserDefaults = false; @@ -341,7 +341,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno:: { NSURL *url = [files objectAtIndex:nIndex]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX +#if HAVE_FEATURE_MACOSX_SANDBOX if (userDefaults != NULL && [url respondsToSelector:@selector(bookmarkDataWithOptions:includingResourceValuesForKeys:relativeToURL:error:)]) { diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index 8690c4d..995b936 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -35,7 +35,7 @@ inline rtl::OString OUStringToOString(const rtl_uString* s) osl_getThreadTextEncoding()); } -#if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX +#if HAVE_FEATURE_MACOSX_SANDBOX #include <Foundation/Foundation.h> #include <Security/Security.h> @@ -289,7 +289,7 @@ int open_c(const char *cpPath, int oflag, int mode) int result = open(cpPath, oflag, mode); -#if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && HAVE_FEATURE_MACOSX_SANDBOX +#if HAVE_FEATURE_MACOSX_SANDBOX if (isSandboxed && result != -1 && (oflag & O_CREAT) && (oflag & O_EXCL)) { // A new file was created. Check if it is outside the sandbox. commit b02e958fa0bf7d062a5b8aff03d22325e3068feb Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 16 10:13:46 2014 +0300 MAC_OS_X_VERSION_MAX_ALLOWED is always >= 1080 now Change-Id: Ieae67cbf917cdf4bca2b0d6c1697eddc6137dbe2 diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index d162af3..cef9074 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -385,11 +385,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename) } NSFileManager *manager = [NSFileManager defaultManager]; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - NSDictionary* pAttribs = [manager fileAttributesAtPath: sFilename traverseLink: NO]; -#else NSDictionary* pAttribs = [manager attributesOfItemAtPath: sFilename error: nil]; -#endif if( pAttribs ) { NSObject* pType = [pAttribs objectForKey: NSFileType]; diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm index 80acb10..858eb27 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.mm +++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm @@ -83,25 +83,6 @@ NSString* resolveAlias( NSString* i_pSystemPath ) kCFURLPOSIXPathStyle, false); if( rUrl != NULL ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - FSRef rFS; - if( CFURLGetFSRef( rUrl, &rFS ) ) - { - Boolean bIsFolder = false; - Boolean bAlias = false; - OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias); - if( (err == noErr) && bAlias ) - { - CFURLRef rResolvedUrl = CFURLCreateFromFSRef( kCFAllocatorDefault, &rFS ); - if( rResolvedUrl != NULL ) - { - pResolvedPath = (NSString*)CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle ); - CFRelease( rResolvedUrl ); - } - } - } - CFRelease( rUrl ); -#else CFErrorRef rError; CFDataRef rBookmark = CFURLCreateBookmarkDataFromFile( NULL, rUrl, &rError ); CFRelease( rUrl ); @@ -121,7 +102,6 @@ NSString* resolveAlias( NSString* i_pSystemPath ) CFRelease( rResolvedUrl ); } } -#endif } return pResolvedPath; diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 3e69877..588baa6 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -769,11 +769,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension() { rtl::OUString suffix = (*(aStringList.begin())).copy(1); NSString *requiredFileType = [NSString stringWithOUString:suffix]; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - [m_pDialog setRequiredFileType:requiredFileType]; -#else [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]]; -#endif OSL_TRACE("disallowing other file types"); [m_pDialog setAllowsOtherFileTypes:NO]; diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index baff7c3..664088f 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -165,19 +165,6 @@ int SalAquaPicker::run() int retVal = 0; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - NSString *startDirectory; - if (m_sDisplayDirectory.getLength() > 0) { - NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory]; - NSURL *url = [NSURL URLWithString:temp]; - startDirectory = [url path]; - - OSL_TRACE("start dir: %s", [startDirectory UTF8String]); - } - else { - startDirectory = NSHomeDirectory(); - } -#else NSURL *startDirectory; if (m_sDisplayDirectory.getLength() > 0) { NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory]; @@ -188,26 +175,17 @@ int SalAquaPicker::run() else { startDirectory = [NSURL fileURLWithPath:NSHomeDirectory() isDirectory:YES]; } -#endif switch(m_nDialogType) { case NAVIGATIONSERVICES_DIRECTORY: case NAVIGATIONSERVICES_OPEN: -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - retVal = [(NSOpenPanel*)m_pDialog runModalForDirectory:startDirectory file:nil types:nil]; -#else [m_pDialog setDirectoryURL:startDirectory]; retVal = [(NSOpenPanel*)m_pDialog runModal]; -#endif break; case NAVIGATIONSERVICES_SAVE: -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - retVal = [m_pDialog runModalForDirectory:startDirectory file:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]]; -#else [m_pDialog setDirectoryURL:startDirectory]; [m_pDialog setNameFieldStringValue:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]]; retVal = [m_pDialog runModal]; -#endif break; // [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog saveFilename] modalForWindow:[NSApp keyWindow] modalDelegate:((SalAquaFilePicker*)this)->getDelegate() didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil]; default: @@ -215,17 +193,10 @@ int SalAquaPicker::run() } if (retVal == NSFileHandlingPanelOKButton) { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - NSString* pDir = [m_pDialog directory]; - if (pDir) { - implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]); - } -#else NSURL* pDir = [m_pDialog directoryURL]; if (pDir) { implsetDisplayDirectory([pDir OUStringForInfo:FULLPATH]); } -#endif } DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal); diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 868026c..aa06d13 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -350,11 +350,7 @@ Reference< XSpellAlternatives > aLang = [aLang stringByAppendingString:aTaggedCountry]; } [macSpell setLanguage:aLang]; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - NSArray *guesses = [macSpell guessesForWord:aNSStr]; -#else NSArray *guesses = [macSpell guessesForWordRange:NSMakeRange(0, [aNSStr length]) inString:aNSStr language:aLang inSpellDocumentWithTag:0]; -#endif count = [guesses count]; if (count) { diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c index f31c28c..e9fb9a8 100644 --- a/sal/osl/unx/memory.c +++ b/sal/osl/unx/memory.c @@ -24,13 +24,6 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size ) { #if defined __ANDROID__ return memalign(align, size); -#elif defined MAC_OS_X_VERSION_MAX_ALLOWED && MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - void* ptr = malloc(size + (align - 1) + sizeof(void*)); - if (!ptr) return NULL; - char* aptr = ((char*)ptr) + sizeof(void*); - aptr += (align - ((size_t)aptr & (align - 1))) & (align - 1); - ((void**)aptr)[-1] = ptr; - return aptr; #else void* ptr; int err = posix_memalign(&ptr, align, size); @@ -41,11 +34,7 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size ) void osl_aligned_free( void* p ) { -#if defined MAC_OS_X_VERSION_MAX_ALLOWED && MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - free(((void**)p)[-1]); -#else free(p); -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c index a234fce..cb5734d 100644 --- a/sal/osl/unx/system.c +++ b/sal/osl/unx/system.c @@ -157,17 +157,10 @@ int macxp_resolveAlias(char *path, int buflen) (void) buflen; return 0; #else -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - FSRef aFSRef; - OSStatus nErr; - Boolean bFolder; - Boolean bAliased; -#else CFStringRef cfpath; CFURLRef cfurl; CFErrorRef cferror; CFDataRef cfbookmark; -#endif char *unprocessedPath = path; @@ -181,49 +174,6 @@ int macxp_resolveAlias(char *path, int buflen) if ( unprocessedPath ) *unprocessedPath = '\0'; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - nErr = noErr; - bFolder = FALSE; - bAliased = FALSE; - - if ( FSPathMakeRef( (const UInt8 *)path, &aFSRef, 0 ) == noErr ) - { - nErr = FSResolveAliasFileWithMountFlags( &aFSRef, TRUE, &bFolder, &bAliased, kResolveAliasFileNoUI ); - if ( nErr == nsvErr ) - { - errno = ENOENT; - nRet = -1; - } - else if ( nErr == noErr && bAliased ) - { - char tmpPath[ PATH_MAX ]; - if ( FSRefMakePath( &aFSRef, (UInt8 *)tmpPath, PATH_MAX ) == noErr ) - { - int nLen = strlen( tmpPath ) + ( unprocessedPath ? strlen( unprocessedPath + 1 ) + 1 : 0 ); - if ( nLen < buflen && nLen < PATH_MAX ) - { - if ( unprocessedPath ) - { - int nTmpPathLen = strlen( tmpPath ); - strcat( tmpPath, "/" ); - strcat( tmpPath, unprocessedPath + 1 ); - strcpy( path, tmpPath); - unprocessedPath = path + nTmpPathLen; - } - else if ( !unprocessedPath ) - { - strcpy( path, tmpPath); - } - } - else - { - errno = ENAMETOOLONG; - nRet = -1; - } - } - } - } -#else cfpath = CFStringCreateWithCString( NULL, path, kCFStringEncodingUTF8 ); cfurl = CFURLCreateWithFileSystemPath( NULL, cfpath, kCFURLPOSIXPathStyle, false ); CFRelease( cfpath ); @@ -283,7 +233,6 @@ int macxp_resolveAlias(char *path, int buflen) } } } -#endif if ( unprocessedPath ) *unprocessedPath++ = '/'; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 82bd117..7611b6d 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -93,11 +93,7 @@ public: sal_uLong mnICOptions; // To prevent display sleep during presentation -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - boost::shared_ptr< Timer > mpActivityTimer; -#else IOPMAssertionID mnAssertionID; -#endif public: /** Constructor diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index 7e957b6..93f8b8f 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -22,11 +22,7 @@ #include "osx/a11ywrapper.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -@interface SalFrameWindow : NSWindow -#else @interface SalFrameWindow : NSWindow<NSWindowDelegate> -#endif { AquaSalFrame* mpFrame; id mDraggingDestinationHandler; @@ -63,11 +59,7 @@ -(void)unregisterDraggingDestinationHandler:(id)theHandler; @end -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -@interface SalFrameView : AquaA11yWrapper <NSTextInput> -#else @interface SalFrameView : AquaA11yWrapper <NSTextInputClient> -#endif { AquaSalFrame* mpFrame; @@ -121,11 +113,7 @@ /* text action methods */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 --(void)insertText:(id)aString; -#else -(void)insertText:(id)aString replacementRange:(NSRange)replacementRange; -#endif -(void)insertTab: (id)aSender; -(void)insertBacktab: (id)aSender; -(void)moveLeft: (id)aSender; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 45a12c4..23d3bb3 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -29,15 +29,6 @@ #include <ApplicationServices/ApplicationServices.h> #include "osx/osxvcltypes.h" #include "osx/salframe.h" - -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -// The following symbols are SPI (System Programming Interface) in 10.5. -extern "C" { - void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]); - const CGSize* CTRunGetAdvancesPtr(CTRunRef run); - extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; -} -#endif #else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index e8179a9..7ee0f5b 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -264,17 +264,9 @@ NSDragOperation DropTarget::draggingUpdated(id sender) } if (dragOp == NSDragOperationNone) -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - SetThemeCursor(kThemeNotAllowedCursor); -#else [[NSCursor operationNotAllowedCursor] set]; -#endif else if (dragOp == NSDragOperationCopy) -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - SetThemeCursor(kThemeCopyArrowCursor); -#else [[NSCursor dragCopyCursor] set]; -#endif else [[NSCursor arrowCursor] set]; diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 43a0674..f205caf 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -37,11 +37,6 @@ #include "osx/a11yfactory.h" #include "quartz/utils.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -#include "vcl/timer.hxx" -#include "osx/saltimer.h" -#endif - #include "salwtype.hxx" #include "premac.h" @@ -198,11 +193,7 @@ void AquaSalFrame::initWindowAndView() [mpNSWindow setAcceptsMouseMovedEvents: YES]; [mpNSWindow setHasShadow: YES]; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); -#else [mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)]; -#endif if( [mpNSWindow respondsToSelector: @selector(setRestorable:)]) { @@ -759,27 +750,6 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SendPaintEvent(); } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -class PreventSleepTimer : public AutoTimer -{ -public: - PreventSleepTimer() - { - SetTimeout( 30000 ); - Start(); - } - - virtual ~PreventSleepTimer() - { - } - - virtual void Timeout() SAL_OVERRIDE - { - UpdateSystemActivity(OverallAct); - } -}; -#endif - void AquaSalFrame::StartPresentation( bool bStart ) { if ( !mpNSWindow ) @@ -791,14 +761,10 @@ void AquaSalFrame::StartPresentation( bool bStart ) if( bStart ) { GetSalData()->maPresentationFrames.push_back( this ); -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - mpActivityTimer.reset( new PreventSleepTimer() ); -#else /* OS X 10.6 and above */ IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR("LibreOffice presentation running"), &mnAssertionID); -#endif [mpNSWindow setLevel: NSPopUpMenuWindowLevel]; if( mbShown ) [mpNSWindow makeMainWindow]; @@ -806,11 +772,7 @@ void AquaSalFrame::StartPresentation( bool bStart ) else { GetSalData()->maPresentationFrames.remove( this ); -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - mpActivityTimer.reset(); -#else IOPMAssertionRelease(mnAssertionID); -#endif [mpNSWindow setLevel: NSNormalWindowLevel]; } } diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 8e74086..7440436 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -34,14 +34,6 @@ #define WHEEL_EVENT_FACTOR 1.5 -// for allowing fullscreen support on deployment targets < OSX 10.7 -#if !defined(MAC_OS_X_VERSION_10_7) - #define NSWindowCollectionBehaviorFullScreenPrimary (1 << 7) - #define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8) -// #define NSFullScreenWindowMask (1 << 14) -#endif - - static sal_uInt16 ImplGetModifierMask( unsigned int nMask ) { sal_uInt16 nRet = 0; @@ -166,18 +158,6 @@ static const struct ExceptionalKey static AquaSalFrame* getMouseContainerFrame() { AquaSalFrame* pDispatchFrame = NULL; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - NSInteger nWindows = 0; - NSCountWindows( &nWindows ); - NSInteger* pWindows = (NSInteger*)alloca( nWindows * sizeof(NSInteger) ); - NSWindowList( nWindows, pWindows ); // NSWindowList is supposed to be in z-order front to back - for(int i = 0; i < nWindows && ! pDispatchFrame; i++ ) - { - NSWindow* pWin = [NSApp windowWithWindowNumber: pWindows[i]]; - if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] ) - pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame]; - } -#else NSArray* aWindows = [NSWindow windowNumbersWithOptions:0]; for(NSUInteger i = 0; i < [aWindows count] && ! pDispatchFrame; i++ ) { @@ -185,7 +165,6 @@ static AquaSalFrame* getMouseContainerFrame() if( pWin && [pWin isMemberOfClass: [SalFrameWindow class]] && [(SalFrameWindow*)pWin containsMouse] ) pDispatchFrame = [(SalFrameWindow*)pWin getSalFrame]; } -#endif return pDispatchFrame; } @@ -776,19 +755,11 @@ private: if( bNewSeries ) mfMagnifyDeltaSum = 0.0; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - mfMagnifyDeltaSum += [pEvent deltaZ]; -#else mfMagnifyDeltaSum += [pEvent magnification]; -#endif mfLastMagnifyTime = [pEvent timestamp]; // TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - static const float fMagnifyFactor = 0.25; -#else static const float fMagnifyFactor = 0.25*500; // steps are 500 times smaller for -magnification -#endif static const float fMinMagnifyStep = 15.0 / fMagnifyFactor; if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep ) return; @@ -1041,15 +1012,9 @@ private: } } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 --(void)insertText:(id)aString -#else -(void)insertText:(id)aString replacementRange:(NSRange)replacementRange -#endif { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 (void) replacementRange; // FIXME: surely it must be used -#endif YIELD_GUARD; @@ -1619,15 +1584,9 @@ private: return mSelectedRange; } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -- (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange -#else - (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange replacementRange:(NSRange)replacementRange -#endif { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 (void) replacementRange; // FIXME - use it! -#endif YIELD_GUARD; @@ -1697,16 +1656,10 @@ private: mSelectedRange = mMarkedRange = NSMakeRange(NSNotFound, 0); } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -- (NSAttributedString *)attributedSubstringFromRange:(NSRange)aRange -#else - (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange -#endif { (void) aRange; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 (void) actualRange; -#endif // FIXME - Implement return nil; @@ -1750,17 +1703,11 @@ private: mpLastEvent = nil; } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -- (NSRect)firstRectForCharacterRange:(NSRange)aRange -#else - (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange -#endif { // FIXME - These should probably be used? (void) aRange; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 (void) actualRange; -#endif YIELD_GUARD; diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index d8adf03..71758b6 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -1046,12 +1046,7 @@ NSImage* CreateNSImage( const Image& rImage ) NSImage* pImage = [[NSImage alloc] initWithSize: NSMakeSize( aSize.Width(), aSize.Height() )]; if( pImage ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - [pImage setFlipped:YES]; - [pImage lockFocus]; -#else [pImage lockFocusFlipped:YES]; -#endif NSGraphicsContext* pContext = [NSGraphicsContext currentContext]; CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]); diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 47129b9..f723449 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -246,11 +246,7 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) : if( ! mbMenuBar ) { mpMenu = [[SalNSMenu alloc] initWithMenu: this]; -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); -#else [mpMenu setDelegate: (id<NSMenuDelegate>)mpMenu]; -#endif } else { diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 52c0902..9440bb3 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -462,11 +462,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, { [mpPrintInfo setJobDisposition: NSPrintSaveJob]; NSString* pPath = CreateNSString( *i_pFileName ); -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - [pPrintDict setObject:[NSURL fileURLWithPath:pPath] forKey:NSPrintSavePath]; -#else [pPrintDict setObject:[NSURL fileURLWithPath:pPath] forKey:NSPrintJobSavingURL]; -#endif [pPath release]; } diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 8a06d3b..a11453c 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -83,13 +83,9 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) ((mpFontData->GetWeight() < WEIGHT_SEMIBOLD) && (mpFontData->GetWeight() != WEIGHT_DONTKNOW)) ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 int nStroke = -10.0; CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke); CFDictionarySetValue(mpStyleDict, kCTStrokeWidthAttributeName, rStroke); -#else /* kCTStrokeWidthAttributeName is not available */ - /* do we really need "fake" bold? */ -#endif } // fake italic @@ -319,10 +315,8 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool // get font-enabled status if( bFontEnabled ) { int bEnabled = TRUE; // by default (and when we're on OS X < 10.6) it's "enabled" -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 CFNumberRef pEnabled = (CFNumberRef)CTFontDescriptorCopyAttribute( pFD, kCTFontEnabledAttribute ); CFNumberGetValue( pEnabled, kCFNumberIntType, &bEnabled ); -#endif *bFontEnabled = bEnabled; } diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index cd9771a..a0bcd24 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -267,11 +267,6 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // - CoreText handles spaces specially (in particular at the text end) if( mnTrailingSpaceCount ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 - // don't recreate line layout here, because this can lead to problems - // (looks like internal issues inside early CoreText versions) - mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine ); -#else if(mfTrailingSpaceWidth <= 0.0) { mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine ); @@ -296,7 +291,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) SAL_INFO( "vcl.ct", "CTLineCreateWithAttributedString(\"" << GetOUString(aCFText) << "\") = " << mpCTLine ); CFRelease( pAttrStr ); CFRelease( aCFText ); -#endif + // in RTL-layouts trailing spaces are leftmost // TODO: use BiDi-algorithm to thoroughly check this assumption if( rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL) @@ -304,12 +299,9 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mfBaseAdv = mfTrailingSpaceWidth; } } -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 - CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth - mfTrailingSpaceWidth ); -#else CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth); SAL_INFO( "vcl.ct", "CTLineCreateJustifiedLine(" << mpCTLine << ",1.0," << nPixelWidth << ") = " << pNewCTLine ); -#endif + if( !pNewCTLine ) { // CTLineCreateJustifiedLine can and does fail @@ -323,11 +315,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) SAL_INFO( "vcl.ct", "CFRelease(" << mpCTLine << ")" ); CFRelease( mpCTLine ); mpCTLine = pNewCTLine; -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 - mfCachedWidth = nPixelWidth; -#else mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth; -#endif } } @@ -382,13 +370,9 @@ bool CTLayout::DrawTextSpecial( SalGraphics& rGraphics, sal_uInt32 flags ) const CFDictionaryGetCount(mpTextStyle->GetStyleDict()), mpTextStyle->GetStyleDict()); -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - /* just don't do 'kCTStrokeWidthAttributeName' */ -#else int nStroke = 2; CFNumberRef rStroke = CFNumberCreate(NULL, kCFNumberSInt32Type, &nStroke); CFDictionarySetValue(styledict, kCTStrokeWidthAttributeName, rStroke); -#endif CFAttributedStringRef pAttrStr = CFAttributedStringCreate( NULL, diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index d33e570..2462ec0 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -339,28 +339,12 @@ static bool AddTempDevFont(const OUString& rFontFileURL) bool success = false; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 CFErrorRef error; success = CTFontManagerRegisterFontsForURL(rFontURL, kCTFontManagerScopeProcess, &error); if (!success) { CFRelease(error); } -#else /* CTFontManagerRegisterFontsForURL is not available on OS X <10.6 */ - CGDataProviderRef dataProvider = CGDataProviderCreateWithURL(rFontURL); - CGFontRef graphicsFont = CGFontCreateWithDataProvider(dataProvider); - if (graphicsFont) - { - CTFontRef coreTextFont = CTFontCreateWithGraphicsFont(graphicsFont, /*fontSize*/ 0, /*matrix*/ NULL, /*attributes*/ NULL); - if (coreTextFont) - { - success = true; - CFRelease(coreTextFont); - } - CGFontRelease(graphicsFont); - } - CGDataProviderRelease(dataProvider); -#endif return success; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits