universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take advantage of new convenience method to get an ObjectModel directly from a File

Browse Source
This commit is contained in:
Michael Becker 2016-02-05 16:33:29 -05:00
parent 0bde860160
commit be42644300
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Package/OpenPackagingConvention/OPCDataFormat.cs
View File

@ -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<RelationshipsObjectModel>(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<ContentTypesObjectModel>(new OPCContentTypesDataFormat());
foreach (ContentType type in contentTypes.ContentTypes)
{
package.ContentTypes.Add(type);