Read the PropertySet Locale property into the PropertyContext if the …

…property is present in the file
ironfede · Dec 4, 2024 · 9463e0a · 9463e0a
1 parent 0c7308d
commit 9463e0a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/OpenMcdf.Ole.Tests/OlePropertiesExtensionsTests.cs b/OpenMcdf.Ole.Tests/OlePropertiesExtensionsTests.cs
@@ -519,6 +519,7 @@ public void TestRetainDictionaryPropertyInAppSpecificStreams()
 
             Assert.AreEqual(ContainerType.AppSpecific, co.ContainerType);
             Assert.AreEqual(expectedFmtid0, co.FMTID0);
+            Assert.AreEqual(1040u, co.Context.Locale);
             CollectionAssert.AreEqual(expectedPropertyNames, co.PropertyNames);
 
             // Write test file

diff --git a/OpenMcdf.Ole/OlePropertiesContainer.cs b/OpenMcdf.Ole/OlePropertiesContainer.cs
@@ -65,7 +65,8 @@ public OlePropertiesContainer(CfbStream cfStream)
 
         Context = new PropertyContext()
         {
-            CodePage = pStream.PropertySet0.PropertyContext.CodePage
+            CodePage = pStream.PropertySet0.PropertyContext.CodePage,
+            Locale = pStream.PropertySet0.PropertyContext.Locale
         };
 
         for (int i = 0; i < pStream.PropertySet0.Properties.Count; i++)

diff --git a/OpenMcdf.Ole/PropertySet.cs b/OpenMcdf.Ole/PropertySet.cs
@@ -13,13 +13,27 @@ internal sealed class PropertySet
     public void LoadContext(int propertySetOffset, BinaryReader br)
     {
         long currPos = br.BaseStream.Position;
+
+        // Read the code page - this should always be present
         int codePageOffset = (int)(propertySetOffset + PropertyIdentifierAndOffsets.First(pio => pio.PropertyIdentifier == SpecialPropertyIdentifiers.CodePage).Offset);
         br.BaseStream.Seek(codePageOffset, SeekOrigin.Begin);
 
         var vType = (VTPropertyType)br.ReadUInt16();
         br.ReadUInt16(); // Ushort Padding
         PropertyContext.CodePage = (ushort)br.ReadInt16();
 
+        // Read the Locale, if present
+        PropertyIdentifierAndOffset? localeProperty = PropertyIdentifierAndOffsets.FirstOrDefault(pio => pio.PropertyIdentifier == SpecialPropertyIdentifiers.Locale);
+        if (localeProperty is not null)
+        {
+            long localeOffset = (propertySetOffset + localeProperty.Offset);
+            br.BaseStream.Seek(localeOffset, SeekOrigin.Begin);
+
+            vType = (VTPropertyType)br.ReadUInt16();
+            br.ReadUInt16(); // Ushort Padding
+            PropertyContext.Locale = br.ReadUInt32();
+        }
+
         br.BaseStream.Position = currPos;
     }