From 23acfa6e795c58b9bc7d77c19aeb8c7fb58e1d0e Mon Sep 17 00:00:00 2001 From: Nikita Khromov Date: Tue, 26 Nov 2024 12:43:27 +0700 Subject: [PATCH] Fix bug #71812 --- pdf/src/document.js | 13 +++++++++++++ pdf/src/drawings/drawingPrototype.js | 2 +- pdf/src/drawings/shape.js | 2 +- word/Editor/GraphicObjects/DrawingStates.js | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pdf/src/document.js b/pdf/src/document.js index 01bbcf32f5..0e1751fddb 100644 --- a/pdf/src/document.js +++ b/pdf/src/document.js @@ -4337,6 +4337,19 @@ var CPresentation = CPresentation || function(){}; if (oDrawing) { oDrawing.fromXml(oXmlReader); + if (oDrawing.IsShape()) { + let new_body_pr = oDrawing.getBodyPr(); + if (new_body_pr) { + new_body_pr = new_body_pr.createDuplicate(); + new_body_pr.textFit = new AscFormat.CTextFit(); + new_body_pr.textFit.type = AscFormat.text_fit_Auto; + + if (oDrawing.txBody) { + oDrawing.txBody.setBodyPr(new_body_pr); + } + } + } + oDrawing.setBDeleted(false); aPageDrawings.push(oDrawing); oDrawing.CheckTextOnOpen(); diff --git a/pdf/src/drawings/drawingPrototype.js b/pdf/src/drawings/drawingPrototype.js index d27aed75ba..77ad7f4c23 100644 --- a/pdf/src/drawings/drawingPrototype.js +++ b/pdf/src/drawings/drawingPrototype.js @@ -54,7 +54,7 @@ CPdfDrawingPrototype.prototype.IsForm = function() { return false; }; - CPdfDrawingPrototype.prototype.IsTextShape = function() { + CPdfDrawingPrototype.prototype.IsShape = function() { return false; }; CPdfDrawingPrototype.prototype.IsImage = function() { diff --git a/pdf/src/drawings/shape.js b/pdf/src/drawings/shape.js index 52b2b1d24b..b28a3e887b 100644 --- a/pdf/src/drawings/shape.js +++ b/pdf/src/drawings/shape.js @@ -44,7 +44,7 @@ CPdfShape.prototype = Object.create(AscFormat.CShape.prototype); Object.assign(CPdfShape.prototype, AscPDF.PdfDrawingPrototype.prototype); - CPdfShape.prototype.IsTextShape = function() { + CPdfShape.prototype.IsShape = function() { return true; }; CPdfShape.prototype.ShouldDrawImaginaryBorder = function(graphicsWord) { diff --git a/word/Editor/GraphicObjects/DrawingStates.js b/word/Editor/GraphicObjects/DrawingStates.js index a29d1002ce..c344516e84 100644 --- a/word/Editor/GraphicObjects/DrawingStates.js +++ b/word/Editor/GraphicObjects/DrawingStates.js @@ -2176,7 +2176,7 @@ TextAddState.prototype = return {cursorType: "default", objectId: oCheckObject.Get_Id()}; } else if (Asc.editor.isPdfEditor()) { - if (oCheckObject.IsTextShape()) { + if (oCheckObject.IsShape()) { return {cursorType: "text", objectId: oCheckObject.Get_Id()}; } }