Skip to content

S
sdkjs
Commit b5c88ddb authored by Ilya.Kirillov's avatar Ilya.Kirillov
Browse files
Options

Переделана функция для получения текущего места расположения автофигуры,... 

Переделана функция для получения текущего места расположения автофигуры, устрено падение после привязки автофигуры к формуле.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58733 954022d7-b5bf-4e40-9824-e11837661b57
parent 5df0cc01
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 56 deletions
Word/Editor/Hyperlink.js
View file @ b5c88ddb
......@@ -726,7 +726,7 @@ ParaHyperlink.prototype.Get_Layout = function(DrawingLayout, UseContentPos, Cont
{
this.Content[CurPos].Get_Layout(DrawingLayout, ( CurPos === CurContentPos ? true : false ), ContentPos, Depth + 1 );
if ( null !== DrawingLayout.Layout )
if (true === DrawingLayout.Layout)
return;
}
};
......
Word/Editor/Math.js
View file @ b5c88ddb
......@@ -441,6 +441,10 @@ ParaMath.prototype.Get_DrawingObjectContentPos = function(Id, ContentPos, Depth)
ParaMath.prototype.Get_Layout = function(DrawingLayout, UseContentPos, ContentPos, Depth)
{
if (true === UseContentPos)
DrawingLayout.Layout = true;
else
DrawingLayout.X += this.Width;
};
ParaMath.prototype.Get_NextRunElements = function(RunElements, UseContentPos, Depth)
......
Word/Editor/Paragraph.js
View file @ b5c88ddb
......@@ -8003,11 +8003,59 @@ Paragraph.prototype =
{
this.Content[CurPos].Get_Layout(DrawingLayout, ( CurPos === CurContentPos ? true : false ), ContentPos, 1);
if ( null !== DrawingLayout.Layout )
return { ParagraphLayout : DrawingLayout.Layout, PageLimits : DrawingLayout.Limits };
if (true === DrawingLayout.Layout)
{
var LogicDocument = this.LogicDocument;
var LD_PageLimits = LogicDocument.Get_PageLimits( CurPage );
var LD_PageFields = LogicDocument.Get_PageFields( CurPage );
var Page_Width = LD_PageLimits.XLimit;
var Page_Height = LD_PageLimits.YLimit;
var X_Left_Field = LD_PageFields.X;
var Y_Top_Field = LD_PageFields.Y;
var X_Right_Field = LD_PageFields.XLimit;
var Y_Bottom_Field = LD_PageFields.YLimit;
var X_Left_Margin = X_Left_Field;
var X_Right_Margin = Page_Width - X_Right_Field;
var Y_Bottom_Margin = Page_Height - Y_Bottom_Field;
var Y_Top_Margin = Y_Top_Field;
var Para = DrawingLayout.Paragraph;
var CurPage = DrawingLayout.Page;
var Drawing = DrawingLayout.Drawing;
var DrawingObjects = this.Parent.DrawingObjects;
var PageLimits = this.Parent.Get_PageLimits(this.PageNum + CurPage);
var PageFields = this.Parent.Get_PageFields(this.PageNum + CurPage);
var ColumnStartX = (0 === CurPage ? this.X_ColumnStart : this.Pages[CurPage].X);
var ColumnEndX = (0 === CurPage ? this.X_ColumnEnd : this.Pages[CurPage].XLimit);
var Top_Margin = Y_Top_Margin;
var Bottom_Margin = Y_Bottom_Margin;
var Page_H = Page_Height;
if ( true === this.Parent.Is_TableCellContent() && undefined != Drawing && true == Drawing.Use_TextWrap() )
{
Top_Margin = 0;
Bottom_Margin = 0;
Page_H = 0;
}
if ( undefined != Drawing && true != Drawing.Use_TextWrap() )
{
PageFields = LD_PageFields;
PageLimits = LD_PageLimits;
}
var Layout = new CParagraphLayout(DrawingLayout.X, DrawingLayout.Y , this.Get_StartPage_Absolute() + CurPage, DrawingLayout.LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, this.Pages[CurPage].Y + this.Lines[CurLine].Y - this.Lines[CurLine].Metrics.Ascent, this.Pages[CurPage].Y);
return {ParagraphLayout : Layout, PageLimits : PageLimits};
}
}
return undefined;
return null;
},
Get_AnchorPos : function(Drawing)
......@@ -12522,8 +12570,7 @@ function CParagraphDrawingLayout(Drawing, Paragraph, X, Y, Line, Range, Page)
this.Y = Y;
this.LastW = 0;
this.Layout = null;
this.Limits = null;
this.Layout = false;
}
function CParagraphGetDropCapText()
......
Word/Editor/Run.js
View file @ b5c88ddb
......@@ -1079,56 +1079,8 @@ ParaRun.prototype.Get_Layout = function(DrawingLayout, UseContentPos, ContentPos
DrawingLayout.X += WidthVisible;
}
if ( CurContentPos === CurPos )
{
var LogicDocument = this.Paragraph.LogicDocument;
var LD_PageLimits = LogicDocument.Get_PageLimits( CurPage );
var LD_PageFields = LogicDocument.Get_PageFields( CurPage );
var Page_Width = LD_PageLimits.XLimit;
var Page_Height = LD_PageLimits.YLimit;
var X_Left_Field = LD_PageFields.X;
var Y_Top_Field = LD_PageFields.Y;
var X_Right_Field = LD_PageFields.XLimit;
var Y_Bottom_Field = LD_PageFields.YLimit;
var X_Left_Margin = X_Left_Field;
var X_Right_Margin = Page_Width - X_Right_Field;
var Y_Bottom_Margin = Page_Height - Y_Bottom_Field;
var Y_Top_Margin = Y_Top_Field;
var Para = DrawingLayout.Paragraph;
var CurPage = DrawingLayout.Page;
var Drawing = DrawingLayout.Drawing;
var DrawingObjects = Para.Parent.DrawingObjects;
var PageLimits = Para.Parent.Get_PageLimits(Para.PageNum + CurPage);
var PageFields = Para.Parent.Get_PageFields(Para.PageNum + CurPage);
var ColumnStartX = (0 === CurPage ? Para.X_ColumnStart : Para.Pages[CurPage].X);
var ColumnEndX = (0 === CurPage ? Para.X_ColumnEnd : Para.Pages[CurPage].XLimit);
var Top_Margin = Y_Top_Margin;
var Bottom_Margin = Y_Bottom_Margin;
var Page_H = Page_Height;
if ( true === Para.Parent.Is_TableCellContent() && undefined != Drawing && true == Drawing.Use_TextWrap() )
{
Top_Margin = 0;
Bottom_Margin = 0;
Page_H = 0;
}
if ( undefined != Drawing && true != Drawing.Use_TextWrap() )
{
PageFields = LD_PageFields;
PageLimits = LD_PageLimits;
}
DrawingLayout.Layout = new CParagraphLayout( DrawingLayout.X, DrawingLayout.Y , Para.Get_StartPage_Absolute() + CurPage, DrawingLayout.LastW, ColumnStartX, ColumnEndX, X_Left_Margin, X_Right_Margin, Page_Width, Top_Margin, Bottom_Margin, Page_H, PageFields.X, PageFields.Y, Para.Pages[CurPage].Y + Para.Lines[CurLine].Y - Para.Lines[CurLine].Metrics.Ascent, Para.Pages[CurPage].Y );
DrawingLayout.Limits = PageLimits;
}
if (CurContentPos === CurPos)
DrawingLayout.Layout = true;
};
ParaRun.prototype.Get_NextRunElements = function(RunElements, UseContentPos, Depth)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7