Commit 1b4850e9 authored by Ilya Kirillov's avatar Ilya Kirillov

В связи с правкой бага 32174, сделано, чтобы в табличных свойствах можно было...

В связи с правкой бага 32174, сделано, чтобы в табличных свойствах можно было получить значение по которому можно переводить абсолютные ширины в процентные и наоборот.
parent b4be6771
......@@ -765,6 +765,8 @@ CTable.prototype =
this.DrawingDocument.CheckTableStyles( new Asc.CTablePropLook( this.TableLook ) );
}
Pr.PercentFullWidth = this.private_RecalculatePercentWidth();
return Pr;
},
......
......@@ -223,7 +223,7 @@ CTable.prototype.private_RecalculateGrid = function()
SumGrid[Index] = TempSum;
}
var PctWidth = this.XLimit - this.X - this.Get_TableOffsetCorrection() + this.Get_RightTableOffsetCorrection();
var PctWidth = this.private_RecalculatePercentWidth();
var MinWidth = this.Internal_Get_TableMinWidth();
var TableW = 0;
if (tblwidth_Auto === TablePr.TableW.Type)
......@@ -3000,6 +3000,10 @@ CTable.prototype.private_RecalculateSkipPage = function(CurPage)
this.Pages[CurPage].LastRow = FirstRow -1;
}
};
CTable.prototype.private_RecalculatePercentWidth = function()
{
return this.XLimit - this.X - this.Get_TableOffsetCorrection() + this.Get_RightTableOffsetCorrection();
};
//----------------------------------------------------------------------------------------------------------------------
// Класс CTablePage
//----------------------------------------------------------------------------------------------------------------------
......
......@@ -4297,6 +4297,7 @@ function CTableProp (tblProp)
this.CellsNoWrap = tblProp.CellsNoWrap;
this.CellsWidth = tblProp.CellsWidth;
this.Locked = (undefined != tblProp.Locked) ? tblProp.Locked : false;
this.PercentFullWidth = tblProp.PercentFullWidth;
}
else
{
......@@ -4552,6 +4553,10 @@ function CTableProp (tblProp)
{
this.CellsWidth = v;
};
CTableProp.prototype.get_PercentFullWidth = function()
{
return this.PercentFullWidth;
};
function CBorders (obj)
......@@ -8946,6 +8951,7 @@ CTableProp.prototype['get_CellsNoWrap'] = CTableProp.prototype.get_CellsN
CTableProp.prototype['put_CellsNoWrap'] = CTableProp.prototype.put_CellsNoWrap;
CTableProp.prototype['get_CellsWidth'] = CTableProp.prototype.get_CellsWidth;
CTableProp.prototype['put_CellsWidth'] = CTableProp.prototype.put_CellsWidth;
CTableProp.prototype['get_PercentFullWidth'] = CTableProp.prototype.get_PercentFullWidth;
window['Asc']['CBorders'] = window['Asc'].CBorders = CBorders;
CBorders.prototype['get_Left'] = CBorders.prototype.get_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