mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-25 11:58:55 +00:00
fix string usage in mailnews. #103412. rs=bienvenu
This commit is contained in:
parent
fdfe0b65f7
commit
25161eec21
@ -180,7 +180,7 @@ ConvertBufToPlainText(nsString &aConBuf)
|
||||
|
||||
parser->SetContentSink(sink);
|
||||
|
||||
nsAutoString mimeStr; mimeStr.AppendWithConversion("text/html");
|
||||
nsAutoString mimeStr(NS_LITERAL_STRING("text/html").get());
|
||||
parser->Parse(aConBuf, 0, mimeStr, PR_FALSE, PR_TRUE);
|
||||
|
||||
//
|
||||
@ -299,7 +299,6 @@ nsMessenger::SetWindow(nsIDOMWindowInternal *aWin, nsIMsgWindow *aMsgWindow)
|
||||
|
||||
mMsgWindow = aMsgWindow;
|
||||
|
||||
nsAutoString docShellName; docShellName.AssignWithConversion("messagepane");
|
||||
NS_IF_RELEASE(mWindow);
|
||||
mWindow = aWin;
|
||||
NS_ADDREF(aWin);
|
||||
@ -320,7 +319,7 @@ nsMessenger::SetWindow(nsIDOMWindowInternal *aWin, nsIMsgWindow *aMsgWindow)
|
||||
if (rootDocShellAsNode)
|
||||
{
|
||||
nsCOMPtr<nsIDocShellTreeItem> childAsItem;
|
||||
nsresult rv = rootDocShellAsNode->FindChildWithName(docShellName.get(),
|
||||
nsresult rv = rootDocShellAsNode->FindChildWithName(NS_LITERAL_STRING("messagepane").get(),
|
||||
PR_TRUE, PR_FALSE, nsnull, getter_AddRefs(childAsItem));
|
||||
|
||||
mDocShell = do_QueryInterface(childAsItem);
|
||||
@ -903,9 +902,9 @@ nsMessenger::SaveAs(const char* url, PRBool asFile, nsIMsgIdentity* identity, ns
|
||||
// a "printing" operation
|
||||
//
|
||||
if (saveAsFileType == 1)
|
||||
urlString.AppendWithConversion("?header=saveas");
|
||||
urlString.Append(NS_LITERAL_STRING("?header=saveas").get());
|
||||
else
|
||||
urlString.AppendWithConversion("?header=print");
|
||||
urlString.Append(NS_LITERAL_STRING("?header=print").get());
|
||||
|
||||
urlCString = ToNewCString(urlString);
|
||||
rv = CreateStartupUrl(urlCString, getter_AddRefs(aURL));
|
||||
|
@ -201,7 +201,6 @@ nsMsgPrintEngine::SetWindow(nsIDOMWindowInternal *aWin)
|
||||
}
|
||||
|
||||
mWindow = aWin;
|
||||
nsAutoString docShellName; docShellName.AssignWithConversion("printengine");
|
||||
|
||||
nsCOMPtr<nsIScriptGlobalObject> globalObj( do_QueryInterface(aWin) );
|
||||
NS_ENSURE_TRUE(globalObj, NS_ERROR_FAILURE);
|
||||
@ -215,12 +214,11 @@ nsMsgPrintEngine::SetWindow(nsIDOMWindowInternal *aWin)
|
||||
nsCOMPtr<nsIDocShellTreeItem> rootAsItem;
|
||||
docShellAsItem->GetSameTypeRootTreeItem(getter_AddRefs(rootAsItem));
|
||||
|
||||
nsAutoString childName; childName.AssignWithConversion("printengine");
|
||||
nsCOMPtr<nsIDocShellTreeNode> rootAsNode(do_QueryInterface(rootAsItem));
|
||||
NS_ENSURE_TRUE(rootAsNode, NS_ERROR_FAILURE);
|
||||
|
||||
nsCOMPtr<nsIDocShellTreeItem> childItem;
|
||||
rootAsNode->FindChildWithName(childName.get(), PR_TRUE, PR_FALSE, nsnull,
|
||||
rootAsNode->FindChildWithName(NS_LITERAL_STRING("printengine").get(), PR_TRUE, PR_FALSE, nsnull,
|
||||
getter_AddRefs(childItem));
|
||||
|
||||
mDocShell = do_QueryInterface(childItem);
|
||||
|
@ -93,8 +93,7 @@ nsMsgServiceProviderService::Init()
|
||||
nsCOMPtr<nsIChromeRegistry> chromeRegistry = do_GetService(kChromeRegistryCID, &rv);
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
nsXPIDLString lc_name;
|
||||
nsAutoString tmpstr; tmpstr.AssignWithConversion("global-region");
|
||||
rv = chromeRegistry->GetSelectedLocale(tmpstr.get(), getter_Copies(lc_name));
|
||||
rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("global-region").get(), getter_Copies(lc_name));
|
||||
if (NS_SUCCEEDED(rv) && (const PRUnichar *)lc_name && nsCRT::strlen((const PRUnichar *)lc_name)) {
|
||||
|
||||
nsCOMPtr<nsIFile> tmpdataFilesDir;
|
||||
|
Loading…
x
Reference in New Issue
Block a user