Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NECKO only: Using helper function NS_MakeAbsoluteURI A: chofmann R:valeski

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@38985 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
andreas.otte%primus-online.de
1999-07-11 15:46:10 +00:00
parent db3b4ce81c
commit aa8f29f8c5
17 changed files with 45 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/html/base/src/nsImageMap.cpp
View File

@@ -26,6 +26,7 @@
#include "nsIIOService.h"
#include "nsIURL.h"
#include "nsIServiceManager.h"
#include "nsNeckoUtil.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#endif // NECKO
#include "nsXIFConverter.h"
@@ -864,22 +865,19 @@ nsImageMap::IsInside(nscoord aX, nscoord aY,
if ((area->mBase).Length() > 0) {
// use the area->base as the base uri
char *uriStr = (area->mBase).ToNewCString();
if (!uriStr) return NS_ERROR_OUT_OF_MEMORY;
if (!uriStr) {
return PR_FALSE;
}
rv = service->NewURI(uriStr, nsnull, &baseUri);
nsCRT::free(uriStr);
delete [] uriStr;
} else {
rv = aDocURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri);
}
if (NS_FAILED(rv)) return PR_FALSE;
char *absUrlStr = nsnull;
char *urlSpec = (area->mHREF).ToNewCString();
if (!urlSpec) return NS_ERROR_OUT_OF_MEMORY;
rv = service->MakeAbsolute(urlSpec, baseUri, &absUrlStr);
NS_MakeAbsoluteURI(area->mHREF, baseUri, aAbsURL);
NS_RELEASE(baseUri);
aAbsURL = absUrlStr;
nsCRT::free(urlSpec);
delete [] absUrlStr;
#endif // NECKO
aTarget = area->mTarget;
aAltText = area->mAltText;