From d8b0f21619201ddb6ae487cd3065b5f605f5278d Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 8 Oct 2014 16:37:28 +0000 Subject: [PATCH] IP2 Background: Fixes for bad pagination within Step Description table & width of some sub-steps --- PROMS/Volian.Print.Library/vlnParagraph.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index e2ecc8fe..035805b0 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3935,12 +3935,20 @@ namespace Volian.Print.Library // for IP2 backgrounds, set widths appropriately for template items: if (itemInfo.IsStep && ((itemInfo.MyActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd)) { - if (itemInfo.IsStep && itemInfo.FormatStepData.Type.ToUpper() == "TITLEWITHTEXTBELOW") + if (itemInfo.FormatStepData.Type.ToUpper() == "TITLEWITHTEXTBELOW") { Width = MyParent.Width; return; } - if (widOvrd == 0 && itemInfo.MyParent.IsStep && itemInfo.MyParent.FormatStepData.Type.ToUpper() == "TITLEWITHTEXTBELOW") + if (itemInfo.MyPrevious != null && itemInfo.MyPrevious.FormatStepData.Type == "TitleWithTextBelow") + { + Width = MyParent.MyParent.Width; + return; + } + if (widOvrd == 0 && itemInfo.MyParent.IsStep && + (itemInfo.MyParent.FormatStepData.Type.ToUpper() == "TITLEWITHTEXTBELOW" || + (((itemInfo.MyActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) && + itemInfo.FormatStepData != null && MyParent.MyItemInfo.MyPrevious != null && MyParent.MyItemInfo.MyPrevious.FormatStepData.Type == "TitleWithTextBelow"))) { Width = MyParent.MyParent.Width + (MyParent.MyParent.MyTab != null ? MyParent.MyParent.MyTab.Width : 0); Width -= (MyTab != null ? MyTab.Width : 0);