B2026-037 - Remove Fix Symbol Font

Looks Good. Ready for QA.

PROMS/Baseline/frmBaseline.cs

@@ -456,7 +456,7 @@ namespace Baseline
 				switch (myLast)
 				{
 					case LastWas.Pagination:
-						line = OpenPDF(line);
+						OpenPDF(line);
 						break;
 					case LastWas.Baseline: // TODO: Need to add code here to open matching file
 						OpenOnePDF(myLine,1);
@@ -479,7 +479,7 @@ namespace Baseline
 			switch (myLast)
 			{
 				case LastWas.Pagination:
-					line = OpenPDF(line);
+					OpenPDF(line);
 					break;
 				case LastWas.Baseline: // TODO: Need to add code here to open matching file
 					OpenOnePDF(myLine,2);
@@ -491,34 +491,99 @@ namespace Baseline
 					break;
 			}
 		}
-		string exePath;
-		private string OpenPDF(string line)
+
+		/// <summary>
+		/// This will return the full path to the PDF file
+		/// </summary>
+		/// <param name="fi"></param>
+		/// <param name="patern"></param>
+		/// <returns></returns>
+		private string GetPFDFileAndPath(FileInfo fi, string patern)
 		{
-			int page = int.Parse(line.Substring(0, 6));
+			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
+			// sort the list of file list
+			Array.Sort((string[])fileList);
+			return fileList.First(); // the PDF file that we what should be top of the list then.
+		}
+
+		/// <summary>
+		/// This will parse out the procedure number for the PROMS ShortPath representation of a procedure section or step part
+		/// In the PROMS ShortPath, ".S" is used to delimit the procedure number, section then uses "..S" for the step parts
+		/// This method was written to handle cases where ".S" is used as part of the procedure number
+		/// </summary>
+		/// <param name="txt"></param>
+		/// <returns></returns>
+		private string ParseOutProcedureNumberFromLine(string txt)
+		{
+			// old logic was looking for the first occurence of ".S" in the txt string as the ending point of the procedure nuumber
+			// Beaver Valley has a procedure number "1.SBGEN" in which the old logic would not work
+			// 1.SBGEN.SC. ==> short path of attachment section "C"
+			// 1.SBGEN.SC..S1. ==> short path of Step 1 in attachment section "C"
+			string rtnstr = null;
+			int lidx = -1;
+			// if the item is to a high levels step or sub-step the short path as "..S" for each part of the step
+			// so look for the last occurence of ".." which will be the end of the section information
+			lidx = txt.LastIndexOf("..");
+			if (lidx > 0)
+			{
+				lidx = txt.LastIndexOf(".S", lidx); // this will position us to the end of the procedure number
+			}
+			else
+			{
+				lidx = txt.LastIndexOf(".S"); // this will position us to the end of the procedure number if there was no step information
+			}
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-			line = line.Substring(8, line.IndexOf(".S") - 8).Replace("/", "_").Replace("\\", "_");
+			rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
+			return rtnstr;
+		}
+
+		string exePath;
+		private void OpenPDF(string line)
+		{
+			int pageNum = int.Parse(line.Substring(0, 6));
+			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
+			string ProcNum = ParseOutProcedureNumberFromLine(line);
+			string procPatern = string.Format("*{0}*.pdf", string.IsNullOrEmpty(line) ? "noProcNumber" : ProcNum);
+
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
 			FileInfo fi1 = new FileInfo(ff.File1);
 			FileInfo fi2 = new FileInfo(ff.File2);
+			string PDFfileName1 = GetPFDFileAndPath(fi1,procPatern);
+			string PDFfileName2 = GetPFDFileAndPath(fi2,procPatern);
+			if (string.IsNullOrEmpty(PDFfileName1) || string.IsNullOrEmpty(PDFfileName2)) return;
+
 			// If you don't know where the Reader executable is for PDFs Open a PDF and Check to see where the path points
 			if (exePath == null)
 			{
-				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + line + ".pdf");
-				exePath = TryToGetPath(p);
-				p.Kill(); // No need to keep it open
+				try
+				{
+					System.Diagnostics.Process p = System.Diagnostics.Process.Start(PDFfileName1);
+					exePath = TryToGetPath(p);
+					p.Kill(); // No need to keep it open
+				}
+				catch (Exception ex)
+				{
+					Application.DoEvents();
+					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
+					Console.WriteLine(msg);
+					MessageBox.Show(msg, "Error opening default PDF Viewer");
+					return;
+				}
 			}
+
 			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi1.DirectoryName + "\\" + line + ".pdf ");
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum,PDFfileName1));
 			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 			// Move the PDF Reader window to 0,0
 			MoveProcess(p1, 0, 0);
-			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi2.DirectoryName + "\\" + line + ".pdf ");
+
+			// Open the second PDF on a Specific Page
+			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum, PDFfileName2));
 			System.Diagnostics.Process p2 = System.Diagnostics.Process.Start(psi2);
 			// Move the PDF Reader window to 960,0
 			// TODO: This Offset could be a Setting
 			MoveProcess(p2, 960, 0);
-			return line;
+			return;
 		}
 		/// <summary>
 		/// Try to get the location of the PDF Reader executable
@@ -530,7 +595,7 @@ namespace Baseline
 			p.WaitForInputIdle();
 			while (p.MainModule == null)
 			{
-				Console.WriteLine("{0} -  {1}", p.MainWindowTitle,p.ProcessName);
+				Console.WriteLine("{0} -  {1}", p.MainWindowTitle, p.ProcessName);
 				p.WaitForInputIdle();
 				Application.DoEvents();
 			}
@@ -594,40 +659,52 @@ namespace Baseline
 		/// <param name="list"></param>
 		private void OpenOnePDF(Line myLine, int list)
 		{
+			if (myLine == null) return; // no PDF to open
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
 			string proc = myLine.MyProc.Number.Replace("/","_").Replace("\\","_");
+
+			// if no procedure number, PROMS creates pdf filename "NoProcNumber.pdf"
+			// create pattern to use to get the PDF from the directory
+			// add wildcards (*) to file the file if any prefix or suffix was added to the filename
+			string procPatern = string.Format("*{0}*.pdf", proc == string.Empty ? "noProcNumber" : proc);
 			int pagenum = myLine.MyPage.Number;
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
-			FileInfo fi1 = new FileInfo(ff.File1);
-			FileInfo fi2 = new FileInfo(ff.File2);
-			if (exePath == null)
-			{
-				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + proc + ".pdf");
-				while (exePath == null)
-				{
-					try
-					{
-
-						exePath = p.MainModule.FileName;
-					}
-					catch (Exception ex)
-					{
-						Application.DoEvents();
-						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
-					}
-				}
-				p.Kill();
-			}
+			string PDFfileName = null;
 			if (list == 1)
 			{
-				System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi1.DirectoryName + "\\" + proc + ".pdf ");
-				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
+				FileInfo fi1 = new FileInfo(ff.File1);
+				PDFfileName = GetPFDFileAndPath(fi1, procPatern);
 			}
-			else
+			else // list == 2
 			{
-				System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi2.DirectoryName + "\\" + proc + ".pdf ");
-				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi2);
+				FileInfo fi2 = new FileInfo(ff.File2);
+				PDFfileName = GetPFDFileAndPath(fi2, procPatern);
 			}
+			if (string.IsNullOrEmpty(PDFfileName)) return; // no PDF to open
+
+			// if exePath is null, then open the found PDF with the default PDF viewer and
+			// capture/save the entire name and path of the default PDF viewer
+			if (exePath == null)
+			{
+				try
+				{
+					System.Diagnostics.Process tp = System.Diagnostics.Process.Start(PDFfileName);
+					exePath = TryToGetPath(tp);
+					tp.Kill();
+				}
+				catch (Exception ex)
+				{
+					Application.DoEvents();
+					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
+					Console.WriteLine(msg);
+					MessageBox.Show(msg, "Error opening default PDF Viewer");
+					return;
+				}
+			}
+			// open the PDF and jump to the page number
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A \"page={0}\" \"{1}\" ", pagenum,PDFfileName));
+			psi1.UseShellExecute = false;
+			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 		}
 		/// <summary>
 		/// Perform Debug Meta file comparison for all of the folders within the automated testing folders 
@@ -709,11 +786,12 @@ namespace Baseline
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			//Initialize Results List Box
-			lbResults1.Items.Clear();
 			Procedure myProc = lbProcedures.SelectedItem as Procedure;
+			if (myProc == null) return; // clicked on the white space (blank line) in the list of different procedures
 			//TODO: May need to consider if there are duplicate procedure numers and titles
 			Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
 			// Build the results ListBox for the left window
+			lbResults1.Items.Clear();
 			if (myProc1 != null)
 			{
 				foreach (Page myPage in myProc1.MyPages)

PROMS/LBWordLibrary/LBObjectExtension.cs

@@ -422,150 +422,6 @@ namespace LBWordLibrary
 					return true;
 			return false;
 		}
-		/// <summary>
-		/// If document contains symbol characters, returns problem font.
-		/// </summary>
-		public string FontHasSymbolCharacters
-		{
-			get
-			{
-				LBRange myRange = Range();
-				myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-				myRange.Start = 0;
-				int end = myRange.End;
-				string myText = GetRangeText(myRange);
-				//return _RegFindSymbol.IsMatch(myText);
-				MatchCollection problems = _RegFindSymbol.Matches(myText);
-				int offset = 0;
-				List<string> alreadyProcessed = new List<string>();
-				List<string> fontHasSymbols = new List<string>();
-				foreach (Match problem in problems)
-				{
-					if (!alreadyProcessed.Contains(problem.Value))
-						{
-						myRange.Start = problem.Index + offset;
-						myRange.End = problem.Index + problem.Length + offset;
-						int newOffset = FindRangeOffset(myRange, problem, offset, end);
-						string fontName = myRange.Font.Name;
-						if (IsSymbolFont(fontName))
-						{
-							if( !fontHasSymbols.Contains(fontName))
-							{
-								fontHasSymbols.Add(fontName);
-								// Found symbol font
-								_MyLog.InfoFormat("Font '{0}' has Symbols", fontName);
-							}
-							//Console.WriteLine("Font '{0}' has Symbols", myRange.Font.Name);
-							//return true;
-						}
-						else
-							return myRange.Font.Name;
-						offset = newOffset;
-						alreadyProcessed.Add(problem.Value);
-					}
-				}
-				return null;
-			}
-		}
-		/// <summary>
-		/// Debug Tool - Return a string containing a list of the fonts that have symbol characters.
-		/// </summary>
-		public string FontsHaveSymbolCharacters
-		{
-			get
-			{
-				string sep = "";
-				StringBuilder sb = new StringBuilder();
-				List<string> fonts=new List<string>();
-				LBRange myRange = Range();
-				myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-				myRange.Start = 0;
-				int end = myRange.End;
-				string myText = GetRangeText(myRange);
-				//return _RegFindSymbol.IsMatch(myText);
-				MatchCollection problems = _RegFindSymbol.Matches(myText);
-				int offset = 0;
-				foreach (Match problem in problems)
-				{
-					myRange.Start = problem.Index + offset;
-					myRange.End = problem.Index + problem.Length + offset;
-					int newOffset = FindRangeOffset(myRange, problem, offset, end);
-					if (!fonts.Contains(myRange.Font.Name))
-					{
-						fonts.Add(myRange.Font.Name);
-						sb.Append(sep + "'" + myRange.Font.Name + "'");
-						sep = ",";
-					}
-					offset = newOffset;
-				}
-				if (sb.Length > 0) return sb.ToString();
-				return null;
-			}
-		}
-		/// <summary>
-		/// Debug Tool - Return a list of symbol characters using VESYMB font.
-		/// </summary>
-		public string FontsHaveSymbolCharacters2
-		{
-			get
-			{
-				try
-				{
-					Dictionary<string, List<int>> fonts = new Dictionary<string, List<int>>();
-					LBRange myRange = Range();
-					myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-					myRange.Start = 0;
-					int end = myRange.End;
-					string myText = GetRangeText(myRange);
-					//return _RegFindSymbol.IsMatch(myText);
-					MatchCollection problems = _RegFindSymbol.Matches(myText);
-					int offset = 0;
-					foreach (Match problem in problems)
-					{
-						myRange.Start = problem.Index + offset;
-						myRange.End = problem.Index + problem.Length + offset;
-						int newOffset = FindRangeOffset(myRange, problem, offset, end);
-						string sFont = myRange.Font.Name;
-						if (sFont.ToUpper().StartsWith("VESYM"))
-						{
-							if (!fonts.ContainsKey(sFont))
-							{
-								fonts.Add(sFont, new List<int>());
-							}
-							List<int> symbols = fonts[sFont];
-							string myTextSymb = GetRangeText(myRange);
-							foreach (char c in myTextSymb)
-							{
-								if (!symbols.Contains((int)c))
-									symbols.Add((int)c);
-							}
-						}
-						offset = newOffset;
-					}
-					if (fonts.Count > 0)
-					{
-						string sep = "";
-						StringBuilder sb = new StringBuilder();
-						foreach (string font in fonts.Keys)
-						{
-							sb.Append(sep + "'" + font + "'");
-							sep = ",";
-							foreach (int i in fonts[font])
-							{
-								sb.Append(sep);
-								sb.Append(i);
-							}
-						}
-						return sb.ToString();
-					}
-				}
-				catch (Exception ex)
-				{
-					Console.WriteLine("{0},{1},{2}", ex.GetType().Name, ex.Message, ex.StackTrace);
-				}
-				return null;
-			}
-		}
 	
 		/// <summary>
 		/// Checks to see if the document contains symbol characters
@@ -601,86 +457,7 @@ namespace LBWordLibrary
 			}
 		}
 		Regex _RegFindSymbol = new Regex("[\\uF020-\\uF07F]+");
-		/// <summary>
-		/// FixSymbolCharacters - Fix any symbol characters in the document
-		/// </summary>
-		public void FixSymbolCharacters()
-		{
-			// Set up range object to be used to process text
-			LBRange myRange = Range();
-			myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-			int end = myRange.End;
-			myRange.Start = 0;
-			string myText = GetRangeText(myRange);
-			MatchCollection problems = _RegFindSymbol.Matches(myText);
-			int offset = 0;
-			foreach (Match problem in problems)
-			{
-				myRange.Start = problem.Index + offset;
-				myRange.End = problem.Index + problem.Length + offset;
-				int newOffset = FindRangeOffset(myRange, problem, offset, end);
-				if (myRange.Font.Name == "")
-				{
-					int wrdStart = myRange.Start;
-					int wrdEnd = myRange.End;
-					int wrdMiddle = wrdStart;
-					while (myRange.Font.Name == "")
-					{
-						do
-						{
-							myRange.End = ++wrdMiddle;
-						} while(myRange.Font.Name != "");
-						myRange.End = wrdMiddle - 1;
-						ReplaceSymbolCharacters(myRange);
-						myRange.Start = wrdMiddle -1;
-						myRange.End = wrdEnd;
-					}
-					ReplaceSymbolCharacters(myRange);
-				}
-				else
-				{
-					ReplaceSymbolCharacters(myRange);
-				}
-				offset = newOffset;
-			}
-		}
-		/// <summary>
-		/// Try to fix the first character in the symbol range F000 to F0FF.  If it cannot be
-		/// fixed, it is an indicator that the font is not installed properly.  Regardless of
-		/// whether there is success, the change is undone so that the document will not be
-		/// considered dirty, i.e. will not prompt user for save.
-		/// </summary>
-		/// <returns></returns>
-		public bool AttemptToFixASymbolCharacter()
-		{
-			// Set up range object to be used to process text
-			LBRange myRange = Range();
-			myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
-			
-			int end = myRange.End;
-			myRange.Start = 0;
-			string myText = GetRangeText(myRange);
-			MatchCollection problems = _RegFindSymbol.Matches(myText);
-			if (problems.Count>0)
-			{
-				Match problem = problems[0];
-				myRange.Start = problem.Index;
-				myRange.End = myRange.Start + 1;
-				if (IsSymbolFont(myRange.Font.Name)) return true;   // if it's a symbol font already, no issue.
-				string before = GetRangeText(myRange);
-				string updated = ReplaceSymbolCharacters(before);
-				myRange.Text = updated;
-				string after = GetRangeText(myRange);
-				Undo(1);
-				//Console.WriteLine("Undo1 results = {0}", tst);
-				//tst = Undo(1);
-				//Console.WriteLine("Undo2 results = {0}", tst);
-				//tst = Undo(1);
-				//Console.WriteLine("Undo3 results = {0}", tst);
-				return (updated == after);
-			}
-			return true;
-		}
+
 		/// <summary>
 		/// Get the Range Text with error handling.  myRange.Text sometimes will get a null reference exception.
 		/// </summary>
@@ -737,35 +514,6 @@ namespace LBWordLibrary
 			return myRange.Start - problem.Index;
 		}
 		/// <summary>
-		/// ReplaceSymbolCharacters Replaces any symbol characters in the specified range
-		/// </summary>
-		/// <param name="myRange"></param>
-		private static void ReplaceSymbolCharacters(LBRange myRange)
-		{
-			try
-			{
-				if (IsSymbolFont(myRange.Font.Name)) 
-					return;
-				string before = GetRangeText(myRange);
-				string updated = ReplaceSymbolCharacters(before);
-				myRange.Text = updated;
-				string after = GetRangeText(myRange);
-				if (after != updated)  // If the Word text doesn't match try including a character before and after and do it again.
-				{
-					Console.WriteLine("'TryEntireRange Failed',{0},{1},'{2}','{3}','{4}'", myRange.Start, myRange.End, before, updated, after);
-					int end = myRange.End;
-					myRange.Start = myRange.Start - 1;
-					myRange.End = end + 1;
-					myRange.Text = ReplaceSymbolCharacters(GetRangeText(myRange));
-					Console.WriteLine("'TryEntireRange Failed',{0},{1},'{2}'", myRange.Start, myRange.End, GetRangeText(myRange));
-				}
-			}
-			catch (Exception ex)
-			{
-				Console.WriteLine("'TryEntireRange Exception',{0},{1},'{2}'", myRange.Start, myRange.End, ex.Message);
-			}
-		}
-		/// <summary>
 		/// ReplaceSymbolCharacters processes the string returned and changes any symbols (0xF0??) to normal characters
 		/// </summary>
 		/// <param name="str"></param>

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -83,7 +83,6 @@ namespace VEPROMS
 			this.lblUser = new DevComponents.DotNetBar.LabelItem();
 			this.lblLastChange = new DevComponents.DotNetBar.LabelItem();
 			this.btnStepRTF = new DevComponents.DotNetBar.ButtonItem();
-			this.btnFixMSWord = new DevComponents.DotNetBar.ButtonItem();
 			this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel();
 			this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails();
 			this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX();
@@ -541,8 +540,7 @@ namespace VEPROMS
 			this.btnEditItem,
 			this.lblUser,
 			this.lblLastChange,
-			this.btnStepRTF,
-			this.btnFixMSWord});
+			this.btnStepRTF});
 			this.bottomBar.Location = new System.Drawing.Point(5, 573);
 			this.bottomBar.Name = "bottomBar";
 			this.bottomBar.Size = new System.Drawing.Size(1185, 25);
@@ -728,14 +726,6 @@ namespace VEPROMS
 			this.btnStepRTF.Text = "Step RTF";
 			this.btnStepRTF.Click += new System.EventHandler(this.btnStepRTF_Click);
 			// 
-			// btnFixMSWord
-			// 
-			this.btnFixMSWord.ForeColor = System.Drawing.Color.Black;
-			this.btnFixMSWord.Name = "btnFixMSWord";
-			this.btnFixMSWord.Text = "Fix Symbol Fonts";
-			this.btnFixMSWord.Visible = false;
-			this.btnFixMSWord.Click += new System.EventHandler(this.btnFixMSWord_Click);
-			// 
 			// epAnnotations
 			// 
 			this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control;
@@ -1775,7 +1765,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnItemInfo;
 		private DevComponents.DotNetBar.ButtonItem btnFilter;
 		private DevComponents.DotNetBar.TextBoxItem txtFilter;
-		private DevComponents.DotNetBar.ButtonItem btnFixMSWord;
 		private Volian.Controls.Library.DisplayBookMarks displayBookMarks;
 		//private DevComponents.DotNetBar.LabelItem lblLocked;
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -234,7 +234,7 @@ namespace VEPROMS
 			System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
 			displayRO.TabControl = tc; // B2019-043 this was being passed in as a parameter for DisplayRO which caused issues with the Visual Studio designer
 
-			SetupFolder(MyDocVersion.FolderID);
+            SetupFolder(MyDocVersion.FolderID);
 			tc.MySessionInfo = MyParent.MySessionInfo;
 			displaySearch1.TopFolderID = myDocVersion.FolderID;
 			SelectedDVI = myDocVersion;
@@ -1578,13 +1578,13 @@ namespace VEPROMS
 						}
 						else
 						{
-							SelectedROFst = myDTP.MyDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
+                            SelectedROFst = myDTP.MyDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 						}
 					}
 				}
 				else if (tc.MyEditItem != null && displayRO.MyROFST != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
 				{
-					SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
+                    SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 				}
 
 				// need this to update RO Tree after UpdateRofst (B2015-226)
@@ -1592,9 +1592,9 @@ namespace VEPROMS
 				if (displayRO.MyROFST != SelectedROFst)
 				{
 					displayRO.MyROFST = SelectedROFst;
-					// B2023-021: force Load of Step Prop/RO panel RO tree by passing in
-					//   true to LoadTree
-					displayRO.LoadTree(true);
+                    // B2023-021: force Load of Step Prop/RO panel RO tree by passing in
+                    //   true to LoadTree
+                    displayRO.LoadTree(true);
 				}
 			}
 
@@ -2396,8 +2396,8 @@ namespace VEPROMS
 			tv.MyUserInfo = MyUserInfo;
 			StepTabRibbon.MySessionInfo = MySessionInfo;
 
-			// Initialize Caption with Server name and Database name.
-			SetCaption(tv.TopNode as VETreeNode);
+            // Initialize Caption with Server name and Database name.
+            SetCaption(tv.TopNode as VETreeNode);
 			System.Threading.AutoResetEvent autoEvent = new System.Threading.AutoResetEvent(false);
 
 			//System.Threading.TimerCallback timerDelegate = new System.Threading.TimerCallback(MySessionInfo.PingSession);
@@ -4552,8 +4552,8 @@ namespace VEPROMS
 
 			SetCaption(tv.SelectedNode as VETreeNode);
 			displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
-			
-			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
+
+            if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
 			{
 				displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 			}
@@ -4628,8 +4628,6 @@ namespace VEPROMS
 			if (args != null && args.MyEditItem != null && !args.MyEditItem.MyStepPanel.ContainsFocus)
 				return;
 
-			btnFixMSWord.Visible = (args != null && (args.MyItemInfo != null && args.MyEditItem == null));
-
 			if (_LastStepRTB != null && !_LastStepRTB.Disposing && !_LastStepRTB.Closed)
 				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
 
@@ -4767,9 +4765,9 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.ProgressBar = bottomProgBar;
 					displayRO.MyRTB = args.MyEditItem.MyStepRTB;
-					displayRO.LoadTree(); 
+					displayRO.LoadTree();
 
-					displayBookMarks.MyEditItem = args.MyEditItem;
+                    displayBookMarks.MyEditItem = args.MyEditItem;
 					displayHistory.MyEditItem = args.MyEditItem;
 
 					lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View";
@@ -4932,7 +4930,7 @@ namespace VEPROMS
 
 			// B2022-026 RO Memory reduction coding (Jakes Merge)
 			displayRO.LoadTree();
-		}
+        }
 
 		#endregion
 
@@ -5241,19 +5239,6 @@ namespace VEPROMS
 				Clipboard.SetDataObject(mydo);
 			}
 		}
-		private void btnFixMSWord_Click(object sender, EventArgs e)
-		{
-			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyDSOTabPanel != null)
-			{
-				string btnText = btnFixMSWord.Text;
-				btnFixMSWord.FixedSize = btnFixMSWord.Size;
-				btnFixMSWord.Text = "Processing  ...";
-				this.Cursor = Cursors.WaitCursor;
-				tc.SelectedDisplayTabItem.MyDSOTabPanel.FixSymbolCharacters();
-				btnFixMSWord.Text = btnText;
-				this.Cursor = Cursors.Default;
-			}
-		}
 
 		private void epAnnotations_Resize(object sender, EventArgs e)
 		{

PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs

@@ -226,11 +226,11 @@ namespace Volian.Controls.Library
 			this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
 			this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
-			| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
 			this.tabControlPanel4.Style.GradientAngle = 90;
 			this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" +
-			"ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140)));
+            "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140)));
 			this.tabControlPanel4.TabIndex = 4;
 			this.tabControlPanel4.TabItem = this.tabStepTypeSearch;
 			// 
@@ -352,7 +352,7 @@ namespace Volian.Controls.Library
 			this.cbxByWord.Name = "cbxByWord";
 			this.cbxByWord.Size = new System.Drawing.Size(56, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("By Word", "", "When this box is checked, Search will find only matches of the search text as a w" +
-			"ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            "ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxByWord.TabIndex = 7;
 			this.cbxByWord.Text = "By Word";
 			// 
@@ -382,7 +382,7 @@ namespace Volian.Controls.Library
 			this.cbxIncROTextSrch.Name = "cbxIncROTextSrch";
 			this.cbxIncROTextSrch.Size = new System.Drawing.Size(169, 12);
 			this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
-			"text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cbxIncROTextSrch.TabIndex = 5;
 			this.cbxIncROTextSrch.Text = "Search RO and Transition Text";
 			// 
@@ -397,7 +397,7 @@ namespace Volian.Controls.Library
 			this.cbxProcSectSrch.Name = "cbxProcSectSrch";
 			this.cbxProcSectSrch.Size = new System.Drawing.Size(180, 18);
 			this.superTooltip1.SetSuperTooltip(this.cbxProcSectSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
-			"text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cbxProcSectSrch.TabIndex = 5;
 			this.cbxProcSectSrch.Text = "Ignore Procedure and Section Titles";
 			// 
@@ -414,7 +414,7 @@ namespace Volian.Controls.Library
 			this.cbxCaseSensitive.Name = "cbxCaseSensitive";
 			this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " +
-			"you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxCaseSensitive.TabIndex = 3;
 			this.cbxCaseSensitive.Text = "Case Sensitive";
 			// 
@@ -431,7 +431,7 @@ namespace Volian.Controls.Library
 			this.cbxRnoOnly.Name = "cbxRnoOnly";
 			this.cbxRnoOnly.Size = new System.Drawing.Size(71, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnly, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
-			".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxRnoOnly.TabIndex = 7;
 			this.cbxRnoOnly.Text = "RNO Only";
 			// 
@@ -479,7 +479,7 @@ namespace Volian.Controls.Library
 			this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4;
 			this.tabStepTypeSearch.Name = "tabStepTypeSearch";
 			this.superTooltip1.SetSuperTooltip(this.tabStepTypeSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Allows you to search for entered text in selected procedure sets and within selec" +
-			"ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
+            "ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
 			this.tabStepTypeSearch.Text = "Text";
 			this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click);
 			// 
@@ -500,8 +500,8 @@ namespace Volian.Controls.Library
 			this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
 			this.tabControlPanel5.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel5.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
-			| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel5.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
 			this.tabControlPanel5.Style.GradientAngle = 90;
 			this.tabControlPanel5.TabIndex = 5;
 			this.tabControlPanel5.TabItem = this.tabTranSearch;
@@ -519,7 +519,7 @@ namespace Volian.Controls.Library
 			this.cbxRnoOnlyTrans.Name = "cbxRnoOnlyTrans";
 			this.cbxRnoOnlyTrans.Size = new System.Drawing.Size(71, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyTrans, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
-			".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxRnoOnlyTrans.TabIndex = 8;
 			this.cbxRnoOnlyTrans.Text = "RNO Only";
 			// 
@@ -630,7 +630,7 @@ namespace Volian.Controls.Library
 			this.tabTranSearch.AttachedControl = this.tabControlPanel5;
 			this.tabTranSearch.Name = "tabTranSearch";
 			this.superTooltip1.SetSuperTooltip(this.tabTranSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Transition From", "", "Allows you to search for transitions of the selected type that point from selecte" +
-			"d procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
+            "d procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
 			this.tabTranSearch.Text = "Transitions";
 			// 
 			// tabControlPanel2
@@ -648,8 +648,8 @@ namespace Volian.Controls.Library
 			this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
 			this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
-			| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
 			this.tabControlPanel2.Style.GradientAngle = 90;
 			this.tabControlPanel2.TabIndex = 2;
 			this.tabControlPanel2.TabItem = this.tabROSearch;
@@ -711,7 +711,7 @@ namespace Volian.Controls.Library
 			this.cbxRnoOnlyRO.Name = "cbxRnoOnlyRO";
 			this.cbxRnoOnlyRO.Size = new System.Drawing.Size(71, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyRO, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
-			".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxRnoOnlyRO.TabIndex = 8;
 			this.cbxRnoOnlyRO.Text = "RNO Only";
 			// 
@@ -730,7 +730,7 @@ namespace Volian.Controls.Library
 			this.lblSrchRoMsg.Size = new System.Drawing.Size(262, 40);
 			this.lblSrchRoMsg.TabIndex = 3;
 			this.lblSrchRoMsg.Text = "This folder(s) ROs are incompatible with the currently selected folder(s).  This " +
-	"may be due to the RO values needing to be updated.";
+    "may be due to the RO values needing to be updated.";
 			this.lblSrchRoMsg.Visible = false;
 			this.lblSrchRoMsg.WordWrap = true;
 			// 
@@ -796,8 +796,8 @@ namespace Volian.Controls.Library
 			this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
 			this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
-			| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
 			this.tabControlPanel3.Style.GradientAngle = 90;
 			this.tabControlPanel3.TabIndex = 5;
 			this.tabControlPanel3.TabItem = this.tabAnnotationSearch;
@@ -874,7 +874,7 @@ namespace Volian.Controls.Library
 			this.cbxRnoOnlyAnnot.Name = "cbxRnoOnlyAnnot";
 			this.cbxRnoOnlyAnnot.Size = new System.Drawing.Size(71, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyAnnot, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
-			".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxRnoOnlyAnnot.TabIndex = 9;
 			this.cbxRnoOnlyAnnot.Text = "RNO Only";
 			// 
@@ -907,7 +907,7 @@ namespace Volian.Controls.Library
 			this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(92, 15);
 			this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitiveAnnoText, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" +
-			" you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+            " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
 			this.cbxCaseSensitiveAnnoText.TabIndex = 5;
 			this.cbxCaseSensitiveAnnoText.Text = "Case Sensitive";
 			// 
@@ -926,7 +926,7 @@ namespace Volian.Controls.Library
 			this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(239, 22);
 			this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.\r\n\r\nLeave Bl" +
-			"ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140)));
+            "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140)));
 			this.cbxTextSearchAnnotation.TabIndex = 6;
 			this.cbxTextSearchAnnotation.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.cbxTextSearchAnnotation.WatermarkText = "Enter Search Text Here";
@@ -970,7 +970,7 @@ namespace Volian.Controls.Library
 			this.tabAnnotationSearch.AttachedControl = this.tabControlPanel3;
 			this.tabAnnotationSearch.Name = "tabAnnotationSearch";
 			this.superTooltip1.SetSuperTooltip(this.tabAnnotationSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Annotations", "", "Allows you to search for types and text for annotations in the selected procedure" +
-			" set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
+            " set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
 			this.tabAnnotationSearch.Text = "Annotations";
 			this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
 			// 
@@ -990,12 +990,12 @@ namespace Volian.Controls.Library
 			this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
 			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
 			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
-			| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
 			this.tabControlPanel1.Style.GradientAngle = 90;
 			this.tabControlPanel1.TabIndex = 17;
 			this.tabControlPanel1.TabItem = this.tabIncTrans;
-			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
 			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			// 
 			// btnTranCvtSelToTxt
@@ -1005,7 +1005,7 @@ namespace Volian.Controls.Library
 			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
 			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
 			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
-			"t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
 			this.btnTranCvtSelToTxt.TabIndex = 3;
 			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
 			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
@@ -1027,7 +1027,7 @@ namespace Volian.Controls.Library
 			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
 			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
 			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
-			"not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
 			this.btnTranCvtAllToTxt.TabIndex = 1;
 			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
 			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
@@ -1040,7 +1040,7 @@ namespace Volian.Controls.Library
 			this.lblSrchIncTran.Name = "lblSrchIncTran";
 			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
 			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
-			"shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
+            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
 			this.lblSrchIncTran.TabIndex = 1;
 			// 
 			// groupBox1
@@ -1083,7 +1083,7 @@ namespace Volian.Controls.Library
 			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
 			this.tabIncTrans.Name = "tabIncTrans";
 			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
-			"nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
+            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
 			this.tabIncTrans.Text = "Incoming\nTransitions";
 			// 
 			// contextMenuBar1
@@ -1092,7 +1092,7 @@ namespace Volian.Controls.Library
 			this.contextMenuBar1.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.contextMenuBar1.IsMaximized = false;
 			this.contextMenuBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.btnCMIFindText});
+            this.btnCMIFindText});
 			this.contextMenuBar1.Location = new System.Drawing.Point(225, -3);
 			this.contextMenuBar1.Margin = new System.Windows.Forms.Padding(2);
 			this.contextMenuBar1.Name = "contextMenuBar1";
@@ -1108,8 +1108,8 @@ namespace Volian.Controls.Library
 			this.btnCMIFindText.AutoExpandOnClick = true;
 			this.btnCMIFindText.Name = "btnCMIFindText";
 			this.btnCMIFindText.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.btnCMEdit,
-			this.btnCMInsert});
+            this.btnCMEdit,
+            this.btnCMInsert});
 			this.btnCMIFindText.Text = "cmFindText";
 			this.btnCMIFindText.PopupOpen += new DevComponents.DotNetBar.DotNetBarManager.PopupOpenEventHandler(this.btnCMIFindText_PopupOpen);
 			// 
@@ -1117,9 +1117,9 @@ namespace Volian.Controls.Library
 			// 
 			this.btnCMEdit.Name = "btnCMEdit";
 			this.btnCMEdit.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.cmFndTxtCut,
-			this.cmFndTxtCopy,
-			this.cmFndTxtPaste});
+            this.cmFndTxtCut,
+            this.cmFndTxtCopy,
+            this.cmFndTxtPaste});
 			this.btnCMEdit.Text = "Edit";
 			// 
 			// cmFndTxtCut
@@ -1151,10 +1151,10 @@ namespace Volian.Controls.Library
 			// 
 			this.btnCMInsert.Name = "btnCMInsert";
 			this.btnCMInsert.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.cmFndTxtInsHardSp,
-			this.cmFndTxtInsSymbol,
-			this.buttonItem1,
-			this.btnBooleanItems});
+            this.cmFndTxtInsHardSp,
+            this.cmFndTxtInsSymbol,
+            this.buttonItem1,
+            this.btnBooleanItems});
 			this.btnCMInsert.Text = "Insert";
 			// 
 			// cmFndTxtInsHardSp
@@ -1171,7 +1171,7 @@ namespace Volian.Controls.Library
 			this.cmFndTxtInsSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image;
 			this.cmFndTxtInsSymbol.Name = "cmFndTxtInsSymbol";
 			this.cmFndTxtInsSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.galSymbols});
+            this.galSymbols});
 			this.cmFndTxtInsSymbol.Text = "Symbol";
 			// 
 			// galSymbols
@@ -1197,9 +1197,9 @@ namespace Volian.Controls.Library
 			// 
 			this.buttonItem1.Name = "buttonItem1";
 			this.buttonItem1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.buttonItem2,
-			this.buttonItem3,
-			this.buttonItem4});
+            this.buttonItem2,
+            this.buttonItem3,
+            this.buttonItem4});
 			this.buttonItem1.Text = "Wild Cards";
 			// 
 			// buttonItem2
@@ -1224,9 +1224,9 @@ namespace Volian.Controls.Library
 			// 
 			this.btnBooleanItems.Name = "btnBooleanItems";
 			this.btnBooleanItems.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-			this.btnAND,
-			this.btnOR,
-			this.btnNOT});
+            this.btnAND,
+            this.btnOR,
+            this.btnNOT});
 			this.btnBooleanItems.Text = "Boolean";
 			this.btnBooleanItems.Visible = false;
 			// 
@@ -1267,7 +1267,7 @@ namespace Volian.Controls.Library
 			this.advTreeProcSets.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode;
 			this.advTreeProcSets.Name = "advTreeProcSets";
 			this.advTreeProcSets.Nodes.AddRange(new DevComponents.AdvTree.Node[] {
-			this.node1});
+            this.node1});
 			this.advTreeProcSets.NodesConnector = this.nodeConnector1;
 			this.advTreeProcSets.NodeStyle = this.elementStyle1;
 			this.advTreeProcSets.NodeStyleSelected = this.elementStyle1;
@@ -1315,7 +1315,7 @@ namespace Volian.Controls.Library
 			this.advTreeStepTypes.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode;
 			this.advTreeStepTypes.Name = "advTreeStepTypes";
 			this.advTreeStepTypes.Nodes.AddRange(new DevComponents.AdvTree.Node[] {
-			this.node2});
+            this.node2});
 			this.advTreeStepTypes.NodesConnector = this.nodeConnector2;
 			this.advTreeStepTypes.NodeStyle = this.elementStyle2;
 			this.advTreeStepTypes.NodeStyleSelected = this.elementStyle2;
@@ -1480,7 +1480,7 @@ namespace Volian.Controls.Library
 			this.btnCopySearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.btnCopySearchResults.Size = new System.Drawing.Size(43, 23);
 			this.superTooltip1.SetSuperTooltip(this.btnCopySearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Copy Search Results", "", "This button copies the Search Results listed below into the copy/paste buffer. Th" +
-			"e copied data can then be pasted into another tool, such as a spreadsheet.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            "e copied data can then be pasted into another tool, such as a spreadsheet.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnCopySearchResults.TabIndex = 10;
 			this.btnCopySearchResults.Text = "Copy";
 			this.btnCopySearchResults.ThemeAware = true;
@@ -1533,7 +1533,7 @@ namespace Volian.Controls.Library
 			this.labelX1.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.labelX1.Size = new System.Drawing.Size(66, 14);
 			this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" +
-			"ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.labelX1.TabIndex = 9;
 			this.labelX1.Text = "Results Style:";
 			// 
@@ -1546,17 +1546,17 @@ namespace Volian.Controls.Library
 			this.cmbResultsStyle.FormattingEnabled = true;
 			this.cmbResultsStyle.ItemHeight = 14;
 			this.cmbResultsStyle.Items.AddRange(new object[] {
-			this.comboItem1,
-			this.comboItem2,
-			this.comboItem3,
-			this.comboItem4});
+            this.comboItem1,
+            this.comboItem2,
+            this.comboItem3,
+            this.comboItem4});
 			this.cmbResultsStyle.Location = new System.Drawing.Point(70, 5);
 			this.cmbResultsStyle.Margin = new System.Windows.Forms.Padding(2);
 			this.cmbResultsStyle.Name = "cmbResultsStyle";
 			this.cmbResultsStyle.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.cmbResultsStyle.Size = new System.Drawing.Size(110, 20);
 			this.superTooltip1.SetSuperTooltip(this.cmbResultsStyle, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" +
-			"ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cmbResultsStyle.TabIndex = 8;
 			this.cmbResultsStyle.SelectedValueChanged += new System.EventHandler(this.cmbResultsStyle_SelectedValueChanged);
 			// 
@@ -1623,7 +1623,7 @@ namespace Volian.Controls.Library
 			this.btnPrnSrchRslts.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			this.btnPrnSrchRslts.Size = new System.Drawing.Size(43, 23);
 			this.superTooltip1.SetSuperTooltip(this.btnPrnSrchRslts, new DevComponents.DotNetBar.SuperTooltipInfo("Print Search Results", "", "This button generates a PDF of a standard formatted report regardless of what Res" +
-			"ults Style is selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            "ults Style is selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnPrnSrchRslts.TabIndex = 5;
 			this.btnPrnSrchRslts.Text = "Print";
 			this.btnPrnSrchRslts.ThemeAware = true;
@@ -1660,8 +1660,8 @@ namespace Volian.Controls.Library
 			this.xpSetToSearch.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
 			this.xpSetToSearch.Style.GradientAngle = 90;
 			this.superTooltip1.SetSuperTooltip(this.xpSetToSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Select Procedure Sets to Search", "", "This allows you to  select specific procedure sets in which to search.\r\n\r\nIf no p" +
-			"rocedure sets are selected in this list, then PROMS will search All of the proce" +
-			"dure sets.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(196, 104)));
+            "rocedure sets are selected in this list, then PROMS will search All of the proce" +
+            "dure sets.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(196, 104)));
 			this.xpSetToSearch.TabIndex = 7;
 			this.xpSetToSearch.TitleHeight = 21;
 			this.xpSetToSearch.TitleStyle.Alignment = System.Drawing.StringAlignment.Center;
@@ -1695,8 +1695,8 @@ namespace Volian.Controls.Library
 			this.xpStepTypes.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
 			this.xpStepTypes.Style.GradientAngle = 90;
 			this.superTooltip1.SetSuperTooltip(this.xpStepTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Filter Search by Selected Step Elements", "", "This allows you to search in only the selected step elements.\r\n\r\nIf the Find Sele" +
-			"cted Step Elements option is selected, search will show you  where the selected " +
-			"Step Elements are use.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(240, 115)));
+            "cted Step Elements option is selected, search will show you  where the selected " +
+            "Step Elements are use.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(240, 115)));
 			this.xpStepTypes.TabIndex = 8;
 			this.xpStepTypes.ThemeAware = true;
 			this.xpStepTypes.TitleHeight = 21;
@@ -1889,4 +1889,4 @@ namespace Volian.Controls.Library
 		private DevComponents.DotNetBar.TabItem tabIncTrans;        // B2021-061: incorrect variable name was used - rename from tabNISearch to tabIncTrans
 																	//end transition search controls
 	}
-}
+}

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -960,7 +960,9 @@ namespace Volian.Print.Library
 			OnStatusChanged("After NewPage", PromsPrinterStatusType.NewPage);
 			if (myProcedure.Sections == null)
 			{
-				MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				// C2026-033 if we are running baselines, don't display the empty procedure message box, instead continue on as if OK was pressed.
+				if (!BaselineTesting)
+					MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				ProfileTimer.Pop(profileDepth);
 				// B2024-062 Added check for EmptyProcedure. This is to prevent the Try Again message 
 				// from appearing after the user clicks on the OK button from the Empty Procedure message