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

[Michael Stahl]

 sw/qa/extras/odfimport/odfimport.cxx |    2 +-
 sw/source/core/unocore/unoframe.cxx  |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit fad75997e6060c63e6d79327573dd51950da1acb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 15 18:09:37 2015 +0200

    tdf#91140: ODF import: try to ignore invalid draw:fill="solid"
    
    ... which was apparently written by LO >= 4.1 on a frame with image
    background, under unknown circumstances.
    
    Change-Id: Ie86643ab67f58bfe5c19d6a1f80a7af8f793edf2
    (cherry picked from commit 97887cd810194ee556d2ec12f2a8be40075c29d2)
    Reviewed-on: https://gerrit.libreoffice.org/15743
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 5db4370..1dfef14 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -562,7 +562,7 @@ DECLARE_ODFIMPORT_TEST(fdo81223, "fdo81223.odt")
     uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
     sal_Int32 nValue(0);
     xFrame->getPropertyValue("BackColor") >>= nValue;
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xfeffffff), nValue);
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffffff), nValue);
 }
 
 DECLARE_ODFIMPORT_TEST(fdo90130_1, "fdo90130-1.odt")
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a418203..7168777 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -254,8 +254,13 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     const uno::Any* pXFillBackgroundItem = 0; GetProperty(XATTR_FILLBACKGROUND, 0, pXFillBackgroundItem);
     const uno::Any* pOwnAttrFillBmpItem = 0; GetProperty(OWN_ATTR_FILLBMP_MODE, 0, pOwnAttrFillBmpItem);
 
+    // tdf#91140: ignore SOLID fill style for determining if fill style is used
+    // but there is a GraphicURL
+    const bool bFillStyleUsed(pXFillStyleItem && pXFillStyleItem->hasValue() &&
+        (pXFillStyleItem->get<drawing::FillStyle>() != drawing::FillStyle_SOLID
+         || !pGrURL));
     const bool bXFillStyleItemUsed(
-        pXFillStyleItem ||
+        bFillStyleUsed ||
         pXFillColorItem ||
         pXFillGradientItem || pXFillGradientNameItem ||
         pXFillHatchItem || pXFillHatchNameItem ||