Commit 6454794f authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

only tabs

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53958 954022d7-b5bf-4e40-9824-e11837661b57
parent 340e7a69
...@@ -4639,7 +4639,6 @@ ...@@ -4639,7 +4639,6 @@
.restore(); .restore();
} }
} }
}; };
WorksheetView.prototype.prepareDepCells = function (se){ WorksheetView.prototype.prepareDepCells = function (se){
...@@ -6271,6 +6270,7 @@ ...@@ -6271,6 +6270,7 @@
ret = this._calcActiveRangeOffset(); ret = this._calcActiveRangeOffset();
} }
if (!this.isCellEditMode && (sc !== ar.startCol || sr !== ar.startRow || isChangeSelectionShape)) { if (!this.isCellEditMode && (sc !== ar.startCol || sr !== ar.startRow || isChangeSelectionShape)) {
if (!this.isSelectionDialogMode) { if (!this.isSelectionDialogMode) {
this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false)); this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false));
...@@ -7276,7 +7276,6 @@ ...@@ -7276,7 +7276,6 @@
return; return;
var range; var range;
var canChangeColWidth = c_oAscCanChangeColWidth.none; var canChangeColWidth = c_oAscCanChangeColWidth.none;
var selectionRange;
var bIsUpdate = true; var bIsUpdate = true;
if (onlyActive) { if (onlyActive) {
...@@ -7311,7 +7310,6 @@ ...@@ -7311,7 +7310,6 @@
return border; return border;
} }
selectionRange = arn.clone();
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
...@@ -7518,8 +7516,8 @@ ...@@ -7518,8 +7516,8 @@
} }
buildRecalc(t.model.workbook); buildRecalc(t.model.workbook);
unLockDraw(t.model.workbook); unLockDraw(t.model.workbook);
arn = selectData[0]; var arn = selectData[0];
selectionRange = arn.clone(true); var selectionRange = arn.clone(true);
//добавляем автофильтры и форматированные таблицы //добавляем автофильтры и форматированные таблицы
if(isLocal === true && val.lStorage && val.lStorage.autoFilters && val.lStorage.autoFilters.length) if(isLocal === true && val.lStorage && val.lStorage.autoFilters && val.lStorage.autoFilters.length)
...@@ -8789,7 +8787,6 @@ ...@@ -8789,7 +8787,6 @@
}; };
switch (prop) { switch (prop) {
case "colWidth": case "colWidth":
functionModelAction = function () { functionModelAction = function () {
pad = t.width_padding * 2 + t.width_1px; pad = t.width_padding * 2 + t.width_1px;
...@@ -8978,6 +8975,7 @@ ...@@ -8978,6 +8975,7 @@
break; break;
case "delCell": case "delCell":
var isCheckChangeAutoFilter;
bUndoRedo = val.range != undefined; bUndoRedo = val.range != undefined;
if (val && val.range) { if (val && val.range) {
_updateRangeDel = val.range; _updateRangeDel = val.range;
...@@ -8988,7 +8986,7 @@ ...@@ -8988,7 +8986,7 @@
range = t.model.getRange3(_updateRangeDel.r1, _updateRangeDel.c1, _updateRangeDel.r2, _updateRangeDel.c2); range = t.model.getRange3(_updateRangeDel.r1, _updateRangeDel.c1, _updateRangeDel.r2, _updateRangeDel.c2);
switch (val) { switch (val) {
case c_oAscDeleteOptions.DeleteCellsAndShiftLeft: case c_oAscDeleteOptions.DeleteCellsAndShiftLeft:
var isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteCellsAndShiftLeft, prop, bUndoRedo); isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteCellsAndShiftLeft, prop, bUndoRedo);
if(!isCheckChangeAutoFilter) if(!isCheckChangeAutoFilter)
return; return;
...@@ -9013,7 +9011,7 @@ ...@@ -9013,7 +9011,7 @@
gc_nMaxCol0, _updateRangeDel.r2), null, onChangeWorksheetCallback); gc_nMaxCol0, _updateRangeDel.r2), null, onChangeWorksheetCallback);
return; return;
case c_oAscDeleteOptions.DeleteCellsAndShiftTop: case c_oAscDeleteOptions.DeleteCellsAndShiftTop:
var isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteCellsAndShiftTop, prop, bUndoRedo); isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteCellsAndShiftTop, prop, bUndoRedo);
if(!isCheckChangeAutoFilter) if(!isCheckChangeAutoFilter)
return; return;
...@@ -9038,7 +9036,7 @@ ...@@ -9038,7 +9036,7 @@
_updateRangeDel.c2, gc_nMaxRow0), null, onChangeWorksheetCallback); _updateRangeDel.c2, gc_nMaxRow0), null, onChangeWorksheetCallback);
return; return;
case c_oAscDeleteOptions.DeleteColumns: case c_oAscDeleteOptions.DeleteColumns:
var isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteColumns, prop, bUndoRedo); isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteColumns, prop, bUndoRedo);
if(!isCheckChangeAutoFilter) if(!isCheckChangeAutoFilter)
return; return;
functionModelAction = function () { functionModelAction = function () {
...@@ -9060,7 +9058,7 @@ ...@@ -9060,7 +9058,7 @@
onChangeWorksheetCallback); onChangeWorksheetCallback);
return; return;
case c_oAscDeleteOptions.DeleteRows: case c_oAscDeleteOptions.DeleteRows:
var isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteRows, prop, bUndoRedo); isCheckChangeAutoFilter = t.autoFilters.isActiveCellsCrossHalfFTable(_updateRangeDel, c_oAscDeleteOptions.DeleteRows, prop, bUndoRedo);
if(!isCheckChangeAutoFilter) if(!isCheckChangeAutoFilter)
return; return;
functionModelAction = function () { functionModelAction = function () {
...@@ -9445,8 +9443,7 @@ ...@@ -9445,8 +9443,7 @@
maxC = ar.startCol; maxC = ar.startCol;
maxR = this.rows.length - 1; maxR = this.rows.length - 1;
} }
} } else {
else {
// Идем назад с последней // Идем назад с последней
c = this.cols.length - 1; c = this.cols.length - 1;
r = this.rows.length - 1; r = this.rows.length - 1;
...@@ -9552,7 +9549,6 @@ ...@@ -9552,7 +9549,6 @@
}; };
WorksheetView.prototype._replaceCellsText = function (aReplaceCells, valueForSearching, options) { WorksheetView.prototype._replaceCellsText = function (aReplaceCells, valueForSearching, options) {
var oSelectionHistory = this.activeRange.clone();
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
...@@ -9730,7 +9726,7 @@ ...@@ -9730,7 +9726,7 @@
var ftext = val.reduce(function (pv,cv) {return pv + cv.text;}, ""); var ftext = val.reduce(function (pv,cv) {return pv + cv.text;}, "");
var ret = true; var ret = true;
// ToDo - при вводе формулы в заголовок автофильтра надо писать "0" // ToDo - при вводе формулы в заголовок автофильтра надо писать "0"
c.setValue(ftext, function(r){ ret = r;} ); c.setValue(ftext, function(r){ret = r;});
if(!ret) { if(!ret) {
t.isFormulaEditMode = oldMode; t.isFormulaEditMode = oldMode;
History.EndTransaction(); History.EndTransaction();
......
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