Сделано, чтобы читалось свойство LayoutInCell.

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

Common/Drawings/Format/Constants.js

@@ -1006,6 +1006,7 @@ var historyitem_Drawing_SetRelativeHeight = 16;// Устанавливаем Z-I
 var historyitem_Drawing_SetEffectExtent   = 17;// Устанавливаем EffectExtent
 var historyitem_Drawing_SetParent         = 18;// Устанавливаем Parent
 var historyitem_Drawing_SetParaMath       = 19; // Добавляем новую формулу для конвертации старого формата в новый
+var historyitem_Drawing_LayoutInCell      = 20; // Устанавливаем параметр расположения в таблице
 
 
 

Word/Editor/Document.js

@@ -15406,12 +15406,12 @@ CDocument.prototype.Continue_FastCollaborativeEditing = function()
             {
                 this.Api.CoAuthoringApi.sendCursor(CursorInfo);
                 this.LastUpdateTargetTime = CurTime;
-    }
+            }
         }
         else
-    {
+        {
             this.LastUpdateTargetTime = CurTime;
-    }
+        }
     }
 };
 CDocument.prototype.Save_DocumentStateBeforeLoadChanges = function()

Word/Editor/ParagraphContent.js

@@ -4879,6 +4879,15 @@ ParaDrawing.prototype =
         this.Distance.B = B;
     },
 
+    Set_LayoutInCell : function(LayoutInCell)
+    {
+        if (this.LayoutInCell === LayoutInCell)
+            return;
+
+        History.Add(this, {Type : historyitem_Drawing_LayoutInCell, Old : this.LayoutInCell, New : LayoutInCell});
+        this.LayoutInCell = LayoutInCell;
+    },
+
     Get_Distance : function()
     {
         var oDist = this.Distance;
@@ -5203,6 +5212,12 @@ ParaDrawing.prototype =
                 break;
             }
 
+            case historyitem_Drawing_LayoutInCell:
+            {
+                this.LayoutInCell = Data.Old;
+                break;
+            }
+
             case historyitem_Drawing_AllowOverlap:
             {
                 this.AllowOverlap = Data.Old;
@@ -5341,6 +5356,12 @@ ParaDrawing.prototype =
                 break;
             }
 
+            case historyitem_Drawing_LayoutInCell:
+            {
+                this.LayoutInCell = Data.New;
+                break;
+            }
+
             case historyitem_Drawing_AllowOverlap :
             {
                 this.AllowOverlap = Data.New;
@@ -5723,6 +5744,13 @@ ParaDrawing.prototype =
                 break;
             }
 
+            case historyitem_Drawing_LayoutInCell:
+            {
+                // Bool : LayoutInCell
+                Writer.WriteBool(Data.New);
+                break;
+            }
+
             case historyitem_Drawing_AllowOverlap:
             {
                 // Bool : AllowOverlap
@@ -5895,6 +5923,13 @@ ParaDrawing.prototype =
                 break;
             }
 
+            case historyitem_Drawing_LayoutInCell:
+            {
+                // Bool : LayoutInCell
+                this.LayoutInCell = Reader.GetBool();
+                break;
+            }
+
             case historyitem_Drawing_AllowOverlap:
             {
                 // Bool : AllowOverlap

Word/Editor/Serialize2.js

@@ -4186,12 +4186,12 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
 				this.memory.WriteByte(c_oSerPropLenType.Double);
 				this.memory.WriteDouble(img.Distance.B);
 			}
-			// if(null != img.LayoutInCell)
-			// {
-				// this.memory.WriteByte(c_oSerImageType2.LayoutInCell);
-				// this.memory.WriteByte(c_oSerPropLenType.Byte);
-				// this.memory.WriteBool(img.LayoutInCell);
-			// }
+            if(null != img.LayoutInCell)
+            {
+                this.memory.WriteByte(c_oSerImageType2.LayoutInCell);
+                this.memory.WriteByte(c_oSerPropLenType.Byte);
+                this.memory.WriteBool(img.LayoutInCell);
+            }
 			if(null != img.RelativeHeight)
 			{
 				this.memory.WriteByte(c_oSerImageType2.RelativeHeight);
@@ -8549,11 +8549,13 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
             oParaDrawing.Set_Distance(null, null, null, Math.abs(this.bcr.ReadDouble()));
         }
 		else if( c_oSerImageType2.Hidden === type )
-			var Hidden = this.stream.GetBool();
-		// else if( c_oSerImageType2.LayoutInCell === type )
-		// {
-			// oParaDrawing.LayoutInCell = this.stream.GetBool();
-		// }
+        {
+            var Hidden = this.stream.GetBool();
+        }
+        else if( c_oSerImageType2.LayoutInCell === type )
+        {
+            oParaDrawing.Set_LayoutInCell(this.stream.GetBool());
+        }
 		else if( c_oSerImageType2.Locked === type )
             oParaDrawing.Set_Locked(this.stream.GetBool());
 		else if( c_oSerImageType2.RelativeHeight === type )