diff options
| author | Justin Luth <justin_luth@sil.org> | 2022-01-10 20:42:17 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-02-01 13:31:33 +0100 |
| commit | 18cc1240565e697859dd7d17058f91d5e01df929 (patch) | |
| tree | d0e60e39cdbbc751becc52f88dc0f838f3bdd90d /oox | |
| parent | 8e4624b9b9fa1322592b73fe0dd6cb03be6fd57f (diff) | |
tdf#141652 partial revert "Reset ShapeProperty priority...
... and handle only crop case."
This reverts a portion of a tdf#134210 related, LO 7.2/7.1.2ish
commit b90a67838e189f3aee6a50724c78c0a50d416970
that was introduced for no apparent reason.
I have no understanding about shapes, and so
I have no idea why setting FillBitmap to an xGraphic
is different from setting it to a name, but it makes
a huge difference on the image size,
and the crop values aren't scaled to the reduced size.
Since this section of code looks like a cut/paste
relic of early stages of developing the fix,
lets just revert this portion since the original
author has made no response at all to the regression report.
Change-Id: I9488c419ceb41bd4ebd7b10494a52fb816654832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128260
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, 1 insertions, 4 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 6a60a685c84f..480bbe641737 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -789,10 +789,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, if(bIsCustomShape && bHasCropValues && bNeedCrop) { xGraphic = lclCropGraphic(xGraphic, aFillRect); - if (rPropMap.supportsProperty(ShapeProperty::FillBitmapName)) - rPropMap.setProperty(ShapeProperty::FillBitmapName, xGraphic); - else - rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); + rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); } } } |