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

Исправлен баг с работой клавиши "Tab", когда выделены маркеры списка (баг 19373).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48281 954022d7-b5bf-4e40-9824-e11837661b57
parent 34b20673
......@@ -8357,11 +8357,29 @@ CDocument.prototype =
{
if ( true === this.Selection.Use )
{
if ( this.Selection.StartPos != this.Selection.EndPos )
Info.Set_MixedSelection();
if ( selectionflag_Numbering === this.Selection.Flag )
{
// Текстовые настройки применяем к конкретной нумерации
if ( !(null == this.Selection.Data || this.Selection.Data.length <= 0) )
{
var CurPara = this.Content[this.Selection.Data[0]];
for ( var Index = 0; Index < this.Selection.Data.length; Index++ )
{
if ( this.CurPos.ContentPos === this.Selection.Data[Index] )
CurPara = this.Content[this.Selection.Data[Index]];
}
CurPara.Get_SelectedElementsInfo(Info);
}
}
else
{
this.Content[this.Selection.StartPos].Get_SelectedElementsInfo(Info);
if ( this.Selection.StartPos != this.Selection.EndPos )
Info.Set_MixedSelection();
else
{
this.Content[this.Selection.StartPos].Get_SelectedElementsInfo(Info);
}
}
}
else
......
......@@ -3286,18 +3286,36 @@ CDocumentContent.prototype =
this.LogicDocument.DrawingObjects.getSelectedElementsInfo(Info);
else //if ( docpostype_Content == this.CurPos.Type )
{
if ( true === this.Selection.Use )
if ( selectionflag_Numbering === this.Selection.Flag )
{
if ( this.Selection.StartPos != this.Selection.EndPos )
Info.Set_MixedSelection();
else
// Текстовые настройки применяем к конкретной нумерации
if ( !(null == this.Selection.Data || this.Selection.Data.length <= 0) )
{
this.Content[this.Selection.StartPos].Get_SelectedElementsInfo(Info);
var CurPara = this.Content[this.Selection.Data[0]];
for ( var Index = 0; Index < this.Selection.Data.length; Index++ )
{
if ( this.CurPos.ContentPos === this.Selection.Data[Index] )
CurPara = this.Content[this.Selection.Data[Index]];
}
CurPara.Get_SelectedElementsInfo(Info);
}
}
else
{
this.Content[this.CurPos.ContentPos].Get_SelectedElementsInfo(Info);
if ( true === this.Selection.Use )
{
if ( this.Selection.StartPos != this.Selection.EndPos )
Info.Set_MixedSelection();
else
{
this.Content[this.Selection.StartPos].Get_SelectedElementsInfo(Info);
}
}
else
{
this.Content[this.CurPos.ContentPos].Get_SelectedElementsInfo(Info);
}
}
}
}
......
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