diff options
| author | Justin Luth <jluth@mail.com> | 2022-07-28 16:45:41 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-08-04 19:20:34 +0200 |
| commit | bbf9b48f5231d75e8c84bd113773682aa14379fb (patch) | |
| tree | e369296afbd8131767856af42e18fdd46f0baf82 /oox/source | |
| parent | 65c9075fcbf0f661cd2b7777c6f78f34b904a45f (diff) | |
Revert "tdf#141652 partial revert "Reset ShapeProperty priority..."
This reverts 7.4 commit 18cc1240565e697859dd7d17058f91d5e01df929.
Someone backported it to 7.3 as well.
Reverting fixes regression report tdf#150061.
Change-Id: Ie04595e11dd9d2e15fa940b8ada71714bd434f6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137581
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
(cherry picked from commit 84b719e41c3a5f1e3dba112508721d69c1b3185e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137530
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit aaf6070682dd99bed9e172a6f27a9801237b9c3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137532
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index a678524035b9..0ef86bc75f5c 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -805,7 +805,10 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, if(bIsCustomShape && bHasCropValues && bNeedCrop) { xGraphic = lclCropGraphic(xGraphic, CropQuotientsFromFillRect(aFillRect)); - rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); + if (rPropMap.supportsProperty(ShapeProperty::FillBitmapName)) + rPropMap.setProperty(ShapeProperty::FillBitmapName, xGraphic); + else + rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); } } } |