diff --git a/PROMS/LBWordLibrary/LBComObject.cs b/PROMS/LBWordLibrary/LBComObject.cs index 01b25dc6..7f5729b5 100644 --- a/PROMS/LBWordLibrary/LBComObject.cs +++ b/PROMS/LBWordLibrary/LBComObject.cs @@ -785,6 +785,16 @@ namespace LBWordLibrary get { return (LBWdViewType)GetProperty("Type"); } set { SetProperty("Type", value); } } + public Boolean ShowRevisionsAndComments + { + get { return (GetProperty("ShowRevisionsAndComments") as Boolean? ?? false); } + set { SetProperty("ShowRevisionsAndComments", value); } + } + public LBWdRevisionsView RevisionsView + { + get { return (LBWdRevisionsView)GetProperty("RevisionsView"); } + set { SetProperty("RevisionsView", value); } + } } public enum LBWdColorIndex { @@ -899,6 +909,27 @@ namespace LBWordLibrary wdColorWhite = 16777215, wdColorAutomatic = -16777216 } + public enum LBWdUnderline + { + wdUnderlineNone = 0, + wdUnderlineSingle = 1, + wdUnderlineWords = 2, + wdUnderlineDouble = 3, + wdUnderlineDotted = 4, + wdUnderlineThick = 6, + wdUnderlineDash = 7, + wdUnderlineDotDash = 9, + wdUnderlineDotDotDash = 10, + wdUnderlineWavy = 11, + wdUnderlineDottedHeavy = 20, + wdUnderlineDashHeavy = 23, + wdUnderlineDotDashHeavy = 25, + wdUnderlineDotDotDashHeavy = 26, + wdUnderlineWavyHeavy = 27, + wdUnderlineDashLong = 39, + wdUnderlineWavyDouble = 43, + wdUnderlineDashLongHeavy = 55 + } public partial class LBInlineShape : LBComObject { public LBInlineShape() { } @@ -1053,6 +1084,33 @@ namespace LBWordLibrary wdWebView = 6, wdReadingView = 7 } + public enum LBWdRevisionsView + { + wdRevisionsViewFinal = 0, + wdRevisionsViewOriginal = 1 + } + public enum LBWdRelativeHorizontalPosition + { + wdRelativeHorizontalPositionMargin = 0, + wdRelativeHorizontalPositionPage = 1, + wdRelativeHorizontalPositionColumn = 2, + wdRelativeHorizontalPositionCharacter = 3, + wdRelativeHorizontalPositionLeftMarginArea = 4, + wdRelativeHorizontalPositionRightMarginArea = 5, + wdRelativeHorizontalPositionInnerMarginArea = 6, + wdRelativeHorizontalPositionOuterMarginArea = 7 + } + public enum LBWdRelativeVerticalPosition + { + wdRelativeVerticalPositionMargin = 0, + wdRelativeVerticalPositionPage = 1, + wdRelativeVerticalPositionParagraph = 2, + wdRelativeVerticalPositionLine = 3, + wdRelativeVerticalPositionTopMarginArea = 4, + wdRelativeVerticalPositionBottomMarginArea = 5, + wdRelativeVerticalPositionInnerMarginArea = 6, + wdRelativeVerticalPositionOuterMarginArea = 7 + } public enum LBWdSaveFormat { wdFormatDocument = 0, @@ -1234,47 +1292,4 @@ namespace LBWordLibrary public LBPictureFormat() { } public LBPictureFormat(Object item) : base(item) { } } - public enum LBWdRelativeHorizontalPosition - { - wdRelativeHorizontalPositionMargin = 0, - wdRelativeHorizontalPositionPage = 1, - wdRelativeHorizontalPositionColumn = 2, - wdRelativeHorizontalPositionCharacter = 3, - wdRelativeHorizontalPositionLeftMarginArea = 4, - wdRelativeHorizontalPositionRightMarginArea = 5, - wdRelativeHorizontalPositionInnerMarginArea = 6, - wdRelativeHorizontalPositionOuterMarginArea = 7 - } - public enum LBWdRelativeVerticalPosition - { - wdRelativeVerticalPositionMargin = 0, - wdRelativeVerticalPositionPage = 1, - wdRelativeVerticalPositionParagraph = 2, - wdRelativeVerticalPositionLine = 3, - wdRelativeVerticalPositionTopMarginArea = 4, - wdRelativeVerticalPositionBottomMarginArea = 5, - wdRelativeVerticalPositionInnerMarginArea = 6, - wdRelativeVerticalPositionOuterMarginArea = 7 - } - public enum LBWdUnderline - { - wdUnderlineNone = 0, - wdUnderlineSingle = 1, - wdUnderlineWords = 2, - wdUnderlineDouble = 3, - wdUnderlineDotted = 4, - wdUnderlineThick = 6, - wdUnderlineDash = 7, - wdUnderlineDotDash = 9, - wdUnderlineDotDotDash = 10, - wdUnderlineWavy = 11, - wdUnderlineDottedHeavy = 20, - wdUnderlineDashHeavy = 23, - wdUnderlineDotDashHeavy = 25, - wdUnderlineDotDotDashHeavy = 26, - wdUnderlineWavyHeavy = 27, - wdUnderlineDashLong = 39, - wdUnderlineWavyDouble = 43, - wdUnderlineDashLongHeavy = 55 - } } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs index 73a0930f..b50ea6ca 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs @@ -796,6 +796,9 @@ namespace VEPROMS.CSLA.Library //sel.Range.Font.Color = (LBWdColor)WordColor(PrintOverride.OverrideTextColor(System.Drawing.Color.Black)); sel.Range.Font.Color = (LBWdColor)WordColor(OverrideColor == System.Drawing.Color.Transparent ? System.Drawing.Color.Black : OverrideColor); sect.MSWordPageCount = myDoc.Length; + // force Print of MS Word Attachment to Final without revisions and comments + myDoc.ActiveWindow.View.ShowRevisionsAndComments = false; + myDoc.ActiveWindow.View.RevisionsView = LBWdRevisionsView.wdRevisionsViewFinal; fileName = CreatePDF(fileName, openPdf); MyApp.ActiveDocument.Close(false); if (CloseWordWhenDone)