Commit d3ce9ca4 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил проблему с сортировкой (Ref теперь это Range, а не string)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58831 954022d7-b5bf-4e40-9824-e11837661b57
parent d0c4d9e5
...@@ -1282,7 +1282,7 @@ ...@@ -1282,7 +1282,7 @@
if(null != sortState.Ref) if(null != sortState.Ref)
{ {
this.memory.WriteByte(c_oSer_SortState.Ref); this.memory.WriteByte(c_oSer_SortState.Ref);
this.memory.WriteString2(sortState.Ref); this.memory.WriteString2(sortState.Ref.getName());
} }
if(null != sortState.CaseSensitive) if(null != sortState.CaseSensitive)
this.bs.WriteItem(c_oSer_SortState.CaseSensitive, function(){oThis.memory.WriteBool(sortState.CaseSensitive);}); this.bs.WriteItem(c_oSer_SortState.CaseSensitive, function(){oThis.memory.WriteBool(sortState.CaseSensitive);});
...@@ -2386,10 +2386,9 @@ ...@@ -2386,10 +2386,9 @@
//activeRange(serialize activeRange) //activeRange(serialize activeRange)
if(oThis.isCopyPaste) if(oThis.isCopyPaste)
{ {
var activeRange = (new CellAddress(oThis.isCopyPaste.r1, oThis.isCopyPaste.c1, 0)).getID() + ":" + (new CellAddress(oThis.isCopyPaste.r2, oThis.isCopyPaste.c2, 0)).getID();
this.memory.WriteByte(c_oSerWorksheetPropTypes.Ref); this.memory.WriteByte(c_oSerWorksheetPropTypes.Ref);
this.memory.WriteByte(c_oSerPropLenType.Variable); this.memory.WriteByte(c_oSerPropLenType.Variable);
this.memory.WriteString2(activeRange); this.memory.WriteString2(oThis.isCopyPaste.getName());
} }
}; };
this.WriteWorksheetCols = function(ws) this.WriteWorksheetCols = function(ws)
......
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