From 5ee82cc838ffedfa488c27ecd2e1d3c95ea03834 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Tue, 16 May 2000 03:22:25 +0000 Subject: [PATCH] Cleaning up GetNodeName() in preparation for swiching mozilla over to a DOM Level 2 compliant .nodeName property. git-svn-id: svn://10.0.0.236/trunk@69956 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/content/src/nsGenericHTMLElement.cpp | 16 ++++++++-------- .../html/content/src/nsGenericHTMLElement.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 484d1f0603a..5c15aa74225 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -443,18 +443,18 @@ nsGenericHTMLElement::GetNodeName(nsString& aNodeName) mNodeInfo->GetPrefix(aNodeName); if (aNodeName.Length()) { aNodeName.Append(PRUnichar(':')); + + nsAutoString tmp; + mNodeInfo->GetName(tmp); + + tmp.ToUpperCase(); + + aNodeName.Append(tmp); } #else - aNodeName.Truncate(); + mNodeInfo->GetName(aNodeName); #endif - nsCOMPtr atom; - mNodeInfo->GetNameAtom(*getter_AddRefs(atom)); - - atom->ToString(aNodeName); - - aNodeName.ToUpperCase(); - return NS_OK; } diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp index 484d1f0603a..5c15aa74225 100644 --- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp @@ -443,18 +443,18 @@ nsGenericHTMLElement::GetNodeName(nsString& aNodeName) mNodeInfo->GetPrefix(aNodeName); if (aNodeName.Length()) { aNodeName.Append(PRUnichar(':')); + + nsAutoString tmp; + mNodeInfo->GetName(tmp); + + tmp.ToUpperCase(); + + aNodeName.Append(tmp); } #else - aNodeName.Truncate(); + mNodeInfo->GetName(aNodeName); #endif - nsCOMPtr atom; - mNodeInfo->GetNameAtom(*getter_AddRefs(atom)); - - atom->ToString(aNodeName); - - aNodeName.ToUpperCase(); - return NS_OK; }