diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-24 15:05:01 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2021-03-10 11:23:57 +0100 |
| commit | 40367b978e4a4ce59a1759248e599af7aecc5ba0 (patch) | |
| tree | 2e939adf92b277d2be7f9412b130529fdfbf8eb6 /oox | |
| parent | fdc5471a8ad8c5a3839dfaf89ca8743dc285870d (diff) | |
Reset ShapeProperty priority and handle only crop case.
With 2c96bd26ec488d865370fe9d394e7c4e228e05ab we changed the
ShapeProperty priority uncessarily. Reset the priority
as use FillBitmapName if supported.
BlipFillProperties::moFillRect negative GraphicCrop values means
stretched. BlipFillProperties::moClipRect positive GraphicCrop
values means stretched. We add a control to handle only stretched
cases.
Change-Id: I2eb1233d0477acf093ada36b4cc29ff34f767037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111479
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112236
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index a67f9278b34e..213eaae10584 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -117,6 +117,8 @@ void lclCalculateCropPercentage(uno::Reference<graphic::XGraphic> const & xGraph aFillRect.Y2 = -nBottomPercentage; } +// Crops a piece of the bitmap. Takes negative aFillRect values. Negative values means "crop", +// positive values means "grow" bitmap with empty spaces. lclCropGraphic doesn't handle growing. Reference< XGraphic > lclCropGraphic(uno::Reference<graphic::XGraphic> const & xGraphic, geometry::IntegerRectangle2D aFillRect) { ::Graphic aGraphic(xGraphic); @@ -764,11 +766,17 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, aGraphCrop.Bottom = static_cast< sal_Int32 >( ( static_cast< double >( aOriginalSize.Height ) * aFillRect.Y2 ) / 100000 ); rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop); - if(bIsCustomShape && - ( aGraphCrop.Left != 0 || aGraphCrop.Right != 0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0)) + bool bHasCropValues = aGraphCrop.Left != 0 || aGraphCrop.Right !=0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0; + // Negative GraphicCrop values means "crop" here. + bool bNeedCrop = aGraphCrop.Left <= 0 && aGraphCrop.Right <= 0 && aGraphCrop.Top <= 0 && aGraphCrop.Bottom <= 0; + + if(bIsCustomShape && bHasCropValues && bNeedCrop) { xGraphic = lclCropGraphic(xGraphic, aFillRect); - rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); + if (rPropMap.supportsProperty(ShapeProperty::FillBitmapName)) + rPropMap.setProperty(ShapeProperty::FillBitmapName, xGraphic); + else + rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); } } } @@ -873,14 +881,15 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe aGraphCrop.Bottom = rtl::math::round( ( static_cast< double >( aOriginalSize.Height ) * oClipRect.Y2 ) / 100000 ); rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop); - if(mbIsCustomShape && - ( aGraphCrop.Left != 0 || aGraphCrop.Right != 0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0)) + bool bHasCropValues = aGraphCrop.Left != 0 || aGraphCrop.Right !=0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0; + // Positive GraphicCrop values means "crop" here. + bool bNeedCrop = aGraphCrop.Left >= 0 && aGraphCrop.Right >= 0 && aGraphCrop.Top >= 0 && aGraphCrop.Bottom >= 0; + + if(mbIsCustomShape && bHasCropValues && bNeedCrop) { geometry::IntegerRectangle2D aCropRect = oClipRect; lclCalculateCropPercentage(xGraphic, aCropRect); xGraphic = lclCropGraphic(xGraphic, aCropRect); - - rPropMap.setProperty(PROP_FillBitmap, xGraphic); } } } |