diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 37a8c317..808d45b0 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -905,7 +905,8 @@ namespace Volian.Print.Library MyGrid.TooBig = SixLinesPerInch + MyGrid.Height * MyPageHelper.YMultiplier - (yLocation - yBottomMargin - ySizeBtmCtnMess); float heightAfter = MyGrid.Height + 4 * MyPageHelper.YMultiplier; MyPageHelper.TableAdjustment += (heightBefore - heightAfter); - if (heightAfter < (yLocation - yBottomMargin - ySizeBtmCtnMess)) + //B2018-092 Determine if the Table is too big by checking it including either 6 LPI or 7 LPI as appropriate + if (heightAfter * MyPageHelper.YMultiplier < (yLocation - yBottomMargin - ySizeBtmCtnMess)) { // B2018-081 - Removed error log message if the code was able to properly adjust the table //_MyLog.WarnFormat("\r\n==> Table is too big to fit on page, Vertical Padding adjusted to fit in\r\n" + @@ -934,9 +935,11 @@ namespace Volian.Print.Library } } } - MyPageHelper.BottomContent = yLocation - (MyGrid.Height + 4 * MyPageHelper.YMultiplier); + //B2018-092 Correct the location of the bottom continue message including either 6 LPI or 7 LPI as appropriate + MyPageHelper.BottomContent = yLocation - (MyGrid.Height + 4) * MyPageHelper.YMultiplier; float retval = Rtf2Pdf.GridAt(cb, MyGrid, XOffset, yLocation, Width, 100, DebugInfo, yBottomMargin, !MyItemInfo.FormatStepData.Type.Contains("Borderless")); - if (MyGrid.Height > (yTopMargin - yBottomMargin)) + //B2018-092 Determine if the Table is too big by checking it including either 6 LPI or 7 LPI as appropriate + if ((MyGrid.Height + 4)* MyPageHelper.YMultiplier > (yLocation - yBottomMargin - ySizeBtmCtnMess)) { // B2018-081 Changed the Error Log Message to be more useful when a table is too big. _MyLog.ErrorFormat("\r\n==> Table is too big to fit on page, expect pagination problems in\r\n" +