Bug 53627. Use nsAutoString to get around bug with nsPromiseFlatString; don't clobber positive result in IsVarInSet(). r=rjc, sr=hyatt
git-svn-id: svn://10.0.0.236/trunk@80739 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
bc109ed5db
commit
9b0e6c9771
@ -5166,7 +5166,7 @@ nsXULTemplateBuilder::IsVarInSet(nsXULTemplateBuilder* aThis,
|
||||
// See if this was one of the variables that was modified. If it
|
||||
// *was*, then this attribute *will* be impacted by the modified
|
||||
// variable set...
|
||||
c->result = c->modifiedVars.Contains(var);
|
||||
c->result = c->result || c->modifiedVars.Contains(var);
|
||||
}
|
||||
|
||||
PRBool
|
||||
@ -7491,7 +7491,7 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
|
||||
const nsAReadableString& propertyStr = Substring(aVariable, PRUint32(4), aVariable.Length() - 4);
|
||||
|
||||
nsCOMPtr<nsIRDFResource> property;
|
||||
gRDFService->GetUnicodeResource(nsPromiseFlatString(propertyStr), getter_AddRefs(property));
|
||||
gRDFService->GetUnicodeResource(nsAutoString(propertyStr).GetUnicode(), getter_AddRefs(property));
|
||||
|
||||
// Create a new variable that we'll binding to the
|
||||
// property's value
|
||||
|
||||
@ -5166,7 +5166,7 @@ nsXULTemplateBuilder::IsVarInSet(nsXULTemplateBuilder* aThis,
|
||||
// See if this was one of the variables that was modified. If it
|
||||
// *was*, then this attribute *will* be impacted by the modified
|
||||
// variable set...
|
||||
c->result = c->modifiedVars.Contains(var);
|
||||
c->result = c->result || c->modifiedVars.Contains(var);
|
||||
}
|
||||
|
||||
PRBool
|
||||
@ -7491,7 +7491,7 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
|
||||
const nsAReadableString& propertyStr = Substring(aVariable, PRUint32(4), aVariable.Length() - 4);
|
||||
|
||||
nsCOMPtr<nsIRDFResource> property;
|
||||
gRDFService->GetUnicodeResource(nsPromiseFlatString(propertyStr), getter_AddRefs(property));
|
||||
gRDFService->GetUnicodeResource(nsAutoString(propertyStr).GetUnicode(), getter_AddRefs(property));
|
||||
|
||||
// Create a new variable that we'll binding to the
|
||||
// property's value
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user