equal
deleted
inserted
replaced
653 dom_prop->setElementPalette(dom); |
653 dom_prop->setElementPalette(dom); |
654 } break; |
654 } break; |
655 case QVariant::Brush: |
655 case QVariant::Brush: |
656 dom_prop->setElementBrush(afb->saveBrush(qvariant_cast<QBrush>(v))); |
656 dom_prop->setElementBrush(afb->saveBrush(qvariant_cast<QBrush>(v))); |
657 break; |
657 break; |
658 default: |
658 default: { |
|
659 const bool hadAttributeStdset = dom_prop->hasAttributeStdset(); |
|
660 const bool attributeStdset = dom_prop->attributeStdset(); |
659 delete dom_prop; |
661 delete dom_prop; |
660 if (afb->resourceBuilder()->isResourceType(v)) { |
662 if (afb->resourceBuilder()->isResourceType(v)) { |
661 dom_prop = afb->resourceBuilder()->saveResource(afb->workingDirectory(), v); |
663 dom_prop = afb->resourceBuilder()->saveResource(afb->workingDirectory(), v); |
662 if (dom_prop) |
664 if (dom_prop) { |
663 dom_prop->setAttributeName(pname); |
665 dom_prop->setAttributeName(pname); |
|
666 if (hadAttributeStdset) |
|
667 dom_prop->setAttributeStdset(attributeStdset); |
|
668 } |
664 break; |
669 break; |
665 } |
670 } |
666 uiLibWarning(msgCannotWriteProperty(pname, v)); |
671 uiLibWarning(msgCannotWriteProperty(pname, v)); |
667 return 0; |
672 } return 0; |
668 } |
673 } |
669 return dom_prop; |
674 return dom_prop; |
670 } |
675 } |
671 |
676 |
672 #ifdef QFORMINTERNAL_NAMESPACE |
677 #ifdef QFORMINTERNAL_NAMESPACE |