From 657c5c9ac1deb3eb5c3ae3c6f931945dfce22738 Mon Sep 17 00:00:00 2001 From: "andreas.otte%primus-online.de" Date: Sun, 7 May 2000 10:35:40 +0000 Subject: [PATCH] working on bug 37616, Retire SetRelativePath, removing last usage of SetRelativePath, r=warren@netscape.com, a=buster@netscape.com --- content/xml/content/src/nsXMLElement.cpp | 6 +++++- layout/xml/content/src/nsXMLElement.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/content/xml/content/src/nsXMLElement.cpp b/content/xml/content/src/nsXMLElement.cpp index 90c660ba396f..eaaec68bb9f3 100644 --- a/content/xml/content/src/nsXMLElement.cpp +++ b/content/xml/content/src/nsXMLElement.cpp @@ -34,6 +34,7 @@ #include "nsIURL.h" #include "nsIIOService.h" #include "nsIServiceManager.h" +#include "nsXPIDLString.h" //static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); static NS_DEFINE_IID(kIXMLContentIID, NS_IXMLCONTENT_IID); @@ -156,7 +157,10 @@ nsXMLElement::GetXMLBaseURI(nsIURI **aURI) if (!base.IsEmpty()) { str.AssignWithConversion(base.GetUnicode()); - rv = (*aURI)->SetRelativePath(str); + nsXPIDLCString resolvedStr; + rv = (*aURI)->Resolve(str, getter_Copies(resolvedStr)); + if (NS_FAILED(rv)) break; + rv = (*aURI)->SetSpec(resolvedStr); } break; diff --git a/layout/xml/content/src/nsXMLElement.cpp b/layout/xml/content/src/nsXMLElement.cpp index 90c660ba396f..eaaec68bb9f3 100644 --- a/layout/xml/content/src/nsXMLElement.cpp +++ b/layout/xml/content/src/nsXMLElement.cpp @@ -34,6 +34,7 @@ #include "nsIURL.h" #include "nsIIOService.h" #include "nsIServiceManager.h" +#include "nsXPIDLString.h" //static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); static NS_DEFINE_IID(kIXMLContentIID, NS_IXMLCONTENT_IID); @@ -156,7 +157,10 @@ nsXMLElement::GetXMLBaseURI(nsIURI **aURI) if (!base.IsEmpty()) { str.AssignWithConversion(base.GetUnicode()); - rv = (*aURI)->SetRelativePath(str); + nsXPIDLCString resolvedStr; + rv = (*aURI)->Resolve(str, getter_Copies(resolvedStr)); + if (NS_FAILED(rv)) break; + rv = (*aURI)->SetSpec(resolvedStr); } break;