Bug/issue1759 (#1769)

* fixed broken linking #1759 * Fixed EMF_COMMENT type being written wrong for EMF+ records * removed a test test --------- Co-authored-by: Ossian Edström <ossian.edstrom@epplussoftware.com>
EPPlusSoftware · Dec 16, 2024 · 5215aac · 5215aac
1 parent 2aa6cd5
commit 5215aac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/EPPlus/Drawing/EMF/Records/PlusRecords/EmfPlusRecord.cs b/src/EPPlus/Drawing/EMF/Records/PlusRecords/EmfPlusRecord.cs
@@ -40,7 +40,7 @@ internal EmfPlusRecord(BinaryReader br, RECORD_TYPES_PLUS type, bool readData =
 
         internal virtual void WriteBytes(BinaryWriter bw)
         {
-            bw.Write((uint)Type);
+            bw.Write((ushort)Type);
             bw.Write(PlusFlags);
             bw.Write(Size);
             bw.Write(DataSize);

diff --git a/src/EPPlus/Drawing/OleObject/ExcelOleObject.cs b/src/EPPlus/Drawing/OleObject/ExcelOleObject.cs
@@ -300,7 +300,7 @@ internal void CreateOleObject(ExcelDrawings drawings, XmlNode node, string name,
                 _mediaImage = _worksheet._package.PictureStore.AddImage(image, null, ePictureType.Emf);
 
             }
-            var imgRelId = _mediaImage.Part.CreateRelationship(_mediaImage.Uri, TargetMode.Internal, ExcelPackage.schemaRelationships + "/image");
+            var imgRelId = _worksheet.Part.CreateRelationship(_mediaImage.Uri, TargetMode.Internal, ExcelPackage.schemaRelationships + "/image");
             //Create drawings xml
             XmlElement spElement = CreateShapeNode();
             spElement.InnerXml = CreateOleObjectDrawingNode(name);
@@ -310,7 +310,7 @@ internal void CreateOleObject(ExcelDrawings drawings, XmlNode node, string name,
             To.Column = 1;    To.ColumnOff = 304800;
             To.Row = 3;       To.RowOff = 114300;
             //Create vml
-            _vml = drawings.Worksheet.VmlDrawings.AddOlePicture(this.Id.ToString(), imgRelId.TargetUri);
+            _vml = drawings.Worksheet.VmlDrawings.AddOlePicture(this.Id.ToString(), _mediaImage.Uri);
             _vmlProp = XmlHelperFactory.Create(_vml.NameSpaceManager, _vml.GetNode("x:ClientData"));
             //Create worksheet xml
             var wsNode = _worksheet.CreateOleContainerNode();

diff --git a/src/EPPlusTest/Drawing/OLETests.cs b/src/EPPlusTest/Drawing/OLETests.cs
@@ -578,5 +578,6 @@ public void CreateEmbeddedOLEFromStream()
                 SaveAndCleanup(genericOlePackage);
             }
         }
+
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -578,5 +578,6 @@ public void CreateEmbeddedOLEFromStream() @@
                     SaveAndCleanup(genericOlePackage);
                 }
             }
         }
     }