зеркало из https://github.com/mozilla/gecko-dev.git
Fixing bug 70014. Making td.chOff use the correct atom when looking up the attribute 'charoff'. r=heikki@netscape.com, sr=vidur@netscape.com
This commit is contained in:
Родитель
1ba483bdea
Коммит
291a81bdbd
|
@ -84,7 +84,6 @@ HTML_ATOM(_char, "char")
|
|||
HTML_ATOM(charoff, "charoff")
|
||||
HTML_ATOM(charset, "charset")
|
||||
HTML_ATOM(checked, "checked")
|
||||
HTML_ATOM(choff, "choff")
|
||||
HTML_ATOM(cite, "cite")
|
||||
HTML_ATOM(kClass, "class")
|
||||
HTML_ATOM(classid, "classid")
|
||||
|
|
|
@ -84,7 +84,6 @@ HTML_ATOM(_char, "char")
|
|||
HTML_ATOM(charoff, "charoff")
|
||||
HTML_ATOM(charset, "charset")
|
||||
HTML_ATOM(checked, "checked")
|
||||
HTML_ATOM(choff, "choff")
|
||||
HTML_ATOM(cite, "cite")
|
||||
HTML_ATOM(kClass, "class")
|
||||
HTML_ATOM(classid, "classid")
|
||||
|
|
|
@ -329,7 +329,7 @@ NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, Align, align)
|
|||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, Axis, axis)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, BgColor, bgcolor)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, Ch, ch)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, ChOff, choff)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, ChOff, charoff)
|
||||
NS_IMPL_INT_ATTR(nsHTMLTableCellElement, ColSpan, colspan)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, Headers, headers)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableCellElement, Height, height)
|
||||
|
@ -358,7 +358,7 @@ nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
|
|||
/* ignore these attributes, stored simply as strings
|
||||
abbr, axis, ch, headers
|
||||
*/
|
||||
if (aAttribute == nsHTMLAtoms::choff) {
|
||||
if (aAttribute == nsHTMLAtoms::charoff) {
|
||||
/* attributes that resolve to integers with a min of 0 */
|
||||
|
||||
if (ParseValue(aValue, 0, aResult, eHTMLUnit_Integer)) {
|
||||
|
@ -427,7 +427,7 @@ nsHTMLTableCellElement::AttributeToString(nsIAtom* aAttribute,
|
|||
abbr, axis, ch, headers
|
||||
*/
|
||||
/* ignore attributes that are of standard types
|
||||
choff, colspan, rowspan, height, width, nowrap, background, bgcolor
|
||||
charoff, colspan, rowspan, height, width, nowrap, background, bgcolor
|
||||
*/
|
||||
if (aAttribute == nsHTMLAtoms::align) {
|
||||
if (TableCellHAlignValueToString(aValue, aResult)) {
|
||||
|
|
|
@ -162,7 +162,7 @@ nsHTMLTableColElement::StringToAttribute(nsIAtom* aAttribute,
|
|||
{
|
||||
/* ignore these attributes, stored simply as strings ch */
|
||||
/* attributes that resolve to integers */
|
||||
if (aAttribute == nsHTMLAtoms::choff) {
|
||||
if (aAttribute == nsHTMLAtoms::charoff) {
|
||||
if (ParseValue(aValue, 0, aResult, eHTMLUnit_Integer)) {
|
||||
return NS_CONTENT_ATTR_HAS_VALUE;
|
||||
}
|
||||
|
@ -204,7 +204,7 @@ nsHTMLTableColElement::AttributeToString(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* ignore attributes that are of standard types
|
||||
choff, span
|
||||
charoff, span
|
||||
*/
|
||||
if (aAttribute == nsHTMLAtoms::align) {
|
||||
if (TableCellHAlignValueToString(aValue, aResult)) {
|
||||
|
|
|
@ -144,7 +144,7 @@ nsHTMLTableColGroupElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
|
|||
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableColGroupElement, Align, align)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableColGroupElement, Ch, ch)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableColGroupElement, ChOff, choff)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableColGroupElement, ChOff, charoff)
|
||||
NS_IMPL_INT_ATTR(nsHTMLTableColGroupElement, Span, span)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableColGroupElement, VAlign, valign)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableColGroupElement, Width, width)
|
||||
|
@ -159,7 +159,7 @@ nsHTMLTableColGroupElement::StringToAttribute(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* attributes that resolve to integers */
|
||||
if (aAttribute == nsHTMLAtoms::choff) {
|
||||
if (aAttribute == nsHTMLAtoms::charoff) {
|
||||
if (ParseValue(aValue, 0, aResult, eHTMLUnit_Integer)) {
|
||||
return NS_CONTENT_ATTR_HAS_VALUE;
|
||||
}
|
||||
|
@ -201,7 +201,7 @@ nsHTMLTableColGroupElement::AttributeToString(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* ignore attributes that are of standard types
|
||||
choff, repeat
|
||||
charoff, repeat
|
||||
*/
|
||||
if (aAttribute == nsHTMLAtoms::align) {
|
||||
if (TableCellHAlignValueToString(aValue, aResult)) {
|
||||
|
|
|
@ -647,7 +647,7 @@ nsHTMLTableRowElement::DeleteCell(PRInt32 aValue)
|
|||
NS_IMPL_STRING_ATTR(nsHTMLTableRowElement, Align, align)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableRowElement, BgColor, bgcolor)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableRowElement, Ch, ch)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableRowElement, ChOff, choff)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableRowElement, ChOff, charoff)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableRowElement, VAlign, valign)
|
||||
|
||||
|
||||
|
@ -660,7 +660,7 @@ nsHTMLTableRowElement::StringToAttribute(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* attributes that resolve to integers with default=0*/
|
||||
if (aAttribute == nsHTMLAtoms::choff) {
|
||||
if (aAttribute == nsHTMLAtoms::charoff) {
|
||||
if (ParseValue(aValue, 0, aResult, eHTMLUnit_Integer)) {
|
||||
return NS_CONTENT_ATTR_HAS_VALUE;
|
||||
}
|
||||
|
@ -709,7 +709,7 @@ nsHTMLTableRowElement::AttributeToString(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* ignore attributes that are of standard types
|
||||
choff, height, width, background, bgcolor
|
||||
charoff, height, width, background, bgcolor
|
||||
*/
|
||||
if (aAttribute == nsHTMLAtoms::align) {
|
||||
if (TableCellHAlignValueToString(aValue, aResult)) {
|
||||
|
|
|
@ -155,7 +155,7 @@ nsHTMLTableSectionElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
|
|||
NS_IMPL_STRING_ATTR(nsHTMLTableSectionElement, Align, align)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableSectionElement, VAlign, valign)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableSectionElement, Ch, ch)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableSectionElement, ChOff, choff)
|
||||
NS_IMPL_STRING_ATTR(nsHTMLTableSectionElement, ChOff, charoff)
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
@ -255,7 +255,7 @@ nsHTMLTableSectionElement::StringToAttribute(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* attributes that resolve to integers */
|
||||
if (aAttribute == nsHTMLAtoms::choff) {
|
||||
if (aAttribute == nsHTMLAtoms::charoff) {
|
||||
if (ParseValue(aValue, 0, aResult, eHTMLUnit_Integer)) {
|
||||
return NS_CONTENT_ATTR_HAS_VALUE;
|
||||
}
|
||||
|
@ -297,7 +297,7 @@ nsHTMLTableSectionElement::AttributeToString(nsIAtom* aAttribute,
|
|||
ch
|
||||
*/
|
||||
/* ignore attributes that are of standard types
|
||||
choff, height, width, background, bgcolor
|
||||
charoff, height, width, background, bgcolor
|
||||
*/
|
||||
if (aAttribute == nsHTMLAtoms::align) {
|
||||
if (TableCellHAlignValueToString(aValue, aResult)) {
|
||||
|
|
|
@ -84,7 +84,6 @@ HTML_ATOM(_char, "char")
|
|||
HTML_ATOM(charoff, "charoff")
|
||||
HTML_ATOM(charset, "charset")
|
||||
HTML_ATOM(checked, "checked")
|
||||
HTML_ATOM(choff, "choff")
|
||||
HTML_ATOM(cite, "cite")
|
||||
HTML_ATOM(kClass, "class")
|
||||
HTML_ATOM(classid, "classid")
|
||||
|
|
|
@ -84,7 +84,6 @@ HTML_ATOM(_char, "char")
|
|||
HTML_ATOM(charoff, "charoff")
|
||||
HTML_ATOM(charset, "charset")
|
||||
HTML_ATOM(checked, "checked")
|
||||
HTML_ATOM(choff, "choff")
|
||||
HTML_ATOM(cite, "cite")
|
||||
HTML_ATOM(kClass, "class")
|
||||
HTML_ATOM(classid, "classid")
|
||||
|
|
Загрузка…
Ссылка в новой задаче