core.git: oox/source

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/fillproperties.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 810b895ec76d374e173a254c98552c3366183af2
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 9 10:14:57 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Dec 9 13:40:01 2024 +0100

    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/+/178132
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index ec2a10da02fe..eaeb0029c415 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -832,7 +832,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 )