Remove gratuitous parentheses in a declaration, and allow trailing #comments in MathFont Property Files

git-svn-id: svn://10.0.0.236/trunk@86224 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rbs%maths.uq.edu.au
2001-02-05 13:39:20 +00:00
parent d35493a252
commit 5c82c57502

View File

@@ -262,8 +262,11 @@ nsGlyphTable::ElementAt(nsMathMLChar* aChar, PRUint32 aPosition)
nsAutoString key, value; key.AssignWithConversion(cbuf);
nsresult rv = mGlyphProperties->GetStringProperty(key, value);
if (NS_FAILED(rv)) return 0;
// Chop the trailing # portion if any ...
PRInt32 comment = value.RFindChar('#');
if (comment > 0) value.Truncate(comment);
value.CompressWhitespace();
mGlyphCache.Assign(value);
mGlyphCache.CompressWhitespace();
mCharCache = ch;
}
@@ -556,7 +559,7 @@ StretchyFontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData)
for (PRInt32 i = 0; i < gGlyphTableList->Count(); i++) {
nsGlyphTable* glyphTable = (nsGlyphTable*)gGlyphTableList->ElementAt(i);
if (kNotFound == currList->IndexOf(glyphTable)) { // avoid duplicates
nsAutoString(fontName);
nsAutoString fontName;
glyphTable->GetFontName(fontName);
if (fontName.EqualsIgnoreCase(aFamily) && glyphTable->Has(currChar)) {
currList->AppendElement(glyphTable); // the table is retained