diff --git a/Plugins/UniversalEditor.Plugins.Genealogy/DataFormats/FamilyTreeMaker/Windows/FTWDataFormat.cs b/Plugins/UniversalEditor.Plugins.Genealogy/DataFormats/FamilyTreeMaker/Windows/FTWDataFormat.cs index 6773e27e..fd05cd8e 100644 --- a/Plugins/UniversalEditor.Plugins.Genealogy/DataFormats/FamilyTreeMaker/Windows/FTWDataFormat.cs +++ b/Plugins/UniversalEditor.Plugins.Genealogy/DataFormats/FamilyTreeMaker/Windows/FTWDataFormat.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; -using UniversalEditor.DataFormats.FileSystem.Microsoft.CompoundDocument; + using UniversalEditor.Plugins.Genealogy.ObjectModels.FamilyTree; using UniversalEditor.ObjectModels.FileSystem; +using UniversalEditor.DataFormats.CompoundDocument; +using UniversalEditor.ObjectModels.CompoundDocument; namespace UniversalEditor.Plugins.Genealogy.DataFormats.FamilyTreeMaker.Windows { @@ -22,13 +24,13 @@ namespace UniversalEditor.Plugins.Genealogy.DataFormats.FamilyTreeMaker.Windows protected override void BeforeLoadInternal (Stack objectModels) { base.BeforeLoadInternal (objectModels); - objectModels.Push (new FileSystemObjectModel ()); + objectModels.Push (new CompoundDocumentObjectModel ()); } protected override void AfterLoadInternal (Stack objectModels) { base.AfterLoadInternal (objectModels); - FileSystemObjectModel fsom = (objectModels.Pop () as FileSystemObjectModel); + CompoundDocumentObjectModel fsom = (objectModels.Pop () as CompoundDocumentObjectModel); File IND_DB = fsom.Files["IND.DB"]; File INDGROUPS = fsom.Files["QEDIT0.DB"]; @@ -59,7 +61,7 @@ namespace UniversalEditor.Plugins.Genealogy.DataFormats.FamilyTreeMaker.Windows protected override void BeforeSaveInternal (Stack objectModels) { FamilyTreeObjectModel ft = (objectModels.Pop() as FamilyTreeObjectModel); - FileSystemObjectModel fsom = new FileSystemObjectModel(); + CompoundDocumentObjectModel fsom = new CompoundDocumentObjectModel(); objectModels.Push(fsom); diff --git a/Plugins/UniversalEditor.Plugins.Microsoft.VisualStudio/DataFormats/PropertyList/Microsoft/VisualStudio/SUODataFormat.cs b/Plugins/UniversalEditor.Plugins.Microsoft.VisualStudio/DataFormats/PropertyList/Microsoft/VisualStudio/SUODataFormat.cs index 93acb39d..34c6302d 100644 --- a/Plugins/UniversalEditor.Plugins.Microsoft.VisualStudio/DataFormats/PropertyList/Microsoft/VisualStudio/SUODataFormat.cs +++ b/Plugins/UniversalEditor.Plugins.Microsoft.VisualStudio/DataFormats/PropertyList/Microsoft/VisualStudio/SUODataFormat.cs @@ -20,7 +20,9 @@ // along with this program. If not, see . using System.Collections.Generic; +using UniversalEditor.DataFormats.CompoundDocument; using UniversalEditor.DataFormats.FileSystem.Microsoft.CompoundDocument; +using UniversalEditor.ObjectModels.CompoundDocument; using UniversalEditor.ObjectModels.FileSystem; using UniversalEditor.ObjectModels.PropertyList; @@ -45,12 +47,12 @@ namespace UniversalEditor.DataFormats.PropertyList.Microsoft.VisualStudio protected override void BeforeLoadInternal(Stack objectModels) { base.BeforeLoadInternal(objectModels); - objectModels.Push(new FileSystemObjectModel()); + objectModels.Push(new CompoundDocumentObjectModel()); } protected override void AfterLoadInternal(Stack objectModels) { base.AfterLoadInternal(objectModels); - FileSystemObjectModel fsom = (objectModels.Pop() as FileSystemObjectModel); + CompoundDocumentObjectModel fsom = (objectModels.Pop() as CompoundDocumentObjectModel); PropertyListObjectModel plom = (objectModels.Pop() as PropertyListObjectModel); for (int i = 0; i < fsom.Files.Count; i++ ) @@ -61,7 +63,7 @@ namespace UniversalEditor.DataFormats.PropertyList.Microsoft.VisualStudio base.BeforeSaveInternal(objectModels); PropertyListObjectModel plom = (objectModels.Pop() as PropertyListObjectModel); - FileSystemObjectModel fsom = new FileSystemObjectModel(); + CompoundDocumentObjectModel fsom = new CompoundDocumentObjectModel(); diff --git a/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/CompoundDocument/CompoundDocumentDataFormat.cs b/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/CompoundDocument/CompoundDocumentDataFormat.cs new file mode 100644 index 00000000..7a398111 --- /dev/null +++ b/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/CompoundDocument/CompoundDocumentDataFormat.cs @@ -0,0 +1,30 @@ +// +// CompoundDocumentDataFormat.cs +// +// Author: +// Michael Becker +// +// Copyright (c) 2022 Mike Becker's Software +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +using System; +using UniversalEditor.DataFormats.FileSystem.Microsoft.CompoundDocument; + +namespace UniversalEditor.DataFormats.CompoundDocument +{ + public class CompoundDocumentDataFormat : CompoundDocumentBaseDataFormat + { + + } +} diff --git a/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/CompoundDocument/CompoundDocumentDataFormat.cs b/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/CompoundDocument/CompoundDocumentBaseDataFormat.cs similarity index 99% rename from Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/CompoundDocument/CompoundDocumentDataFormat.cs rename to Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/CompoundDocument/CompoundDocumentBaseDataFormat.cs index 21262783..a5b30759 100644 --- a/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/CompoundDocument/CompoundDocumentDataFormat.cs +++ b/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/CompoundDocument/CompoundDocumentBaseDataFormat.cs @@ -32,7 +32,7 @@ namespace UniversalEditor.DataFormats.FileSystem.Microsoft.CompoundDocument /// s that manipulate files based on the Microsoft Compound Document Format specification, such as those from older /// versions of Microsoft Office. /// - public class CompoundDocumentDataFormat : DataFormat + public class CompoundDocumentBaseDataFormat : DataFormat { private static DataFormatReference _dfr; protected override DataFormatReference MakeReferenceInternal() diff --git a/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Text/Formatted/DOC/DOCDataFormat.cs b/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Text/Formatted/DOC/DOCDataFormat.cs index 64b419ba..2892d8c8 100644 --- a/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Text/Formatted/DOC/DOCDataFormat.cs +++ b/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/Text/Formatted/DOC/DOCDataFormat.cs @@ -20,7 +20,9 @@ // along with this program. If not, see . using System.Collections.Generic; +using UniversalEditor.DataFormats.CompoundDocument; using UniversalEditor.DataFormats.FileSystem.Microsoft.CompoundDocument; +using UniversalEditor.ObjectModels.CompoundDocument; using UniversalEditor.ObjectModels.FileSystem; using UniversalEditor.ObjectModels.Text.Formatted; @@ -45,20 +47,20 @@ namespace UniversalEditor.DataFormats.Text.Formatted.DOC protected override void BeforeLoadInternal(Stack objectModels) { base.BeforeLoadInternal(objectModels); - objectModels.Push(new FileSystemObjectModel()); + objectModels.Push(new CompoundDocumentObjectModel()); } protected override void AfterLoadInternal(Stack objectModels) { base.AfterLoadInternal(objectModels); - FileSystemObjectModel fsom = (objectModels.Pop() as FileSystemObjectModel); + CompoundDocumentObjectModel fsom = (objectModels.Pop() as CompoundDocumentObjectModel); FormattedTextObjectModel ftom = (objectModels.Pop() as FormattedTextObjectModel); } protected override void BeforeSaveInternal(Stack objectModels) { FormattedTextObjectModel ftom = (objectModels.Pop() as FormattedTextObjectModel); - FileSystemObjectModel fsom = new FileSystemObjectModel(); + CompoundDocumentObjectModel fsom = new CompoundDocumentObjectModel(); diff --git a/Plugins/UniversalEditor.Plugins.Microsoft/ObjectModels/CompoundDocument/CompoundDocumentObjectModel.cs b/Plugins/UniversalEditor.Plugins.Microsoft/ObjectModels/CompoundDocument/CompoundDocumentObjectModel.cs new file mode 100644 index 00000000..249076c3 --- /dev/null +++ b/Plugins/UniversalEditor.Plugins.Microsoft/ObjectModels/CompoundDocument/CompoundDocumentObjectModel.cs @@ -0,0 +1,32 @@ +// +// CompoundDocumentObjectModel.cs +// +// Author: +// Michael Becker +// +// Copyright (c) 2022 Mike Becker's Software +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +using System; +using UniversalEditor.ObjectModels.FileSystem; + +namespace UniversalEditor.ObjectModels.CompoundDocument +{ + public class CompoundDocumentObjectModel : FileSystemObjectModel + { + public CompoundDocumentObjectModel() + { + } + } +} diff --git a/Plugins/UniversalEditor.Plugins.Microsoft/UniversalEditor.Plugins.Microsoft.csproj b/Plugins/UniversalEditor.Plugins.Microsoft/UniversalEditor.Plugins.Microsoft.csproj index e0f223b1..9c976a90 100644 --- a/Plugins/UniversalEditor.Plugins.Microsoft/UniversalEditor.Plugins.Microsoft.csproj +++ b/Plugins/UniversalEditor.Plugins.Microsoft/UniversalEditor.Plugins.Microsoft.csproj @@ -44,7 +44,7 @@ - + @@ -147,6 +147,8 @@ + + @@ -203,6 +205,8 @@ + +