fix: 修复 Better-EN5 侧 EnbxReader 类型错误 + PptxImporter Relationship 命名空间修复
This commit is contained in:
@@ -10,6 +10,7 @@ namespace BetterSeewo.Manager.Services.Conversion
|
||||
{
|
||||
public class EnbxReader
|
||||
{
|
||||
private static readonly XNamespace Rel = "http://schemas.openxmlformats.org/package/2006/relationships";
|
||||
private int _nextId;
|
||||
|
||||
public SmfDocument Import(string enbxPath)
|
||||
@@ -67,7 +68,7 @@ namespace BetterSeewo.Manager.Services.Conversion
|
||||
|
||||
var relsPart = enbx.GetPart(relsUri);
|
||||
var rels = XDocument.Load(relsPart.GetStream());
|
||||
foreach (var rel in rels.Root?.Elements("Relationship") ?? Enumerable.Empty<XElement>())
|
||||
foreach (var rel in rels.Root?.Elements(Rel + "Relationship") ?? Enumerable.Empty<XElement>())
|
||||
{
|
||||
var type = (string)rel.Attribute("Type") ?? "";
|
||||
if (type.Contains("document") || type.Contains("officeDocument"))
|
||||
@@ -84,7 +85,7 @@ namespace BetterSeewo.Manager.Services.Conversion
|
||||
private void ParseDocumentXml(XElement docXml, SmfDocument doc, Package enbx)
|
||||
{
|
||||
var root = docXml;
|
||||
var enNs = root.GetDefaultNamespace();
|
||||
var enNs = root.Name.Namespace;
|
||||
|
||||
var props = root.Element(enNs + "Properties");
|
||||
if (props != null)
|
||||
|
||||
Reference in New Issue
Block a user