equal
deleted
inserted
replaced
893 { |
893 { |
894 if (decl.d->parsed.isValid()) { |
894 if (decl.d->parsed.isValid()) { |
895 BorderData data = qvariant_cast<BorderData>(decl.d->parsed); |
895 BorderData data = qvariant_cast<BorderData>(decl.d->parsed); |
896 *width = lengthValueFromData(data.width, f); |
896 *width = lengthValueFromData(data.width, f); |
897 *style = data.style; |
897 *style = data.style; |
898 *color = brushFromData(data.color, pal); |
898 *color = data.color.type != BrushData::Invalid ? brushFromData(data.color, pal) : QBrush(QColor()); |
899 return; |
899 return; |
900 } |
900 } |
901 |
901 |
902 *width = 0; |
902 *width = 0; |
903 *style = BorderStyle_None; |
903 *style = BorderStyle_None; |