[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Michael Stahl]

 sw/source/core/unocore/unoframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d8263317d1812fabf139c5ffa2bf8b17aa612b3e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 21 00:15:55 2015 +0200

    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 at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 1bcdc23..a418203 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.