summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2024-12-09 10:14:57 +0000
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2024-12-10 17:00:20 +0100
commit6046c3a9e9ebc0c85183666416068076a2307d92 (patch)
treeed5a69192aa4a39160c8ce7682d534355c5f6da2
parent12fa60087cb847596988515df22ba8281c166ebe (diff)
crashtesting: reimport of fdo61125-1.docx has negative image width
we probably shouldn't do that anyway, but the assumption at this import check appears to be for >= 0 Change-Id: Ibf98b1b0802a15bc283b3d1e3db7e4e8163837dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178134 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 0e5ad67de1516e3553cf787107316ddbdbeefc69) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178187 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--oox/source/drawingml/fillproperties.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 061cab065849..d8337632d6d7 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -833,7 +833,7 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe
{
geometry::IntegerRectangle2D oClipRect( maBlipProps.moClipRect.value() );
awt::Size aOriginalSize( rGraphicHelper.getOriginalSize( xGraphic ) );
- if ( aOriginalSize.Width && aOriginalSize.Height )
+ if (aOriginalSize.Width > 0 && aOriginalSize.Height > 0)
{
text::GraphicCrop aGraphCrop( 0, 0, 0, 0 );
if ( oClipRect.X1 )