fixed error checking for command creation.

git-svn-id: svn://10.0.0.236/trunk@19920 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
1999-02-06 06:09:53 +00:00
parent 07105200e3
commit 2e186fb37f

View File

@@ -438,14 +438,13 @@ void nsWebShellWindow::LoadCommands(nsIWebShell * aWebShell, nsIDOMDocument * aD
nsIXULCommand * xulCmdInterface = nsnull;
rv = nsRepository::CreateInstance(kXULCommandCID, nsnull, kIXULCommandIID,
(void**)&xulCmdInterface);
if (NS_OK != rv) {
// Error
if (NS_OK == rv) {
xulCmdInterface->SetName(name);//nsIXULCommand
xulCmdInterface->SetCommand(value);//nsIXULCommand
xulCmdInterface->SetWebShell(aWebShell);// Added to nsIXULCommand
xulCmdInterface->SetDOMElement(element);// Added to nsIXULCommand
mCommands.AppendElement(xulCmdInterface);
}
xulCmdInterface->SetName(name);//nsIXULCommand
xulCmdInterface->SetCommand(value);//nsIXULCommand
xulCmdInterface->SetWebShell(aWebShell);// Added to nsIXULCommand
xulCmdInterface->SetDOMElement(element);// Added to nsIXULCommand
mCommands.AppendElement(xulCmdInterface);
/*
nsXULCommand * xulCmd = new nsXULCommand();
@@ -488,17 +487,16 @@ void nsWebShellWindow::LoadCommands(nsIWebShell * aWebShell, nsIDOMDocument * aD
nsIXULCommand * xulCmdInterface = nsnull;
rv = nsRepository::CreateInstance(kXULCommandCID, nsnull, kIXULCommandIID,
(void**)&xulCmdInterface);
if (NS_OK != rv) {
// Error
}
xulCmdInterface->SetName(name);
xulCmdInterface->SetCommand(value);
xulCmdInterface->SetWebShell(aWebShell);
xulCmdInterface->SetDOMElement(element);
if (NS_OK == rv) {
xulCmdInterface->SetName(name);
xulCmdInterface->SetCommand(value);
xulCmdInterface->SetWebShell(aWebShell);
xulCmdInterface->SetDOMElement(element);
mCommands.AppendElement(xulCmdInterface);
mCommands.AppendElement(xulCmdInterface);
xulCmdInterface->AddUINode(node);
xulCmdInterface->AddUINode(node);
}
/*
nsXULCommand * xulCmd = new nsXULCommand();
xulCmd->SetName(name);