236,6 → 236,8 |
lists.collectStyle(sty->name()); |
charStyle().getNamedResources(lists); |
|
lists.collectColor(backgroundColor()); |
|
QString parEffectStyle = peCharStyleName(); |
if (parEffectStyle.length() > 0) |
{ |
249,7 → 251,7 |
|
void ParagraphStyle::replaceNamedResources(ResourceCollection& newNames) |
{ |
QMap<QString,QString>::ConstIterator it; |
QMap<QString, QString>::ConstIterator it; |
|
if (hasParent() && (it = (newNames.styles().find(parent()))) != newNames.styles().end()) |
{ |
256,6 → 258,10 |
setParent(it.value()); |
repairImplicitCharStyleInheritance(); |
} |
|
if (!inh_BackgroundColor && (it = newNames.colors().find(backgroundColor())) != newNames.colors().end()) |
setBackgroundColor(it.value()); |
|
if ((it = (newNames.charStyles().find(peCharStyleName()))) != newNames.charStyles().end()) |
setPeCharStyleName(it.value()); |
m_cstyle.replaceNamedResources(newNames); |