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

Исправлен баг с рассчетом выосоты ячейки с flow - таблицей внутри данной...

Исправлен баг с рассчетом выосоты ячейки с flow - таблицей внутри данной ячейки (баг 27818). Исправлен баг с работой Undo/Redo внутри таблиц (баг 27837).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59978 954022d7-b5bf-4e40-9824-e11837661b57
parent 812d3403
...@@ -1370,7 +1370,7 @@ CDocumentContent.prototype = ...@@ -1370,7 +1370,7 @@ CDocumentContent.prototype =
for ( var Index = 0; Index < Count; Index++ ) for ( var Index = 0; Index < Count; Index++ )
{ {
var Element = this.Content[Index]; var Element = this.Content[Index];
if ( type_Table === Element.GetType() && true != Element.Is_Inline() ) if (type_Table === Element.GetType() && true != Element.Is_Inline() && Element.Pages.length > PageNum - Element.PageNum)
{ {
var TableBounds = Element.Get_PageBounds( PageNum - Element.PageNum ); var TableBounds = Element.Get_PageBounds( PageNum - Element.PageNum );
if ( TableBounds.Bottom > Bounds.Bottom ) if ( TableBounds.Bottom > Bounds.Bottom )
......
...@@ -6035,7 +6035,8 @@ CTable.prototype = ...@@ -6035,7 +6035,8 @@ CTable.prototype =
Type : this.Selection.Type, Type : this.Selection.Type,
Data : null, Data : null,
Type2 : this.Selection.Type2, Type2 : this.Selection.Type2,
Data2 : null Data2 : null,
CurRow : this.Selection.CurRow
}; };
TableState.Selection.Data = []; TableState.Selection.Data = [];
...@@ -6094,7 +6095,8 @@ CTable.prototype = ...@@ -6094,7 +6095,8 @@ CTable.prototype =
Type : TableState.Selection.Type, Type : TableState.Selection.Type,
Data : null, Data : null,
Type2 : TableState.Selection.Type2, Type2 : TableState.Selection.Type2,
Data2 : null Data2 : null,
CurRow : TableState.Selection.CurRow
}; };
this.Selection.Data = []; this.Selection.Data = [];
...@@ -7339,6 +7341,7 @@ CTable.prototype = ...@@ -7339,6 +7341,7 @@ CTable.prototype =
this.Selection.Type2 = table_Selection_Common; this.Selection.Type2 = table_Selection_Common;
this.Selection.Data = null; this.Selection.Data = null;
this.Selection.Data2 = null; this.Selection.Data2 = null;
this.Selection.CurRow = 0;
this.CurCell.Content.Set_SelectionState2( TableState.Data ); this.CurCell.Content.Set_SelectionState2( TableState.Data );
} }
......
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