Commit 26dd8b3a authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

для merge и hyperlink расширяем Worksheet.nRowsCount и nColsCount

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58725 954022d7-b5bf-4e40-9824-e11837661b57
parent 57bda52d
...@@ -1978,6 +1978,13 @@ function Woorksheet(wb, _index, sId){ ...@@ -1978,6 +1978,13 @@ function Woorksheet(wb, _index, sId){
oHistoryRange = to; oHistoryRange = to;
History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ChangeMerge, oThis.getId(), oHistoryRange, new UndoRedoData_FromTo(new UndoRedoData_BBox(from), new UndoRedoData_BBox(to))); History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ChangeMerge, oThis.getId(), oHistoryRange, new UndoRedoData_FromTo(new UndoRedoData_BBox(from), new UndoRedoData_BBox(to)));
} }
//расширяем границы
if(null != to){
if(to.r2 > oThis.nRowsCount)
oThis.nRowsCount = to.r2 + 1;
if(to.c2 > oThis.nColsCount)
oThis.nColsCount = to.c2 + 1;
}
}); });
this.hyperlinkManager = new RangeDataManager(function(data, from, to, oChangeParam){ this.hyperlinkManager = new RangeDataManager(function(data, from, to, oChangeParam){
if(History.Is_On() && (null != from || null != to)) if(History.Is_On() && (null != from || null != to))
...@@ -1998,6 +2005,13 @@ function Woorksheet(wb, _index, sId){ ...@@ -1998,6 +2005,13 @@ function Woorksheet(wb, _index, sId){
data.Ref = oThis.getRange3(to.r1, to.c1, to.r2, to.c2); data.Ref = oThis.getRange3(to.r1, to.c1, to.r2, to.c2);
else if (oChangeParam && oChangeParam.removeStyle && null != data.Ref) else if (oChangeParam && oChangeParam.removeStyle && null != data.Ref)
data.Ref.cleanFormat(); data.Ref.cleanFormat();
//расширяем границы
if(null != to){
if(to.r2 > oThis.nRowsCount)
oThis.nRowsCount = to.r2 + 1;
if(to.c2 > oThis.nColsCount)
oThis.nColsCount = to.c2 + 1;
}
}); });
this.hyperlinkManager.setDependenceManager(this.mergeManager); this.hyperlinkManager.setDependenceManager(this.mergeManager);
this.DrawingDocument = new CDrawingDocument(); this.DrawingDocument = new CDrawingDocument();
......
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