From 238c92502fc382f5c931b84dba9011a243666219 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 22 Jul 2015 14:50:03 +0000 Subject: [PATCH] =?UTF-8?q?Use=20=E2=80=98DocStyleListActive=E2=80=99=20fo?= =?UTF-8?q?r=20section=20types?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmSectionProperties.cs | 6 ++--- .../VEPROMS.CSLA.Library/Format/DocStyles.cs | 24 +++++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 5d1eb994..28c2c652 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -174,7 +174,7 @@ namespace VEPROMS bool isWordSect = true; int sectype = (int)sectinfo.MyContent.Type - 10000; PlantFormat pf = sectinfo.ActiveFormat.PlantFormat; - foreach (DocStyle ds in pf.DocStyles.DocStyleList) + foreach (DocStyle ds in pf.DocStyles.DocStyleListActive) { if (ds.Index == sectype) { @@ -505,7 +505,7 @@ namespace VEPROMS if (pf != opf) { oldDocStyles = new DocStyleList(null); - foreach (DocStyle ds in opf.DocStyles.DocStyleList) + foreach (DocStyle ds in opf.DocStyles.DocStyleListActive) { if (_isStepSection && ds.IsStepSection) oldDocStyles.Add(ds); // find only step section types @@ -519,7 +519,7 @@ namespace VEPROMS DocStyleList newDocStyles = new DocStyleList(null); int selindx = -1; - foreach (DocStyle nds in pf.DocStyles.DocStyleList) + foreach (DocStyle nds in pf.DocStyles.DocStyleListActive) { if (_isStepSection && nds.IsStepSection) newDocStyles.Add(nds); // add only step section types diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 8887709a..a5724e21 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -28,16 +28,32 @@ namespace VEPROMS.CSLA.Library { DocStyleList tmp = new DocStyleList(SelectNodes("DocStyle")); DocStyleList retval = new DocStyleList(null); - foreach (DocStyle ds in tmp) - { - if (!ds.Inactive) retval.Add(ds); - } + foreach (DocStyle ds in tmp) retval.Add(ds); _DocStyleList = retval; } return (_DocStyleList); } set { _DocStyleList = value; } } + private DocStyleList _DocStyleListActive; + public DocStyleList DocStyleListActive + { + get + { + if (_DocStyleListActive == null) + { + DocStyleList tmp = new DocStyleList(SelectNodes("DocStyle")); + DocStyleList retval = new DocStyleList(null); + foreach (DocStyle ds in tmp) + { + if (!ds.Inactive) retval.Add(ds); + } + _DocStyleListActive = retval; + } + return (_DocStyleListActive); + } + set { _DocStyleListActive = value; } + } public DocStyles(XmlNode xmlNode) : base(xmlNode) { } } #endregion