Commit 3853b59b authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

fix bug #26786

При сохранении не было проверки на pane (не frozen)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58581 954022d7-b5bf-4e40-9824-e11837661b57
parent 4881b661
...@@ -2533,7 +2533,7 @@ ...@@ -2533,7 +2533,7 @@
this.bs.WriteItem(c_oSer_SheetView.ShowGridLines, function(){oThis.memory.WriteBool(oSheetView.showGridLines);}); this.bs.WriteItem(c_oSer_SheetView.ShowGridLines, function(){oThis.memory.WriteBool(oSheetView.showGridLines);});
if (null !== oSheetView.showRowColHeaders) if (null !== oSheetView.showRowColHeaders)
this.bs.WriteItem(c_oSer_SheetView.ShowRowColHeaders, function(){oThis.memory.WriteBool(oSheetView.showRowColHeaders);}); this.bs.WriteItem(c_oSer_SheetView.ShowRowColHeaders, function(){oThis.memory.WriteBool(oSheetView.showRowColHeaders);});
if (null !== oSheetView.pane) if (null !== oSheetView.pane && oSheetView.pane.isInit())
this.bs.WriteItem(c_oSer_SheetView.Pane, function(){oThis.WriteSheetViewPane(oSheetView.pane);}); this.bs.WriteItem(c_oSer_SheetView.Pane, function(){oThis.WriteSheetViewPane(oSheetView.pane);});
}; };
this.WriteSheetViewPane = function (oPane) { this.WriteSheetViewPane = function (oPane) {
......
...@@ -1165,6 +1165,9 @@ ...@@ -1165,6 +1165,9 @@
return this; return this;
} }
asc_CPane.prototype.isInit = function () {
return null !== this.topLeftFrozenCell;
};
asc_CPane.prototype.clone = function() { asc_CPane.prototype.clone = function() {
var res = new asc_CPane(); var res = new asc_CPane();
res.state = this.state; res.state = this.state;
......
...@@ -1142,7 +1142,8 @@ ...@@ -1142,7 +1142,8 @@
WorksheetView.prototype._initPane = function () { WorksheetView.prototype._initPane = function () {
var pane = this.model.sheetViews[0].pane; var pane = this.model.sheetViews[0].pane;
if (null !== pane && null !== (this.topLeftFrozenCell = pane.topLeftFrozenCell)) { if (null !== pane && pane.isInit()) {
this.topLeftFrozenCell = pane.topLeftFrozenCell;
this.visibleRange.r1 = this.topLeftFrozenCell.getRow0(); this.visibleRange.r1 = this.topLeftFrozenCell.getRow0();
this.visibleRange.c1 = this.topLeftFrozenCell.getCol0(); this.visibleRange.c1 = this.topLeftFrozenCell.getCol0();
} }
......
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