Commit bd665825 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

рефакторинг

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58603 954022d7-b5bf-4e40-9824-e11837661b57
parent 98910674
...@@ -2811,13 +2811,11 @@ ...@@ -2811,13 +2811,11 @@
var ref; var ref;
var style; var style;
var range; var range;
var tempRange;
t.lStorage.autoFilters = []; t.lStorage.autoFilters = [];
for(var i = 0; i < findFilter.length; i++) for(var i = 0; i < findFilter.length; i++)
{ {
ref = findFilter[i].Ref; ref = findFilter[i].Ref;
tempRange = autoFiltersObj._refToRange(ref); range = {r1: ref.r1 - activeRange.r1, c1: ref.c1 - activeRange.c1, r2: ref.r2 - activeRange.r1, c2: ref.c2 - activeRange.c1};
range = {r1: tempRange.r1 - activeRange.r1, c1: tempRange.c1 - activeRange.c1, r2: tempRange.r2 - activeRange.r1, c2: tempRange.c2 - activeRange.c1};
style = findFilter[i].TableStyleInfo ? findFilter[i].TableStyleInfo.Name : null; style = findFilter[i].TableStyleInfo ? findFilter[i].TableStyleInfo.Name : null;
t.lStorage.autoFilters[i] = t.lStorage.autoFilters[i] =
{ {
......
...@@ -8114,7 +8114,7 @@ ...@@ -8114,7 +8114,7 @@
var range; var range;
var tablePartRange; var tablePartRange;
var activeRange = window["Asc"]["editor"].wb.clipboard.activeRange; var activeRange = window["Asc"]["editor"].wb.clipboard.activeRange;
var refInsertBinary = t.autoFilters._refToRange(activeRange); var refInsertBinary = Asc.g_oRangeCache.getAscRange(activeRange);
var diffRow; var diffRow;
var diffCol; var diffCol;
for(var aF = 0; aF < aFilters.length; aF++) for(var aF = 0; aF < aFilters.length; aF++)
...@@ -8782,7 +8782,7 @@ ...@@ -8782,7 +8782,7 @@
var numFor = 0; var numFor = 0;
var pasteRange = window["Asc"]["editor"].wb.clipboard.activeRange; var pasteRange = window["Asc"]["editor"].wb.clipboard.activeRange;
var activeCellsPasteFragment = this.autoFilters._refToRange(pasteRange); var activeCellsPasteFragment = Asc.g_oRangeCache.getAscRange(pasteRange);
var rMax = (activeCellsPasteFragment.r2 - activeCellsPasteFragment.r1) + arn.r1 + 1; var rMax = (activeCellsPasteFragment.r2 - activeCellsPasteFragment.r1) + arn.r1 + 1;
var cMax = (activeCellsPasteFragment.c2 - activeCellsPasteFragment.c1) + arn.c1 + 1; var cMax = (activeCellsPasteFragment.c2 - activeCellsPasteFragment.c1) + arn.c1 + 1;
......
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