From 373e8e75c74ecbf40b47dce84d84cd8f4bf7671a Mon Sep 17 00:00:00 2001 From: Sergey Luzyanin Date: Mon, 25 Nov 2024 19:01:25 +0300 Subject: [PATCH] fix reset crop --- common/Drawings/CommonController.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/common/Drawings/CommonController.js b/common/Drawings/CommonController.js index dbfd99230c..32dec8867c 100644 --- a/common/Drawings/CommonController.js +++ b/common/Drawings/CommonController.js @@ -3972,12 +3972,26 @@ } if (props.resetCrop) { for (i = 0; i < objects_by_type.images.length; ++i) { - if (objects_by_type.images[i].blipFill) { - var oBlipFill = objects_by_type.images[i].blipFill.createDuplicate(); - oBlipFill.tile = null; - oBlipFill.stretch = true; - oBlipFill.srcRect = null; - objects_by_type.images[i].setBlipFill(oBlipFill); + let oImg = objects_by_type.images[i]; + let oBlipFill = oImg.blipFill; + if (oBlipFill) { + let oBlipFillCopy = oBlipFill.createDuplicate(); + oBlipFillCopy.tile = null; + oBlipFillCopy.stretch = true; + oBlipFillCopy.srcRect = null; + oImg.setBlipFill(oBlipFillCopy); + + let oImgPr = new Asc.asc_CImgProperty(); + oImgPr.ImageUrl = oBlipFill.RasterImageId; + let oSize = oImgPr.asc_getOriginSize(Asc.editor); + if(oSize.asc_getIsCorrect()) { + oImgPr.Width = oSize.asc_getImageWidth(); + oImgPr.Height = oSize.asc_getImageHeight(); + fApplyDrawingSize(oImg, oImgPr); + if(oImg.parent && oImg.parent.CheckWH) { + oImg.parent.CheckWH(); + } + } } }