Commit 8a82c85b authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал getActiveRange (переделал на getName)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56084 954022d7-b5bf-4e40-9824-e11837661b57
parent 27d47d6b
...@@ -6177,8 +6177,10 @@ ...@@ -6177,8 +6177,10 @@
}; };
WorksheetView.prototype.getSelectionRangeValue = function () { WorksheetView.prototype.getSelectionRangeValue = function () {
// ToDo стоит добавлять $ и проблема с выбором целого столбца/строки
var sListName = this.model.getName(); var sListName = this.model.getName();
return sListName + "!" + this.getActiveRange(this.activeRange.clone(true)); var tmpRange = this.activeRange.clone(true);
return sListName + "!" + tmpRange.getName();
}; };
WorksheetView.prototype.getSelectionInfo = function (bExt) { WorksheetView.prototype.getSelectionInfo = function (bExt) {
...@@ -10425,18 +10427,7 @@ ...@@ -10425,18 +10427,7 @@
ar.c2 = ar.c1; ar.c2 = ar.c1;
} }
var s = t.getActiveRange(ar); editor.enterCellRange(ar.getName());
editor.enterCellRange(s);
};
WorksheetView.prototype.getActiveRange = function (ar) {
if (ar.c1 === ar.c2 && ar.r1 === ar.r2) {return this._getCellTitle(ar.c1, ar.r1);}
if (ar.c1 === ar.c2 && ar.r1 === 0 && ar.r2 === this.rows.length -1) {var ct = this._getColumnTitle(ar.c1); return ct + ":" + ct;}
if (ar.r1 === ar.r2 && ar.c1 === 0 && ar.c2 === this.cols.length -1) {var rt = this._getRowTitle(ar.r1); return rt + ":" + rt;}
if (ar.r1 === 0 && ar.r2 === gc_nMaxRow0 || ar.r1 === 1 && ar.r2 === gc_nMaxRow ){return this._getColumnTitle(ar.c1) + ":" + this._getColumnTitle(ar.c2);}
if (ar.c1 === 0 && ar.c2 === gc_nMaxCol0 || ar.c1 === 1 && ar.c2 === gc_nMaxCol ){return this._getRowTitle(ar.r1) + ":" + this._getRowTitle(ar.r2);}
return this._getCellTitle(ar.c1, ar.r1) + ":" + this._getCellTitle(ar.c2, ar.r2);
}; };
WorksheetView.prototype.addFormulaRange = function (range) { WorksheetView.prototype.addFormulaRange = function (range) {
......
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