Читаем закрепленную область по xSplit и ySplit

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55999 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/Serialize.js

@@ -6118,11 +6118,15 @@
         };
         this.ReadPane = function (type, length, oPane) {
             var res = c_oSerConstants.ReadOk;
-            if (c_oSer_Pane.State === type) {
+            if (c_oSer_Pane.State === type)
                 oPane.state = this.stream.GetString2LE(length);
-            } else if (c_oSer_Pane.TopLeftCell === type) {
-                oPane.topLeftCell = this.stream.GetString2LE(length);
-            } else
+            else if (c_oSer_Pane.TopLeftCell === type)
+				oPane.topLeftCell = this.stream.GetString2LE(length);
+			else if (c_oSer_Pane.XSplit === type)
+				oPane.xSplit = this.stream.GetDoubleLE();
+			else if (c_oSer_Pane.YSplit === type)
+				oPane.ySplit = this.stream.GetDoubleLE();
+            else
                 res = c_oSerConstants.ReadUnknown;
             return res;
         };

Excel/utils/utils.js

@@ -1031,6 +1031,8 @@
 
 			this.state = null;
 			this.topLeftCell = null;
+			this.xSplit = 0;
+			this.ySplit = 0;
 			// CellAddress для удобства
 			this.topLeftFrozenCell = null;
 
@@ -1040,14 +1042,17 @@
 			var res = new asc_CPane();
 			res.state = this.state;
 			res.topLeftCell = this.topLeftCell;
+			res.xSplit = this.xSplit;
+			res.ySplit = this.ySplit;
 			res.topLeftFrozenCell = this.topLeftFrozenCell ?
 				new CellAddress(this.topLeftFrozenCell.row, this.topLeftFrozenCell.col) : null;
 			return res;
 		};
 		asc_CPane.prototype.init = function() {
 			// ToDo Обрабатываем пока только frozen и frozenSplit
-			if (c_oAscPaneState.Frozen === this.state || c_oAscPaneState.FrozenSplit === this.state) {
-				this.topLeftFrozenCell = new CellAddress(this.topLeftCell);
+			if ((c_oAscPaneState.Frozen === this.state || c_oAscPaneState.FrozenSplit === this.state) &&
+				(0 < this.xSplit || 0 < this.ySplit)) {
+				this.topLeftFrozenCell = new CellAddress(this.ySplit, this.xSplit, 0);
 				if (!this.topLeftFrozenCell.isValid())
 					this.topLeftFrozenCell = null;
 			}