corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for build warnings (shadow & strange null pointer treatment) bug 287102 r/sr=dbaron

Browse Source
This commit is contained in:
bmlk@gmx.de
2005-03-24 18:41:39 +00:00
parent 4f778ef813
commit 4fef1d22ac
3 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
layout/forms/nsFormControlFrame.cpp
View File

@@ -566,51 +566,18 @@ nsresult
nsFormControlFrame::RegUnRegAccessKey(nsPresContext* aPresContext, nsIFrame * aFrame, PRBool aDoReg)
{
NS_ASSERTION(aPresContext, "aPresContext is NULL in RegUnRegAccessKey!");
NS_ASSERTION(aFrame, "aFrame is NULL in RegUnRegAccessKey!");
NS_ENSURE_ARG_POINTER(aFrame);
nsresult rv = NS_ERROR_FAILURE;
nsAutoString accessKey;
if (aFrame) {
nsIContent* content = aFrame->GetContent();
#if 1
nsAutoString resultValue;
rv = content->GetAttr(kNameSpaceID_None,
nsHTMLAtoms::accesskey, accessKey);
#else
nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(content));
if (inputElement) {
rv = inputElement->GetAccessKey(accessKey);
} else {
nsCOMPtr<nsIDOMHTMLTextAreaElement> textarea(do_QueryInterface(content));
if (textarea) {
rv = textarea->GetAccessKey(accessKey);
} else {
nsCOMPtr<nsIDOMHTMLLabelElement> label(do_QueryInterface(content));
if (label) {
rv = label->GetAccessKey(accessKey);
} else {
nsCOMPtr<nsIDOMHTMLLegendElement> legend(do_QueryInterface(content));
if (legend) {
rv = legend->GetAccessKey(accessKey);
} else {
nsCOMPtr<nsIDOMHTMLButtonElement> btn(do_QueryInterface(content));
if (btn) {
rv = btn->GetAccessKey(accessKey);
}
}
}
}
}
#endif
}
nsIContent* content = aFrame->GetContent();
content->GetAttr(kNameSpaceID_None, nsHTMLAtoms::accesskey, accessKey);
if (!accessKey.IsEmpty()) {
nsIEventStateManager *stateManager = aPresContext->EventStateManager();
if (aDoReg) {
return stateManager->RegisterAccessKey(aFrame->GetContent(), (PRUint32)accessKey.First());
return stateManager->RegisterAccessKey(content, (PRUint32)accessKey.First());
} else {
return stateManager->UnregisterAccessKey(aFrame->GetContent(), (PRUint32)accessKey.First());
return stateManager->UnregisterAccessKey(content, (PRUint32)accessKey.First());
}
}
return NS_ERROR_FAILURE;