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

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

Исправлен баг с выставлением селекта после перемещения картинки внутри таблицы, находящейся в колонтитуле (баг 27640).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59950 954022d7-b5bf-4e40-9824-e11837661b57
parent 777102f5
...@@ -4154,9 +4154,14 @@ CDocumentContent.prototype = ...@@ -4154,9 +4154,14 @@ CDocumentContent.prototype =
else if (null !== this.LogicDocument && docpostype_HdrFtr === this.LogicDocument.CurPos.Type) else if (null !== this.LogicDocument && docpostype_HdrFtr === this.LogicDocument.CurPos.Type)
{ {
this.Parent.Set_CurrentElement(false, this.Get_StartPage_Absolute()); this.Parent.Set_CurrentElement(false, this.Get_StartPage_Absolute());
this.CurPos.Type = docpostype_DrawingObjects; var DocContent = this;
this.Selection.Use = true; var HdrFtr = this.Is_HdrFtr(true);
this.Selection.Start = false; if (null !== HdrFtr)
DocContent = HdrFtr.Content;
DocContent.CurPos.Type = docpostype_DrawingObjects;
DocContent.Selection.Use = true;
DocContent.Selection.Start = false;
} }
} }
}, },
......
...@@ -281,8 +281,9 @@ CHeaderFooter.prototype = ...@@ -281,8 +281,9 @@ CHeaderFooter.prototype =
{ {
var PageIndex = -1; var PageIndex = -1;
for ( var PIndex in this.Parent.Pages ) for (var Key in this.Parent.Pages)
{ {
var PIndex = Key | 0;
if ( ( this === this.Parent.Pages[PIndex].Header || this === this.Parent.Pages[PIndex].Footer ) && ( -1 === PageIndex || PageIndex > PIndex ) ) if ( ( this === this.Parent.Pages[PIndex].Header || this === this.Parent.Pages[PIndex].Footer ) && ( -1 === PageIndex || PageIndex > PIndex ) )
PageIndex = PIndex; PageIndex = PIndex;
} }
......
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