wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 718627 - Part 6: Cleanup string conversion. Make sure to return enmpty string for text instead of nil. r=surkov

Browse Source
This commit is contained in:
Hub Figuière 2012-04-03 12:39:38 -07:00
parent d28e101ac7
commit 61fe16a7f9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
accessible/src/mac/mozTextAccessible.mm
View File

@ -330,12 +330,14 @@ ToNSString(id aValue)
return (lineNumber >= 0) ? [NSNumber numberWithInt:lineNumber] : nil;
}
- (void)setText:(NSString*)newString
- (void)setText:(NSString*)aNewString
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
if (mGeckoEditableTextAccessible) {
mGeckoEditableTextAccessible->SetTextContents(NS_ConvertUTF8toUTF16([newString UTF8String]));
nsString text;
nsCocoaUtils::GetStringForNSString(aNewString, text);
mGeckoEditableTextAccessible->SetTextContents(text);
}
NS_OBJC_END_TRY_ABORT_BLOCK;
@ -347,12 +349,11 @@ ToNSString(id aValue)
return nil;
nsAutoString text;
nsresult rv =
mGeckoTextAccessible->GetText(0, nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT,
text);
NS_ENSURE_SUCCESS(rv, nil);
nsresult rv = mGeckoTextAccessible->
GetText(0, nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT, text);
NS_ENSURE_SUCCESS(rv, @"");
return text.IsEmpty() ? nil : nsCocoaUtils::ToNSString(text);
return nsCocoaUtils::ToNSString(text);
}
- (long)textLength
@ -392,7 +393,7 @@ ToNSString(id aValue)
if (start != end) {
nsAutoString selText;
mGeckoTextAccessible->GetText(start, end, selText);
return selText.IsEmpty() ? nil : [NSString stringWithCharacters:selText.BeginReading() length:selText.Length()];
return nsCocoaUtils::ToNSString(selText);
}
}
return nil;