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

[Michael Stahl]

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

New commits:
commit 25922e2f50b27e47d0953d4a2ac51e9f6673a17a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 22 17:59:55 2015 +0200

    tdf#90946: sw: ODF import: ignore invalid gradient-name if style SOLID
    
    The bugdoc has a fill-gradient-name that refers to a non-existent
    gradient and also draw:fill="solid"; handle this combination without
    exception.
    
    Change-Id: I2c912b28a6b1550e2e4c6c71ff8889ae1779c618
    (cherry picked from commit 00eab70295cbce40368d57224c3f51c6e5f2457e)
    Reviewed-on: https://gerrit.libreoffice.org/15866
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 7168777..f151e36 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -392,7 +392,17 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
                     throw lang::IllegalArgumentException();
                 }
 
-                bRet &= SvxShape::SetFillAttribute(XATTR_FILLGRADIENT, aTempName, rToSet);
+                bool const bSuccess = SvxShape::SetFillAttribute(
+                                        XATTR_FILLGRADIENT, aTempName, rToSet);
+                if (aXFillStyleItem.GetValue() == drawing::FillStyle_GRADIENT)
+                {   // tdf#90946 ignore invalid gradient-name if SOLID
+                    bRet &= bSuccess;
+                }
+                else
+                {
+                    SAL_INFO_IF(!bSuccess, "sw.uno",
+                       "FillBaseProperties: ignoring invalid FillGradientName");
+                }
             }
         }