Commit 96ba7fb0 authored by Ilya Kirillov's avatar Ilya Kirillov

Added new field to the properties of a table.

parent 84423d6f
...@@ -304,8 +304,9 @@ CTable.prototype = ...@@ -304,8 +304,9 @@ CTable.prototype =
var Border_insideH = null; var Border_insideH = null;
var Border_insideV = null; var Border_insideV = null;
var CellShd = null; var CellShd = null;
var CellWidth = undefined; var CellWidth = undefined;
var CellWidthStart = undefined;
var Prev_row = -1; var Prev_row = -1;
var bFirstRow = true; var bFirstRow = true;
...@@ -360,6 +361,8 @@ CTable.prototype = ...@@ -360,6 +361,8 @@ CTable.prototype =
CellWidth = Cell_w.W; CellWidth = Cell_w.W;
else// if (tblwidth_Pct === Cell_w.Type) else// if (tblwidth_Pct === Cell_w.Type)
CellWidth = -Cell_w.W; CellWidth = -Cell_w.W;
CellWidthStart = CellWidth;
} }
else else
{ {
...@@ -487,7 +490,18 @@ CTable.prototype = ...@@ -487,7 +490,18 @@ CTable.prototype =
Pr.CellsVAlign = VAlign; Pr.CellsVAlign = VAlign;
Pr.CellsTextDirection = TextDirection; Pr.CellsTextDirection = TextDirection;
Pr.CellsNoWrap = NoWrap; Pr.CellsNoWrap = NoWrap;
Pr.CellsWidth = CellWidth;
if (undefined === CellWidth)
{
Pr.CellsWidth = CellWidthStart;
Pr.CellsWidthNotEqual = true;
}
else
{
Pr.CellsWidth = CellWidthStart;
Pr.CellsWidthNotEqual = false;
}
Pr.CellBorders = Pr.CellBorders =
{ {
...@@ -569,6 +583,8 @@ CTable.prototype = ...@@ -569,6 +583,8 @@ CTable.prototype =
else// if (tblwidth_Pct === CellW.Type) else// if (tblwidth_Pct === CellW.Type)
Pr.CellsWidth = -CellW.W; Pr.CellsWidth = -CellW.W;
Pr.CellsWidthNotEqual = false;
var Spacing = this.Content[0].Get_CellSpacing(); var Spacing = this.Content[0].Get_CellSpacing();
var Border_left = null; var Border_left = null;
......
...@@ -4291,6 +4291,7 @@ background-repeat: no-repeat;\ ...@@ -4291,6 +4291,7 @@ background-repeat: no-repeat;\
this.CellsTextDirection = tblProp.CellsTextDirection; this.CellsTextDirection = tblProp.CellsTextDirection;
this.CellsNoWrap = tblProp.CellsNoWrap; this.CellsNoWrap = tblProp.CellsNoWrap;
this.CellsWidth = tblProp.CellsWidth; this.CellsWidth = tblProp.CellsWidth;
this.CellsWidthNotEqual = tblProp.CellsWidthNotEqual;
this.Locked = (undefined != tblProp.Locked) ? tblProp.Locked : false; this.Locked = (undefined != tblProp.Locked) ? tblProp.Locked : false;
this.PercentFullWidth = tblProp.PercentFullWidth; this.PercentFullWidth = tblProp.PercentFullWidth;
} }
...@@ -4552,6 +4553,10 @@ background-repeat: no-repeat;\ ...@@ -4552,6 +4553,10 @@ background-repeat: no-repeat;\
{ {
return this.PercentFullWidth; return this.PercentFullWidth;
}; };
CTableProp.prototype.get_CellsWidthNotEqual = function()
{
return this.CellsWidthNotEqual;
};
function CBorders(obj) function CBorders(obj)
...@@ -9029,6 +9034,8 @@ background-repeat: no-repeat;\ ...@@ -9029,6 +9034,8 @@ background-repeat: no-repeat;\
CTableProp.prototype['get_CellsWidth'] = CTableProp.prototype.get_CellsWidth; CTableProp.prototype['get_CellsWidth'] = CTableProp.prototype.get_CellsWidth;
CTableProp.prototype['put_CellsWidth'] = CTableProp.prototype.put_CellsWidth; CTableProp.prototype['put_CellsWidth'] = CTableProp.prototype.put_CellsWidth;
CTableProp.prototype['get_PercentFullWidth'] = CTableProp.prototype.get_PercentFullWidth; CTableProp.prototype['get_PercentFullWidth'] = CTableProp.prototype.get_PercentFullWidth;
CTableProp.prototype['get_CellsWidthNotEqual'] = CTableProp.prototype.get_CellsWidthNotEqual;
window['Asc']['CBorders'] = window['Asc'].CBorders = CBorders; window['Asc']['CBorders'] = window['Asc'].CBorders = CBorders;
CBorders.prototype['get_Left'] = CBorders.prototype.get_Left; CBorders.prototype['get_Left'] = CBorders.prototype.get_Left;
CBorders.prototype['put_Left'] = CBorders.prototype.put_Left; CBorders.prototype['put_Left'] = CBorders.prototype.put_Left;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment