Улучшено описание добавления/удаления элементов внутри параграфа в...

Улучшено описание добавления/удаления элементов внутри параграфа в рецензировании: добавлено описание удаленных объектов (картинок, автофигур, диаграмм, формул).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66617 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/Paragraph.js

@@ -14860,7 +14860,7 @@ function CParagraphRevisionsChangesChecker(Para, RevisionsManager)
         ChangeType : null,
         StartPos   : null,
         EndPos     : null,
-        Value      : "",
+        Value      : [],
         UserId     : "",
         UserName   : "",
         DateTime   : 0
@@ -14897,7 +14897,7 @@ CParagraphRevisionsChangesChecker.prototype.Flush_AddRemoveChange = function()
     AddRemove.ChangeType = null;
     AddRemove.StartPos   = null;
     AddRemove.EndPos     = null;
-    AddRemove.Value      = "";
+    AddRemove.Value      = [];
     AddRemove.UserId     = "";
     AddRemove.UserName   = "";
     AddRemove.DateTime   = 0;
@@ -14936,7 +14936,7 @@ CParagraphRevisionsChangesChecker.prototype.Start_AddRemove = function(ChangeTyp
     this.AddRemove.ChangeType = ChangeType;
     this.AddRemove.StartPos   = ContentPos.Copy();
     this.AddRemove.EndPos     = ContentPos.Copy();
-    this.AddRemove.Value      = "";
+    this.AddRemove.Value      = [];
 };
 CParagraphRevisionsChangesChecker.prototype.Set_AddRemoveEndPos = function(ContentPos)
 {
@@ -14953,15 +14953,51 @@ CParagraphRevisionsChangesChecker.prototype.Update_AddRemoveReviewInfo = functio
 };
 CParagraphRevisionsChangesChecker.prototype.Add_Text = function(Text)
 {
-    this.AddRemove.Value += Text;
+    if (!Text || "" === Text)
+        return;
+
+    var Value = this.AddRemove.Value;
+    var ValueLen = Value.length;
+    if (ValueLen <= 0 || "string" !== typeof Value[ValueLen - 1])
+    {
+        Value.push("" + Text);
+    }
+    else
+    {
+        Value[ValueLen - 1] += Text;
+    }
 };
 CParagraphRevisionsChangesChecker.prototype.Add_Math = function(MathElement)
 {
-    this.AddRemove.Value += "[ FORMULA ]";
+    this.AddRemove.Value.push(c_oAscRevisionsObjectType.MathEquation);
 };
 CParagraphRevisionsChangesChecker.prototype.Add_Drawing = function(Drawing)
 {
-    this.AddRemove.Value += "[ DRAWING ]";
+    if (Drawing)
+    {
+        var Type = Drawing.Get_ObjectType();
+        switch (Type)
+        {
+            case historyitem_type_Chart:
+            case historyitem_type_ChartSpace:
+            {
+                this.AddRemove.Value.push(c_oAscRevisionsObjectType.Chart);
+                break;
+            }
+            case historyitem_type_ImageShape:
+            case historyitem_type_Image:
+            {
+                this.AddRemove.Value.push(c_oAscRevisionsObjectType.Image);
+                break;
+            }
+            case historyitem_type_Shape:
+            default:
+            {
+                this.AddRemove.Value.push(c_oAscRevisionsObjectType.Shape);
+                break;
+            }
+        }
+    }
 };
 CParagraphRevisionsChangesChecker.prototype.Have_PrChange = function()
 {

Word/Editor/ParagraphContent.js

@@ -6839,6 +6839,14 @@ ParaDrawing.prototype =
     {
         if (this.GraphicObj && this.GraphicObj.Get_RevisionsChangeParagraph)
             this.GraphicObj.Get_RevisionsChangeParagraph(SearchEngine);
+    },
+
+    Get_ObjectType : function()
+    {
+        if (this.GraphicObj)
+            return this.GraphicObj.getObjectType();
+
+        return historyitem_type_Drawing;
     }
 };
 

Word/apiDefines.js

@@ -579,4 +579,12 @@ var c_oAscRevisionsChangeType = {
   ParaPr: 0x06
 };
 
+var c_oAscRevisionsObjectType =
+{
+  Image        : 0,
+  Shape        : 1,
+  Chart        : 2,
+  MathEquation : 3
+};
+
 window["flat_desine"] = false;
\ No newline at end of file