changes

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57758 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/Qt_build/test_resources/sdk-all.js

@@ -222138,6 +222138,9 @@ CHistory.prototype =
 
     Is_SimpleChanges : function()
     {
+        if (this.Index - this.RecIndex !== 1)
+            return [];
+        
         if ( this.Index >= 0 && this.Points[this.Index].Items.length > 0 )
         {
             // Считываем изменения, начиная с последней точки, и смотрим что надо пересчитать.
@@ -396343,10 +396346,15 @@ CCellCommentator.prototype.Redo = function(type, data) {
         {
             var oThis = this;
             var aIndexes = [];
+			var bIsTablePartContainActiveRange;
             if(oThis.isCopyPaste)
             {
                 for(var i = oThis.isCopyPaste.c1; i <= oThis.isCopyPaste.c2; i++)
                     aIndexes.push(i);
+					
+				var api = window["Asc"]["editor"];
+				var ws = api.wb.getWorksheet();
+				bIsTablePartContainActiveRange = ws.autoFilters.isTablePartContainActiveRange();
             }
             else
             {
@@ -396360,7 +396368,12 @@ CCellCommentator.prototype.Redo = function(type, data) {
                 //готовим ячейку к записи
                 if(!oThis.isCopyPaste || (oThis.isCopyPaste && cell))
                 {	
-                    var nXfsId = this.prepareXfs(cell.xfs);
+					var nXfsId;
+					if(oThis.isCopyPaste && bIsTablePartContainActiveRange)
+						nXfsId = this.prepareXfs(cell.compiledXfs);
+					else
+						nXfsId  = this.prepareXfs(cell.xfs);
+					
                     //сохраняем как и Excel даже пустой стиль(нужно чтобы убрать стиль строки/колонки)
                     if(null != cell.xfs || false == cell.isEmptyText())
                         this.bs.WriteItem(c_oSerRowTypes.Cell, function(){oThis.WriteCell(cell, nXfsId);});
@@ -425574,6 +425587,9 @@ function CDrawingDocument()
     this.FrameRect = { IsActive : false, Rect : { X : 0, Y : 0, R : 0, B : 0 }, Frame : null,
         Track : { X : 0, Y : 0, L : 0, T : 0, R : 0, B : 0, PageIndex : 0, Type : -1 }, IsTracked : false, PageIndex : 0 };
 	
+	// math rect
+	this.MathRect = { IsActive : false, Rect : { X : 0, Y : 0, R : 0, B : 0, PageIndex : 0 } };
+
     // table track
     this.TableOutlineDr = new CTableOutlineDr();
 }
@@ -426190,6 +426206,7 @@ CDrawingDocument.prototype =
         }
 
         this.DrawFrameTrack();
+		this.DrawMathTrack();
 
         if (this.InlineTextTrackEnabled && null != this.InlineTextTrack)
         {
@@ -426865,6 +426882,29 @@ CDrawingDocument.prototype =
         }
     },
 	
+	DrawMathTrack : function()
+    {
+        if (!this.MathRect.IsActive)
+            return;
+
+        this.Native["DD_Overlay_DrawFrameTrack1"](this.MathRect.Rect.PageIndex,
+            this.MathRect.Rect.X, this.MathRect.Rect.Y, this.MathRect.Rect.R, this.MathRect.Rect.B);
+    },
+	
+	Update_MathTrack : function(IsActive, X, Y, W, H, PageIndex)
+    {       
+        this.MathRect.IsActive = IsActive;
+        
+        if (true === IsActive)
+        {
+            this.MathRect.Rect.X = X;
+            this.MathRect.Rect.Y = Y;
+            this.MathRect.Rect.R = X + W;
+            this.MathRect.Rect.B = Y + H;
+            this.MathRect.Rect.PageIndex = PageIndex;
+        }
+    },
+
     IsCursorInTableCur : function(x, y, page)
     {
         var _table = this.TableOutlineDr.TableOutline;