From 442198860cf1372ff7daa769b7289324394fa753 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 26 Feb 2013 14:37:15 +0000
Subject: [PATCH]

---
 .../Extension/DocumentExt.cs                  |  60 ++++++++++++------
 .../VEObjects/VETreeNode.cs                   |   9 ++-
 PROMS/fmtxml/WST2all.xml                      | Bin 61224 -> 61884 bytes
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
index 511c2771..96ce353b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
@@ -667,7 +667,7 @@ namespace VEPROMS.CSLA.Library
 					string roid = lookup.GetROIDByAccPagID(sel.Text, spPrefix, igPrefix);
 					if (roid != null)
 					{
-						string roidkey = string.Format("{0}:{1}",rofst.RODbID, roid);
+						string roidkey = string.Format("{0}:{1}", rofst.RODbID, roid);
 						if (!roids.Contains(roidkey))
 							roids.Add(roidkey);
 					}
@@ -998,26 +998,44 @@ namespace VEPROMS.CSLA.Library
 		}
 		private static LBSelection FindRO()
 		{
-			LBSelection sel = MyApp.Selection;
-			LBFind find = sel.Find;
-			find.ClearFormatting();
-			// Search string format - this is MSWord wildcard format
-			// If you do a search in MSWord, make sure wildcard box is checked and then press the
-			// Special button to see the definitions of the various wildcards
-			// [<] - Less-Than Character
-			// [!<> ]@ - 1 or more characters not including Less-Than, Greater-Than or Space
-			// - Dash
-			// [!<> ]@ - 1 or more characters not including Less-Than, Greater-Than or Space
-			// [>] - Greater-Than Character
-			find.Text = "[<][!<> ]@-[!<> ]@[>]";
-			//find.Wrap = LBWdFindWrap.wdFindStop;
-			find.Wrap = LBWdFindWrap.wdFindContinue;
-			find.MatchCase = false;
-			find.MatchWholeWord = false;
-			find.MatchWildcards = true;
-			find.MatchSoundsLike = false;
-			find.MatchAllWordForms = false;
-			if (find.Execute()) return sel;
+			int firstStart = 0;
+			bool executeResult = false;
+			LBSelection sel = null;
+			while (!executeResult)
+			{
+				sel = MyApp.Selection;
+				LBFind find = sel.Find;
+				find.ClearFormatting();
+				// Search string format - this is MSWord wildcard format
+				// If you do a search in MSWord, make sure wildcard box is checked and then press the
+				// Special button to see the definitions of the various wildcards
+				// [<] - Less-Than Character
+				// [!<> ]@ - 1 or more characters not including Less-Than, Greater-Than or Space
+				// - Dash
+				// [!<> ]@ - 1 or more characters not including Less-Than, Greater-Than or Space
+				// [>] - Greater-Than Character
+				find.Text = "[<][!<> ]@-[!<> ]@[>]";
+				find.Wrap = LBWdFindWrap.wdFindContinue;
+				find.MatchCase = false;
+				find.MatchWholeWord = false;
+				find.MatchWildcards = true;
+				find.MatchSoundsLike = false;
+				find.MatchAllWordForms = false;
+				executeResult = find.Execute();
+				// MS Word found 'invalid' ro when text had "[335.0<T<335.6ºC]" (not sure what problem was). 
+				// When this occurred, the selection was found, but it's end = 0, so move 1 char past it.  
+				// Also, need to simulate a loop by saving first position and if loop back to first position, 
+				// we are done with the search.
+				if (sel.End == 0)
+				{
+					if (firstStart == sel.Start) return null;
+					if (firstStart == 0)
+						firstStart = sel.Start;
+					sel.MoveStart(LBWdUnits.wdCharacter, 1);
+					executeResult = false;
+				}
+			}
+			if (executeResult) return sel;
 			return null;
 		}
 		private static string CreatePDF(string fileName, bool openPdf)
diff --git a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs
index 6f3eb9d1..2a8b15e7 100644
--- a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs
+++ b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs
@@ -234,14 +234,13 @@ namespace VEPROMS.CSLA.Library
 					bool isStepPart = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Step);
 					if (isStepPart)
 					{
+						
 						// get parent section and see if it has the Editable flag set.  Only skip
 						// if this flag is set to "N".
 						ItemInfo sectInfo = (ItemInfo)(o as PartInfo).ActiveParent;
-						if (sectInfo != null)
-						{
-							SectionConfig sc = sectInfo.MyConfig as SectionConfig;
-							if (sc != null && sc.SubSection_Edit == "N") skipIt = true;
-						}
+						bool hasMetaSubs = sectInfo != null && sectInfo.Sections != null && sectInfo.Sections.Count > 0;
+						bool editSteps = !hasMetaSubs || (sectInfo.MyConfig is SectionConfig && (sectInfo.MyConfig as SectionConfig).SubSection_Edit == "Y");
+						if (!editSteps) skipIt = true;
 					}
 					if (!skipIt)
 					{
diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml
index 9f813442d9ad2753d3b618c4012f0c978ef96b1c..a28d412b0d967260f2c238d190271f6a37176e1f 100644
GIT binary patch
delta 70
zcmV-M0J;CD-UGbj1F(d1lMp8y12q6KlTB_dlW0{kldx_GlLRbclQ3x<lWu7glT2?O
c15W@_lVLC!lQ2=NlePsClR!&^vxIY`dx+^7n*aa+

delta 14
Wcmdn<n0duL<_#^yn<dJYR09Aw(g!mD