diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 8dcb5226..92274dcf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1800,7 +1800,10 @@ namespace VEPROMS.CSLA.Library if (ActiveParent is DocVersionInfo) _MyDocVersion = ActiveParent as DocVersionInfo; else + { + if (ActiveParent == null) return null; _MyDocVersion = (ActiveParent as ItemInfo).MyDocVersion; + } } return _MyDocVersion; } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 707d2806..30da3aac 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -483,8 +483,10 @@ namespace VEPROMS.CSLA.Library { string retstr = tb._ToItem.MyProcedure.MyContent.Number; // start with UnitSpecific procedure number. - string unitnum = tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ProcedureNumber; - if (unitnum.Length > 0) + string unitnum = null; + if (tb._ToItem.MyDocVersion != null && tb._ToItem.MyDocVersion.DocVersionConfig != null) + unitnum = tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ProcedureNumber; + if (unitnum != null && unitnum.Length > 0) { unitnum = unitnum.Replace("-", @"\u8209?"); retstr = unitnum.Replace("#", retstr); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index fe25a7da..0538afc5 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -286,8 +286,7 @@ namespace Volian.Print.Library { get { - if (_MaxRNO == 0) _MaxRNO = _MySection.ColumnMode; - return _MaxRNO; + return _MySection.ColumnMode; } } private int _CurrentPageOf = 0;