diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-23 16:41:15 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-10 09:12:55 +0100 |
| commit | 47e2c2f428c870de12b7a99c7bcb249a3a3b86ea (patch) | |
| tree | eefb640b4b3a5881927dbde887e172fb3817f30d | |
| parent | fix ScFlatBoolSegmentsImpl delayed setup with threads (tdf#140754) (diff) | |
| download | core-47e2c2f428c870de12b7a99c7bcb249a3a3b86ea.tar.gz core-47e2c2f428c870de12b7a99c7bcb249a3a3b86ea.zip | |
Prevent the unnecessary lclCropGraphic call.
In case text::GraphicCrop aGraphCrop( 0, 0, 0, 0 )
we don't need to call lclCropGraphic.
Change-Id: I9960900f9b5c5b770824c76ffeb9ec9b51cbaef3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111401
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112240
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index a4eedfaa6d63..88be3e9eb0f3 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -773,7 +773,8 @@ 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) + if(bIsCustomShape && + ( aGraphCrop.Left != 0 || aGraphCrop.Right != 0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0)) { xGraphic = lclCropGraphic(xGraphic, aFillRect); rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic); @@ -879,17 +880,17 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe if ( oClipRect.Y2 ) aGraphCrop.Bottom = rtl::math::round( ( static_cast< double >( aOriginalSize.Height ) * oClipRect.Y2 ) / 100000 ); rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop); - } - if(mbIsCustomShape) - { - geometry::IntegerRectangle2D aCropRect = oClipRect; - lclCalculateCropPercentage(xGraphic, aCropRect); - xGraphic = lclCropGraphic(xGraphic, aCropRect); + if(mbIsCustomShape && + ( aGraphCrop.Left != 0 || aGraphCrop.Right != 0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0)) + { + geometry::IntegerRectangle2D aCropRect = oClipRect; + lclCalculateCropPercentage(xGraphic, aCropRect); + xGraphic = lclCropGraphic(xGraphic, aCropRect); - rPropMap.setProperty(PROP_FillBitmap, xGraphic); + rPropMap.setProperty(PROP_FillBitmap, xGraphic); + } } - } if(mbIsCustomShape) |