Procházet zdrojové kódy

Fix for CreatePicture provided by mstrewe

master
MadBoy_cp před 11 roky
rodič
revize
a1d61d2fa2
1 změnil soubory, kde provedl 14 přidání a 2 odebrání
  1. 14
    2
      DocX/Paragraph.cs

+ 14
- 2
DocX/Paragraph.cs Zobrazit soubor

{ {
PackagePart part = document.package.GetPart(document.mainPart.GetRelationship(id).TargetUri); PackagePart part = document.package.GetPart(document.mainPart.GetRelationship(id).TargetUri);
int newDocPrId = 1;
List<string> existingIds = new List<string>();
foreach (var docPrId in document.Xml.Descendants(XName.Get("docPr", DocX.wp.NamespaceName)))
{
existingIds.Add(docPrId.Attributes().FirstOrDefault(x => x.Name == "id").Value);
}
while (existingIds.Contains(newDocPrId.ToString()))
newDocPrId++;
int cx, cy; int cx, cy;
using (System.Drawing.Image img = System.Drawing.Image.FromStream(part.GetStream())) using (System.Drawing.Image img = System.Drawing.Image.FromStream(part.GetStream()))
<wp:inline distT=""0"" distB=""0"" distL=""0"" distR=""0"" xmlns:wp=""http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing""> <wp:inline distT=""0"" distB=""0"" distL=""0"" distR=""0"" xmlns:wp=""http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"">
<wp:extent cx=""{0}"" cy=""{1}"" /> <wp:extent cx=""{0}"" cy=""{1}"" />
<wp:effectExtent l=""0"" t=""0"" r=""0"" b=""0"" /> <wp:effectExtent l=""0"" t=""0"" r=""0"" b=""0"" />
<wp:docPr id=""1"" name=""{3}"" descr=""{4}"" />
<wp:docPr id=""{5}"" name=""{3}"" descr=""{4}"" />
<wp:cNvGraphicFramePr> <wp:cNvGraphicFramePr>
<a:graphicFrameLocks xmlns:a=""http://schemas.openxmlformats.org/drawingml/2006/main"" noChangeAspect=""1"" /> <a:graphicFrameLocks xmlns:a=""http://schemas.openxmlformats.org/drawingml/2006/main"" noChangeAspect=""1"" />
</wp:cNvGraphicFramePr> </wp:cNvGraphicFramePr>
</a:graphic> </a:graphic>
</wp:inline> </wp:inline>
</drawing> </drawing>
", cx, cy, id, name, descr));
", cx, cy, id, name, descr, newDocPrId.ToString()));
return new Picture(document, xml, new Image(document, document.mainPart.GetRelationship(id))); return new Picture(document, xml, new Image(document, document.mainPart.GetRelationship(id)));
} }

Načítá se…
Zrušit
Uložit