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

Bug 41321. Use PRUnichar* instead of nsString* to store string values for nsCSSValue and nsHTMLValue. r=attinasi.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@71406 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2000-06-02 22:54:35 +00:00
parent 6a5e71f874
commit f39433e11c
14 changed files with 100 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/content/shared/src/nsHTMLValue.cpp
View File

@@ -67,7 +67,7 @@ nsHTMLValue::nsHTMLValue(const nsString& aValue, nsHTMLUnit aUnit)
(eHTMLUnit_ColorName == aUnit), "not a string value");
if ((eHTMLUnit_String == aUnit) ||
(eHTMLUnit_ColorName == aUnit)) {
mValue.mString = aValue.ToNewString();
mValue.mString = aValue.ToNewUnicode();
}
else {
mUnit = eHTMLUnit_Null;
@@ -93,7 +93,7 @@ nsHTMLValue::nsHTMLValue(const nsHTMLValue& aCopy)
{
if ((eHTMLUnit_String == mUnit) || (eHTMLUnit_ColorName == mUnit)) {
if (nsnull != aCopy.mValue.mString) {
mValue.mString = aCopy.mValue.mString->ToNewString();
mValue.mString = nsCRT::strdup(aCopy.mValue.mString);
}
else {
mValue.mString = nsnull;
@@ -125,7 +125,7 @@ nsHTMLValue& nsHTMLValue::operator=(const nsHTMLValue& aCopy)
mUnit = aCopy.mUnit;
if ((eHTMLUnit_String == mUnit) || (eHTMLUnit_ColorName == mUnit)) {
if (nsnull != aCopy.mValue.mString) {
mValue.mString = aCopy.mValue.mString->ToNewString();
mValue.mString = nsCRT::strdup(aCopy.mValue.mString);
}
}
else if (eHTMLUnit_ISupports == mUnit) {
@@ -154,7 +154,7 @@ PRBool nsHTMLValue::operator==(const nsHTMLValue& aOther) const
}
}
else if (nsnull != aOther.mValue.mString) {
return mValue.mString->EqualsIgnoreCase(*(aOther.mValue.mString));
return 0 == nsCRT::strcasecmp(mValue.mString, aOther.mValue.mString);
}
}
else if (eHTMLUnit_ISupports == mUnit) {
@@ -178,7 +178,7 @@ PRUint32 nsHTMLValue::HashValue(void) const
return PRUint32(mUnit) ^
((((eHTMLUnit_String == mUnit) || (eHTMLUnit_ColorName == mUnit)) &&
(nsnull != mValue.mString)) ?
nsCRT::HashValue(mValue.mString->GetUnicode()) :
nsCRT::HashValue(mValue.mString) :
mValue.mInt);
}
@@ -187,7 +187,7 @@ void nsHTMLValue::Reset(void)
{
if ((eHTMLUnit_String == mUnit) || (eHTMLUnit_ColorName == mUnit)) {
if (nsnull != mValue.mString) {
delete mValue.mString;
nsCRT::free(mValue.mString);
}
}
else if (eHTMLUnit_ISupports == mUnit) {
@@ -231,7 +231,7 @@ void nsHTMLValue::SetStringValue(const nsString& aValue, nsHTMLUnit aUnit)
Reset();
if ((eHTMLUnit_String == aUnit) || (eHTMLUnit_ColorName == aUnit)) {
mUnit = aUnit;
mValue.mString = aValue.ToNewString();
mValue.mString = aValue.ToNewUnicode();
}
}
@@ -267,7 +267,7 @@ void nsHTMLValue::AppendToString(nsString& aBuffer) const
else if ((eHTMLUnit_String == mUnit) || (eHTMLUnit_ColorName == mUnit)) {
if (nsnull != mValue.mString) {
aBuffer.AppendWithConversion('"');
aBuffer.Append(*(mValue.mString));
aBuffer.Append(mValue.mString);
aBuffer.AppendWithConversion('"');
}
else {