[pdf] Disable stream appearance if annots in changed.

ONLYOFFICE · Feb 7, 2024 · c5e0fdf · c5e0fdf
1 parent 5860294
commit c5e0fdf
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 21 deletions.
diff --git a/pdf/src/annotations/base.js b/pdf/src/annotations/base.js
@@ -243,6 +243,7 @@
 
         if (oViewer.IsOpenAnnotsInProgress == false) {
             this._wasChanged = isChanged;
+            this.SetDrawFromStream(!isChanged);
         }
     };
     CAnnotationBase.prototype.IsChanged = function() {
@@ -531,9 +532,6 @@
         this._origRect[3] = this._rect[3] / nScaleY;
 
         this.SetWasChanged(true);
-        if (oViewer.IsOpenAnnotsInProgress == false) {
-            this.SetDrawFromStream(false);
-        }
     };
     CAnnotationBase.prototype.IsUseInDocument = function() {
         if (this.GetDocument().annots.indexOf(this) == -1)
@@ -937,13 +935,8 @@
     };
 
     CAnnotationBase.prototype.SetStrokeColor = function(aColor) {
-        let oViewer = editor.getDocumentRenderer();
-
         this._strokeColor = aColor;
         this.SetWasChanged(true);
-        if (oViewer.IsOpenAnnotsInProgress == false) {
-            this.SetDrawFromStream(false);
-        }
     };
     CAnnotationBase.prototype.GetStrokeColor = function() {
         return this._strokeColor;

diff --git a/pdf/src/annotations/circle.js b/pdf/src/annotations/circle.js
@@ -154,7 +154,6 @@
         this.recalcGeometry();
         this.AddToRedraw();
         this.SetWasChanged(true);
-        this.SetDrawFromStream(false);
     };
     CAnnotationCircle.prototype.SetRectangleDiff = function(aDiff) {
         let oDoc = this.GetDocument();

diff --git a/pdf/src/annotations/freeText.js b/pdf/src/annotations/freeText.js
@@ -183,9 +183,6 @@
 
         return calculateBoundingRectangle(oLine, oShapeEndSize);
     };
-    CAnnotationFreeText.prototype.IsNeedDrawFromStream = function() {
-        return false;
-    };
 
     CAnnotationFreeText.prototype.IsFreeText = function() {
         return true;

diff --git a/pdf/src/annotations/ink.js b/pdf/src/annotations/ink.js
@@ -246,7 +246,6 @@
         this.RefillGeometry(this.spPr.geometry, [aRect[0] * g_dKoef_pix_to_mm, aRect[1] * g_dKoef_pix_to_mm, aRect[2] * g_dKoef_pix_to_mm, aRect[3] * g_dKoef_pix_to_mm]);
 
         this.SetWasChanged(true);
-        this.SetDrawFromStream(false);
     };
     CAnnotationInk.prototype.SetFlipV = function(bFlip) {
         let oDoc = this.GetDocument();

diff --git a/pdf/src/annotations/line.js b/pdf/src/annotations/line.js
@@ -341,7 +341,6 @@
 
         this.AddToRedraw();
         this.SetWasChanged(true);
-        this.SetDrawFromStream(false);
     };
     CAnnotationLine.prototype.SetStrokeColor = function(aColor) {
         this._strokeColor = aColor;

diff --git a/pdf/src/annotations/polyLine.js b/pdf/src/annotations/polyLine.js
@@ -175,7 +175,6 @@
 
         this.AddToRedraw();
         this.SetWasChanged(true);
-        this.SetDrawFromStream(false);
     };
     CAnnotationPolyLine.prototype.LazyCopy = function() {
         let oDoc = this.GetDocument();

diff --git a/pdf/src/annotations/polygon.js b/pdf/src/annotations/polygon.js
@@ -183,7 +183,6 @@
 
         this.AddToRedraw();
         this.SetWasChanged(true);
-        this.SetDrawFromStream(false);
     };
     CAnnotationPolygon.prototype.LazyCopy = function() {
         let oDoc = this.GetDocument();

diff --git a/pdf/src/annotations/square.js b/pdf/src/annotations/square.js
@@ -185,7 +185,6 @@
         this.recalcGeometry();
         this.AddToRedraw();
         this.SetWasChanged(true);
-        this.SetDrawFromStream(false);
     };
     CAnnotationSquare.prototype.SetRectangleDiff = function(aDiff) {
         let oDoc = this.GetDocument();

diff --git a/pdf/src/document.js b/pdf/src/document.js
@@ -2496,7 +2496,7 @@ var CPresentation = CPresentation || function(){};
 
 		this.defaultFontsLoaded = 0;
 		let _t = this;
-		this.fontLoader.LoadDocumentFonts2([{name : "Arial"}],
+		this.fontLoader.LoadDocumentFonts2([{name : AscPDF.DEFAULT_FIELD_FONT}],
 			Asc.c_oAscAsyncActionType.Empty,
 			function()
 			{

diff --git a/pdf/src/viewer.js b/pdf/src/viewer.js
@@ -1260,9 +1260,7 @@
 			this.doc.FillButtonsIconsOnOpen();
 		};
 		this.openAnnots = function() {
-			let oThis = this;
-
-			this.doc.checkDefaultFieldFonts();
+			// this.doc.checkDefaultFieldFonts();
 			let oAnnotsMap = {};
 			let oDoc = this.getPDFDoc();
 			let aAnnotsInfo = this.file.nativeFile["getAnnotationsInfo"]();