Commit 0b0aba38 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 30318 - [TextArt] При скрытии столбцов часть textart не отрисовывается

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64746 954022d7-b5bf-4e40-9824-e11837661b57
parent c7d6f23a
...@@ -9331,6 +9331,7 @@ ...@@ -9331,6 +9331,7 @@
functionModelAction = function () { functionModelAction = function () {
t.model.setColHidden(/*bHidden*/false, arn.c1, arn.c2); t.model.setColHidden(/*bHidden*/false, arn.c1, arn.c2);
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
}; };
oChangeData.hided = new asc_Range(arn.c1, 0, arn.c2, gc_nMaxRow0); oChangeData.hided = new asc_Range(arn.c1, 0, arn.c2, gc_nMaxRow0);
this._isLockedAll(onChangeWorksheetCallback); this._isLockedAll(onChangeWorksheetCallback);
...@@ -9339,6 +9340,7 @@ ...@@ -9339,6 +9340,7 @@
functionModelAction = function () { functionModelAction = function () {
t.model.setColHidden(/*bHidden*/true, arn.c1, arn.c2); t.model.setColHidden(/*bHidden*/true, arn.c1, arn.c2);
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
}; };
oChangeData.hided = new asc_Range(arn.c1, 0, arn.c2, gc_nMaxRow0); oChangeData.hided = new asc_Range(arn.c1, 0, arn.c2, gc_nMaxRow0);
this._isLockedAll(onChangeWorksheetCallback); this._isLockedAll(onChangeWorksheetCallback);
...@@ -9358,6 +9360,7 @@ ...@@ -9358,6 +9360,7 @@
t.model.setRowHidden(/*bHidden*/false, arn.r1, arn.r2); t.model.setRowHidden(/*bHidden*/false, arn.r1, arn.r2);
t.autoFilters.reDrawFilter(arn); t.autoFilters.reDrawFilter(arn);
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
}; };
oChangeData.hided = new asc_Range(0, arn.r1, gc_nMaxCol0, arn.r2); oChangeData.hided = new asc_Range(0, arn.r1, gc_nMaxCol0, arn.r2);
this._isLockedAll(onChangeWorksheetCallback); this._isLockedAll(onChangeWorksheetCallback);
...@@ -9367,6 +9370,7 @@ ...@@ -9367,6 +9370,7 @@
t.model.setRowHidden(/*bHidden*/true, arn.r1, arn.r2); t.model.setRowHidden(/*bHidden*/true, arn.r1, arn.r2);
t.autoFilters.reDrawFilter(arn); t.autoFilters.reDrawFilter(arn);
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
}; };
oChangeData.hided = new asc_Range(0, arn.r1, gc_nMaxCol0, arn.r2); oChangeData.hided = new asc_Range(0, arn.r1, gc_nMaxCol0, arn.r2);
this._isLockedAll(onChangeWorksheetCallback); this._isLockedAll(onChangeWorksheetCallback);
...@@ -9384,6 +9388,7 @@ ...@@ -9384,6 +9388,7 @@
History.StartTransaction(); History.StartTransaction();
if (range.addCellsShiftRight()) { if (range.addCellsShiftRight()) {
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
if(isCheckChangeAutoFilter === true) if(isCheckChangeAutoFilter === true)
t.autoFilters.insertColumn(prop, arn, c_oAscInsertOptions.InsertCellsAndShiftRight); t.autoFilters.insertColumn(prop, arn, c_oAscInsertOptions.InsertCellsAndShiftRight);
t.cellCommentator.updateCommentsDependencies(true, val, arn); t.cellCommentator.updateCommentsDependencies(true, val, arn);
...@@ -9405,6 +9410,7 @@ ...@@ -9405,6 +9410,7 @@
History.StartTransaction(); History.StartTransaction();
if (range.addCellsShiftBottom()) { if (range.addCellsShiftBottom()) {
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
if(isCheckChangeAutoFilter === true) if(isCheckChangeAutoFilter === true)
t.autoFilters.insertRows(prop, arn, c_oAscInsertOptions.InsertCellsAndShiftDown); t.autoFilters.insertRows(prop, arn, c_oAscInsertOptions.InsertCellsAndShiftDown);
t.cellCommentator.updateCommentsDependencies(true, val, arn); t.cellCommentator.updateCommentsDependencies(true, val, arn);
...@@ -9421,6 +9427,7 @@ ...@@ -9421,6 +9427,7 @@
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
t.model.insertColsBefore(arn.c1, arn.c2 - arn.c1 + 1); t.model.insertColsBefore(arn.c1, arn.c2 - arn.c1 + 1);
t.autoFilters.insertColumn(prop, arn, c_oAscInsertOptions.InsertColumns); t.autoFilters.insertColumn(prop, arn, c_oAscInsertOptions.InsertColumns);
t.objectRender.updateDrawingObject(true, val, arn); t.objectRender.updateDrawingObject(true, val, arn);
...@@ -9435,6 +9442,7 @@ ...@@ -9435,6 +9442,7 @@
case c_oAscInsertOptions.InsertRows: case c_oAscInsertOptions.InsertRows:
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
t.model.insertRowsBefore(arn.r1, arn.r2 - arn.r1 + 1); t.model.insertRowsBefore(arn.r1, arn.r2 - arn.r1 + 1);
t.autoFilters.insertRows(prop, arn, c_oAscInsertOptions.InsertRows); t.autoFilters.insertRows(prop, arn, c_oAscInsertOptions.InsertRows);
t.objectRender.updateDrawingObject(true, val, arn); t.objectRender.updateDrawingObject(true, val, arn);
...@@ -9470,6 +9478,7 @@ ...@@ -9470,6 +9478,7 @@
t.objectRender.updateDrawingObject(false, val, checkRange); t.objectRender.updateDrawingObject(false, val, checkRange);
} }
History.EndTransaction(); History.EndTransaction();
reinitRanges = true;
}; };
oChangeData.changedRange = new asc_Range(checkRange.c1, checkRange.r1, gc_nMaxCol0, checkRange.r2); oChangeData.changedRange = new asc_Range(checkRange.c1, checkRange.r1, gc_nMaxCol0, checkRange.r2);
...@@ -9495,6 +9504,8 @@ ...@@ -9495,6 +9504,8 @@
t.objectRender.updateDrawingObject(false, val, checkRange); t.objectRender.updateDrawingObject(false, val, checkRange);
} }
History.EndTransaction(); History.EndTransaction();
reinitRanges = true;
}; };
oChangeData.changedRange = new asc_Range(checkRange.c1, checkRange.r1, checkRange.c2, gc_nMaxRow0); oChangeData.changedRange = new asc_Range(checkRange.c1, checkRange.r1, checkRange.c2, gc_nMaxRow0);
...@@ -9507,6 +9518,7 @@ ...@@ -9507,6 +9518,7 @@
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
t.cellCommentator.updateCommentsDependencies(false, val, checkRange); t.cellCommentator.updateCommentsDependencies(false, val, checkRange);
...@@ -9528,6 +9540,7 @@ ...@@ -9528,6 +9540,7 @@
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
t.cellCommentator.updateCommentsDependencies(false, val, checkRange); t.cellCommentator.updateCommentsDependencies(false, val, checkRange);
...@@ -9551,6 +9564,7 @@ ...@@ -9551,6 +9564,7 @@
isUpdateCols = true; isUpdateCols = true;
isUpdateRows = true; isUpdateRows = true;
fullRecalc = true; fullRecalc = true;
reinitRanges = true;
}; };
this._isLockedAll (onChangeWorksheetCallback); this._isLockedAll (onChangeWorksheetCallback);
......
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