Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made option code more robust

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@3433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp 1998-06-06 20:25:11 +00:00
parent 54bd6545a2
commit 85bcfaecd7
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mozilla/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
mozilla/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;
}