From 3fff7760468c5e78f706641eae595023ba7dbb04 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 10 Feb 2014 15:18:30 +0000 Subject: [PATCH] WCN OFN BCK Format improvement uncomment rofst access from previous update --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 7 ++++++- PROMS/Volian.Print.Library/vlnParagraph.cs | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 52944302..beeacd42 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2837,8 +2837,13 @@ namespace VEPROMS.CSLA.Library { _MyTab.BasicTab = isAlpha ? alpha : ordinal.ToString(); newtab = FormatStepData.TabData.IdentAltPrint.Substring(indxnewtab + 1); + if (newtab.Contains("{numeric}") || newtab.Contains("{LNK Step Num}")) + { + newtab = tbformat; + newtab = @"\ul " + newtab.Substring(0,newtab.IndexOf(":")+1) + @"\ulnone " + newtab.Substring(newtab.IndexOf(":")+1); + } // also see if there is the 'pagelist' string in this tab: - if ((FormatStepData.TabData.Font.Style & E_Style.Underline) == E_Style.Underline) + else if ((FormatStepData.TabData.Font.Style & E_Style.Underline) == E_Style.Underline) // the reason that the underline commands were not included in format file is that the '\' character // is used as a separator and the following code will not impact other formats HighLevelStepTabPageList = @"\ul " + FormatStepData.TabData.IdentAltPrint.Substring(0, indxnewtab).Trim() + @"\ulnone " + tbformat; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 8bdb7ba0..c09b64f1 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1729,12 +1729,8 @@ namespace Volian.Print.Library // DocVersionInfo dvi = proc.ActiveParent as DocVersionInfo; DocVersionInfo dvi = proc.MyDocVersion; ROFstInfo rofst = dvi.DocVersionAssociations[0].MyROFst; - rofst.docVer = dvi; - ROFSTLookup lookup = rofst.ROFSTLookup; - /** Jim's changes //rofst.docVer = dvi; ROFSTLookup lookup = rofst.GetROFSTLookup(dvi); - ***/ string linkInfoText = itemInfo.MyContent.Text.Replace(@"\v ", ""); Match m = Regex.Match(linkInfoText, @"(.*)[#]Link:([A-Za-z]*):(.*)"); if (m.Groups.Count < 4)