diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-05-22 17:58:57 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-25 14:54:24 +0000 |
| commit | 7cbcb57df49d8b0cc28c28c5a04bcac464b504fb (patch) | |
| tree | 364f65fcd9c4b914e50170d3904c5b8a19108f01 | |
| parent | 25922e2f50b27e47d0953d4a2ac51e9f6673a17a (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/XMLBackgroundImageContext.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index f151e36b6a24..a98d9ee28bd6 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 18749d82f4a5..5acd95109076 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; |