diff --git a/PROMS/DataLoader/Steps.cs b/PROMS/DataLoader/Steps.cs index 08b0e465..21bf44ef 100644 --- a/PROMS/DataLoader/Steps.cs +++ b/PROMS/DataLoader/Steps.cs @@ -117,7 +117,8 @@ namespace DataLoader string fixStpText = ""; if (IsATable(content.Type)) { - fixStpText = ConvertTableToGrid(stptext, content, fmt, isROTable); + bool hasBorder = !WithoutBorder(content.Type); + fixStpText = ConvertTableToGrid(stptext, content, fmt, isROTable, hasBorder ? GridLinePattern.Single : GridLinePattern.None ); int? typ = ConvertTableType(content, fmt); if (typ != null) content.Type = typ; else _ContentMigrationErrors.Add(content.ContentID, null); @@ -359,7 +360,7 @@ namespace DataLoader private Regex _RemoveComments = new Regex(@"\\v .*?\\v0( |$)"); - private string ConvertTableToGrid(string stepText, Content content, FormatInfo fmt, bool isROTable) + private string ConvertTableToGrid(string stepText, Content content, FormatInfo fmt, bool isROTable, GridLinePattern border) { string savethis = stepText; string strGrid = ""; @@ -368,7 +369,7 @@ namespace DataLoader VE_Font vefont = fmt.PlantFormat.FormatData.StepDataList.Table.Font; Font GridFont = new Font(vefont.Family, (float)vefont.Size); grd.Font = GridFont; // this also changes the default Row Height "Rows.DefaultSize" - grd.ParseTableFromText(stepText); + grd.ParseTableFromText(stepText,border); grd.AutoSizeCols(); grd.AutoSizeRows(); grd.MakeRTFcells(); @@ -398,6 +399,18 @@ namespace DataLoader } return rtnval; } + private bool WithoutBorder(int? contenttype) + { + bool rtnval = false; + switch (contenttype) + { + case 20033: // AER table without boarder + case 20034: // Centered table without boarder + rtnval = true; + break; + } + return rtnval; + } //private static bool AddContentDetail(Content content, int type, string strn) //{