This commit is contained in:
2012-05-08 13:06:22 +00:00
parent 00e634f4ed
commit 1c183dc7ae
3 changed files with 20 additions and 3 deletions

View File

@@ -588,7 +588,8 @@ namespace Volian.Print.Library
// flag SectionPageBreak is set to true to flag that a pagebreak should not be done
// on that first step.
StepConfig sc = firstChild.MyItemInfo.MyConfig as StepConfig;
ManualPageBreak = sc == null? false: sc.Step_ManualPagebreak;
ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc == null?false: sc.Step_ManualPagebreak):
sc == null? false: sc.Step_NewManualPagebreak;
if (ManualPageBreak)
{
SectionPageBreak = true;
@@ -608,7 +609,9 @@ namespace Volian.Print.Library
return 0; // Don't Paginate (page break) on a Step Section if it's first thing on page
}
if (!MyItemInfo.IsHigh) return 0; // Don't Paginate on a Substep level
ManualPageBreak = (MyItemInfo.MyConfig as StepConfig).Step_ManualPagebreak;
StepConfig sc1 = MyItemInfo.MyConfig as StepConfig;
ManualPageBreak = MyPageHelper.OriginalPageBreak ? (sc1 == null ? false : sc1.Step_ManualPagebreak) :
sc1 == null ? false : sc1.Step_NewManualPagebreak;
if (MyItemInfo.FirstSibling == MyItemInfo && ManualPageBreak)
{
// if parent/section used this pagebreak, skip it.