diff options
Diffstat (limited to 'sc/source/filter/oox/stylesbuffer.cxx')
| -rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index a6887b7bd103..db86ac8d0659 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1824,11 +1824,14 @@ void Fill::finalizeImport() { if( rModel.mbFillColorUsed && (!rModel.mbPatternUsed || (rModel.mnPattern == XML_solid)) ) { - rModel.maPatternColor = rModel.maFillColor; + if (!rModel.mbPatternUsed) + rModel.maPatternColor = rModel.maFillColor; rModel.mnPattern = XML_solid; rModel.mbPattColorUsed = rModel.mbPatternUsed = true; } - else if( !rModel.mbFillColorUsed && rModel.mbPatternUsed && (rModel.mnPattern == XML_solid) ) + else if( + !rModel.mbFillColorUsed && !rModel.mbPattColorUsed && + rModel.mbPatternUsed && rModel.mnPattern == XML_solid ) { rModel.mbPatternUsed = false; } |