Commit cbff1d70 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

пропадали картинки в колонтитулах на всех страницах кроме первой.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60688 954022d7-b5bf-4e40-9824-e11837661b57
parent bc20eedc
...@@ -722,7 +722,7 @@ CGraphicObjects.prototype = ...@@ -722,7 +722,7 @@ CGraphicObjects.prototype =
for(i = 0; i < drawings.length; ++i) for(i = 0; i < drawings.length; ++i)
{ {
var array_type = drawings[i].getDrawingArrayType(); var array_type = drawings[i].getDrawingArrayType();
if(drawings[i].PageNum === pageIndex) if(!drawings[i].bNoNeedToAdd)
{ {
var drawing_array = null; var drawing_array = null;
switch(array_type) switch(array_type)
......
...@@ -3897,6 +3897,7 @@ function ParaDrawing(W, H, GraphicObj, DrawingDocument, DocumentContent, Parent) ...@@ -3897,6 +3897,7 @@ function ParaDrawing(W, H, GraphicObj, DrawingDocument, DocumentContent, Parent)
this.selected = false; this.selected = false;
this.behindDoc = false; this.behindDoc = false;
this.bNoNeedToAdd = false;
this.pageIndex = -1;//pageIndex; this.pageIndex = -1;//pageIndex;
...@@ -4492,7 +4493,13 @@ ParaDrawing.prototype = ...@@ -4492,7 +4493,13 @@ ParaDrawing.prototype =
if(!(this.DocumentContent && this.DocumentContent.Is_HdrFtr() && this.DocumentContent.Get_StartPage_Absolute() !== pageIndex)) if(!(this.DocumentContent && this.DocumentContent.Is_HdrFtr() && this.DocumentContent.Get_StartPage_Absolute() !== pageIndex))
{ {
this.graphicObjects.addObjectOnPage(pageIndex, this.GraphicObj); this.graphicObjects.addObjectOnPage(pageIndex, this.GraphicObj);
this.bNoNeedToAdd = false;
} }
else
{
this.bNoNeedToAdd = true;
}
this.selectX = x; this.selectX = x;
this.selectY = y; this.selectY = y;
......
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