From 4ce10793948ecf59dbfc376af6ef0dddacbe63ab Mon Sep 17 00:00:00 2001
From: "aaronl%netscape.com"
 <aaronl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 3 May 2001 02:22:13 +0000
Subject: [PATCH] Link fixes

git-svn-id: svn://10.0.0.236/branches/Accessible_042501_Branch3@93758 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/accessible/src/base/nsGenericAccessible.cpp  | 2 +-
 mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp | 2 +-
 mozilla/accessible/src/nsGenericAccessible.cpp       | 2 +-
 mozilla/accessible/src/nsHTMLLinkAccessible.cpp      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/accessible/src/base/nsGenericAccessible.cpp b/mozilla/accessible/src/base/nsGenericAccessible.cpp
index 062bb7b291c..fda26661b58 100644
--- a/mozilla/accessible/src/base/nsGenericAccessible.cpp
+++ b/mozilla/accessible/src/base/nsGenericAccessible.cpp
@@ -529,7 +529,7 @@ PRBool nsLinkableAccessible::IsALink()
 
   nsCOMPtr<nsIContent> walkUpContent(do_QueryInterface(mNode));
   if (walkUpContent) {
-    nsCOMPtr<nsIContent> tempContent;
+    nsCOMPtr<nsIContent> tempContent = walkUpContent;
     while (walkUpContent) {
       nsCOMPtr<nsILink> link(do_QueryInterface(walkUpContent));
       if (link) {
diff --git a/mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp b/mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp
index da981b23027..a44288bbfaa 100644
--- a/mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp
+++ b/mozilla/accessible/src/html/nsHTMLLinkAccessible.cpp
@@ -40,7 +40,7 @@ nsLinkableAccessible(aShell, aDomNode)
 /* wstring getAccName (); */
 NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(PRUnichar **_retval)
 { 
-  if (!mLinkContent)
+  if (!IsALink())  // Also initializes private data members
     return NS_ERROR_FAILURE;
 
   nsAutoString nameString;
diff --git a/mozilla/accessible/src/nsGenericAccessible.cpp b/mozilla/accessible/src/nsGenericAccessible.cpp
index 062bb7b291c..fda26661b58 100644
--- a/mozilla/accessible/src/nsGenericAccessible.cpp
+++ b/mozilla/accessible/src/nsGenericAccessible.cpp
@@ -529,7 +529,7 @@ PRBool nsLinkableAccessible::IsALink()
 
   nsCOMPtr<nsIContent> walkUpContent(do_QueryInterface(mNode));
   if (walkUpContent) {
-    nsCOMPtr<nsIContent> tempContent;
+    nsCOMPtr<nsIContent> tempContent = walkUpContent;
     while (walkUpContent) {
       nsCOMPtr<nsILink> link(do_QueryInterface(walkUpContent));
       if (link) {
diff --git a/mozilla/accessible/src/nsHTMLLinkAccessible.cpp b/mozilla/accessible/src/nsHTMLLinkAccessible.cpp
index da981b23027..a44288bbfaa 100644
--- a/mozilla/accessible/src/nsHTMLLinkAccessible.cpp
+++ b/mozilla/accessible/src/nsHTMLLinkAccessible.cpp
@@ -40,7 +40,7 @@ nsLinkableAccessible(aShell, aDomNode)
 /* wstring getAccName (); */
 NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(PRUnichar **_retval)
 { 
-  if (!mLinkContent)
+  if (!IsALink())  // Also initializes private data members
     return NS_ERROR_FAILURE;
 
   nsAutoString nameString;