Добавлена обработка в апи нового парамертра TableLayout, также доработан...

Добавлена обработка в апи нового парамертра TableLayout, также доработан тестовый пример с новым параметром. Исправлены баги с пересчетом ширины колонок при автоподборе по ширине.

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

Word/Editor/GraphicObjects/ObjectTypes/WordShape.js

@@ -114,6 +114,14 @@ WordShape.prototype =
         return true;
     },
 
+    Is_InTable : function(bReturnTopTable)
+    {
+        if ( true === bReturnTopTable )
+            return null;
+
+        return false;
+    },
+
     init: function(presetGeom, posX, posY, extX, extY, flipH, flipV, beginFlag, endFlag)
     {
         var data = {

Word/TextEditor.html

@@ -2302,6 +2302,9 @@
                 </div>
 
             </div>
+            <div style="float:left;width:400px;">
+                <input id="tblLayout" type="checkbox" /> AutoFit
+            </div>
         </div>
         <div style="float:left;border-top: 2px ridge silver;padding-left:5px;width:400px">
             <div style="float:left;width:400px;text-align: center;">Wrap</div>

Word/api.js

@@ -3931,6 +3931,7 @@ function CTableProp (tblProp)
         this.RowsInHeader = (undefined != tblProp.RowsInHeader) ? tblProp.RowsInHeader : 0;
         this.CellsVAlign = (undefined != tblProp.CellsVAlign) ? tblProp.CellsVAlign :c_oAscVertAlignJc.Top;
         this.AllowOverlap = (undefined != tblProp.AllowOverlap) ? tblProp.AllowOverlap : undefined;
+        this.TableLayout  = tblProp.TableLayout;
         this.Locked = (undefined != tblProp.Locked) ? tblProp.Locked : false;
 	}
 	else
@@ -4009,6 +4010,8 @@ CTableProp.prototype.get_TableStyle = function() {return this.TableStyle;}
 CTableProp.prototype.put_TableStyle = function(v){this.TableStyle = v;}
 CTableProp.prototype.get_AllowOverlap = function() {return this.AllowOverlap;}
 CTableProp.prototype.put_AllowOverlap = function(v){this.AllowOverlap = v;}
+CTableProp.prototype.get_TableLayout = function() {return this.TableLayout;}
+CTableProp.prototype.put_TableLayout = function(v){this.TableLayout = v;}
 
 function CBorders (obj)
 {

Word/apiDefines.js

@@ -257,6 +257,12 @@ var c_oAscVertAlignJc =
     Bottom : 0x02  // var vertalignjc_Bottom = 0x02
 };
 
+var c_oAscTableLayout =
+{
+    AutoFit : 0x00,
+    Fixed   : 0x01
+};
+
 var c_oAscHAnchor =
 {
     Margin : 0x00,

Word/menu/main_menu.js

@@ -2646,6 +2646,17 @@ $(".colorWatch").mouseover(function(){
                         document.getElementById("tblY").value = "";
                     }
 
+                    var TableLayout = elemVal.get_TableLayout();
+                    if ( undefined === TableLayout )
+                    {
+                        document.getElementById("tblLayout").disabled = "disabled";
+                    }
+                    else
+                    {
+                        document.getElementById("tblLayout").disabled = 0;
+                        document.getElementById("tblLayout").checked = ( TableLayout === c_oAscTableLayout.AutoFit ? true : false );
+                    }
+
                     var bMerge = editor.CheckBeforeMergeCells();
                     var bSplit = editor.CheckBeforeSplitCells();
 
@@ -3156,6 +3167,11 @@ $(".colorWatch").mouseover(function(){
         }
 		else
             tblOBJ.TableWidth = null;
+
+        if ( document.getElementById("tblLayout").checked )
+            tblOBJ.TableLayout = c_oAscTableLayout.AutoFit;
+        else
+            tblOBJ.TableLayout = c_oAscTableLayout.Fixed;
 		
 		if ( document.getElementById("tblAllowSpacing").checked )
         {