diff options
| author | Justin Luth <jluth@mail.com> | 2022-07-28 16:45:41 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2022-07-29 00:08:54 +0200 |
| commit | be39a3d8c1bf9b134839a90e52ccabb2101421f4 (patch) | |
| tree | c688d0bd65140b3c765ff747754ee68c8c626675 /oox | |
| parent | cca8a1935197554a3ae22f448b15800eb12a700d (diff) | |
Revert "tdf#141652 partial revert "Reset ShapeProperty priority..."
This reverts 7.4 commit 18cc1240565e697859dd7d17058f91d5e01df929.
Someone backported it to 7.3 as well.
Change-Id: Ie04595e11dd9d2e15fa940b8ada71714bd434f6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137581
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'oox')
| -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 f7dc16bf231b..fef43b0ca238 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -811,7 +811,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); } } } |