Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Changed code to use ActiveSection rather than MyActiveSection

Browse Source
This commit is contained in:
Rich 2011-04-19 16:09:33 +00:00
parent 76bdab0549
commit 05c97e9aed
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
View File

@ -321,7 +321,7 @@ namespace VEPROMS.CSLA.Library
fs.Close(); fs.Close();
pdfFile.Delete(); pdfFile.Delete();
Pdf.DeleteAll(doc.DocID); // clear the PDF table for DocID first Pdf.DeleteAll(doc.DocID); // clear the PDF table for DocID first
DocStyle myDocStyle = myItemInfo.MyActiveSection.MyDocStyle; DocStyle myDocStyle = myItemInfo.ActiveSection.MyDocStyle;
using (Pdf myPdf = Pdf.MakePdf(doc, MSWordToPDF.DebugStatus, (int) myDocStyle.Layout.TopRow, (int) myDocStyle.Layout.PageLength, using (Pdf myPdf = Pdf.MakePdf(doc, MSWordToPDF.DebugStatus, (int) myDocStyle.Layout.TopRow, (int) myDocStyle.Layout.PageLength,
(int) myDocStyle.Layout.LeftMargin, (int) myDocStyle.Layout.PageWidth, (double)myItemInfo.MSWordPageCount, buf)) { ;} (int) myDocStyle.Layout.LeftMargin, (int) myDocStyle.Layout.PageWidth, (double)myItemInfo.MSWordPageCount, buf)) { ;}
doc.UpdateDRoUsages(roids); doc.UpdateDRoUsages(roids);
@ -431,7 +431,7 @@ namespace VEPROMS.CSLA.Library
pdfFile.Delete(); pdfFile.Delete();
using (Document doc = docInfo.Get()) using (Document doc = docInfo.Get())
{ {
DocStyle myDocStyle = sect.MyActiveSection.MyDocStyle; DocStyle myDocStyle = sect.ActiveSection.MyDocStyle;
using (Pdf myPdf = Pdf.MakePdf(doc, MSWordToPDF.DebugStatus, (int)myDocStyle.Layout.TopRow, (int)myDocStyle.Layout.PageLength, using (Pdf myPdf = Pdf.MakePdf(doc, MSWordToPDF.DebugStatus, (int)myDocStyle.Layout.TopRow, (int)myDocStyle.Layout.PageLength,
(int)myDocStyle.Layout.LeftMargin, (int)myDocStyle.Layout.PageWidth, (double)sect.MSWordPageCount, buf)) { ;} (int)myDocStyle.Layout.LeftMargin, (int)myDocStyle.Layout.PageWidth, (double)sect.MSWordPageCount, buf)) { ;}
doc.UpdateDRoUsages(roids); doc.UpdateDRoUsages(roids);

7
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -1752,7 +1752,10 @@ namespace VEPROMS.CSLA.Library
} }
} }
private ItemInfo _ActiveSection = null; private ItemInfo _ActiveSection = null;
public ItemInfo MyActiveSection { get { return ActiveSection; } } /// <summary>
/// MyActiveSection is used to determine if _ActiveSection is null or not.
/// </summary>
public ItemInfo MyActiveSection { get { return _ActiveSection; } }
public ItemInfo ActiveSection public ItemInfo ActiveSection
{ {
get get
@ -1993,7 +1996,7 @@ namespace VEPROMS.CSLA.Library
if (IsCaution || IsNote) tbformat = CheckNoteCautionTab(tbformat); if (IsCaution || IsNote) tbformat = CheckNoteCautionTab(tbformat);
int ordinal = Ordinal; int ordinal = Ordinal;
if (!IsSection && !IsProcedure) tbformat = tbformat.Replace("{Section Prefix}", this.MyActiveSection.MyTab.CleanText); if (!IsSection && !IsProcedure) tbformat = tbformat.Replace("{Section Prefix}", this.ActiveSection.MyTab.CleanText);
string alpha = AlphabeticalNumbering(ordinal); string alpha = AlphabeticalNumbering(ordinal);
tbformat = tbformat.Replace("{alpha}", alpha.ToLower()); tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower()); tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());