C2022-003-Change-Textboxes-to-RTF-3

format only change - good for testing phase

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/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/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,11 +45,12 @@
     <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">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -92,6 +94,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="epall\EPFormatTST1.xml" />
+    <Content Include="epall\EPFormatTST2.xml" />
+    <Content Include="epall\EPFormatTST3.xml" />
+    <Content Include="epall\EPFormatTST4.xml" />
     <Content Include="fmtall\AEPall.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -176,6 +182,8 @@
     <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" />
     <Content Include="fmtall\CWERall.xml" />
@@ -187,6 +195,7 @@
     <Content Include="fmtall\EFSGBCKall.xml" />
     <Content Include="fmtall\ELFDEVall.xml" />
     <Content Include="fmtall\ENall.xml" />
+    <Content Include="fmtall\EPTST2all.xml" />
     <Content Include="fmtall\ESFDEVall.xml" />
     <Content Include="fmtall\EXCLNall.xml" />
     <Content Include="fmtall\EXCLN_00all.xml" />
@@ -282,6 +291,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" />
@@ -499,6 +512,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/frmFormatCopy.Designer.cs

@@ -33,6 +33,9 @@ namespace Formats
 			this.btnCopyFormats = new DevComponents.DotNetBar.ButtonX();
 			this.btnBrowse = new DevComponents.DotNetBar.ButtonX();
 			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
@@ -64,7 +67,7 @@ namespace Formats
 			// 
 			this.btnCopyFormats.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnCopyFormats.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnCopyFormats.Location = new System.Drawing.Point(152, 68);
+			this.btnCopyFormats.Location = new System.Drawing.Point(232, 156);
 			this.btnCopyFormats.Name = "btnCopyFormats";
 			this.btnCopyFormats.Size = new System.Drawing.Size(84, 27);
 			this.btnCopyFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +91,7 @@ namespace Formats
 			// 
 			this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.buttonX2.Location = new System.Drawing.Point(329, 68);
+			this.buttonX2.Location = new System.Drawing.Point(409, 156);
 			this.buttonX2.Name = "buttonX2";
 			this.buttonX2.Size = new System.Drawing.Size(75, 23);
 			this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -96,17 +99,67 @@ namespace Formats
 			this.buttonX2.Text = "Exit";
 			this.buttonX2.Click += new System.EventHandler(this.buttonX2_Click);
 			// 
-			// Form1
+			// labelX2
+			// 
+			// 
+			// 
+			// 
+			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX2.Location = new System.Drawing.Point(12, 41);
+			this.labelX2.Name = "labelX2";
+			this.labelX2.Size = new System.Drawing.Size(200, 23);
+			this.labelX2.TabIndex = 5;
+			this.labelX2.Text = "Excluding Format Files that Start with:";
+			// 
+			// LstBxExcludeFiles
+			// 
+			this.LstBxExcludeFiles.AutoScroll = true;
+			// 
+			// 
+			// 
+			this.LstBxExcludeFiles.BackgroundStyle.Class = "ListBoxAdv";
+			this.LstBxExcludeFiles.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.LstBxExcludeFiles.CausesValidation = false;
+			this.LstBxExcludeFiles.CheckStateMember = null;
+			this.LstBxExcludeFiles.ContainerControlProcessDialogKey = true;
+			this.LstBxExcludeFiles.DragDropSupport = true;
+			this.LstBxExcludeFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.LstBxExcludeFiles.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+			this.LstBxExcludeFiles.Location = new System.Drawing.Point(57, 70);
+			this.LstBxExcludeFiles.Name = "LstBxExcludeFiles";
+			this.LstBxExcludeFiles.ShowToolTips = false;
+			this.LstBxExcludeFiles.Size = new System.Drawing.Size(134, 76);
+			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, 107);
+			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);
 			this.Controls.Add(this.btnBrowse);
 			this.Controls.Add(this.btnCopyFormats);
 			this.Controls.Add(this.labelX1);
 			this.Controls.Add(this.txbxPROMSFormatsPath);
-			this.Name = "Form1";
+			this.Name = "frmFormatCopy";
 			this.Text = "Form1";
 			this.ResumeLayout(false);
 
@@ -119,6 +172,9 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX btnCopyFormats;
 		private DevComponents.DotNetBar.ButtonX btnBrowse;
 		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

@@ -14,6 +14,10 @@ namespace Formats
 		public frmFormatCopy()
 		{
 			InitializeComponent();
+			foreach (string excludeThis in excludeThese)
+			{
+				LstBxExcludeFiles.Items.Add(excludeThis);
+			}
 				SetDefaults();
 		}
 
@@ -92,12 +96,17 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
+		// 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..
-			string[] excludeThese = { "WPS", "WEP", "WPB", "VCBEPP" };
 			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;
 		}
 
@@ -156,5 +165,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-}
+	}
 }

PROMS/Formats/frmFormatCopy.resx

@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

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/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj

@@ -59,7 +59,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -85,6 +85,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -92,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -103,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs

@@ -96,10 +96,10 @@ namespace ROEditor
 		private System.Windows.Forms.Label lblW2;
 		private System.Windows.Forms.Label lblW3;
 		private System.Windows.Forms.Label lblW4;
-		private System.Windows.Forms.TextBox tbSingleTxtWid;
+		ctlXMLEditLib.roRichTextBox tbSingleTxtWid; // RO Editor add symbols C2022 - 003
-		private System.Windows.Forms.TextBox tbVariableTxtWid;
+		ctlXMLEditLib.roRichTextBox tbVariableTxtWid;
-		private System.Windows.Forms.TextBox tbTableWid;
+		ctlXMLEditLib.roRichTextBox tbTableWid;
-		private System.Windows.Forms.TextBox tbXYPlotWid;
+		ctlXMLEditLib.roRichTextBox tbXYPlotWid;
 		private System.Windows.Forms.Button btnOK;
 		private System.Windows.Forms.Button btnCancel;
 		/// <summary>
@@ -218,10 +218,10 @@ namespace ROEditor
 			this.lblFieldName = new System.Windows.Forms.Label();
 			this.tbFieldName = new System.Windows.Forms.TextBox();
 			this.gbAlternatives = new System.Windows.Forms.GroupBox();
-			this.tbXYPlotWid = new System.Windows.Forms.TextBox();
+			this.tbXYPlotWid = new ctlXMLEditLib.roRichTextBox(); // RO Editor add symbols C2022 - 003
-			this.tbTableWid = new System.Windows.Forms.TextBox();
+			this.tbTableWid = new ctlXMLEditLib.roRichTextBox();
-			this.tbVariableTxtWid = new System.Windows.Forms.TextBox();
+			this.tbVariableTxtWid = new ctlXMLEditLib.roRichTextBox ();
-			this.tbSingleTxtWid = new System.Windows.Forms.TextBox();
+			this.tbSingleTxtWid = new ctlXMLEditLib.roRichTextBox();
 			this.lblW4 = new System.Windows.Forms.Label();
 			this.lblW3 = new System.Windows.Forms.Label();
 			this.lblW2 = new System.Windows.Forms.Label();

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -1584,7 +1584,7 @@ namespace ROEditor
 					if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
 				}
 			}
-			if (inuserecs != origFieldsInUse)
+			if ((inuserecs ?? "") != (origFieldsInUse ?? ""))
 				return true;
 
 
@@ -1599,7 +1599,7 @@ namespace ROEditor
 					if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
 				}
 			}
-			if (applicfieldrecs != origApplicFields)
+			if ((applicfieldrecs ?? "") != (origApplicFields ?? ""))
 				return true;
 
 			//nothing has changed

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj

@@ -7,7 +7,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -71,7 +71,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -96,6 +96,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -103,11 +104,15 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
@@ -123,10 +128,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <Reference Include="Volian.Base.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutROEditor.cs">
@@ -167,6 +168,7 @@
     <Compile Include="RO_FST.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Content Include="Symbols.xml" />
     <EmbeddedResource Include="AboutROEditor.resx">
       <SubType>Designer</SubType>
       <DependentUpon>AboutROEditor.cs</DependentUpon>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RO_FST.cs

@@ -101,7 +101,6 @@ using System.Runtime.InteropServices;
 using VlnStatus;
 using System.Collections.Specialized;
 using ROFST_FILE;
-using Volian.Base.Library;
 
 //using VlnProfiler; //don't forget to add VlnProfiler to the reference list
 
@@ -264,9 +263,11 @@ namespace ROEditor
 				File.Delete(FstNew); // remove ROFST.NEW
 				if (OrphanedRecords.Length > 0)
 				{
-					StreamWriter sw = new StreamWriter(VlnSettings.TemporaryFolder + @"\Orphaned RO Records.txt");
+					using (StreamWriter sw = new StreamWriter(Path.Combine(FstDir, @"Orphaned RO Records.txt"), false))
+					{
 						sw.Write(OrphanedRecords.ToString());
 						sw.Close();
+					}
 					MessageBox.Show("The file Orphaned RO Records.txt has been created", "Warning - Orphan RO Record");
 				}
 

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -62,6 +62,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -86,6 +87,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +95,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -104,7 +106,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.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,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>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -59,7 +61,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -263,6 +263,7 @@ using System.Collections.Specialized;
 using Org.Mentalis.Files;
 using System.Data.SqlClient;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 
 
 namespace RODBInterface
@@ -409,7 +410,7 @@ namespace RODBInterface
 			GetDbServerInfo(ropath);
 			if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER))
 			{
-				strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
+				strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
 			}
 		}
 		#endregion
@@ -1909,6 +1910,8 @@ namespace RODBInterface
 				string Info = DBE.GetString(3);
 				//B2022-043 &pos; was missing the ;
 				Info = Info.Replace("'", "\'");		// B2021-071: crash when getting/saving field names
+				Info = Regex.Replace(Info, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());  // RO Editor add symbols C2022 - 003
+
 				node.SetAttribute("HasChild", "True");
 
 				// Store data in the VlnXmlElement as a subgroup
@@ -2182,10 +2185,13 @@ namespace RODBInterface
 				parent.SetAttribute("ChildLoaded", "True");
 			}
 			string xmlstr = GenerateXmlString(ro, false);
+
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
 				string accid = ro.GetAttribute("AccPageID");
+
+
 				int quote = accid.IndexOf("'");
 				if (quote >= 0)
 					wraccid = accid.Insert(quote, "'");
@@ -2251,7 +2257,7 @@ namespace RODBInterface
 				// select all of the field definition records in this table.
 				//			strGetFields = "SELECT RecID, Info from " + elem.GetAttribute("Table");
 				strGetFields = "SELECT RecID, Info from " + TableName;
-				strGetFields = strGetFields + " where RecType = 2";  //  + rtype.ToString();
+				strGetFields = strGetFields + " where RecType = 2";  
 				DBE.Command(strGetFields);
 				DBE.Reader();
 

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -62,6 +62,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -86,6 +87,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +95,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -104,7 +106,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -171,6 +173,17 @@
       <Name>VlnStatus</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Interop.Access.Dao">
+      <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid>
+      <VersionMajor>12</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -735,10 +735,13 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
+				if (parentName != "#whitespace")
+				{
 					//applicValues = "";
 					applicValues = string.Format("<APL DefaultVal={0}", parentValue);
 					int pcChildIdx = 0;
 					//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+
 					foreach (string c in pcChildern)
 					{
 						//string csufx = CvtUserFldToFld(c);
@@ -754,6 +757,7 @@ namespace RODBInterface
 								applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
 						}
 					}
+				}
 				applicValues += " /APL>";
 			}
 			return applicValues;
@@ -834,7 +838,7 @@ namespace RODBInterface
 					ValueType |= FldType;
 					if (PCApplicability)
 						text = GetPCReturnValues(theDb, pcChildern, elm, PCApplicability, inusename, text); // C2021-026 Get P/C Children return values
-					strbld.Append(text);
+					strbld.Append(text.Replace("{", "&123;").Replace("}", "&125;"));
 				}
 				else
 				{