Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made option code more robust

Browse Source
This commit is contained in:
kipp 1998-06-06 20:25:11 +00:00
parent 0e3fb2872b
commit 92cfe5b226
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
content/html/document/src/nsHTMLContentSink.cpp
View File

@ -1274,32 +1274,34 @@ nsresult
HTMLContentSink::ProcessOPTIONTagContent(const nsIParserNode& aNode)
{
if ((nsnull != mCurrentSelect) && (nsnull != mCurrentOption)) {
nsIFormControl* control;
nsresult rv = mCurrentOption->QueryInterface(kIFormControlIID, (void **)&control);
nsAutoString currentText;
control->GetContent(currentText); // why do we need to do this
nsIFormControl* control = nsnull;
mCurrentOption->QueryInterface(kIFormControlIID, (void **)&control);
if (nsnull != control) {
// Get current content and append on the new content
nsAutoString currentText;
control->GetContent(currentText);
switch (aNode.GetTokenType()) {
case eToken_text:
case eToken_whitespace:
case eToken_newline:
currentText.Append(aNode.GetText());
break;
switch (aNode.GetTokenType()) {
case eToken_text:
case eToken_whitespace:
case eToken_newline:
currentText.Append(aNode.GetText());
break;
case eToken_entity:
{
nsAutoString tmp2("");
PRInt32 unicode = aNode.TranslateToUnicodeStr(tmp2);
if (unicode < 0) {
currentText.Append(aNode.GetText());
} else {
currentText.Append(tmp2);
case eToken_entity:
{
nsAutoString tmp2("");
PRInt32 unicode = aNode.TranslateToUnicodeStr(tmp2);
if (unicode < 0) {
currentText.Append(aNode.GetText());
} else {
currentText.Append(tmp2);
}
}
break;
}
break;
control->SetContent(currentText);
}
control->SetContent(currentText);
}
return NS_OK;
}

44
layout/html/document/src/nsHTMLContentSink.cpp
View File

@ -1274,32 +1274,34 @@ nsresult
HTMLContentSink::ProcessOPTIONTagContent(const nsIParserNode& aNode)
{
if ((nsnull != mCurrentSelect) && (nsnull != mCurrentOption)) {
nsIFormControl* control;
nsresult rv = mCurrentOption->QueryInterface(kIFormControlIID, (void **)&control);
nsAutoString currentText;
control->GetContent(currentText); // why do we need to do this
nsIFormControl* control = nsnull;
mCurrentOption->QueryInterface(kIFormControlIID, (void **)&control);
if (nsnull != control) {
// Get current content and append on the new content
nsAutoString currentText;
control->GetContent(currentText);
switch (aNode.GetTokenType()) {
case eToken_text:
case eToken_whitespace:
case eToken_newline:
currentText.Append(aNode.GetText());
break;
switch (aNode.GetTokenType()) {
case eToken_text:
case eToken_whitespace:
case eToken_newline:
currentText.Append(aNode.GetText());
break;
case eToken_entity:
{
nsAutoString tmp2("");
PRInt32 unicode = aNode.TranslateToUnicodeStr(tmp2);
if (unicode < 0) {
currentText.Append(aNode.GetText());
} else {
currentText.Append(tmp2);
case eToken_entity:
{
nsAutoString tmp2("");
PRInt32 unicode = aNode.TranslateToUnicodeStr(tmp2);
if (unicode < 0) {
currentText.Append(aNode.GetText());
} else {
currentText.Append(tmp2);
}
}
break;
}
break;
control->SetContent(currentText);
}
control->SetContent(currentText);
}
return NS_OK;
}