Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

string backsliding. r=mjudge

Browse Source
This commit is contained in:
scc%netscape.com 2000-05-12 07:53:02 +00:00
parent c9662034e6
commit 383fdc142e
12 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caps/src/nsCertificatePrincipal.cpp
View File

@ -105,7 +105,7 @@ nsCertificatePrincipal::ToStreamableForm(char** aName, char** aData)
{
if (!mPrefName) {
nsCAutoString s("security.principal.certificate");
s += mCapabilitiesOrdinal++;
s.AppendInt(mCapabilitiesOrdinal++);
mPrefName = s.ToNewCString();
}
*aName = nsCRT::strdup(mPrefName);

2
caps/src/nsCodebasePrincipal.cpp
View File

@ -68,7 +68,7 @@ nsCodebasePrincipal::ToStreamableForm(char** aName, char** aData)
{
if (!mPrefName) {
nsCAutoString s("security.principal.codebase");
s += mCapabilitiesOrdinal++;
s.AppendInt(mCapabilitiesOrdinal++);
mPrefName = s.ToNewCString();
}
*aName = nsCRT::strdup(mPrefName);

3
chrome/src/nsChromeRegistry.cpp
View File

@ -1689,7 +1689,8 @@ void nsChromeRegistry::LoadStyleSheet(nsICSSStyleSheet** aSheet, const nsCString
void nsChromeRegistry::GetUserSheetURL(nsCString & aURL)
{
aURL = mProfileRoot + "user.css";
aURL = mProfileRoot;
aURL.Append("user.css");
}
//////////////////////////////////////////////////////////////////////

92
dom/src/base/nsGlobalWindow.cpp
View File

@ -4301,19 +4301,19 @@ NS_IMETHODIMP nsDOMWindowController::IsCommandEnabled(const PRUnichar *aCommand,
if ( NS_FAILED (rv ) )
return rv;
if (PR_TRUE== nsCAutoString(sCopyString).Equals(aCommand))
if (PR_TRUE== nsCAutoString(sCopyString).EqualsWithConversion(aCommand))
{
rv = editInterface->GetCopyable( aResult );
}
else if (PR_TRUE==nsCAutoString(sCutString).Equals(aCommand))
else if (PR_TRUE==nsCAutoString(sCutString).EqualsWithConversion(aCommand))
{
rv = editInterface->GetCutable( aResult);
}
else if (PR_TRUE==nsCAutoString(sPasteString).Equals(aCommand))
else if (PR_TRUE==nsCAutoString(sPasteString).EqualsWithConversion(aCommand))
{
rv = editInterface->GetPasteable( aResult );
}
else if (PR_TRUE==nsCAutoString(sSelectAllString).Equals(aCommand))
else if (PR_TRUE==nsCAutoString(sSelectAllString).EqualsWithConversion(aCommand))
{
*aResult = PR_TRUE;
rv = NS_OK;
@ -4329,40 +4329,40 @@ NS_IMETHODIMP nsDOMWindowController::SupportsCommand(const PRUnichar *aCommand,
*aResult = PR_FALSE;
if (
(PR_TRUE== nsCAutoString(sCopyString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectAllString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sCutString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sPasteString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sBeginLineString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sEndLineString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectBeginLineString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectEndLineString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollTopString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollBottomString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sMoveTopString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sMoveBottomString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMoveTopString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMoveBottomString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sDownString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sUpString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sLeftString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sRightString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectDownString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectUpString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectLeftString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectRightString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sWordLeftString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sWordRightString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectWordLeftString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectWordRightString).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollPageUp).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollPageDown).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollLineUp).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollLineDown).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sMovePageUp).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sMovePageDown).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMovePageUp).Equals(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMovePageDown).Equals(aCommand))
(PR_TRUE== nsCAutoString(sCopyString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectAllString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sCutString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sPasteString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sBeginLineString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sEndLineString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectBeginLineString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectEndLineString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollTopString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollBottomString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sMoveTopString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sMoveBottomString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMoveTopString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMoveBottomString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sDownString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sUpString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sLeftString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sRightString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectDownString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectUpString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectLeftString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectRightString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sWordLeftString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sWordRightString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectWordLeftString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectWordRightString).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollPageUp).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollPageDown).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollLineUp).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sScrollLineDown).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sMovePageUp).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sMovePageDown).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMovePageUp).EqualsWithConversion(aCommand)) ||
(PR_TRUE== nsCAutoString(sSelectMovePageDown).EqualsWithConversion(aCommand))
)
{
*aResult = PR_TRUE;
@ -4382,38 +4382,38 @@ NS_IMETHODIMP nsDOMWindowController::DoCommand(const PRUnichar *aCommand)
if ( NS_FAILED ( rv ) )
return rv;
if (PR_TRUE== nsCAutoString(sCopyString).Equals(aCommand))
if (PR_TRUE== nsCAutoString(sCopyString).EqualsWithConversion(aCommand))
{
rv = editInterface->CopySelection();
}
else if (PR_TRUE== nsCAutoString(sCutString).Equals(aCommand))
else if (PR_TRUE== nsCAutoString(sCutString).EqualsWithConversion(aCommand))
{
rv = editInterface->CutSelection();
}
else if (PR_TRUE== nsCAutoString(sPasteString).Equals(aCommand))
else if (PR_TRUE== nsCAutoString(sPasteString).EqualsWithConversion(aCommand))
{
rv = editInterface->Paste();
}
else if (PR_TRUE== nsCAutoString(sSelectAllString).Equals(aCommand))
else if (PR_TRUE== nsCAutoString(sSelectAllString).EqualsWithConversion(aCommand))
{
rv = editInterface->SelectAll();
}
else if (PR_TRUE==nsCAutoString(sScrollPageUp).Equals(aCommand)) //ScrollPageUp
else if (PR_TRUE==nsCAutoString(sScrollPageUp).EqualsWithConversion(aCommand)) //ScrollPageUp
{
NS_ENSURE_SUCCESS(GetSelectionController(getter_AddRefs(selCont)),NS_ERROR_FAILURE);
return selCont->ScrollPage(PR_FALSE);
}
else if (PR_TRUE==nsCAutoString(sScrollPageDown).Equals(aCommand)) //ScrollPageDown
else if (PR_TRUE==nsCAutoString(sScrollPageDown).EqualsWithConversion(aCommand)) //ScrollPageDown
{
NS_ENSURE_SUCCESS(GetSelectionController(getter_AddRefs(selCont)),NS_ERROR_FAILURE);
return selCont->ScrollPage(PR_TRUE);
}
else if (PR_TRUE==nsCAutoString(sScrollLineUp).Equals(aCommand)) //ScrollLineUp
else if (PR_TRUE==nsCAutoString(sScrollLineUp).EqualsWithConversion(aCommand)) //ScrollLineUp
{
NS_ENSURE_SUCCESS(GetSelectionController(getter_AddRefs(selCont)),NS_ERROR_FAILURE);
return selCont->ScrollLine(PR_FALSE);
}
else if (PR_TRUE==nsCAutoString(sScrollLineDown).Equals(aCommand)) //ScrollLineDown
else if (PR_TRUE==nsCAutoString(sScrollLineDown).EqualsWithConversion(aCommand)) //ScrollLineDown
{
NS_ENSURE_SUCCESS(GetSelectionController(getter_AddRefs(selCont)),NS_ERROR_FAILURE);
return selCont->ScrollLine(PR_TRUE);

4
htmlparser/src/nsHTMLTokens.cpp
View File

@ -290,7 +290,7 @@ void CStartToken::GetSource(nsString& anOutputString){
anOutputString=mTextValue;
else
anOutputString.AssignWithConversion(GetTagName(mTypeID));
anOutputString+='>';
anOutputString.AppendWithConversion('>');
}
}
@ -313,7 +313,7 @@ void CStartToken::AppendSource(nsString& anOutputString){
anOutputString+=mTextValue;
else
anOutputString.AppendWithConversion(GetTagName(mTypeID));
anOutputString+='>';
anOutputString.AppendWithConversion('>');
}
}

2
layout/base/nsCSSFrameConstructor.cpp
View File

@ -1221,7 +1221,7 @@ nsCSSFrameConstructor::CreateGeneratedFrameFor(nsIPresContext* aPresContex
} else {
// XXX Don't assume default. Only use what is in 'quotes' property
contentString = '\"';
contentString.AssignWithConversion('\"');
}
}
break;

2
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -1221,7 +1221,7 @@ nsCSSFrameConstructor::CreateGeneratedFrameFor(nsIPresContext* aPresContex
} else {
// XXX Don't assume default. Only use what is in 'quotes' property
contentString = '\"';
contentString.AssignWithConversion('\"');
}
}
break;

2
mailnews/import/src/nsImportMail.cpp
View File

@ -1064,7 +1064,7 @@ void nsImportGenericMail::GetUniquePrettyName( nsIMsgAccountManager *pMgr, nsStr
nsXPIDLString prettyName;
rv = server->GetPrettyName( getter_Copies( prettyName));
if (NS_SUCCEEDED( rv)) {
if (!newName.Compare( nsAutoString(prettyName), PR_TRUE))
if (!newName.CompareWithConversion( nsAutoString(prettyName), PR_TRUE))
found = PR_TRUE;
}
}

10
modules/libjar/nsJAR.cpp
View File

@ -491,9 +491,15 @@ nsJAR::ParseManifest(nsISignatureVerifier* verifier)
(void)sigFilename.Cut(extension, 2);
nsXPIDLCString sigBuffer;
PRUint32 sigLen;
rv = LoadEntry(sigFilename+"rsa", getter_Copies(sigBuffer), &sigLen);
{
nsCAutoString tempFilename(sigFilename); tempFilename.Append("rsa", 3);
rv = LoadEntry(tempFilename, getter_Copies(sigBuffer), &sigLen);
}
if (NS_FAILED(rv))
rv = LoadEntry(sigFilename+"RSA", getter_Copies(sigBuffer), &sigLen);
{
nsCAutoString tempFilename(sigFilename); tempFilename.Append("RSA", 3);
rv = LoadEntry(tempFilename, getter_Copies(sigBuffer), &sigLen);
}
if (NS_FAILED(rv)) return rv;
//-- Verify that the signature file is a valid signature of the SF file

4
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@ -290,7 +290,7 @@ void CStartToken::GetSource(nsString& anOutputString){
anOutputString=mTextValue;
else
anOutputString.AssignWithConversion(GetTagName(mTypeID));
anOutputString+='>';
anOutputString.AppendWithConversion('>');
}
}
@ -313,7 +313,7 @@ void CStartToken::AppendSource(nsString& anOutputString){
anOutputString+=mTextValue;
else
anOutputString.AppendWithConversion(GetTagName(mTypeID));
anOutputString+='>';
anOutputString.AppendWithConversion('>');
}
}

3
rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -1689,7 +1689,8 @@ void nsChromeRegistry::LoadStyleSheet(nsICSSStyleSheet** aSheet, const nsCString
void nsChromeRegistry::GetUserSheetURL(nsCString & aURL)
{
aURL = mProfileRoot + "user.css";
aURL = mProfileRoot;
aURL.Append("user.css");
}
//////////////////////////////////////////////////////////////////////

4
xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -2488,7 +2488,7 @@ nsBookmarksService::OnStopRequest(nsIChannel* channel, nsISupports *ctxt,
{
changedFlag = PR_TRUE;
}
contentLenStr = contentLengthValue;
contentLenStr.AssignWithConversion(contentLengthValue);
nsCOMPtr<nsIRDFLiteral> newContentLengthLiteral;
if (NS_SUCCEEDED(rv = gRDF->GetLiteral(contentLenStr.GetUnicode(),
getter_AddRefs(newContentLengthLiteral))))
@ -2500,7 +2500,7 @@ nsBookmarksService::OnStopRequest(nsIChannel* channel, nsISupports *ctxt,
}
else
{
contentLenStr = contentLengthValue;
contentLenStr.AssignWithConversion(contentLengthValue);
nsCOMPtr<nsIRDFLiteral> newContentLengthLiteral;
if (NS_SUCCEEDED(rv = gRDF->GetLiteral(contentLenStr.GetUnicode(),
getter_AddRefs(newContentLengthLiteral))))