Attempt to fix #8137 (arrived at r40862).

[lyx.git] / src / support / AppleSpeller.m

diff --git a/src/support/AppleSpeller.m b/src/support/AppleSpeller.m
index feba78c1a1b4b55cfee4509d20e24390b9c47153..82901f4664768591a9a9dc3b45f17c98650dc7db 100644 (file)
--- a/src/support/AppleSpeller.m
+++ b/src/support/AppleSpeller.m
@@ -69,7 +69,7 @@ static NSString * toLanguage(AppleSpeller speller, const char * lang)
                NSArray * languages = [speller->checker availableLanguages];
                
                for (NSString *element in languages) {
-                       if ([element isEqualToString:lang_]) {
+                       if (0 == [element caseInsensitiveCompare:lang_]) {
                                result = element;
                                break;
                        } else if ([lang_ hasPrefix:element]) {
@@ -94,16 +94,17 @@ SpellCheckResult AppleSpeller_check(AppleSpeller speller, const char * word, con
        NSString * lang_ = toString(lang);
        SpellCheckResult result = SPELL_CHECK_FAILED;
        int start = 0;
-
+       int length = [word_ length];
+       
        [speller->misspelled release];
        speller->misspelled = nil;
 
-       while (result == SPELL_CHECK_FAILED) {
+       while (result == SPELL_CHECK_FAILED && start < length) {
                NSRange match = [speller->checker
                        checkSpellingOfString:word_
                        startingAt:start
                        language:lang_
-                       wrap:NO
+                       wrap:(BOOL)NO
                        inSpellDocumentWithTag:speller->doctag
                        wordCount:NULL];
 
@@ -114,7 +115,11 @@ SpellCheckResult AppleSpeller_check(AppleSpeller speller, const char * word, con
                                        result = SPELL_CHECK_LEARNED;
                        }
                } else {
+#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
+                       NSUInteger capacity = [speller->misspelled count] + 1;
+#else
                        int capacity = [speller->misspelled count] + 1;
+#endif
                        NSMutableArray * misspelled = [NSMutableArray arrayWithCapacity:capacity];
                        [misspelled addObjectsFromArray:speller->misspelled];
                        [misspelled addObject:[NSValue valueWithRange:match]];
@@ -232,7 +237,11 @@ int AppleSpeller_numMisspelledWords(AppleSpeller speller)
 
 void AppleSpeller_misspelledWord(AppleSpeller speller, int index, int * start, int * length)
 {
+#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
+       NSRange range = [[speller->misspelled objectAtIndex:(NSUInteger)index] rangeValue];
+#else
        NSRange range = [[speller->misspelled objectAtIndex:index] rangeValue];
+#endif
        *start = range.location;
        *length = range.length;
 }
@@ -240,5 +249,9 @@ void AppleSpeller_misspelledWord(AppleSpeller speller, int index, int * start, i
 
 int AppleSpeller_hasLanguage(AppleSpeller speller, const char * lang)
 {
+#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
        return toLanguage(speller, lang) != nil;
+#else
+       return true;
+#endif
 }