diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/printcontext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/printcontext.cs index b430355d9b9..5a412a886cd 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/printcontext.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/printcontext.cs @@ -47,7 +47,7 @@ public Misc(JobTicket jobTicket, string printerName) byte [] devmode = jtc.ConvertJobTicketToDevMode(jobTicket.XmlStream, BaseDevModeType.UserDefault); _pDevmode = Marshal.AllocHGlobal(devmode.Length); - + Marshal.Copy(devmode, 0, _pDevmode, devmode.Length); jtc.Dispose(); @@ -121,13 +121,13 @@ public IntPtr pDevmode return _pDevmode; } } - + IntPtr _pDevmode; } #endregion - // Override GetResourceSystem such that resource can be embedded in PrintSystemEDocmentJob + // Override GetResourceSystem such that resource can be embedded in PrintSystemEDocumentJob internal class ContainerFixedXamlDesigner : FixedXamlDesigner { private PrintSystemEDocumentJob _eDocJob; @@ -183,9 +183,9 @@ public PrintContext(PrintQueue queue) { if( queue == null ) { - throw new ArgumentNullException("queue"); + throw new ArgumentNullException("queue"); } - + // enter batching for printing MediaContext.CurrentMediaContext.ChannelSyncMode = true; @@ -209,7 +209,7 @@ public void Print(GetPageCallback getPage, string jobName) this.StartDoc(jobName); int pageNo = 0; - + Visual visual = getPage(this); while (!_cancel && (visual != null)) @@ -218,9 +218,9 @@ public void Print(GetPageCallback getPage, string jobName) this.Render(visual, uri); this.EndPage(); - + pageNo++; - + visual = getPage(this); } @@ -230,7 +230,7 @@ public void Print(GetPageCallback getPage, string jobName) { // restore normal batching MediaContext.CurrentMediaContext.ChannelSyncMode = false; - + _stream = null; _writer = null; @@ -255,7 +255,7 @@ public bool Cancel _cancel = value; } } - + /// /// JobTicket property /// @@ -331,9 +331,9 @@ private string GetOutputFilename() /// delegate GetPageCallback /// public delegate Visual GetPageCallback(PrintContext printContext); - + #region Private methods - + /// /// StartDoc /// @@ -349,7 +349,7 @@ private void StartDoc(string jobName) PrintSystemJobInfo jobinfo = _queue.AddJob(typeof(PrintSystemEDocumentJob)); _eDocJob = jobinfo.JobData as PrintSystemEDocumentJob; - + _eDocJob.Name = jobName; _eDocJob.Commit(); @@ -521,7 +521,7 @@ private void Render(Visual visual, string uri) AssertPositive(sizeX, "PageCanvasSizeCap.CanvasSizeX"); AssertPositive(sizeY, "PageCanvasSizeCap.CanvasSizeY"); - + if (IsPremium()) { VisualTreeFlattener.SaveAsXml(visual, _writer, new ContainerFixedXamlDesigner(_eDocJob, uri)); @@ -536,7 +536,7 @@ private void Render(Visual visual, string uri) private bool _cancel; private PrintQueue _queue; private JobTicket _jobTicket; - + // Member variables used for premium print job private Stream _stream; private System.Xml.XmlTextWriter _writer; diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/DocumentApplicationDocumentViewer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/DocumentApplicationDocumentViewer.cs index f10416440db..30ed4508fc8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/DocumentApplicationDocumentViewer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/DocumentApplicationDocumentViewer.cs @@ -70,7 +70,7 @@ public DocumentApplicationDocumentViewer() : base() // Setup the CommandEnforcer before any of the UI is prepared. CreateEnforcer(); } - } + } #endregion Constructors @@ -186,7 +186,7 @@ public RightsManagementPolicy RightsManagementPolicy } /// - /// Exposes XPSViewer's RootBrowserWindow as an IWin32Window for use in parenting Winforms + /// Exposes XPSViewer's RootBrowserWindow as an IWin32Window for use in parenting Winforms /// dialogs. /// public System.Windows.Forms.IWin32Window RootBrowserWindow @@ -216,7 +216,7 @@ public static DocumentApplicationDocumentViewer Instance { return _singletonInstance; } - } + } #endregion Public Properties @@ -225,7 +225,7 @@ public static DocumentApplicationDocumentViewer Instance // Public Methods // //------------------------------------------------------ - #region Public Methods + #region Public Methods /// /// Used to initialize the UI controls. @@ -306,7 +306,7 @@ protected override void OnPrintCommand() SR.RightsManagementExceptionNoRightsForOperation); } } - + /// /// Handler for the CancelPrint command. /// @@ -358,7 +358,7 @@ private void HandlePrintCancelled(object sender, WritingCancelledEventArgs e) #endif // DONOTREFPRINTINGASMMETA } /// - /// This is a copy of DocumentViewerBase OnPrintCommand modified to + /// This is a copy of DocumentViewerBase OnPrintCommand modified to /// handle page ranges /// private void OnPrintCommandPageRangeOverride() @@ -431,17 +431,17 @@ private void OnPrintCommandPageRangeOverride() } /// - /// This method finds the URI to pages from the document + /// This method finds the URI to pages from the document /// specified in the page range. Deserializes a copy of the pages from /// a package stored in the PreloadedPackages and generates a new - /// doucment with these pages. This is serialized to the provided + /// document with these pages. This is serialized to the provided /// document writer. /// private void - WritePageSelection( + WritePageSelection( XpsDocumentWriter docWriter, - DocumentPaginator docPaginator, + DocumentPaginator docPaginator, System.Windows.Controls.PageRange pageRange, PrintDocumentImageableArea ia ) @@ -562,7 +562,7 @@ protected override void OnDocumentChanged() /// /// Called when ContextMenuOpening is raised on this element. - /// We use this opportunity to make sure the ScrollViewer's ContextMenu is invoked. + /// We use this opportunity to make sure the ScrollViewer's ContextMenu is invoked. /// /// Event arguments protected override void OnContextMenuOpening(ContextMenuEventArgs e) @@ -570,9 +570,9 @@ protected override void OnContextMenuOpening(ContextMenuEventArgs e) // Raise the ContextMenu command on the ScrollViewer if the ContextMenu // was invoked via the Menu key. // A negative offset for e.CursorLeft means the user invoked - // the menu with a hotkey (shift-F10). + // the menu with a hotkey (shift-F10). if (_scrollViewer != null && DoubleUtil.LessThan(e.CursorLeft, 0)) - { + { this.ContextMenu = ScrollViewer.ContextMenu; } @@ -603,7 +603,7 @@ protected override void OnKeyDown(KeyEventArgs e) } base.OnKeyDown(e); - } + } /// /// Returns the current UI state @@ -806,7 +806,7 @@ private Button PageDownButton return _pageDownButton; } } - + /// /// Used to view document at 100% /// @@ -822,7 +822,7 @@ private Button ActualSizeButton return _actualSizeButton; } } - + /// /// Used to view document at page width /// @@ -838,7 +838,7 @@ private Button PageWidthButton return _pageWidthButton; } } - + /// /// Used to view document at 1 whole page at a time /// @@ -854,8 +854,8 @@ private Button WholePageButton return _wholePageButton; } } - - + + /// /// Used to view document at 2 pages at a time /// @@ -871,7 +871,7 @@ private Button TwoPageButton return _twoPageButton; } } - + /// /// Used to view document in a 'tiled' or 'thumbnail' view /// @@ -903,7 +903,7 @@ private Button RMButton return _rmButton; } } - + /// /// Used to spawn the Save As dialog /// @@ -919,7 +919,7 @@ private Button SaveAsButton return _saveAsButton; } } - + /// /// Menu to hold the DigSig options /// @@ -975,7 +975,7 @@ private Button InfoBarCloseButton } /// - /// Used to display DigSig information and to launch the + /// Used to display DigSig information and to launch the /// summary dialog /// private Button InfoBarDigSigButton @@ -1000,7 +1000,7 @@ private Button InfoBarDigSigButton } /// - /// Used to display RM information and to launch the + /// Used to display RM information and to launch the /// a dialog with more information /// private Button InfoBarRMButton @@ -1350,13 +1350,13 @@ private static void OnApplicationCommandExecute(object sender, ExecutedRoutedEve } /// - /// Central handler for QueryEnabled events fired by Commands directed at DocumentViewer. + /// Central handler for QueryEnabled events fired by Commands directed at DocumentViewer. /// /// The target of this Command, expected to be DocumentViewer /// The event arguments for this event. private static void OnApplicationCommandQuery(object target, CanExecuteRoutedEventArgs e) { - + // Check if arguments are valid, fail silently otherwise. if ((e != null) && (e.Command != null)) { @@ -1691,7 +1691,7 @@ private void OnZoomComboBoxSelectionChanged(object sender, SelectionChangedEvent { ComboBoxItem cbItem = ZoomComboBox.SelectedItem as ComboBoxItem; // Check if a selection is made (when an item is selected from the list the - // SelectedItem will be non-null) + // SelectedItem will be non-null) if (cbItem != null && cbItem.Content is ZoomComboBoxItem) { @@ -2200,7 +2200,7 @@ private void CreateEnforcer() private DocumentApplicationState _state; private const int _invalidPageNumber = -1; private SecurityCriticalDataForSet _rightsManagementPolicy; - private RightsManagementStatus _rightsManagementStatus; + private RightsManagementStatus _rightsManagementStatus; // The enforcer for RM private SecurityCriticalDataForSet _commandEnforcer; @@ -2510,7 +2510,7 @@ public override DocumentPage GetPage(int pageNumber) pageBounds = scale.TransformBounds(pageBounds); } - // + // // Now center the result // double left = (_ia.MediaSizeWidth - pageBounds.Width) / 2.0; diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XPSSignatureDefinition.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XPSSignatureDefinition.cs index 07d08b4eab5..ee4fc5b879d 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XPSSignatureDefinition.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XPSSignatureDefinition.cs @@ -3,18 +3,18 @@ // See the LICENSE file in the project root for more information. /*++ - - - + + + Abstract: This file contains the definition and implementation for the XpsSignatureDefinition class. This class deserializes, provides access and serializes the properties associated with a Signature Definition. - XpsSignatureDefinitions is the means by which document producers provide - guidance for signers in the case that they are not themselves the ones + XpsSignatureDefinitions is the means by which document producers provide + guidance for signers in the case that they are not themselves the ones that will ultimately sign this document - - + + --*/ using System; using System.Collections; @@ -32,9 +32,9 @@ namespace System.Windows.Xps.Packaging /// Helper class to group spot location data together /// public - class + class SpotLocation - { + { /// /// Empty contructor /// @@ -44,18 +44,18 @@ class } /// - /// Specifies which page the signature spot should be + /// Specifies which page the signature spot should be /// displayed in /// public - Uri + Uri PageUri { get { return _pageUri; } - + set { _pageUri = value; @@ -63,18 +63,18 @@ class } /// - /// Specifies the x-coordinate of the point in the page where + /// Specifies the x-coordinate of the point in the page where /// the signature spot should be drawn starting from. /// public - double + double StartX { get { return _startX; } - + set { _startX = value; @@ -82,23 +82,23 @@ class } /// - /// Specifies the y-coordinate of the point in the page where + /// Specifies the y-coordinate of the point in the page where /// the signature spot should be drawn starting from. /// public - double + double StartY { get { return _startY; } - + set { _startY = value; } - } + } Uri _pageUri; double _startX; @@ -107,9 +107,9 @@ class /// /// This class provides de-serialization, access and serialization - /// to the core properties of a Xps Dcoument + /// to the core properties of a Xps Document /// - public class XpsSignatureDefinition + public class XpsSignatureDefinition { /// /// Default creator @@ -125,8 +125,8 @@ public class XpsSignatureDefinition _hasBeenModified = false; } /// - /// Any string representing the identity of the individual - /// who is requested to sign this document + /// Any string representing the identity of the individual + /// who is requested to sign this document /// This property is OPTIONAL. /// /// @@ -140,16 +140,16 @@ public class XpsSignatureDefinition { return _requestedSigner; } - + set { _requestedSigner = value; _hasBeenModified = true; - } + } } - + /// - /// Specifies where the Xps document viewer should place a visual + /// Specifies where the Xps document viewer should place a visual /// to indicate to the user that a signature has been requested /// This property is OPTIONAL. /// @@ -157,14 +157,14 @@ public class XpsSignatureDefinition /// Will return null if it has not been set. /// public - SpotLocation - SpotLocation + SpotLocation + SpotLocation { get { return _spotLocation; } - + set { _spotLocation = value; @@ -173,7 +173,7 @@ public class XpsSignatureDefinition } /// - /// It holds the string value of the signature intention agreement + /// It holds the string value of the signature intention agreement /// that the signer is signing against /// This property is OPTIONAL. /// @@ -197,8 +197,8 @@ public class XpsSignatureDefinition } /// - /// It specifies the date-time by which the requested signer must - /// sign the parts of the document specified. + /// It specifies the date-time by which the requested signer must + /// sign the parts of the document specified. /// This property is OPTIONAL. /// /// @@ -219,11 +219,11 @@ public class XpsSignatureDefinition _hasBeenModified = true; } } - + /// - /// It can be set by the original producer of the document or the - /// signer at the time of signing the document. - /// It specifies the location under whose legislature this document + /// It can be set by the original producer of the document or the + /// signer at the time of signing the document. + /// It specifies the location under whose legislature this document /// is being signed /// This property is OPTIONAL. /// @@ -247,7 +247,7 @@ public class XpsSignatureDefinition } /// - /// This attribute MAY be used to link an existing signature + /// This attribute MAY be used to link an existing signature /// to this SignatureDefinition element /// This property is REQUIRED. /// @@ -275,7 +275,7 @@ public class XpsSignatureDefinition /// to the SignatureDefinition element /// This property is OPTIONAL /// - public + public CultureInfo Culture { @@ -308,7 +308,7 @@ public class XpsSignatureDefinition _hasBeenModified = value; } } - + private SpotLocation _spotLocation; private string _intent; @@ -318,7 +318,7 @@ public class XpsSignatureDefinition private string _signingLocale; private CultureInfo _cultureInfo; private bool _hasBeenModified; - + #region Public methods /// /// Writes Signature Definition in XML format @@ -414,11 +414,11 @@ public class XpsSignatureDefinition ArgumentNullException.ThrowIfNull(reader); // - // Assume the calling function has already read the + // Assume the calling function has already read the // SignatureDefinition start element // - if( reader.NodeType != XmlNodeType.Element || - reader.Name != XpsS0Markup.SignatureDefinition + if( reader.NodeType != XmlNodeType.Element || + reader.Name != XpsS0Markup.SignatureDefinition ) { throw new XpsPackagingException(SR.ReachPackaging_NotSignatureDefinitionElement); @@ -430,7 +430,7 @@ public class XpsSignatureDefinition // Read the attributes off of SignatureDefinition // ReadAttributes( reader ); - + while( !exitLoop && reader.Read() ) { switch( reader.NodeType ) @@ -438,7 +438,7 @@ public class XpsSignatureDefinition case XmlNodeType.Element: ReadElement( reader ); break; - + case XmlNodeType.EndElement: if( ReadEndElement( reader ) ) { @@ -452,7 +452,7 @@ public class XpsSignatureDefinition #region Private methods - private + private void ReadAttributes( XmlReader reader ) { @@ -470,11 +470,11 @@ public class XpsSignatureDefinition ValidateSpotLocationAttribute(reader.Name, reader.Value); } } - // Move the reader back to the element node. + // Move the reader back to the element node. reader.MoveToElement(); - } + } } - + private void ValidateSignatureDefinitionAttribute( string attributeName, string attributeValue ) @@ -520,7 +520,7 @@ public class XpsSignatureDefinition } else if (attributeName == XpsS0Markup.StartY) { - SpotLocation.StartY = double.Parse(attributeValue, System.Globalization.CultureInfo.InvariantCulture); + SpotLocation.StartY = double.Parse(attributeValue, System.Globalization.CultureInfo.InvariantCulture); } else if (attributeName == XpsS0Markup.PageUri) { @@ -616,5 +616,5 @@ public class XpsSignatureDefinition #endregion Private methods } } - + diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs index 586b02513ba..d53efe130ea 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Packaging/XpsFixedDocumentReaderWriter.cs @@ -98,13 +98,13 @@ Uri pageSource SignatureDefinitions{ get; } /// - /// thumbnail image associated with this doucment + /// thumbnail image associated with this document /// XpsThumbnail Thumbnail{ get; } /// - /// Document Structure associated with this doucment + /// Document Structure associated with this document /// XpsStructure DocumentStructure{ get; } @@ -274,7 +274,7 @@ int documentNumber _partEditor = new XmlPartEditor(_metroPart); _pageCache = new List(); - + _pagesWritten = 0; _parentNode = parent; @@ -391,7 +391,7 @@ public int DocumentNumber { get { - EnsureDoucmentStructure(); + EnsureDocumentStructure(); return _documentStructure; } } @@ -426,7 +426,7 @@ public int DocumentNumber throw new XpsPackagingException(SR.ReachPackaging_PanelOrSequenceAlreadyOpen); } - + _linkTargetStream = new List(); // @@ -440,7 +440,7 @@ public int DocumentNumber // _currentPage = fixedPage; - + //Here we used to add the fixed page to _pageCache, but _pageCache is never accessed if this object was created as an IXpsFixedDocumentWriter. //So instead keep a separate pagesWritten count and forget about the cache when using this method. _pagesWritten++; @@ -459,7 +459,7 @@ public int DocumentNumber public XpsThumbnail AddThumbnail( - XpsImageType imageType + XpsImageType imageType ) { _thumbnail = CurrentXpsManager.AddThumbnail( imageType, this, Thumbnail ); @@ -681,7 +681,7 @@ XpsSignatureDefinition signatureDefinition ((INode)this).Flush(); _partEditor.Close(); - + _partEditor = null; _metroPart = null; @@ -690,7 +690,7 @@ XpsSignatureDefinition signatureDefinition _thumbnail = null; _pageCache = null; - + _pagesWritten = 0; _hasParsedPages = false; @@ -724,7 +724,7 @@ XpsDigSigPartAlteringRestrictions restrictions // PackagePart signatureDefinitionPart = CurrentXpsManager.GetSignatureDefinitionPart(Uri); - + // // Add Signature Definitions // @@ -732,9 +732,9 @@ XpsDigSigPartAlteringRestrictions restrictions Uri, PackageRelationshipSelectorType.Type, XpsS0Markup.SignatureDefinitionRelationshipName - ) + ) ); - + if( signatureDefinitionPart != null ) { @@ -747,7 +747,7 @@ XpsDigSigPartAlteringRestrictions restrictions Uri, PackageRelationshipSelectorType.Type, XpsS0Markup.RestrictedFontRelationshipType - ) + ) ); // // Add Document Structure relationship @@ -756,7 +756,7 @@ XpsDigSigPartAlteringRestrictions restrictions Uri, PackageRelationshipSelectorType.Type, XpsS0Markup.StructureRelationshipName - ) + ) ); // // Add this documents dependants @@ -785,7 +785,7 @@ List xmlPartList // // Add DocumentStructure // - EnsureDoucmentStructure(); + EnsureDocumentStructure(); if (_documentStructure != null) { // @@ -825,7 +825,7 @@ XpsDigSigPartAlteringRestrictions restrictions foreach( IXpsFixedPageReader reader in _pageCache) { (reader as XpsFixedPageReaderWriter). - CollectSelfAndDependents( + CollectSelfAndDependents( dependents, selectorList, restrictions @@ -835,7 +835,7 @@ XpsDigSigPartAlteringRestrictions restrictions // // Add DocumentStructure // - EnsureDoucmentStructure(); + EnsureDocumentStructure(); if( _documentStructure != null ) { dependents[_documentStructure.Uri] = _documentStructure.Uri; @@ -873,7 +873,7 @@ IList linkTargetStream { xmlWriter.WriteRaw (String.Format( System.Globalization.CultureInfo.InvariantCulture, - "", + "", nameElement) ); } @@ -924,7 +924,7 @@ IList linkTargetStream _currentPage = null; } } - + /// /// Test if the page cache has been initialized and /// updates it if necessary @@ -982,7 +982,7 @@ IList linkTargetStream { throw new XpsPackagingException(SR.ReachPackaging_PartNotFound); } - + if (!pagePart.ValidatedContentType().AreTypeAndSubTypeEqual(XpsS0Markup.FixedPageContentType)) { throw new XpsPackagingException(SR.ReachPackaging_NotAFixedPage); @@ -1033,7 +1033,7 @@ IList linkTargetStream private void - EnsureDoucmentStructure() + EnsureDocumentStructure() { // if _xpsSignaturs is not null we have already initialized this // @@ -1056,7 +1056,7 @@ IList linkTargetStream if (documentStructureRelationship != null) { - Uri documentStructureUri = PackUriHelper.ResolvePartUri(documentStructureRelationship.SourceUri, + Uri documentStructureUri = PackUriHelper.ResolvePartUri(documentStructureRelationship.SourceUri, documentStructureRelationship.TargetUri); if (CurrentXpsManager.MetroPackage.PartExists(documentStructureUri)) @@ -1156,7 +1156,7 @@ Collection sigDefCollection private IList _linkTargetStream; private List _pageCache; - + // // This variable is used to keep a count of pages written via AddFixedPage // @@ -1206,7 +1206,7 @@ Collection sigDefCollection // has been changed // private bool _sigCollectionDirty; - + private XpsStructure _documentStructure; #endregion Private data diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManager.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManager.cs index 6db6db19a9b..3fcd9622395 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManager.cs @@ -474,7 +474,7 @@ bool documentPrintTicketRequired _device.EndDocument(); // - // Inform any potential listeners that the doucment has been printed + // Inform any potential listeners that the document has been printed // XpsSerializationProgressChangedEventArgs e = new XpsSerializationProgressChangedEventArgs(XpsWritingProgressChangeLevel.FixedDocumentWritingProgress, diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManagerAsync.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManagerAsync.cs index 0add48bfc4f..bc9eac0ead6 100644 --- a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManagerAsync.cs +++ b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManagerAsync.cs @@ -728,7 +728,7 @@ bool documentPrintTicketRequired _device.EndDocument(abort); // - // Inform the listener that the doucment has been printed + // Inform the listener that the document has been printed // XpsSerializationProgressChangedEventArgs e = new XpsSerializationProgressChangedEventArgs(XpsWritingProgressChangeLevel.FixedDocumentWritingProgress,