diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-04-21 00:15:55 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-04-22 04:08:26 +0000 |
| commit | b2914050c0e2b3843f1067560a5de7dd8c76dd72 (patch) | |
| tree | 7df6bd540d268fec52141275c47575698fa4e8f5 | |
| parent | 1636879e50b3fbeba4b2742f9841adb1df48ba88 (diff) | |
sw: ODF import: frame background: do not override gradient transparency
... with style:background-transparency
(regression from 102bb87ca1a5dee3a09442bf503a54bb703c79ea)
Change-Id: Icead7a47c145eace51249896b6e05d65dfaa2f78
(cherry picked from commit 3670e3c0c1bfcea9dc50fefb20b67a828b1e35bb)
Reviewed-on: https://gerrit.libreoffice.org/15464
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit d8263317d1812fabf139c5ffa2bf8b17aa612b3e)
Reviewed-on: https://gerrit.libreoffice.org/15469
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -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 7cd950ef64ac..63fa7dfb9ac7 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. |