From 88ce63f4113f91b863f47bc7168b8a9b9fbf5877 Mon Sep 17 00:00:00 2001 From: "heikki%citec.fi" Date: Wed, 17 May 2000 05:43:14 +0000 Subject: [PATCH] Enable show=new for simple XLink. Works at least when the link is clicked, does not seem to work with actuate=onLoad. Bug 15086. git-svn-id: svn://10.0.0.236/trunk@70319 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 8 +++----- mozilla/webshell/src/nsWebShell.cpp | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 056dab2e872..d8a335ba74a 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1001,11 +1001,11 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, const PRUnichar* aTargetSpec, nsIInputStream* aPostDataStream) { - nsAutoString target(aTargetSpec); + nsCAutoString target; target.AssignWithConversion(aTargetSpec); switch(aVerb) { case eLinkVerb_New: - target.AssignWithConversion("_blank"); + target = "_blank"; // Fall into replace case case eLinkVerb_Undefined: // Fall through, this seems like the most reasonable action @@ -1017,9 +1017,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, nsCOMPtr uri; NS_NewURI(getter_AddRefs(uri), aURLSpec, nsnull); - nsCAutoString tempTargetSpecCString; - tempTargetSpecCString.AssignWithConversion(aTargetSpec); - InternalLoad(uri, mCurrentURI, tempTargetSpecCString, aPostDataStream, loadLink); + InternalLoad(uri, mCurrentURI, target, aPostDataStream, loadLink); } break; case eLinkVerb_Embed: diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 056dab2e872..d8a335ba74a 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -1001,11 +1001,11 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, const PRUnichar* aTargetSpec, nsIInputStream* aPostDataStream) { - nsAutoString target(aTargetSpec); + nsCAutoString target; target.AssignWithConversion(aTargetSpec); switch(aVerb) { case eLinkVerb_New: - target.AssignWithConversion("_blank"); + target = "_blank"; // Fall into replace case case eLinkVerb_Undefined: // Fall through, this seems like the most reasonable action @@ -1017,9 +1017,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, nsCOMPtr uri; NS_NewURI(getter_AddRefs(uri), aURLSpec, nsnull); - nsCAutoString tempTargetSpecCString; - tempTargetSpecCString.AssignWithConversion(aTargetSpec); - InternalLoad(uri, mCurrentURI, tempTargetSpecCString, aPostDataStream, loadLink); + InternalLoad(uri, mCurrentURI, target, aPostDataStream, loadLink); } break; case eLinkVerb_Embed: