Commit 711c7994 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Правка для проверки на форматированную таблицу

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52759 954022d7-b5bf-4e40-9824-e11837661b57
parent 7ff61ef1
...@@ -302,15 +302,15 @@ ...@@ -302,15 +302,15 @@
if(isTurnOffHistory) if(isTurnOffHistory)
History.TurnOff(); History.TurnOff();
History.Create_NewPoint(); History.Create_NewPoint();
if(selectionTable) if(selectionTable)
{ {
var oSelection = History.GetSelection(); var oSelection = History.GetSelection();
if(null != oSelection) if(null != oSelection)
{ {
oSelection = oSelection.clone(); oSelection = oSelection.clone();
oSelection.assign(selectionTable.c1, selectionTable.r1, selectionTable.c2, selectionTable.r2); oSelection.assign(selectionTable.c1, selectionTable.r1, selectionTable.c2, selectionTable.r2);
History.SetSelectionRedo(oSelection); History.SetSelectionRedo(oSelection);
} }
} }
History.StartTransaction(); History.StartTransaction();
if(paramsForCallBack) if(paramsForCallBack)
...@@ -2032,7 +2032,7 @@ ...@@ -2032,7 +2032,7 @@
return tableRange; return tableRange;
} }
} }
return false; return null;
}, },
getAddFormatTableOptions: function(activeCells) getAddFormatTableOptions: function(activeCells)
......
...@@ -5631,7 +5631,7 @@ ...@@ -5631,7 +5631,7 @@
cell_info.halign = c.getAlignHorizontalByValue().toLowerCase(); cell_info.halign = c.getAlignHorizontalByValue().toLowerCase();
cell_info.valign = c.getAlignVertical().toLowerCase(); cell_info.valign = c.getAlignVertical().toLowerCase();
cell_info.isFormatTable = this.autoFilters.searchRangeInTableParts(activeCell); cell_info.isFormatTable = (null !== this.autoFilters.searchRangeInTableParts(activeCell));
cell_info.styleName = c.getStyleName(); cell_info.styleName = c.getStyleName();
cell_info.angle = c.getAngle(); cell_info.angle = c.getAngle();
......
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