Comment 6 for bug 174720

There are two issues.
1. sp_style_read_icolor does not mark the paint as set when it has read a color
2. sp_style_merge_ipaint clears the set mark of the paint, which causes problems on the next invocation
The attached patch should solve both these issues. Please test & commit.