Moved to Old Repo

Unused Solutions
.bak files
Old Referenced Objects Code / Correct ROEditor Code in PROMS\ReferencedObjects\Exe\RefObj\ROEditor
LBWordLibrary - LBBozoComObject.cs, LBComObject.old.cs not part of solution
PROMS folder (correct versions in VEPROMS) - dlgApproveProcedure.cs,dlgExportImport.cs,frmVEPROMS.cs,StepRTB.cs,VlnFlexGrid.cs,Grid2Pdf.cs,Rtf2iTextSharp.cs
VEPROMS User Interface - Correct dlgChgId, FindReplace in Volian.Controls.Library
VEPROMS.CSLA.Library - Remove cs files that are not part of project/solution
Volian.Controls.Library - Remove cs files that are not part of project/solution

.gitignore

@@ -401,4 +401,5 @@ FodyWeavers.xsd
 
 /fmtall
 /genmacall
-*AssemblyInfo.cs
+*AssemblyInfo.cs
+/PROMS/Baseline/Baseline.sln

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -5,7 +5,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -44,6 +44,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -53,13 +54,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/AdjustBuildRevision/AdjustBuildRevision.sln

@@ -1,36 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdjustBuildRevision", "AdjustBuildRevision.csproj", "{D1AB675E-828D-4781-BACD-8A2324CD84A5}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 2
-		SccProjectUniqueName0 = AdjustBuildRevision.csproj
-		SccLocalPath0 = .
-		SccLocalPath1 = .
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.ActiveCfg = Debug|x86
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Debug|x86.Build.0 = Debug|x86
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|x86.ActiveCfg = Release|x86
-		{D1AB675E-828D-4781-BACD-8A2324CD84A5}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

PROMS/AdjustBuildRevision/Program.cs

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
 						{
 							// Allow for setting build revision on either proms or the roeditor:
 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")");
 							else
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/Baseline/Baseline.csproj

@@ -22,7 +22,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -30,15 +30,17 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

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.FirstOrDefault(); // 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/DropDownPanel/Controls/DropDownPanel.cs

@@ -28,7 +28,9 @@ namespace AT.STO.UI.Win
 
 			_dropDownHelper = new DropDownWindowHelper();
 
+			_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
 			_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
+			_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			
 			combo.DisplayMember = "Text";
@@ -82,7 +84,9 @@ namespace AT.STO.UI.Win
 				DropDownForm dropDown = new DropDownForm(_dropDownControl);
 				
 				
+				dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 				dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
+				dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				
 				combo.DroppedDown = false;

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,13 +45,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -60,7 +61,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -69,7 +70,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -78,7 +79,7 @@
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>TRACE;DEMO</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,7 +49,9 @@ namespace AT.STO.UI.Win
 		{
 			base.OnShown(e);
 			
+			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
+			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 			_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 		}
 	#endregion

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -39,6 +39,7 @@ namespace AT.STO.UI.Win
 		public DropDownWindowHelper()
 		{
 			_filter = new DropDownMessageFilter(this);
+			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
 	#endregion

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -29,7 +29,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -40,13 +40,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -56,7 +57,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/Formats/Formats.csproj

@@ -35,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -44,6 +45,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
@@ -177,9 +179,11 @@
     <Content Include="fmtall\CPL_00all.xml" />
     <Content Include="fmtall\CPL_01all.xml" />
     <Content Include="fmtall\CPL_02all.xml" />
+    <Content Include="fmtall\CPL_04all.xml" />
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />
+    <Content Include="fmtall\EPTSTBCK1all.xml" />
     <Content Include="fmtall\EPTST1all.xml" />
     <Content Include="fmtall\CWEall.xml" />
     <Content Include="fmtall\CWEDEVall.xml" />
@@ -288,6 +292,10 @@
     <Content Include="fmtall\NSPWGall.xml" />
     <Content Include="fmtall\NSP_00all.xml" />
     <Content Include="fmtall\OHLPall.xml" />
+    <Content Include="fmtall\PROMSDemo1all.xml" />
+    <Content Include="fmtall\PROMSDemo2all.xml" />
+    <Content Include="fmtall\PROMSDemoALRall.xml" />
+    <Content Include="fmtall\PROMSDemoBCKall.xml" />
     <Content Include="fmtall\PROMSMan1all.xml" />
     <Content Include="fmtall\PROMSMan2all.xml" />
     <Content Include="fmtall\RGEall.xml" />
@@ -505,6 +513,10 @@
     <Content Include="genmacall\nspsam.svg" />
     <Content Include="genmacall\nspsamdev.svg" />
     <Content Include="genmacall\ohlp.svg" />
+    <Content Include="genmacall\PROMSDemo1.svg" />
+    <Content Include="genmacall\PROMSDemo2.svg" />
+    <Content Include="genmacall\PROMSDemoALR.svg" />
+    <Content Include="genmacall\PROMSDemoBCK.svg" />
     <Content Include="genmacall\PROMSMan1.svg" />
     <Content Include="genmacall\PROMSMan2.svg" />
     <Content Include="genmacall\rge.svg" />

PROMS/Formats/Formats.sln

@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Formats", "Formats.csproj", "{F479493D-A543-4CCF-9541-039FD5126794}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F479493D-A543-4CCF-9541-039FD5126794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F479493D-A543-4CCF-9541-039FD5126794}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F479493D-A543-4CCF-9541-039FD5126794}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F479493D-A543-4CCF-9541-039FD5126794}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

PROMS/Formats/Production Formats.sln

@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Formats", "Formats.csproj", "{F479493D-A543-4CCF-9541-039FD5126794}"
-EndProject
-Global
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 2
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = Formats.csproj
-		SccLocalPath1 = .
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F479493D-A543-4CCF-9541-039FD5126794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F479493D-A543-4CCF-9541-039FD5126794}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F479493D-A543-4CCF-9541-039FD5126794}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F479493D-A543-4CCF-9541-039FD5126794}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

PROMS/Formats/frmFormatCopy.Designer.cs

@@ -35,6 +35,7 @@ namespace Formats
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
 			this.labelX2 = new DevComponents.DotNetBar.LabelX();
 			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
+			this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -131,11 +132,26 @@ namespace Formats
 			this.LstBxExcludeFiles.TabIndex = 6;
 			this.LstBxExcludeFiles.Text = "listBoxAdv1";
 			// 
+			// cbIncludeDemoFormats
+			// 
+			// 
+			// 
+			// 
+			this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
+			this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
+			this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
+			this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
+			this.cbIncludeDemoFormats.TabIndex = 7;
+			this.cbIncludeDemoFormats.Text = "Include Demo Formats";
+			// 
 			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(496, 191);
+			this.Controls.Add(this.cbIncludeDemoFormats);
 			this.Controls.Add(this.LstBxExcludeFiles);
 			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
@@ -158,6 +174,7 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX buttonX2;
 		private DevComponents.DotNetBar.LabelX labelX2;
 		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
+		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -96,13 +96,17 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
-
+		// Added a PROMSDemo to the list of excluded format files
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
+		
+		// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
+		// dialog is check
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
 			foreach (string excludeThis in excludeThese)
-				if (fn.ToUpper().StartsWith(excludeThis)) return true;
+				if (fn.ToUpper().StartsWith(excludeThis) 
+					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
 			return false;
 		}
 
@@ -161,5 +165,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-}
+	}
 }

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/LBWordLibrary/LBWordLibrary.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,13 +45,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -61,7 +62,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/PROMS/Volian.Print.Library/Rtf2iTextSharp.cs

@@ -1,415 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using iTextSharp.text;
-using iTextSharp.text.pdf;
-using iTextSharp.text.factories;
-using Itenso.Rtf;
-using Itenso.Rtf.Parser;
-using Itenso.Rtf.Interpreter;
-//using Itenso.Rtf.Model;
-using Itenso.Rtf.Support;
-using Microsoft.Win32;
-using Volian.Base.Library;
-
-namespace Volian.Print.Library
-{
-	public partial class PrintOverride
-	{
-		public static bool CompressSub = false;
-		public static bool CompressSuper = false;
-		public static bool CompressPropSubSup = false;
-		private static System.Drawing.Color _TextColor = System.Drawing.Color.Empty;
-		public static System.Drawing.Color TextColor
-		{
-			get { return _TextColor; }
-			set { _TextColor = value; }
-		}
-		public static System.Drawing.Color OverrideTextColor(System.Drawing.Color color)
-		{
-			if (_TextColor == System.Drawing.Color.Empty)
-				return color;
-			return _TextColor;
-		}
-		private static System.Drawing.Color _SvgColor = System.Drawing.Color.Empty;
-		public static System.Drawing.Color SvgColor
-		{
-			get { return _SvgColor; }
-			set { _SvgColor = value; Volian.Svg.Library.Svg.OverrideColor = value; }
-		}
-		public static System.Drawing.Color OverrideSvgColor(System.Drawing.Color color)
-		{
-			if (_SvgColor == System.Drawing.Color.Empty)
-				return color;
-			return _SvgColor;
-		}
-		private static System.Drawing.Color _BoxColor = System.Drawing.Color.Empty;
-		public static System.Drawing.Color BoxColor
-		{
-			get { return _BoxColor; }
-			set { _BoxColor = value; }
-		}
-		public static System.Drawing.Color OverrideBoxColor(System.Drawing.Color color)
-		{
-			if (_BoxColor == System.Drawing.Color.Empty)
-				return color;
-			return _BoxColor;
-		}
-		private static System.Drawing.Color _ChangeBarColor = System.Drawing.Color.Empty;
-		public static System.Drawing.Color ChangeBarColor
-		{
-			get { return _ChangeBarColor; }
-			set { _ChangeBarColor = value; }
-		}
-		public static System.Drawing.Color OverrideChangeBarColor(System.Drawing.Color color)
-		{
-			if (_ChangeBarColor == System.Drawing.Color.Empty)
-				return color;
-			return _ChangeBarColor;
-		}
-		private static System.Drawing.Color _DebugColor = System.Drawing.Color.Empty;
-		public static System.Drawing.Color DebugColor
-		{
-			get { return _DebugColor; }
-			set { _DebugColor = value; }
-		}
-		public static System.Drawing.Color OverrideDebugColor(System.Drawing.Color color)
-		{
-			if (_DebugColor == System.Drawing.Color.Empty)
-				return color;
-			return _DebugColor;
-		}
-		public static void Reset()
-		{
-			DebugColor = System.Drawing.Color.Empty;
-			TextColor = System.Drawing.Color.Empty;
-			SvgColor = System.Drawing.Color.Empty;
-			BoxColor = System.Drawing.Color.Empty;
-			ChangeBarColor = System.Drawing.Color.Empty;
-		}
-	}
-	public class Rtf2iTextSharp : RtfVisualVisitorBase
-	{
-		private bool _HasIndent = false;
-		public bool HasIndent
-		{
-			get { return _HasIndent; }
-			set { _HasIndent = value; }
-		}
-		private static bool _DoingComparison = false;
-		public static bool DoingComparison
-		{
-			get { return Rtf2iTextSharp._DoingComparison; }
-			set { Rtf2iTextSharp._DoingComparison = value; }
-		}
-
-		private IRtfDocument _RtfDoc;
-		private Paragraph _MyParagraph = new Paragraph();
-		private iTextSharp.text.Font _MyFont;
-
-		// Allow for definition of a default font:  if the font is not proportional, this gets set.  
-		// It is needed to set the chunk's font if the first character of a cell is a hardspace (or various
-		// other special cases (see its use below).  Without this, pdfs were using the Helvetica font, 
-		// which is a default itextsharp font (this was causing a problem for HLP, their pdfs could not
-		// contain a Helvetica font when putting them in their production environment).
-		private iTextSharp.text.Font _DefaultFont;
-		public iTextSharp.text.Font DefaultFont
-		{
-			get { return _DefaultFont; }
-			set { _DefaultFont = value; }
-		}
-		private string _MyDebugID = null;
-		public string MyDebugID
-		{
-			get { return _MyDebugID; }
-			set { _MyDebugID = value; }
-		}
-
-		//		public Rtf2iTextSharp(IRtfDocument rtfDoc, Document doc, PdfWriter writer)
-		public Rtf2iTextSharp(IRtfDocument rtfDoc)
-		{
-			if (rtfDoc == null)
-				throw new ArgumentNullException("rtfDoc");
-			
-			_RtfDoc = rtfDoc;
-		}
-		public Paragraph Convert()
-		{
-			int profileDepth = ProfileTimer.Push(">>>> Rtf2ITextSharp.Convert");
-			_MyParagraph.Clear();
-			_MyFont = null;
-			foreach (IRtfVisual visual in _RtfDoc.VisualContent)
-			{
-				visual.Visit(this);
-			}
-			//_MyParagraph.SetLeading(0, 1);
-			ProfileTimer.Pop(profileDepth);
-			return _MyParagraph;
-		}
-		// ----------------------------------------------------------------------
-		protected override void DoVisitBreak(IRtfVisualBreak visualBreak)
-		{
-			switch (visualBreak.BreakKind)
-			{
-				case RtfVisualBreakKind.Line:
-					Chunk ck = HasIndent ? new Chunk("".PadLeft(200)) : new Chunk("".PadLeft(200));
-					_MyParagraph.Add(ck);
-					break;
-				case RtfVisualBreakKind.Page:
-					break;
-				case RtfVisualBreakKind.Paragraph:
-					Chunk ck1 = HasIndent ? new Chunk("".PadLeft(200)) : Chunk.NEWLINE;
-					_MyParagraph.Add(ck1);
-					break;
-				case RtfVisualBreakKind.Section:
-					break;
-				default:
-					break;
-			}
-			//_MyParagraph.Add(string.Format("<{0}>", visualBreak.BreakKind.ToString()));
-		}
-		private void AddChunk(string str, iTextSharp.text.Font font)
-		{
-			if (font == null)
-				_MyParagraph.Add(new Chunk(str));
-			else
-				_MyParagraph.Add(new Chunk(str, font));
-		}
-		protected override void DoVisitSpecial(IRtfVisualSpecialChar visualSpecialChar)
-		{
-			//_MyParagraph.Add(string.Format("<special {0}>", visualSpecialChar.CharKind.ToString()));
-			iTextSharp.text.Font activeFont = _MyFont ?? DefaultFont;
-			switch (visualSpecialChar.CharKind)
-			{
-				case RtfVisualSpecialCharKind.Bullet:
-					AddChunk("\u2022", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.EmDash:
-					AddChunk("\u2014", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.EmSpace:
-					AddChunk("\u2003", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.EnDash:
-					AddChunk("\u2013", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.EnSpace:
-					AddChunk(" ", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.LeftDoubleQuote:
-					AddChunk("\u201C", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.LeftSingleQuote:
-					AddChunk("\u2018", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.NonBreakingHyphen:
-					AddChunk("\u2011", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.NonBreakingSpace:
-					//iTextSharp.text.Font font = Volian.Svg.Library.VolianPdf.GetFont(sdf);
-					AddChunk("\u00A0", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.OptionalHyphen:
-					AddChunk("\u00AD", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.ParagraphNumberBegin:
-					break;
-				case RtfVisualSpecialCharKind.ParagraphNumberEnd:
-					break;
-				case RtfVisualSpecialCharKind.QmSpace:
-					break;
-				case RtfVisualSpecialCharKind.RightDoubleQuote:
-					AddChunk("\u201D", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.RightSingleQuote:
-					AddChunk("\u2019", activeFont);
-					break;
-				case RtfVisualSpecialCharKind.Tabulator:
-					break;
-				default:
-					break;
-			}
-		}
-		private bool ContainsAllSymbols(string p)
-		{
-			foreach (char c in p)
-				if (c <= '\x7F') return false;
-			return true;
-		}
-		private bool ContainsAnySymbols(string p)
-		{
-			foreach (char c in p)
-				if (c > '\x7F' && c != '\xA0' && c != '\xB0') return true;
-			return false;
-		}
-		protected override void DoVisitText(IRtfVisualText visualText)
-		{
-			int profileDepth = ProfileTimer.Push(">>>> DoVisitText");
-			if (visualText.Format.IsHidden)
-			{
-				ProfileTimer.Pop(profileDepth);
-				return;
-			}
-			iTextSharp.text.Font font = Volian.Svg.Library.VolianPdf.GetFont(visualText.Format.Font.Name, visualText.Format.FontSize,
-				(visualText.Format.IsBold ? iTextSharp.text.Font.BOLD : 0) +
-				(visualText.Format.IsItalic ? iTextSharp.text.Font.ITALIC : 0));
-			font.Color = new iTextSharp.text.Color(PrintOverride.OverrideTextColor(visualText.Format.ForegroundColor.AsDrawingColor));
-			// The following line of code was added to allow for comparisons between the 16bit and 32bit pdf files.  Without
-			// the size change, the overlays did not match up.  It seems that the 16bit font size may be inaccurate
-			// and the 16bit conversion to be pdf may be off.  
-			//if (font.Familyname.StartsWith("Arial") && font.Size == 11 && DoingComparison) font.Size = 11.15f;
-			iTextSharp.text.pdf.FontSelector fs = new FontSelector();
-			// DEBUG
-			//if (visualText.Format.Font.Name != "VESymbFix" && ContainsAnySymbols(visualText.Text))
-			//{
-			//	Console.WriteLine("Font: {0} TEXT: {1}", visualText.Format.Font.Name, ShowSpecialCharacters(visualText.Text));
-			//}
-			if (visualText.Format.Font.Name == "VESymbFix" && ContainsAllSymbols(visualText.Text))
-			{
-				fs.AddFont(font);
-				// if the symbol character cannot be found in VESymbFix then check/use the Consolas font
-				// We are using the VESymbFix font first because not all of the symbols that we use are in the Consolas font
-				// The Consolas font will give us other symbols that we don't have in VESymbFix (ex the Omega)
-				fs.AddFont(FontFactory.GetFont("Consolas", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, (visualText.Format.FontSize * 1.1F) / 2,
-					(visualText.Format.IsBold ? iTextSharp.text.Font.BOLD : 0) +
-					(visualText.Format.IsItalic ? iTextSharp.text.Font.ITALIC : 0), font.Color));
-				Phrase ph = fs.Process(visualText.Text);
-				foreach (Chunk chk in ph.Chunks)
-				{
-					AdjustChunk(visualText, font, chk);
-					_MyParagraph.Add(chk);
-				}
-			}
-			else
-			{
-				// The bullet character for some unknown reason was entered in a text font rather than a symbol font
-				// switch from x25cf ot x2022 moves to a valid bullet character in the text font
-				Chunk chk = new Chunk(visualText.Text.Replace("\u25cf", "\u2022"), font);
-					AdjustChunk(visualText, font, chk);
-				_MyParagraph.Add(chk);
-			}
-			ProfileTimer.Pop(profileDepth);
-		}
-
-		private void AdjustChunk(IRtfVisualText visualText, iTextSharp.text.Font font, Chunk chk)
-		{
-			if (visualText.Format.BackgroundColor.AsDrawingColor.ToArgb() != System.Drawing.Color.White.ToArgb())
-				chk.SetBackground(new iTextSharp.text.Color(visualText.Format.BackgroundColor.AsDrawingColor));
-			if (visualText.Format.IsStrikeThrough)
-				chk.SetUnderline(font.Color, 0, 0.05F, 0, .3F, PdfContentByte.LINE_CAP_ROUND); // Relative Based upon font size
-			if (visualText.Format.IsUnderline)
-				if (visualText.Format.SuperScript < 0)
-				{
-					if (PrintOverride.CompressSub)
-					{
-						float yoffundx = (_MyParagraph.Leading < 12 && font.Size >= 12) ? -0.06F : -0.18F;
-						chk.SetUnderline(font.Color, 0, 0.07F, 0, yoffundx, PdfContentByte.LINE_CAP_ROUND); // Relative Based upon font size
-					}
-					else
-						chk.SetUnderline(font.Color, 0, 0.05F, 0, -.381F, PdfContentByte.LINE_CAP_ROUND); // Relative Based upon font size
-				}
-				else if (visualText.Format.SuperScript > 0 && PrintOverride.CompressSuper)
-				{
-					float yoffundx = (_MyParagraph.Leading < 12 && font.Size >= 12) ? -0.06F : -0.18F;
-					chk.SetUnderline(font.Color, 0, 0.07F, 0, yoffundx, PdfContentByte.LINE_CAP_ROUND);
-				}
-				else
-				{
-					// If on a compressed printed step (Leading < 12) and a larger underlined font, then set the underlining
-					// a little less far down the page.  Without this, the underline was touching the 2nd line of text, if it existed.
-					// Any plant that had compressed steps with the font size/underline would have this problem. An example
-					// was Braidwood FSG-6, high level steps.
-					float yoffund = (_MyParagraph.Leading < 12 && font.Size >= 12) ? -0.06F : -0.131F;
-					chk.SetUnderline(font.Color, 0, 0.05F, 0, yoffund, PdfContentByte.LINE_CAP_ROUND); // Relative Based upon font size
-				}
-
-			if (visualText.Format.SuperScript > 0)
-			{
-				if (PrintOverride.CompressPropSubSup)
-				{
-					chk.SetTextRise(.33F * chk.Font.Size);
-					chk.Font.Size *= .75f;
-				}
-				else
-				{
-					chk.SetTextRise(.25F * chk.Font.Size);
-					if (PrintOverride.CompressSuper) chk.Font.Size = 9;
-				}
-
-			}
-			else if (visualText.Format.SuperScript < 0)
-			{
-				if (PrintOverride.CompressPropSubSup)
-					chk.Font.Size *= .75f;
-				else
-				{
-					// if the subscript is not compressed or if it is compress but not underlined, then move it down
-					if (!PrintOverride.CompressSub || !visualText.Format.IsUnderline) chk.SetTextRise(-.25F * chk.Font.Size);
-					if (PrintOverride.CompressSub) chk.Font.Size = 9;
-				}
-			}
-			else
-				chk.SetTextRise(0);
-			switch (visualText.Format.Alignment)
-			{
-				case RtfTextAlignment.Center:
-					_MyParagraph.Alignment = Element.ALIGN_CENTER;
-					break;
-				case RtfTextAlignment.Justify:
-					_MyParagraph.Alignment = Element.ALIGN_JUSTIFIED;
-					break;
-				case RtfTextAlignment.Left:
-					_MyParagraph.Alignment = Element.ALIGN_LEFT;
-					break;
-				case RtfTextAlignment.Right:
-					_MyParagraph.Alignment = Element.ALIGN_RIGHT;
-					break;
-				default:
-					break;
-			}
-			if (_MyFont == null)
-			{
-				_MyFont = font;
-				_MyParagraph.Font = _MyFont;
-			}
-		}
-
-		private string ShowSpecialCharacters(string p)
-		{
-			StringBuilder sb = new StringBuilder();
-			foreach (char c in p)
-			{
-				int i = (int)c;
-				if (i < 20 || i > 127)
-					sb.Append(string.Format("<{0:x}>", i));
-				else
-					sb.Append(c);
-			}
-			return sb.ToString();
-		}// DoVisitText
-
-
-		// ----------------------------------------------------------------------
-		protected override void DoVisitImage(IRtfVisualImage visualImage)
-		{
-			//_MyParagraph.Add(new Chunk("<Image>"));
-			DateTime dt1 = DateTime.Now;
-			//System.Drawing.Image img2 = visualImage.ImageForDrawing;
-			//Console.WriteLine("1 Time Span {0}", TimeSpan.FromTicks(DateTime.Now.Ticks - dt1.Ticks).TotalMilliseconds);
-			//img2.Save(@"c:\datacvrt\x.png");
-			System.IO.MemoryStream ms = new System.IO.MemoryStream();
-
-			//Console.WriteLine("2 Time Span {0}", TimeSpan.FromTicks(DateTime.Now.Ticks - dt1.Ticks).TotalMilliseconds);
-			Console.WriteLine("Size {0}", visualImage.ImageForDrawing.Size);
-			visualImage.ImageForDrawing.Save(ms, System.Drawing.Imaging.ImageFormat.Jpeg);
-			//Console.WriteLine("3 Time Span {0}", TimeSpan.FromTicks(DateTime.Now.Ticks - dt1.Ticks).TotalMilliseconds);
-			ms.Seek(0, System.IO.SeekOrigin.Begin);
-			//Console.WriteLine("4 Time Span {0}", TimeSpan.FromTicks(DateTime.Now.Ticks - dt1.Ticks).TotalMilliseconds);
-			iTextSharp.text.Image img = iTextSharp.text.Image.GetInstance(ms);
-			//Console.WriteLine("5 Time Span {0}", TimeSpan.FromTicks(DateTime.Now.Ticks - dt1.Ticks).TotalMilliseconds);
-			_MyParagraph.Add(img);
-			Console.WriteLine("6 Time Span {0}", TimeSpan.FromTicks(DateTime.Now.Ticks - dt1.Ticks).TotalMilliseconds);
-		} // DoVisitImage
-
-	}
-}

PROMS/PROMS/proms.sln

@@ -1,111 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataLoader", "DataLoader\DataLoader.csproj", "{8E239A2B-B38C-4CD5-BA0D-A41A88BD2AEE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volian.Controls.Library", "Volian.Controls.Library\Volian.Controls.Library.csproj", "{8556527C-6615-487F-8AF7-22EBC3EF0268}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Volian.Utils.Library", "Volian.Utils.Library", "{5A0EDD18-70A4-4D5E-93CC-39F4D246352A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IniReader", "Volian.Utils.Library\IniReader\IniReader.csproj", "{889E30F7-CFBC-470D-9488-7009C354F9C9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSWord", "Volian.Utils.Library\MSWord\MSWord.csproj", "{2F79D7F9-885E-4441-99F3-045D7612B2E5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vlnObjectLibrary", "Volian.Utils.Library\vlnObject\vlnObjectLibrary.csproj", "{933269F5-C3AD-423E-88EB-133A7333FD6B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vlnServerLibrary", "Volian.Utils.Library\vlnServerLibrary\vlnServerLibrary.csproj", "{F9B53DDC-2A2E-4A17-B777-4EC0EE585DE2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "veproms", "veproms\veproms.csproj", "{0D8723B4-51DD-486A-A5E1-8D55BB526690}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volian.CSLA.Library", "Volian.CSLA.Library\Volian.CSLA.Library.csproj", "{3C162BD7-5DBC-45A6-90D8-9391AC8CD0FD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volian.Object.Library", "Volian.Object.Library\Volian.Object.Library.csproj", "{B8BED4CF-D60A-4CC0-B652-CEFA04B774B1}"
-EndProject
-Global
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 10
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = DataLoader\\DataLoader.csproj
-		SccLocalPath1 = .
-		SccProjectFilePathRelativizedFromConnection1 = DataLoader\\
-		SccProjectUniqueName2 = veproms\\veproms.csproj
-		SccLocalPath2 = .
-		SccProjectFilePathRelativizedFromConnection2 = veproms\\
-		SccProjectUniqueName3 = Volian.Controls.Library\\Volian.Controls.Library.csproj
-		SccLocalPath3 = .
-		SccProjectFilePathRelativizedFromConnection3 = Volian.Controls.Library\\
-		SccProjectUniqueName4 = Volian.CSLA.Library\\Volian.CSLA.Library.csproj
-		SccLocalPath4 = .
-		SccProjectFilePathRelativizedFromConnection4 = Volian.CSLA.Library\\
-		SccProjectUniqueName5 = Volian.Utils.Library\\IniReader\\IniReader.csproj
-		SccProjectTopLevelParentUniqueName5 = proms.sln
-		SccLocalPath5 = .
-		SccProjectFilePathRelativizedFromConnection5 = Volian.Utils.Library\\IniReader\\
-		SccProjectUniqueName6 = Volian.Utils.Library\\MSWord\\MSWord.csproj
-		SccProjectTopLevelParentUniqueName6 = proms.sln
-		SccLocalPath6 = .
-		SccProjectFilePathRelativizedFromConnection6 = Volian.Utils.Library\\MSWord\\
-		SccProjectUniqueName7 = Volian.Utils.Library\\vlnObject\\vlnObjectLibrary.csproj
-		SccProjectTopLevelParentUniqueName7 = proms.sln
-		SccLocalPath7 = .
-		SccProjectFilePathRelativizedFromConnection7 = Volian.Utils.Library\\vlnObject\\
-		SccProjectUniqueName8 = Volian.Utils.Library\\vlnServerLibrary\\vlnServerLibrary.csproj
-		SccProjectTopLevelParentUniqueName8 = proms.sln
-		SccLocalPath8 = .
-		SccProjectFilePathRelativizedFromConnection8 = Volian.Utils.Library\\vlnServerLibrary\\
-		SccProjectUniqueName9 = Volian.Object.Library\\Volian.Object.Library.csproj
-		SccLocalPath9 = .
-		SccProjectFilePathRelativizedFromConnection9 = Volian.Object.Library\\
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8E239A2B-B38C-4CD5-BA0D-A41A88BD2AEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E239A2B-B38C-4CD5-BA0D-A41A88BD2AEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E239A2B-B38C-4CD5-BA0D-A41A88BD2AEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E239A2B-B38C-4CD5-BA0D-A41A88BD2AEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8556527C-6615-487F-8AF7-22EBC3EF0268}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8556527C-6615-487F-8AF7-22EBC3EF0268}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8556527C-6615-487F-8AF7-22EBC3EF0268}.Release|Any CPU.Build.0 = Release|Any CPU
-		{889E30F7-CFBC-470D-9488-7009C354F9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{889E30F7-CFBC-470D-9488-7009C354F9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{889E30F7-CFBC-470D-9488-7009C354F9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{889E30F7-CFBC-470D-9488-7009C354F9C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F79D7F9-885E-4441-99F3-045D7612B2E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F79D7F9-885E-4441-99F3-045D7612B2E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F79D7F9-885E-4441-99F3-045D7612B2E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F79D7F9-885E-4441-99F3-045D7612B2E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{933269F5-C3AD-423E-88EB-133A7333FD6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{933269F5-C3AD-423E-88EB-133A7333FD6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{933269F5-C3AD-423E-88EB-133A7333FD6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{933269F5-C3AD-423E-88EB-133A7333FD6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9B53DDC-2A2E-4A17-B777-4EC0EE585DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9B53DDC-2A2E-4A17-B777-4EC0EE585DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9B53DDC-2A2E-4A17-B777-4EC0EE585DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9B53DDC-2A2E-4A17-B777-4EC0EE585DE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D8723B4-51DD-486A-A5E1-8D55BB526690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D8723B4-51DD-486A-A5E1-8D55BB526690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D8723B4-51DD-486A-A5E1-8D55BB526690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D8723B4-51DD-486A-A5E1-8D55BB526690}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C162BD7-5DBC-45A6-90D8-9391AC8CD0FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C162BD7-5DBC-45A6-90D8-9391AC8CD0FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C162BD7-5DBC-45A6-90D8-9391AC8CD0FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C162BD7-5DBC-45A6-90D8-9391AC8CD0FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8BED4CF-D60A-4CC0-B652-CEFA04B774B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8BED4CF-D60A-4CC0-B652-CEFA04B774B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8BED4CF-D60A-4CC0-B652-CEFA04B774B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8BED4CF-D60A-4CC0-B652-CEFA04B774B1}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{889E30F7-CFBC-470D-9488-7009C354F9C9} = {5A0EDD18-70A4-4D5E-93CC-39F4D246352A}
-		{2F79D7F9-885E-4441-99F3-045D7612B2E5} = {5A0EDD18-70A4-4D5E-93CC-39F4D246352A}
-		{933269F5-C3AD-423E-88EB-133A7333FD6B} = {5A0EDD18-70A4-4D5E-93CC-39F4D246352A}
-		{F9B53DDC-2A2E-4A17-B777-4EC0EE585DE2} = {5A0EDD18-70A4-4D5E-93CC-39F4D246352A}
-	EndGlobalSection
-EndGlobal