Commit 261c4600 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug with add a new tables in the document. Keeping work on the new class CBlockLevelSdt.

parent 8999a308
...@@ -11712,7 +11712,7 @@ CDocument.prototype.controller_AddInlineTable = function(Cols, Rows) ...@@ -11712,7 +11712,7 @@ CDocument.prototype.controller_AddInlineTable = function(Cols, Rows)
for (var Index = 0; Index < Cols; Index++) for (var Index = 0; Index < Cols; Index++)
Grid[Index] = W / Cols; Grid[Index] = W / Cols;
var NewTable = new CTable(this.DrawingDocument, this, true, 0, 0, 0, 0, Rows, Cols, Grid); var NewTable = new CTable(this.DrawingDocument, this, true, Rows, Cols, Grid);
NewTable.Set_ParagraphPrOnAdd(Item); NewTable.Set_ParagraphPrOnAdd(Item);
// Проверим позицию в текущем параграфе // Проверим позицию в текущем параграфе
......
...@@ -146,6 +146,9 @@ CDocumentContentElementBase.prototype.Get_PagesCount = function() ...@@ -146,6 +146,9 @@ CDocumentContentElementBase.prototype.Get_PagesCount = function()
{ {
return 0; return 0;
}; };
CDocumentContentElementBase.prototype.Document_CreateFontMap = function(FontMap)
{
};
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Функции для работы с номерами страниц // Функции для работы с номерами страниц
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
......
...@@ -114,6 +114,10 @@ CBlockLevelSdt.prototype.Read_FromBinary2 = function(Reader) ...@@ -114,6 +114,10 @@ CBlockLevelSdt.prototype.Read_FromBinary2 = function(Reader)
// String : Content id // String : Content id
this.Content = this.LogicDocument.Get_TableId().Get_ById(Reader.GetString2()); this.Content = this.LogicDocument.Get_TableId().Get_ById(Reader.GetString2());
}; };
CBlockLevelSdt.prototype.Draw = function(CurPage, oGraphics)
{
this.Content.Draw(CurPage, oGraphics);
};
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
CBlockLevelSdt.prototype.Is_HdrFtr = function(bReturnHdrFtr) CBlockLevelSdt.prototype.Is_HdrFtr = function(bReturnHdrFtr)
{ {
...@@ -162,6 +166,29 @@ CBlockLevelSdt.prototype.Is_UseInDocument = function(Id) ...@@ -162,6 +166,29 @@ CBlockLevelSdt.prototype.Is_UseInDocument = function(Id)
return false; return false;
}; };
CBlockLevelSdt.prototype.Get_ColorMap = function()
{
return this.Parent.Get_ColorMap();
};
CBlockLevelSdt.prototype.Get_TextBackGroundColor = function()
{
return this.Parent.Get_TextBackGroundColor();
};
CBlockLevelSdt.prototype.Is_ThisElementCurrent = function(oElement)
{
if (oElement === this.Content)
return this.Parent.Is_ThisElementCurrent();
return false;
};
CBlockLevelSdt.prototype.OnContentReDraw = function(StartPageAbs, EndPageAbs)
{
this.Parent.OnContentReDraw(StartPageAbs, EndPageAbs);
};
CDocumentContentElementBase.prototype.Document_CreateFontMap = function(FontMap)
{
this.Content.Document_CreateFontMap(FontMap);
};
//--------------------------------------------------------export-------------------------------------------------------- //--------------------------------------------------------export--------------------------------------------------------
window['AscCommonWord'] = window['AscCommonWord'] || {}; window['AscCommonWord'] = window['AscCommonWord'] || {};
window['AscCommonWord'].CBlockLevelSdt = CBlockLevelSdt; 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