For bug 72801

Add removeAllInks for presentation
ONLYOFFICE · Feb 12, 2025 · 710d32e · 710d32e
1 parent 7d9a3b3
commit 710d32e
Show file tree

Hide file tree

Showing 8 changed files with 171 additions and 0 deletions.
diff --git a/common/Drawings/Format/Format.js b/common/Drawings/Format/Format.js
@@ -10087,6 +10087,38 @@
 		}
 
 		InitClass(CSld, CBaseNoIdObject, 0);
+		CSld.prototype.removeAllInks = function () {
+			if (!this.parent) {
+				return;
+			}
+			const arrSpTree = this.spTree;
+			for (let i = arrSpTree.length - 1; i >= 0; i -= 1) {
+				const oDrawing = arrSpTree[i];
+				if (oDrawing.isInk()) {
+					this.parent.removeFromSpTreeByPos(i);
+					if (oDrawing.setBDeleted2) {
+						oDrawing.setBDeleted2(true);
+					} else {
+						oDrawing.setBDeleted(true);
+					}
+				} else {
+					oDrawing.removeAllInks();
+				}
+			}
+		};
+		CSld.prototype.getAllInks = function (arrInks) {
+			arrInks = arrInks || [];
+			const arrSpTree = this.spTree;
+			for (let i = arrSpTree.length - 1; i >= 0; i -= 1) {
+				const oDrawing = arrSpTree[i];
+				if (oDrawing.isInk()) {
+					arrInks.push(oDrawing);
+				} else {
+					oDrawing.getAllInks(arrInks);
+				}
+			}
+			return arrInks;
+		};
 		CSld.prototype.getObjectsNamesPairs = function () {
 			var aPairs = [];
 			var aSpTree = this.spTree;

diff --git a/common/Drawings/Format/GraphicObjectBase.js b/common/Drawings/Format/GraphicObjectBase.js
@@ -3799,6 +3799,8 @@
 	CGraphicObjectBase.prototype.generateLocalDrawingPart = function () {};
 	CGraphicObjectBase.prototype.generateSmartArtDrawingPart = function () {};
 	CGraphicObjectBase.prototype.checkDrawingPartWithHistory = function () {};
+	CGraphicObjectBase.prototype.removeAllInks = function () {};
+	CGraphicObjectBase.prototype.getAllInks = function (arrInks) {return arrInks || []};
 	var ANIM_LABEL_WIDTH_PIX = 22;
 	var ANIM_LABEL_HEIGHT_PIX = 17;
 

diff --git a/common/Drawings/Format/GroupShape.js b/common/Drawings/Format/GroupShape.js
@@ -1716,6 +1716,45 @@
 				this.spTree[i].generateSmartArtDrawingPart();
 			}
 		};
+		CGroupShape.prototype.isInk = function () {
+			if (!this.spTree.length) {
+				return false;
+			}
+			for (let i = 0; i < this.spTree.length; i++) {
+				const oDrawing = this.spTree[i];
+				if (!oDrawing.isInk()) {
+					return false;
+				}
+			}
+			return true;
+		};
+		CGroupShape.prototype.removeAllInks = function () {
+			for (let i = this.spTree.length - 1; i >= 0; i -= 1) {
+				const oDrawing = this.spTree[i];
+				if (oDrawing.isInk()) {
+					this.removeFromSpTreeByPos(i);
+					if (oDrawing.setBDeleted2) {
+						oDrawing.setBDeleted2(true);
+					} else {
+						oDrawing.setBDeleted(true);
+					}
+				} else {
+					oDrawing.removeAllInks();
+				}
+			}
+		};
+		CGroupShape.prototype.getAllInks = function (arrInks) {
+			arrInks = arrInks || [];
+			for (let i = this.spTree.length - 1; i >= 0; i -= 1) {
+				const oDrawing = this.spTree[i];
+				if (oDrawing.isInk()) {
+					arrInks.push(oDrawing);
+				} else {
+					oDrawing.getAllInks(arrInks);
+				}
+			}
+			return arrInks;
+		};
 
 		//--------------------------------------------------------export----------------------------------------------------
 		window['AscFormat'] = window['AscFormat'] || {};

diff --git a/slide/Editor/Format/Layout.js b/slide/Editor/Format/Layout.js
@@ -990,6 +990,13 @@ SlideLayout.prototype.getMaster = function(){
     SlideLayout.prototype.checkPlaceholders = function(oPlaceholders) {
         return AscCommonSlide.Slide.prototype.checkPlaceholders.call(this, oPlaceholders);
     };
+SlideLayout.prototype.removeAllInks = function() {
+	return AscCommonSlide.Slide.prototype.removeAllInks.call(this);
+};
+SlideLayout.prototype.getAllInks = function(arrInks) {
+	arrInks = arrInks || [];
+	return AscCommonSlide.Slide.prototype.getAllInks.call(this, arrInks);
+};
 
     let LAYOUT_TYPE_MAP = {};
     LAYOUT_TYPE_MAP["blank"] = AscFormat.nSldLtTBlank;

diff --git a/slide/Editor/Format/Presentation.js b/slide/Editor/Format/Presentation.js
@@ -10149,6 +10149,32 @@ CPresentation.prototype.Document_Is_SelectionLocked = function (CheckType, Addit
 		this.viewPrLock.Lock.Check(check_obj);
 	}
 
+	if (CheckType === AscCommon.changestype_None) {
+		if (AdditionalData) {
+			if (AscCommon.changestype_2_ElementsArray_and_Type === AdditionalData.Type) {
+				if (AdditionalData.CheckType === AscCommon.changestype_Drawing_Props) {
+					const arrElements = AdditionalData.Elements;
+					const oMainElements = {};
+					for (let i = 0; i < arrElements.length; ++i) {
+						const oElement = arrElements[i].getMainGroup() || arrElements[i];
+						const sElementId = oElement.Get_Id();
+						if (!oMainElements[sElementId]) {
+							oMainElements[sElementId] = true;
+							const oCheckObj =
+								{
+									"type"   : c_oAscLockTypeElemPresentation.Object,
+									"slideId": slide_id,
+									"objId"  : sElementId,
+									"guid"   : sElementId
+								};
+							oElement.Lock.Check(oCheckObj);
+						}
+					}
+				}
+			}
+		}
+	}
+
 	var bResult = AscCommon.CollaborativeEditing.OnEnd_CheckLock(DontLockInFastMode);
 
 	if (true === bResult) {
@@ -11327,6 +11353,35 @@ CPresentation.prototype.RemoveCustomProperty = function(idx) {
 	this.FinalizeAction(true);
 };
 
+CPresentation.prototype.RemoveAllInks = function () {
+	const arrInks = this.GetAllInks();
+	if (!arrInks.length || this.Document_Is_SelectionLocked(AscCommon.changestype_None, {Type: AscCommon.changestype_2_ElementsArray_and_Type, CheckType: AscCommon.changestype_Drawing_Props, Elements: arrInks})) {
+		return;
+	}
+
+	this.StartAction(0);
+	for (let i = 0; i < this.Slides.length; i += 1) {
+		const oSlide = this.Slides[i];
+		oSlide.removeAllInks();
+	}
+	for (let i = 0; i < this.slideMasters.length; i += 1) {
+		const oSlideMaster = this.slideMasters[i];
+		oSlideMaster.removeAllInks();
+	}
+	this.FinalizeAction();
+};
+CPresentation.prototype.GetAllInks = function () {
+	const arrInks = [];
+	for (let i = 0; i < this.Slides.length; i += 1) {
+		const oSlide = this.Slides[i];
+		oSlide.getAllInks(arrInks);
+	}
+	for (let i = 0; i < this.slideMasters.length; i += 1) {
+		const oSlideMaster = this.slideMasters[i];
+		oSlideMaster.getAllInks(arrInks);
+	}
+	return arrInks;
+};
 function collectSelectedObjects(aSpTree, aCollectArray, bRecursive, oIdMap, bSourceFormatting) {
 	var oSp;
 	var oPr = new AscFormat.CCopyObjectProperties();

diff --git a/slide/Editor/Format/Slide.js b/slide/Editor/Format/Slide.js
@@ -2127,6 +2127,14 @@ AscFormat.InitClass(Slide, AscFormat.CBaseFormatObject, AscDFH.historyitem_type_
         }
         return false;
     };
+Slide.prototype.removeAllInks = function () {
+	this.cSld.removeAllInks();
+};
+Slide.prototype.getAllInks = function (arrInks) {
+	arrInks = arrInks || [];
+	this.cSld.getAllInks(arrInks);
+	return arrInks;
+};
 
 function fLoadComments(oObject, authors)
 {

diff --git a/slide/Editor/Format/SlideMaster.js b/slide/Editor/Format/SlideMaster.js
@@ -845,6 +845,22 @@ MasterSlide.prototype.drawViewPrMarks = function(oGraphics) {
     if(oGraphics.isSupportTextDraw && !oGraphics.isSupportTextDraw()) return;
     return AscCommonSlide.Slide.prototype.drawViewPrMarks.call(this, oGraphics);
 };
+MasterSlide.prototype.removeAllInks = function() {
+	AscCommonSlide.Slide.prototype.removeAllInks.call(this);
+	for (let i = 0; i < this.sldLayoutLst.length; i++) {
+		const oLayout = this.sldLayoutLst[i];
+		oLayout.removeAllInks();
+	}
+};
+MasterSlide.prototype.getAllInks = function(arrInks) {
+	arrInks = arrInks || [];
+	AscCommonSlide.Slide.prototype.getAllInks.call(this, arrInks);
+	for (let i = 0; i < this.sldLayoutLst.length; i++) {
+		const oLayout = this.sldLayoutLst[i];
+		oLayout.getAllInks(arrInks);
+	}
+	return arrInks;
+};
 function CMasterThumbnailDrawer()
 {
     this.CanvasImage    = null;

diff --git a/slide/api.js b/slide/api.js
@@ -9595,6 +9595,18 @@ background-repeat: no-repeat;\
 
 		oLogicDocument.EraseAllInksOnSlide();
 	};
+	asc_docs_api.prototype.removeAllInks = function () {
+		let oLogicDocument = this.getLogicDocument();
+		if(!oLogicDocument) return;
+
+		oLogicDocument.RemoveAllInks();
+	};
+	baseEditorsApi.prototype.haveInks = function() {
+		let oLogicDocument = this.getLogicDocument();
+		if(!oLogicDocument) return;
+
+		return !!oLogicDocument.GetAllInks().length;
+	};
 
 	//-------------------------------------------------------------export---------------------------------------------------
 	window['Asc']                                                 = window['Asc'] || {};