diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 52785c29..8c9f9d7d 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1669,8 +1669,11 @@ namespace Volian.Controls.Library { // If there is only one 'table' type from format under the ribbon's table item, // eliminate that button and move up the RO & Text Table buttons. + // This is done for single column mode, or if in the calvertconditionresponse table (dual column) and in the rno column. Note + // the '&&' in if check because when in the calvertconditionresponse table, the section is in 'single column' mode even though + // the condition response table is dual column. This fixes B2014-105. SectionConfig sc = (SectionConfig)MyItemInfo.ActiveSection.MyConfig; - if (sc.Section_ColumnMode == SectionConfig.SectionColumnMode.One) // single column step editor + if (sc.Section_ColumnMode == SectionConfig.SectionColumnMode.One && (!MyItemInfo.IsInCalvertConditionResponse || MyItemInfo.IsInRNO)) // single column step editor { // setup the sub menus for the insert table ribbon button btn.Tag = btn.SubItems[0].Tag; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 4355b816..fa711d11 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4202,7 +4202,14 @@ namespace Volian.Print.Library else if (itemInfo.RNOLevel != 0) // RNO XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2; else if (aerTableOrFigure) - XOffset = MyHighLevelParagraph.XOffset + MyHighLevelParagraph.Width / 2 - Width / 2; + { + // if in the BGE alarm format and the hls is a Window (upper right corner when it prints), use the parent of the table + // to print in aer column (B2014-105) + if (MyItemInfo.IsInCalvertConditionResponse) + XOffset = hls1.XOffset + hls1.Width / 2 - Width / 2; + else + XOffset = MyHighLevelParagraph.XOffset + MyHighLevelParagraph.Width / 2 - Width / 2; + } else // Centered Table or Figure { // Determine center of hls