diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-04-14 16:25:42 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-16 23:06:58 +0200 |
| commit | fa4fb5b45b72ff66659606040ce3ad89609d526f (patch) | |
| tree | c4274d8aadddae810a0366e08511864ae3ebd9e9 /svx | |
| parent | 90357315c1a5f2d6051351b4bac47dfb8ac8385c (diff) | |
tdf#89478: svx: ODF import: SvxBrushItem Graphics should override Color
The bugdoc has:
<style:page-layout-properties fo:background-color="#007f7f" >
<style:background-image
xlink:href="Pictures/2000003900002FA3000055F455EC9F63.svm"/>
</style:page-layout-properties>
In this case it's clearly better to prefer the Graphics.
The old code could actually store both in the model but the UI only
allows setting either Color or Graphic, so this should be good enough.
(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: Id33231ad90815d9791f90289fb0b55455d334c14
(cherry picked from commit b82791e3c586d6e4247d0eb1bb94681bcb113762)
Reviewed-on: https://gerrit.libreoffice.org/15307
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unobrushitemhelper.cxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index 4a2ec1d3c0c8..d10aab649ee0 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -50,19 +50,8 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI const sal_uInt8 nTransparency(rBrush.GetColor().GetTransparency()); - if(0xff != nTransparency) - { - // we have a color fill - const Color aColor(rBrush.GetColor().GetRGBColor()); - - rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); - rToSet.Put(XFillColorItem(OUString(), aColor)); - - // #125189# nTransparency is in range [0..254], convert to [0..100] which is used in - // XFillTransparenceItem (caution with the range which is in an *item-specific* range) - rToSet.Put(XFillTransparenceItem((((sal_Int32)nTransparency * 100) + 127) / 254)); - } - else if(GPOS_NONE != rBrush.GetGraphicPos()) + // tdf#89478 check for image first + if (GPOS_NONE != rBrush.GetGraphicPos()) { // we have a graphic fill, set fill style rToSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); @@ -131,6 +120,18 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI rToSet.Put(XFillTransparenceItem(nGraphicTransparency)); } } + else if (0xff != nTransparency) + { + // we have a color fill + const Color aColor(rBrush.GetColor().GetRGBColor()); + + rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); + rToSet.Put(XFillColorItem(OUString(), aColor)); + + // #125189# nTransparency is in range [0..254], convert to [0..100] which is used in + // XFillTransparenceItem (caution with the range which is in an *item-specific* range) + rToSet.Put(XFillTransparenceItem((((sal_Int32)nTransparency * 100) + 127) / 254)); + } else { // GPOS_NONE == rBrush.GetGraphicPos() && 0xff == rBrush.GetColor().GetTransparency(), |