Commit db0cf18b authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

правка для смещения форматированных таблиц в случае добавление строки/столбца

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59229 954022d7-b5bf-4e40-9824-e11837661b57
parent 9366fdf0
......@@ -1255,7 +1255,7 @@ var gUndoInsDelCellsFlag = true;
insertColumn: function(type, val, ar, insertType)
{
var activeCells;
var DeleteColumns = (insertType == c_oAscDeleteOptions.DeleteColumns && type == 'delCell') ? true : false;
var DeleteColumns = ((insertType == c_oAscDeleteOptions.DeleteColumns && type == 'delCell') || insertType == c_oAscInsertOptions.InsertColumns) ? true : false;
if(typeof val == 'object')
{
activeCells = val.clone();
......@@ -1289,7 +1289,7 @@ var gUndoInsDelCellsFlag = true;
insertRows: function(type, val, ar, insertType)
{
var activeCells;
var DeleteRows = (insertType == c_oAscDeleteOptions.DeleteRows && type == 'delCell') ? true : false;
var DeleteRows = ((insertType == c_oAscDeleteOptions.DeleteRows && type == 'delCell') || insertType == c_oAscInsertOptions.InsertRows) ? true : false;
if(typeof val == 'object')
{
activeCells = val.clone();
......
......@@ -9596,7 +9596,7 @@
fullRecalc = true;
t.model.insertColsBefore(_updateRangeIns.c1, _updateRangeIns.c2 - _updateRangeIns.c1 + 1);
if(gUndoInsDelCellsFlag == true)
t.autoFilters.insertColumn(prop, _updateRangeIns, arn);
t.autoFilters.insertColumn(prop, _updateRangeIns, arn, c_oAscInsertOptions.InsertColumns);
else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
gUndoInsDelCellsFlag = true;
......@@ -9617,7 +9617,7 @@
fullRecalc = true;
t.model.insertRowsBefore(_updateRangeIns.r1, _updateRangeIns.r2 - _updateRangeIns.r1 + 1);
if(gUndoInsDelCellsFlag == true)
t.autoFilters.insertRows(prop,_updateRangeIns, arn);
t.autoFilters.insertRows(prop,_updateRangeIns, arn, c_oAscInsertOptions.InsertRows);
else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
gUndoInsDelCellsFlag = true;
......
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