Merge branch 'release/v8.2.0' into fix/bug-70323

ONLYOFFICE · Sep 20, 2024 · b0c5e40 · b0c5e40
2 parents 137875d + 78ae917
commit b0c5e40
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 31 deletions.
diff --git a/common/CollaborativeEditingBase.js b/common/CollaborativeEditingBase.js
@@ -123,9 +123,9 @@
     };
     CCollaborativeChanges.prototype.private_SaveData = function(Binary)
     {
-        var Writer = AscCommon.History.BinaryWriter;
-        var Pos    = Binary.Pos;
-        var Len    = Binary.Len;
+        let Writer = AscCommon.History.BinaryWriter;
+        let Pos    = Binary.Pos;
+        let Len    = Binary.Len;
         if ((Asc.editor || editor).binaryChanges) {
             return Writer.GetDataUint8(Pos, Len);
         } else {

diff --git a/common/wordcopypaste.js b/common/wordcopypaste.js
@@ -4425,21 +4425,9 @@ PasteProcessor.prototype =
 		if (drawings && drawings.length) {
 			let paste_callback = function () {
 				if (false === oThis.bNested) {
-					let oIdMap = {};
-					let aCopies = [];
-					let oCopyPr = new AscFormat.CCopyObjectProperties();
-					oCopyPr.idMap = oIdMap;
-
-					for (let i = 0; i < arr_shapes.length; ++i) {
-						let shape = arr_shapes[i].graphicObject.copy(oCopyPr);
-						aCopies.push(shape);
-						oIdMap[arr_shapes[i].graphicObject.Id] = shape.Id;
-						shape.worksheet = null;
-						shape.drawingBase = null;
-
-						arr_shapes[i] = new AscPDF.DrawingCopyObject(shape, 0, 0, 0, 0);
-					}
-					AscFormat.fResetConnectorsIds(aCopies, oIdMap);
+					arr_shapes = arr_shapes.map(function(drawing) {
+						return new AscPDF.DrawingCopyObject(drawing.graphicObject, 0, 0, 0, 0);
+					});
 
 					let oPDFSelContent = new AscPDF.PDFSelectedContent();
 					oPDFSelContent.Drawings = arr_shapes;

diff --git a/pdf/api.js b/pdf/api.js
@@ -987,7 +987,7 @@
 			}, AscDFH.historydescription_Pdf_AddAnnot, this);
 		}
 
-		if (oDoc.checkDefaultFonts(addFreeText)) {
+		if (oDoc.checkFonts(["Arial"], addFreeText)) {
 			addFreeText();
 		}
 	};
@@ -1736,6 +1736,18 @@
 			window["AscDesktopEditor"]["onDocumentModifiedChanged"](bValue);
 		}
 	};
+	PDFEditorApi.prototype.CheckChangedDocument = function() {
+		let oDoc = this.getPDFDoc();
+
+		if (true === oDoc.History.Have_Changes()) {
+			this.SetDocumentModified(true);
+		}
+		else {
+			this.SetDocumentModified(false);
+		}
+
+		this._onUpdateDocumentCanSave();
+	};
 	PDFEditorApi.prototype._autoSaveInner = function() {
 		let _curTime = new Date();
 		if (null === this.lastSaveTime) {
@@ -2462,6 +2474,13 @@
 	PDFEditorApi.prototype.sync_ContextMenuCallback = function(Data) {
 		this.sendEvent("asc_onContextMenu", new CPdfContextMenuData(Data));
 	};
+	PDFEditorApi.prototype._finalizeAction = function() {
+		let oDoc = this.getPDFDoc();
+		if (!oDoc){
+			return;
+		}
+		oDoc.FinalizeAction(true);
+	};
 
 	PDFEditorApi.prototype._waitPrint = function(actionType, options)
 	{
@@ -2546,6 +2565,7 @@
 	PDFEditorApi.prototype['asc_getHeaderFooterProperties']	= PDFEditorApi.prototype.asc_getHeaderFooterProperties;
 	PDFEditorApi.prototype['ChangeReaderMode']				= PDFEditorApi.prototype.ChangeReaderMode;
 
+	PDFEditorApi.prototype['CheckChangedDocument']		   = PDFEditorApi.prototype.CheckChangedDocument;
 	PDFEditorApi.prototype['SetDrawingFreeze']             = PDFEditorApi.prototype.SetDrawingFreeze;
 	PDFEditorApi.prototype['OnMouseUp']                    = PDFEditorApi.prototype.OnMouseUp;
 

diff --git a/pdf/src/CollaborativeEditing.js b/pdf/src/CollaborativeEditing.js
@@ -111,13 +111,18 @@ CPDFCollaborativeEditing.prototype.GetDocument = function() {
 CPDFCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, AdditionalInfo, IsUpdateInterface, isAfterAskSave) {
 	if (!this.canSendChanges())
 		return;
-
     // Пересчитываем позиции
     this.Refresh_DCChanges();
 
     let oDoc        = this.GetDocument();
     let oHistory    = oDoc.History;
-
+
+	let localHistory = AscCommon.History;
+	AscCommon.History = oHistory;
+
+	AscCommon.DocumentEditorApi.prototype.asc_Save.apply(this, arguments);
+
+
     // Генерируем свои изменения
     let StartPoint = ( null === oHistory.SavedIndex ? 0 : oHistory.SavedIndex + 1 );
     let LastPoint = -1;
@@ -222,6 +227,7 @@ CPDFCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Additiona
     }
 
     editor.WordControl.m_oLogicDocument.getCompositeInput().checkState();
+	AscCommon.History = localHistory;
 };
 CPDFCollaborativeEditing.prototype.OnEnd_Load_Objects = function()
 {

diff --git a/pdf/src/GraphicObjects.js b/pdf/src/GraphicObjects.js
@@ -1302,6 +1302,7 @@
     CGraphicObjects.prototype.getDrawingsPasteShift     = AscFormat.DrawingObjectsController.prototype.getDrawingsPasteShift;
     CGraphicObjects.prototype.endTrackNewShape          = AscFormat.DrawingObjectsController.prototype.endTrackNewShape;
     CGraphicObjects.prototype.removeCallback            = AscFormat.DrawingObjectsController.prototype.removeCallback;
+    CGraphicObjects.prototype.getAllSingularDrawings    = AscFormat.DrawingObjectsController.prototype.getAllSingularDrawings;
 
     CGraphicObjects.prototype.startRecalculate = function() {};
 

diff --git a/pdf/src/annotations/textPrTrackHandler.js b/pdf/src/annotations/textPrTrackHandler.js
@@ -89,11 +89,15 @@
 
 		if (!oAnnot)
 			return null;
-
+
+		let oDoc = oAnnot.GetDocument();
+		if (!oDoc) {
+			return null;
+		}
+
         let aOrigRect   = oAnnot.GetOrigRect();
         let aRD         = oAnnot.GetRectangleDiff() || [0, 0, 0, 0]; // отступ координат фигуры с текстом от ректа аннотации
         let nPage       = oAnnot.GetPage();
-		let oDoc		= oAnnot.GetDocument();
 		let oTr			= oDoc.pagesTransform[nPage].invert;
 
         let aFreeTextRect = []; // прямоугольник

diff --git a/pdf/src/document.js b/pdf/src/document.js
@@ -1205,16 +1205,26 @@ var CPresentation = CPresentation || function(){};
     PDFSelectedContent.prototype.copy = function() {
         let oCopy = new PDFSelectedContent();
 
+        let oIdMap = {};
+        let oCopyPr = new AscFormat.CCopyObjectProperties();
+        oCopyPr.idMap = oIdMap;
+
         for (let i = 0; i < this.Drawings.length; i++) {
+            let oCopyDrawingObj = this.Drawings[i].Drawing.copy(oCopyPr);
+            oIdMap[this.Drawings[i].Drawing.GetId()] = oCopyDrawingObj.GetId();
             oCopy.Drawings.push({
-                Drawing: this.Drawings[i].Drawing.copy(),
+                Drawing: oCopyDrawingObj,
                 ExtX: this.Drawings[i].ExtX,
                 X: this.Drawings[i].X,
                 Y: this.Drawings[i].Y,
                 base64: this.Drawings[i].base64
             });
         }
 
+        AscFormat.fResetConnectorsIds(oCopy.Drawings.map(function(drawing) {
+            return drawing.Drawing;
+        }), oIdMap);
+
         if (this.DocContent) {
             //TODO: перенести копирование в CSelectedContent;
             oCopy.DocContent = new AscCommonWord.CSelectedContent();
@@ -4724,7 +4734,7 @@ var CPresentation = CPresentation || function(){};
             case AscPDF.FREE_TEXT_INTENT_TYPE.FreeText: {
                 oFreeText.SetIntent(AscPDF.FREE_TEXT_INTENT_TYPE.FreeText);
                 oFreeText.SetSubject('Text box');
-                return;
+                break;
             }
             // прописываем RD и Callout
             case AscPDF.FREE_TEXT_INTENT_TYPE.FreeTextCallout: {
@@ -4782,7 +4792,7 @@ var CPresentation = CPresentation || function(){};
                 }
 
                 oFreeText.SetCallout([x1, y1, x2, y2, x3, y3]);
-                return;
+                break;
             }
         }
 

diff --git a/pdf/src/viewer.js b/pdf/src/viewer.js
@@ -3513,7 +3513,8 @@
 			}
 			else if ( e.KeyCode == 83 && true === e.CtrlKey ) // Ctrl + S + ...
 			{
-				// nothing
+				oDoc.BlurActiveObject();
+				this.Api.asc_Save(false);
 				bRetValue = true;
 			}
 			else if ( e.KeyCode == 89 && true === e.CtrlKey ) // Ctrl + Y

diff --git a/word/Math/mathContent.js b/word/Math/mathContent.js
@@ -6081,13 +6081,17 @@ CMathContent.prototype.GetTextContent = function(bSelectedText, isLaTeX)
 		isLaTeX = false;
 
 	let nStartPos	= 0;
-	let nEndPos		= this.Content.length;
+	let nEndPos		= this.Content.length - 1;
 	let oMathText	= new AscMath.MathTextAndStyles(isLaTeX);
 
 	if (bSelectedText)
 	{
-		nStartPos = (this.Selection.Use == true ? Math.min(this.Selection.StartPos, this.Selection.EndPos) : this.CurPos.ContentPos);
-		nEndPos   = (this.Selection.Use == true ? Math.max(this.Selection.StartPos, this.Selection.EndPos) : this.CurPos.ContentPos);
+		nStartPos	= this.Selection.Use == true
+			? Math.min(this.Selection.StartPos, this.Selection.EndPos)
+			: this.CurPos.ContentPos;
+		nEndPos	= this.Selection.Use == true
+			? Math.max(this.Selection.StartPos, this.Selection.EndPos)
+			: this.CurPos.ContentPos;
 	}
 
 	for (let i = nStartPos; i <= nEndPos; i++)
@@ -6096,7 +6100,8 @@ CMathContent.prototype.GetTextContent = function(bSelectedText, isLaTeX)
 		oMathText.Add(oElement, false, false, bSelectedText);
 	}
 
-	return {str: oMathText.GetText(), content: oMathText};
+	let strContent = oMathText.GetText();
+	return {str: strContent, content: oMathText};
 };
 
 var g_DefaultAutoCorrectMathFuncs =