Merge pull request #143 from Visionaid-International-Ltd/spelling-and…

…-formatting Spelling and formatting fixes
ironfede · Sep 3, 2024 · 6037a1f · 6037a1f
2 parents 2e0d67b + 5b4778c
commit 6037a1f
Show file tree

Hide file tree

Showing 60 changed files with 206 additions and 323 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,11 +13,11 @@ variables:
   buildConfiguration: 'Release'
   libFramework: 'netstandard2.0'
   appFramework: 'net6.0'
-  # pay attention to  slashes
+  # pay attention to slashes
   testsProject:  'sources/Test/OpenMcdf.Test/OpenMcdf.Test.csproj'
   extensionTestsProject: 'sources/Test/OpenMcdf.Extensions.Test/OpenMcdf.Extensions.Test.csproj'
   buildProject: 'sources/OpenMcdf/OpenMcdf.csproj'
-  # without filter it  will timoeout in azure AFTER 60+ min
+  # without filter it will timeout in azure AFTER 60+ min
   testFilter: 'Name!=Test_FIX_BUG_GH_14&Name!=Test_FIX_BUG_GH_15'
 
 steps:

diff --git a/sources/OpenMcdf.Extensions/CFStreamExtensions.cs b/sources/OpenMcdf.Extensions/CFStreamExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
+using System.IO;
 
 namespace OpenMcdf.Extensions
 {
@@ -25,7 +22,7 @@ public static Stream AsIOStream(this CFStream cfStream)
         ///// as a OLE properties Stream.
         ///// </summary>
         ///// <param name="cfStream"></param>
-        ///// <returns>A <see cref="T:OpenMcdf.OLEProperties.PropertySetStream">OLE Propertie stream</see></returns>
+        ///// <returns>A <see cref="T:OpenMcdf.OLEProperties.PropertySetStream">OLE Property Set Stream</see></returns>
         //public static OLEProperties.PropertySetStream AsOLEProperties(this CFStream cfStream)
         //{
         //    var result = new OLEProperties.PropertySetStream();

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/Common.cs b/sources/OpenMcdf.Extensions/OLEProperties/Common.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/DictionaryEntry.cs b/sources/OpenMcdf.Extensions/OLEProperties/DictionaryEntry.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace OpenMcdf.Extensions.OLEProperties

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/DictionaryProperty.cs b/sources/OpenMcdf.Extensions/OLEProperties/DictionaryProperty.cs
@@ -1,5 +1,4 @@
 using OpenMcdf.Extensions.OLEProperties.Interfaces;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -51,7 +50,7 @@ public void Read(BinaryReader br)
 
             if (m > 0)
             {
-                for(int i = 0; i < m; i++)
+                for (int i = 0; i < m; i++)
                 {
                     br.ReadByte();
                 }
@@ -69,7 +68,7 @@ public void Read(BinaryReader br)
         public void Write(BinaryWriter bw)
         {
             long curPos = bw.BaseStream.Position;
-            
+
             bw.Write(entries.Count);
 
             foreach (KeyValuePair<uint, string> kv in entries)
@@ -102,7 +101,7 @@ private void WriteEntry(BinaryWriter bw, uint propertyIdentifier, string name)
                 if (addNullTerminator)
                     byteLength += 2;
 
-                bw.Write((uint)byteLength / 2);
+                bw.Write(byteLength / 2);
                 bw.Write(nameBytes);
 
                 if (addNullTerminator)

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/Interfaces/IBinarySerializable.cs b/sources/OpenMcdf.Extensions/OLEProperties/Interfaces/IBinarySerializable.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.IO;
 
 namespace OpenMcdf.Extensions.OLEProperties.Interfaces
 {

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/Interfaces/IProperty.cs b/sources/OpenMcdf.Extensions/OLEProperties/Interfaces/IProperty.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenMcdf.Extensions.OLEProperties.Interfaces
+namespace OpenMcdf.Extensions.OLEProperties.Interfaces
 {
     public interface IProperty : IBinarySerializable
     {
@@ -17,6 +13,6 @@ PropertyType PropertyType
         {
             get;
         }
-       
+
     }
 }
diff --git a/sources/OpenMcdf.Extensions/OLEProperties/Interfaces/ITypedPropertyValue.cs b/sources/OpenMcdf.Extensions/OLEProperties/Interfaces/ITypedPropertyValue.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenMcdf.Extensions.OLEProperties.Interfaces
+namespace OpenMcdf.Extensions.OLEProperties.Interfaces
 {
     public interface ITypedPropertyValue : IProperty
     {
@@ -19,7 +15,7 @@ PropertyDimensions PropertyDimensions
 
         bool IsVariant
         {
-            get; 
+            get;
         }
     }
 }
diff --git a/sources/OpenMcdf.Extensions/OLEProperties/OLEPropertiesContainer.cs b/sources/OpenMcdf.Extensions/OLEProperties/OLEPropertiesContainer.cs
@@ -1,9 +1,8 @@
-using System;
+using OpenMcdf.Extensions.OLEProperties.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using OpenMcdf.Extensions.OLEProperties.Interfaces;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {
@@ -123,7 +122,7 @@ internal OLEPropertiesContainer(CFStream cfStream)
                 var op = new OLEProperty(this)
                 {
                     VTType = p.VTType,
-                    PropertyIdentifier = (uint)pStream.PropertySet0.PropertyIdentifierAndOffsets[i].PropertyIdentifier,
+                    PropertyIdentifier = pStream.PropertySet0.PropertyIdentifierAndOffsets[i].PropertyIdentifier,
                     Value = p.Value
                 };
 
@@ -150,7 +149,7 @@ internal OLEPropertiesContainer(CFStream cfStream)
                     var op = new OLEProperty(UserDefinedProperties);
 
                     op.VTType = p.VTType;
-                    op.PropertyIdentifier = (uint)pStream.PropertySet1.PropertyIdentifierAndOffsets[i].PropertyIdentifier;
+                    op.PropertyIdentifier = pStream.PropertySet1.PropertyIdentifierAndOffsets[i].PropertyIdentifier;
                     op.Value = p.Value;
 
                     UserDefinedProperties.properties.Add(op);
@@ -159,7 +158,7 @@ internal OLEPropertiesContainer(CFStream cfStream)
                 var existingPropertyNames = (Dictionary<uint, string>)pStream.PropertySet1.Properties
                     .Where(p => p.PropertyType == PropertyType.DictionaryProperty).FirstOrDefault()?.Value;
 
-                UserDefinedProperties.PropertyNames = existingPropertyNames ?? new Dictionary<uint, string> ();
+                UserDefinedProperties.PropertyNames = existingPropertyNames ?? new Dictionary<uint, string>();
             }
         }
 
@@ -266,7 +265,7 @@ public void Save(CFStream cfStream)
                 }
             };
 
-            PropertyFactory factory = 
+            PropertyFactory factory =
                 this.ContainerType == ContainerType.DocumentSummaryInfo ? DocumentSummaryInfoPropertyFactory.Instance : DefaultPropertyFactory.Instance;
 
             foreach (var op in this.Properties)

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/OLEProperty.cs b/sources/OpenMcdf.Extensions/OLEProperties/OLEProperty.cs
@@ -1,7 +1,5 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/PropertyFactory.cs b/sources/OpenMcdf.Extensions/OLEProperties/PropertyFactory.cs
@@ -1,7 +1,7 @@
 using OpenMcdf.Extensions.OLEProperties.Interfaces;
 using System;
-using System.Text;
 using System.IO;
+using System.Text;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {
@@ -443,7 +443,7 @@ public override void WriteScalarValue(BinaryWriter bw, string pValue)
                     //if (addNullTerminator)
                     dataLength += 2;            // null terminator \u+0000
 
-                   // var mod = dataLength % 4;       // pad to multiple of 4 bytes
+                    // var mod = dataLength % 4;       // pad to multiple of 4 bytes
 
                     bw.Write(dataLength);           // datalength of string + null char (unicode)
                     bw.Write(data);                 // string
@@ -602,7 +602,7 @@ public override Decimal ReadScalarValue(System.IO.BinaryReader br)
 
             public override void WriteScalarValue(BinaryWriter bw, Decimal pValue)
             {
-                int[] parts = Decimal.GetBits((Decimal)pValue);
+                int[] parts = Decimal.GetBits(pValue);
 
                 bool sign = (parts[3] & 0x80000000) != 0;
                 byte scale = (byte)((parts[3] >> 16) & 0x7F);
@@ -628,14 +628,14 @@ public VT_BOOL_Property(VTPropertyType vType, bool isVariant) : base(vType, isVa
             public override bool ReadScalarValue(System.IO.BinaryReader br)
             {
 
-                this.propertyValue = br.ReadUInt16() == (ushort)0xFFFF ? true : false;
+                this.propertyValue = br.ReadUInt16() == 0xFFFF ? true : false;
                 return (bool)propertyValue;
                 //br.ReadUInt16();//padding
             }
 
             public override void WriteScalarValue(BinaryWriter bw, bool pValue)
             {
-                bw.Write((bool)pValue ? (ushort)0xFFFF : (ushort)0);
+                bw.Write(pValue ? (ushort)0xFFFF : (ushort)0);
 
             }
 
@@ -761,7 +761,7 @@ public override void WriteScalarValue(BinaryWriter bw, object pValue)
     }
 
     // The default property factory.
-    internal sealed class DefaultPropertyFactory : PropertyFactory 
+    internal sealed class DefaultPropertyFactory : PropertyFactory
     {
         public static PropertyFactory Instance { get; } = new DefaultPropertyFactory();
     }

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/PropertyIdentifierAndOffset.cs b/sources/OpenMcdf.Extensions/OLEProperties/PropertyIdentifierAndOffset.cs
@@ -1,12 +1,9 @@
 using OpenMcdf.Extensions.OLEProperties.Interfaces;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {
-    public class PropertyIdentifierAndOffset: IBinarySerializable
+    public class PropertyIdentifierAndOffset : IBinarySerializable
     {
         public uint PropertyIdentifier { get; set; }
         public uint Offset { get; set; }

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/PropertyReader.cs b/sources/OpenMcdf.Extensions/OLEProperties/PropertyReader.cs
@@ -27,8 +27,8 @@
 //            this.ctx.CodePage = (int)(ushort)(short)pr.Value;
 //        }
 
-
 
-
+
+
 //    }
 //}
diff --git a/sources/OpenMcdf.Extensions/OLEProperties/PropertySet.cs b/sources/OpenMcdf.Extensions/OLEProperties/PropertySet.cs
@@ -1,18 +1,16 @@
 using OpenMcdf.Extensions.OLEProperties.Interfaces;
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Linq;
 using System.IO;
+using System.Linq;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {
-    internal class PropertySet
+    internal sealed class PropertySet
     {
 
         public PropertyContext PropertyContext
         {
-            get;  set;
+            get; set;
         }
 
         public uint Size { get; set; }
@@ -51,7 +49,7 @@ public void LoadContext(int propertySetOffset, BinaryReader br)
 
             VTPropertyType vType = (VTPropertyType)br.ReadUInt16();
             br.ReadUInt16(); // Ushort Padding
-            PropertyContext.CodePage = (int)(ushort)br.ReadInt16();
+            PropertyContext.CodePage = (ushort)br.ReadInt16();
 
             br.BaseStream.Position = currPos;
         }

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/PropertySetStream.cs b/sources/OpenMcdf.Extensions/OLEProperties/PropertySetStream.cs
@@ -1,13 +1,11 @@
 using OpenMcdf.Extensions.OLEProperties.Interfaces;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Linq;
 using System.IO;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {
-    internal class PropertySetStream
+    internal sealed class PropertySetStream
     {
 
 
@@ -68,13 +66,13 @@ public void Read(System.IO.BinaryReader br)
             // Read properties (P0)
             for (int i = 0; i < PropertySet0.NumProperties; i++)
             {
-                br.BaseStream.Seek(Offset0 + PropertySet0.PropertyIdentifierAndOffsets[i].Offset, System.IO.SeekOrigin.Begin);
+                br.BaseStream.Seek(Offset0 + PropertySet0.PropertyIdentifierAndOffsets[i].Offset, SeekOrigin.Begin);
                 PropertySet0.Properties.Add(ReadProperty(PropertySet0.PropertyIdentifierAndOffsets[i].PropertyIdentifier, PropertySet0.PropertyContext.CodePage, br, factory));
             }
 
             if (NumPropertySets == 2)
             {
-                br.BaseStream.Seek(Offset1, System.IO.SeekOrigin.Begin);
+                br.BaseStream.Seek(Offset1, SeekOrigin.Begin);
                 PropertySet1 = new PropertySet();
                 PropertySet1.Size = br.ReadUInt32();
                 PropertySet1.NumProperties = br.ReadUInt32();
@@ -93,7 +91,7 @@ public void Read(System.IO.BinaryReader br)
                 // Read properties
                 for (int i = 0; i < PropertySet1.NumProperties; i++)
                 {
-                    br.BaseStream.Seek(Offset1 + PropertySet1.PropertyIdentifierAndOffsets[i].Offset, System.IO.SeekOrigin.Begin);
+                    br.BaseStream.Seek(Offset1 + PropertySet1.PropertyIdentifierAndOffsets[i].Offset, SeekOrigin.Begin);
                     PropertySet1.Properties.Add(ReadProperty(PropertySet1.PropertyIdentifierAndOffsets[i].PropertyIdentifier, PropertySet1.PropertyContext.CodePage, br, DefaultPropertyFactory.Instance));
                 }
             }
@@ -186,28 +184,28 @@ public void Write(System.IO.BinaryWriter bw)
 
                 int size1 = (int)(bw.BaseStream.Position - oc1.OffsetPS);
 
-                bw.Seek(oc1.OffsetPS, System.IO.SeekOrigin.Begin);
+                bw.Seek(oc1.OffsetPS, SeekOrigin.Begin);
                 bw.Write(size1);
             }
 
-            bw.Seek(oc0.OffsetPS, System.IO.SeekOrigin.Begin);
+            bw.Seek(oc0.OffsetPS, SeekOrigin.Begin);
             bw.Write(size0);
 
             int shiftO1 = 2 + 2 + 4 + 16 + 4 + 16; //OFFSET0
-            bw.Seek(shiftO1, System.IO.SeekOrigin.Begin);
+            bw.Seek(shiftO1, SeekOrigin.Begin);
             bw.Write(oc0.OffsetPS);
 
             if (NumPropertySets == 2)
             {
-                bw.Seek(shiftO1 + 4 + 16, System.IO.SeekOrigin.Begin);
+                bw.Seek(shiftO1 + 4 + 16, SeekOrigin.Begin);
                 bw.Write(oc1.OffsetPS);
             }
 
             //-----------
 
             for (int i = 0; i < PropertySet0.PropertyIdentifierAndOffsets.Count; i++)
             {
-                bw.Seek((int)oc0.PropertyIdentifierOffsets[i] + 4, System.IO.SeekOrigin.Begin); //Offset of 4 to Offset value
+                bw.Seek((int)oc0.PropertyIdentifierOffsets[i] + 4, SeekOrigin.Begin); //Offset of 4 to Offset value
                 bw.Write((int)(oc0.PropertyOffsets[i] - oc0.OffsetPS));
             }
 
@@ -217,7 +215,7 @@ public void Write(System.IO.BinaryWriter bw)
             {
                 for (int i = 0; i < PropertySet1.PropertyIdentifierAndOffsets.Count; i++)
                 {
-                    bw.Seek((int)oc1.PropertyIdentifierOffsets[i] + 4, System.IO.SeekOrigin.Begin); //Offset of 4 to Offset value
+                    bw.Seek((int)oc1.PropertyIdentifierOffsets[i] + 4, SeekOrigin.Begin); //Offset of 4 to Offset value
                     bw.Write((int)(oc1.PropertyOffsets[i] - oc1.OffsetPS));
                 }
             }

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/ProperyIdentifiers.cs b/sources/OpenMcdf.Extensions/OLEProperties/ProperyIdentifiers.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenMcdf.Extensions.OLEProperties
 {