oox/source/drawingml/fillproperties.cxx | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 0229d1e058c4688abaef59c8932c902457800b8f
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Tue Feb 23 16:41:15 2021 +0300
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Mar 1 13:58:04 2021 +0100
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.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111565
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index bdd81e1d0434..a67f9278b34e 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -764,7 +764,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);
@@ -871,17 +872,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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
