fixing code that relied on implicit string construction
git-svn-id: svn://10.0.0.236/trunk@76718 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -935,7 +935,7 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM
|
||||
* @param
|
||||
* @return nsresult
|
||||
*/
|
||||
CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(aKey) {
|
||||
CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(nsAutoString(aKey)) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -812,8 +812,8 @@ int nsExpatTokenizer::HandleExternalEntityRef(XML_Parser parser,
|
||||
#ifdef XML_DTD
|
||||
// Load the external entity into a buffer
|
||||
nsCOMPtr<nsIInputStream> in = nsnull;
|
||||
nsAutoString urlSpec = (const PRUnichar*) systemId;
|
||||
nsAutoString baseURL = (const PRUnichar*) base;
|
||||
nsAutoString urlSpec( (const PRUnichar*) systemId );
|
||||
nsAutoString baseURL( (const PRUnichar*) base );
|
||||
nsAutoString absURL;
|
||||
|
||||
nsresult rv = OpenInputStream(urlSpec, baseURL, getter_AddRefs(in), &absURL);
|
||||
|
||||
@@ -1486,7 +1486,7 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
||||
// Note that we are in whitespace.
|
||||
mInWhitespace = PR_TRUE;
|
||||
if(!mCacheLine) {
|
||||
nsAutoString whitestring=aString[nextpos];
|
||||
nsAutoString whitestring(aString[nextpos]);
|
||||
WriteSimple(whitestring);
|
||||
} else {
|
||||
offsetIntoBuffer = aString.GetUnicode();
|
||||
|
||||
@@ -240,7 +240,7 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale)
|
||||
else {
|
||||
res = locale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar);
|
||||
if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) {
|
||||
if (mLocale.Length() && mLocale.EqualsIgnoreCase(aLocaleUnichar)) {
|
||||
if (mLocale.Length() && mLocale.EqualsIgnoreCase(nsAutoString(aLocaleUnichar))) {
|
||||
nsMemory::Free(aLocaleUnichar);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -183,7 +183,7 @@ nsStringBundle::FormatStringFromName(const PRUnichar *aName,
|
||||
{
|
||||
nsresult rv;
|
||||
nsAutoString formatStr;
|
||||
rv = GetStringFromName(aName, formatStr);
|
||||
rv = GetStringFromName(nsAutoString(aName), formatStr);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
return FormatString(formatStr.GetUnicode(), aParams, aLength, aResult);
|
||||
|
||||
@@ -935,7 +935,7 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM
|
||||
* @param
|
||||
* @return nsresult
|
||||
*/
|
||||
CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(aKey) {
|
||||
CRTFContent::CRTFContent(PRUnichar* aKey) : CToken(nsAutoString(aKey)) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -812,8 +812,8 @@ int nsExpatTokenizer::HandleExternalEntityRef(XML_Parser parser,
|
||||
#ifdef XML_DTD
|
||||
// Load the external entity into a buffer
|
||||
nsCOMPtr<nsIInputStream> in = nsnull;
|
||||
nsAutoString urlSpec = (const PRUnichar*) systemId;
|
||||
nsAutoString baseURL = (const PRUnichar*) base;
|
||||
nsAutoString urlSpec( (const PRUnichar*) systemId );
|
||||
nsAutoString baseURL( (const PRUnichar*) base );
|
||||
nsAutoString absURL;
|
||||
|
||||
nsresult rv = OpenInputStream(urlSpec, baseURL, getter_AddRefs(in), &absURL);
|
||||
|
||||
@@ -1486,7 +1486,7 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
||||
// Note that we are in whitespace.
|
||||
mInWhitespace = PR_TRUE;
|
||||
if(!mCacheLine) {
|
||||
nsAutoString whitestring=aString[nextpos];
|
||||
nsAutoString whitestring(aString[nextpos]);
|
||||
WriteSimple(whitestring);
|
||||
} else {
|
||||
offsetIntoBuffer = aString.GetUnicode();
|
||||
|
||||
Reference in New Issue
Block a user