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

[Michael Stahl]

 sw/source/core/unocore/unoframe.cxx               |    2 ++
 xmloff/source/style/XMLBackgroundImageContext.cxx |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7cbcb57df49d8b0cc28c28c5a04bcac464b504fb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 22 17:58:57 2015 +0200

    tdf#91140: tweak fix a bit, turns out xmloff was also passing empty URL
    
    Change-Id: Ia6e1fbe18e72c9c06915e1b437076a1f56a6c206
    (cherry picked from commit 12f907da9535ae9fb28fb7ef1b05240eabf51e82)
    Reviewed-on: https://gerrit.libreoffice.org/15867
    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 f151e36..a98d9ee 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -259,6 +259,8 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
     const bool bFillStyleUsed(pXFillStyleItem && pXFillStyleItem->hasValue() &&
         (pXFillStyleItem->get<drawing::FillStyle>() != drawing::FillStyle_SOLID
          || !pGrURL));
+    SAL_INFO_IF(pXFillStyleItem && pXFillStyleItem->hasValue() && !bFillStyleUsed,
+            "sw.uno", "FillBaseProperties: ignoring invalid FillStyle");
     const bool bXFillStyleItemUsed(
         bFillStyleUsed ||
         pXFillColorItem ||
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 18749d82..5acd951 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -389,7 +389,8 @@ void XMLBackgroundImageContext::EndElement()
     else if( GraphicLocation_NONE == ePos )
         ePos = GraphicLocation_TILED;
 
-    aProp.maValue <<= sURL;
+    if (!sURL.isEmpty())
+        aProp.maValue <<= sURL;
     aPosProp.maValue <<= ePos;
     aFilterProp.maValue <<= sFilter;
     aTransparencyProp.maValue <<= nTransparency;