diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-04-21 00:15:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-04-21 00:33:59 +0200 |
| commit | 3670e3c0c1bfcea9dc50fefb20b67a828b1e35bb (patch) | |
| tree | 284553abeb72778159cb78d5aad8ca777e1c83ec /sw | |
| parent | 09f0919f9a1686f6c1492777307e77f841294192 (diff) | |
sw: ODF import: frame background: do not override gradient transparency
... with style:background-transparency
(regression from 102bb87ca1a5dee3a09442bf503a54bb703c79ea)
Change-Id: Icead7a47c145eace51249896b6e05d65dfaa2f78
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 2ea6eae00bda..cbb6b94659ff 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -455,7 +455,8 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI aXFillTransparenceItem.PutValue(*pXFillTransparenceItem); rToSet.Put(aXFillTransparenceItem); } - else if (pColTrans) + else if (pColTrans && + !pXFillFloatTransparenceItem && !pXFillFloatTransparenceNameItem) { // No fill transparency is given. On the other hand, we have a // BackColorTransparency, so use that. |