From be426443008e2aa2a3919fe4854dccf229b25f58 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 5 Feb 2016 16:33:29 -0500 Subject: [PATCH] Take advantage of new convenience method to get an ObjectModel directly from a File --- .../OpenPackagingConvention/OPCDataFormat.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs index e065f01d..71779515 100644 --- a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs +++ b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs @@ -43,13 +43,7 @@ namespace UniversalEditor.DataFormats.Package.OpenPackagingConvention relatedFileName = fn.Substring(0, fn.Length - ".rels".Length); } - - byte[] data = file.GetData(); - - OPCRelationshipsDataFormat df = new OPCRelationshipsDataFormat(); - RelationshipsObjectModel rels = new RelationshipsObjectModel(); - Document.Load(rels, df, new MemoryAccessor(data)); - + RelationshipsObjectModel rels = file.GetObjectModel(new OPCRelationshipsDataFormat()); if (relatedFileName != null) { @@ -64,12 +58,7 @@ namespace UniversalEditor.DataFormats.Package.OpenPackagingConvention } else if (file.Name == "[Content_Types].xml" && file.Parent == null) { - byte[] data = file.GetData(); - - OPCContentTypesDataFormat df = new OPCContentTypesDataFormat(); - ContentTypesObjectModel contentTypes = new ContentTypesObjectModel(); - Document.Load(contentTypes, df, new MemoryAccessor(data)); - + ContentTypesObjectModel contentTypes = file.GetObjectModel(new OPCContentTypesDataFormat()); foreach (ContentType type in contentTypes.ContentTypes) { package.ContentTypes.Add(type);