Commit 90cd3753 authored by Ilya Kirillov's avatar Ilya Kirillov

Implemented function StartFromNewPage for class CBlockLevelSdt.

parent b67ea6bf
...@@ -988,7 +988,7 @@ CDocumentContent.prototype.Recalculate_Page = function(PageIndex, ...@@ -988,7 +988,7 @@ CDocumentContent.prototype.Recalculate_Page = function(PageIndex,
if ((FrameY2 + FrameH2 > YLimit || Y > YLimit - 0.001 ) && Index != StartIndex) if ((FrameY2 + FrameH2 > YLimit || Y > YLimit - 0.001 ) && Index != StartIndex)
{ {
this.RecalcInfo.Set_FrameRecalc(true); this.RecalcInfo.Set_FrameRecalc(true);
this.Content[Index].Start_FromNewPage(); this.Content[Index].StartFromNewPage();
RecalcResult = recalcresult_NextPage; RecalcResult = recalcresult_NextPage;
} }
else else
...@@ -1574,13 +1574,13 @@ CDocumentContent.prototype.Is_ContentOnFirstPage = function() ...@@ -1574,13 +1574,13 @@ CDocumentContent.prototype.Is_ContentOnFirstPage = function()
var Element = this.Content[0]; var Element = this.Content[0];
return Element.Is_ContentOnFirstPage(); return Element.Is_ContentOnFirstPage();
}; };
CDocumentContent.prototype.Start_FromNewPage = function() CDocumentContent.prototype.StartFromNewPage = function()
{ {
this.Pages.length = 1; this.Pages.length = 1;
this.Pages[0] = new CDocumentPage(); this.Pages[0] = new CDocumentPage();
var Element = this.Content[0]; var Element = this.Content[0];
Element.Start_FromNewPage(); Element.StartFromNewPage();
}; };
CDocumentContent.prototype.Get_ParentTextTransform = function() CDocumentContent.prototype.Get_ParentTextTransform = function()
{ {
......
...@@ -612,6 +612,9 @@ CDocumentContentElementBase.prototype.Get_FirstParagraph = function() ...@@ -612,6 +612,9 @@ CDocumentContentElementBase.prototype.Get_FirstParagraph = function()
{ {
return null; return null;
}; };
CDocumentContentElementBase.prototype.StartFromNewPage = function()
{
};
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// Функции для работы с номерами страниц // Функции для работы с номерами страниц
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
......
...@@ -395,7 +395,7 @@ Paragraph.prototype.Recalculate_SkipPage = function(PageIndex) ...@@ -395,7 +395,7 @@ Paragraph.prototype.Recalculate_SkipPage = function(PageIndex)
{ {
if (0 === PageIndex) if (0 === PageIndex)
{ {
this.Start_FromNewPage(); this.StartFromNewPage();
} }
else else
{ {
...@@ -449,7 +449,7 @@ Paragraph.prototype.PrepareRecalculateObject = function() ...@@ -449,7 +449,7 @@ Paragraph.prototype.PrepareRecalculateObject = function()
/** /**
* Пересчитываем первую страницу параграфа так, чтобы он начинался с новой страницы. * Пересчитываем первую страницу параграфа так, чтобы он начинался с новой страницы.
*/ */
Paragraph.prototype.Start_FromNewPage = function() Paragraph.prototype.StartFromNewPage = function()
{ {
this.Pages.length = 1; this.Pages.length = 1;
this.Pages[0] = new CParaPage(this.X, this.Y, this.XLimit, this.YLimit, 0); this.Pages[0] = new CParaPage(this.X, this.Y, this.XLimit, this.YLimit, 0);
......
...@@ -640,6 +640,10 @@ CBlockLevelSdt.prototype.Get_FirstParagraph = function() ...@@ -640,6 +640,10 @@ CBlockLevelSdt.prototype.Get_FirstParagraph = function()
{ {
return this.Content.Get_FirstParagraph(); return this.Content.Get_FirstParagraph();
}; };
CBlockLevelSdt.prototype.StartFromNewPage = function()
{
this.Content.StartFromNewPage();
};
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
CBlockLevelSdt.prototype.Is_HdrFtr = function(bReturnHdrFtr) CBlockLevelSdt.prototype.Is_HdrFtr = function(bReturnHdrFtr)
{ {
......
...@@ -65,7 +65,7 @@ CTable.prototype.Recalculate_SkipPage = function(PageIndex) ...@@ -65,7 +65,7 @@ CTable.prototype.Recalculate_SkipPage = function(PageIndex)
{ {
if (0 === PageIndex) if (0 === PageIndex)
{ {
this.Start_FromNewPage(); this.StartFromNewPage();
} }
else else
{ {
...@@ -122,7 +122,7 @@ CTable.prototype.PrepareRecalculateObject = function() ...@@ -122,7 +122,7 @@ CTable.prototype.PrepareRecalculateObject = function()
this.Content[Index].PrepareRecalculateObject(); this.Content[Index].PrepareRecalculateObject();
} }
}; };
CTable.prototype.Start_FromNewPage = function() CTable.prototype.StartFromNewPage = function()
{ {
this.Pages.length = 1; this.Pages.length = 1;
this.Pages[0] = new CTablePage(0, 0, 0, 0, 0, 0); this.Pages[0] = new CTablePage(0, 0, 0, 0, 0, 0);
...@@ -164,7 +164,7 @@ CTable.prototype.Start_FromNewPage = function() ...@@ -164,7 +164,7 @@ CTable.prototype.Start_FromNewPage = function()
for (var CurCell = 0; CurCell < CellsCount; CurCell++) for (var CurCell = 0; CurCell < CellsCount; CurCell++)
{ {
var Cell = this.Content[0].Get_Cell(CurCell); var Cell = this.Content[0].Get_Cell(CurCell);
Cell.Content.Start_FromNewPage(); Cell.Content.StartFromNewPage();
Cell.PagesCount = 2; Cell.PagesCount = 2;
} }
} }
...@@ -2437,7 +2437,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage) ...@@ -2437,7 +2437,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
if ( vmerge_Continue === Vmerge || VMergeCount > 1 ) if ( vmerge_Continue === Vmerge || VMergeCount > 1 )
continue; continue;
Cell.Content.Start_FromNewPage(); Cell.Content.StartFromNewPage();
Cell.PagesCount = 2; Cell.PagesCount = 2;
} }
} }
...@@ -2485,7 +2485,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage) ...@@ -2485,7 +2485,7 @@ CTable.prototype.private_RecalculatePage = function(CurPage)
if ( vmerge_Continue === Vmerge || VMergeCount > 1 ) if ( vmerge_Continue === Vmerge || VMergeCount > 1 )
continue; continue;
Cell.Content.Start_FromNewPage(); Cell.Content.StartFromNewPage();
Cell.PagesCount = 2; Cell.PagesCount = 2;
} }
......
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