Commit be0f48c0 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с обновлением типа курсора.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62917 954022d7-b5bf-4e40-9824-e11837661b57
parent 70195567
......@@ -9162,6 +9162,9 @@ CDocument.prototype =
Update_CursorType : function( X, Y, PageIndex, MouseEvent )
{
if (null !== this.FullRecalc.Id && this.FullRecalc.PageIndex <= PageIndex)
return;
editor.sync_MouseMoveStartCallback();
// Ничего не делаем
......@@ -9178,8 +9181,8 @@ CDocument.prototype =
}
else
{
var bInText = (null === this.Is_InText(X, Y, this.CurPage) ? false : true);
var bTableBorder = (null === this.Is_TableBorder(X, Y, this.CurPage) ? false : true);
var bInText = (null === this.Is_InText(X, Y, PageIndex) ? false : true);
var bTableBorder = (null === this.Is_TableBorder(X, Y, PageIndex) ? false : true);
// Ничего не делаем
if ( true === this.DrawingObjects.updateCursorType(PageIndex, X, Y, MouseEvent, ( true === bInText || true === bTableBorder ? true : false )) )
......
......@@ -18003,16 +18003,17 @@ CTable.prototype =
{
// Определим какие строки попадают на данную страницу
Row_start = this.Pages[PNum].FirstRow;
Row_last = Row_start;
if (PNum + 1 < this.Pages.length)
{
Row_last = this.Pages[PNum + 1].FirstRow;
if (Row_last != Row_start && false === this.RowsInfo[Row_last].FirstPage)
Row_last--;
}
else
Row_last = this.Content.length - 1;
Row_last = this.Pages[PNum].LastRow;
// Row_last = Row_start;
//
// if (PNum + 1 < this.Pages.length)
// {
// Row_last = this.Pages[PNum + 1].FirstRow;
// if (Row_last != Row_start && false === this.RowsInfo[Row_last].FirstPage)
// Row_last--;
// }
// else
// Row_last = this.Content.length - 1;
}
if ( Row_last < Row_start )
......
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