Commit 03e5bccd authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug with adding ContentControl into a drawing shape.

parent d2476b49
......@@ -1607,6 +1607,7 @@ CDocumentContent.prototype.Get_ParentTextTransform = function()
{
return this.Parent.Get_ParentTextTransform();
}
return null;
};
CDocumentContent.prototype.IsTableBorder = function(X, Y, CurPage)
......@@ -2103,17 +2104,17 @@ CDocumentContent.prototype.MoveCursorToCell = function(bNext)
}
}
};
CDocumentContent.prototype.Set_ClipInfo = function(CurPage, X0, X1)
CDocumentContent.prototype.Set_ClipInfo = function(CurPage, X0, X1)
{
this.ClipInfo[CurPage] = {X0 : X0, X1 : X1};
this.ClipInfo[CurPage] = {X0 : X0, X1 : X1};
};
CDocumentContent.prototype.Set_ApplyToAll = function(bValue)
CDocumentContent.prototype.Set_ApplyToAll = function(bValue)
{
this.ApplyToAll = bValue;
this.ApplyToAll = bValue;
};
CDocumentContent.prototype.Get_ApplyToAll = function()
CDocumentContent.prototype.Get_ApplyToAll = function()
{
return this.ApplyToAll;
return this.ApplyToAll;
};
CDocumentContent.prototype.UpdateCursorType = function(X, Y, CurPage)
{
......
......@@ -594,6 +594,9 @@ CDocumentContentElementBase.prototype.SaveRecalculateObject = function()
CDocumentContentElementBase.prototype.LoadRecalculateObject = function(RecalcObj)
{
};
CDocumentContentElementBase.prototype.Set_ApplyToAll = function(bValue)
{
};
//----------------------------------------------------------------------------------------------------------------------
// Функции для работы с номерами страниц
//----------------------------------------------------------------------------------------------------------------------
......
......@@ -594,7 +594,7 @@ CBlockLevelSdt.prototype.DrawContentControlsTrack = function(isHover)
arrRects.push({X : oBounds.Left, Y : oBounds.Top, R : oBounds.Right, B : oBounds.Bottom, Page : nPageAbs});
}
oDrawingDocument.OnDrawContentControl(this.GetId(), isHover ? c_oContentControlTrack.Hover : c_oContentControlTrack.In, arrRects);
oDrawingDocument.OnDrawContentControl(this.GetId(), isHover ? c_oContentControlTrack.Hover : c_oContentControlTrack.In, arrRects, this.Get_ParentTextTransform());
};
CBlockLevelSdt.prototype.AddContentControl = function()
{
......@@ -624,6 +624,10 @@ CBlockLevelSdt.prototype.LoadRecalculateObject = function(RecalcObj)
{
return this.Content.LoadRecalculateObject(RecalcObj);
};
CBlockLevelSdt.prototype.Set_ApplyToAll = function(bValue)
{
this.Content.Set_ApplyToAll(bValue);
};
//----------------------------------------------------------------------------------------------------------------------
CBlockLevelSdt.prototype.Is_HdrFtr = function(bReturnHdrFtr)
{
......@@ -770,6 +774,10 @@ CBlockLevelSdt.prototype.GetAllMaths = function(AllMaths)
{
return this.Content.GetAllMaths(AllMaths);
};
CBlockLevelSdt.prototype.Get_ParentTextTransform = function()
{
return this.Parent.Get_ParentTextTransform();
};
//--------------------------------------------------------export--------------------------------------------------------
window['AscCommonWord'] = window['AscCommonWord'] || {};
window['AscCommonWord'].CBlockLevelSdt = CBlockLevelSdt;
......
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