From 9ddf1ac940f42f3b9ddd9d3ebe507f50c5d50a82 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 16 Jan 2014 12:05:30 +0000 Subject: [PATCH] =?UTF-8?q?if=20format=20has=20DSS=5FAddDotZeroStdHLS=20an?= =?UTF-8?q?d=20going=20to=20a=20High=20Level=20Step,=20don=E2=80=99t=20rem?= =?UTF-8?q?ove=20.0=20from=20High=20Level=20Step=20transition=20text=20Add?= =?UTF-8?q?ed=20enum=20for=20DSS=5FDontDoCheckOffs=20format=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 5 ++++- PROMS/VEPROMS.CSLA.Library/Format/ENums.cs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index e2b07352..ec96b1c4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -717,7 +717,10 @@ namespace VEPROMS.CSLA.Library if (hasDelim && !hlsTab.EndsWith(".") && !hlsTab.EndsWith(")")) hlsTab = hlsTab + "."; if (hasDotZero) { - if (hlsTab.EndsWith(".0.")) hlsTab = hlsTab.Substring(0, hlsTab.Length - 2); + if (item.IsHigh) + hlsTab = hlsTab.Substring(0, hlsTab.Length - 1); + else if (hlsTab.EndsWith(".0.")) + hlsTab = hlsTab.Substring(0, hlsTab.Length - 2); if (sret == "" || !sret.StartsWith(hlsTab)) sret = hlsTab + sret; } else diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index 457379df..417d982a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -118,7 +118,7 @@ namespace VEPROMS.CSLA.Library BottomOfPage = 2 }; [Flags] - public enum E_DocStructStyle : uint + public enum E_DocStructStyle : ulong { //USEONALLPAGES = 0, // Default //USEONFIRSTPAGE = 1, // Use only on the first page @@ -160,6 +160,7 @@ namespace VEPROMS.CSLA.Library DSS_SkipTwoStepLevels = 0x20000000, // Skip two step levels for this doc style DSS_SkipOneStepLevel = 0x40000000, // Skip one step level for this doc style DSS_SimpleTopSectionContinue = 0x80000000, // Use the Top continue message as the section continue */ + DSS_DontDoCheckOffs = 0x100000000, // format has checkoffs, but don't do for this section }; public enum E_DocStyleUse : uint {