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

New commits:
commit 6046c3a9e9ebc0c85183666416068076a2307d92
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 9 10:14:57 2024 +0000
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Dec 10 17:00:20 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/+/178134
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Jenkins
    (cherry picked from commit 0e5ad67de1516e3553cf787107316ddbdbeefc69)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178187
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

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 )

Reply via email to