98,6 → 98,7 |
|
void CharStyle::applyCharStyle(const CharStyle & other) |
{ |
other.validate(); |
Style::applyStyle(other); |
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \ |
if (! other.inh_##attr_NAME) \ |
193,9 → 194,9 |
void CharStyle::setStyle(const CharStyle& other) |
{ |
other.validate(); |
setParent(other.parent()); |
setParent(""); |
#define ATTRDEF(attr_TYPE, attr_GETTER, attr_NAME, attr_DEFAULT) \ |
inh_##attr_NAME = other.inh_##attr_NAME; \ |
inh_##attr_NAME = false; \ |
m_##attr_NAME = other.m_##attr_NAME; |
#include "charstyle.attrdefs.cxx" |
#undef ATTRDEF |