Commit 4c4b4b03 authored by Alexey.Musinov's avatar Alexey.Musinov

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

* 'develop' of https://github.com/ONLYOFFICE/sdkjs:
  freeze pane m_oState revert to string
  fix bug 30245 support function SUMIFS
parents d437ac6b dd61d3ee
......@@ -268,9 +268,9 @@ var c_oAscCanChangeColWidth = {
};
var c_oAscPaneState = {
Frozen: 0,
FrozenSplit: 1,
Split: 2
Frozen: "frozen",
FrozenSplit: "frozenSplit",
Split: "split"
};
var c_oAscFindLookIn = {
......
......@@ -1072,7 +1072,7 @@ cArea.prototype.foreach = function ( action ) {
}
};
cArea.prototype.getMatrix = function () {
var t = this, arr = [], r = this.getRange();
var arr = [], r = this.getRange();
r._foreach2(function (cell, i, j, r1, c1) {
if (!arr[i - r1]) {
arr[i - r1] = [];
......@@ -1082,7 +1082,7 @@ cArea.prototype.foreach = function ( action ) {
return arr;
};
cArea.prototype.getValuesNoEmpty = function () {
var t = this, arr = [], r = this.getRange();
var arr = [], r = this.getRange();
r._foreachNoEmpty(function (cell) {
arr.push(checkTypeCell(cell));
});
......@@ -2943,28 +2943,28 @@ var cFormulaOperators = {
В методе Calculate необходимо отслеживать тип принимаемых аргументов. Для примера, если мы обращаемся к ячейке A1, в которой лежит 123, то этот аргумент будет числом. Если же там лежит "123", то это уже строка. Для более подробной информации смотреть спецификацию.
Метод getInfo является обязательным, ибо через этот метод в интерфейс передается информация о реализованных функциях.
*/
var cFormulaFunctionGroup = {};
var cFormulaFunction = {};
var cAllFormulaFunction = {};
function getFormulasInfo() {
var list = [], a, b, f;
for ( var type in cFormulaFunctionGroup ) {
b = new AscCommon.asc_CFormulaGroup(type);
for ( var i = 0; i < cFormulaFunctionGroup[type].length; ++i ) {
a = new cFormulaFunctionGroup[type][i]();
if ( a.getInfo ) {
f = new AscCommon.asc_CFormula(a.getInfo());
b.asc_addFormulaElement( f );
cFormulaFunction[f.asc_getName()] = cFormulaFunctionGroup[type][i];
}
cAllFormulaFunction[a.name] = cFormulaFunctionGroup[type][i];
}
list.push( b );
}
return list;
}
var cFormulaFunctionGroup = {};
var cFormulaFunction = {};
var cAllFormulaFunction = {};
function getFormulasInfo() {
var list = [], a, b, f;
for (var type in cFormulaFunctionGroup) {
b = new AscCommon.asc_CFormulaGroup(type);
for (var i = 0; i < cFormulaFunctionGroup[type].length; ++i) {
a = new cFormulaFunctionGroup[type][i]();
if (a.getInfo) {
f = new AscCommon.asc_CFormula(a.getInfo());
b.asc_addFormulaElement(f);
cFormulaFunction[f.asc_getName()] = cFormulaFunctionGroup[type][i];
}
cAllFormulaFunction[a.name] = cFormulaFunctionGroup[type][i];
}
list.push(b);
}
return list;
}
/*--------------------------------------------------------------------------*/
......
......@@ -630,11 +630,10 @@
/** @enum */
var c_oSer_Pane = {
ActivePane : 0,
//State : 1,
State : 1,
TopLeftCell : 2,
XSplit : 3,
YSplit : 4,
State : 5
YSplit : 4
};
/** @enum */
var c_oSer_Selection = {
......@@ -2653,7 +2652,7 @@
var oThis = this;
//this.bs.WriteItem(c_oSer_Pane.ActivePane, function(){oThis.memory.WriteByte();});
// Всегда пишем Frozen
this.bs.WriteItem(c_oSer_Pane.State, function(){oThis.memory.WriteByte(AscCommonExcel.c_oAscPaneState.Frozen);});
this.bs.WriteItem(c_oSer_Pane.State, function(){oThis.memory.WriteString3(AscCommonExcel.c_oAscPaneState.Frozen);});
this.bs.WriteItem(c_oSer_Pane.TopLeftCell, function(){oThis.memory.WriteString3(oPane.topLeftFrozenCell.getID());});
var col = oPane.topLeftFrozenCell.getCol0();
......@@ -6589,7 +6588,7 @@
if (c_oSer_Pane.ActivePane === type)
this.stream.GetUChar();
else if (c_oSer_Pane.State === type)
oPane.state = this.stream.GetUChar();
oPane.state = this.stream.GetString2LE(length);
else if (c_oSer_Pane.TopLeftCell === type)
oPane.topLeftCell = this.stream.GetString2LE(length);
else if (c_oSer_Pane.XSplit === type)
......
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