fix for mixing up SchemeVersion and FileVersion

This commit is contained in:
wmayer
2017-07-06 17:59:01 +02:00
parent cf01dd18ab
commit 2f5ff3186c
2 changed files with 2 additions and 1 deletions

View File

@@ -320,7 +320,7 @@ void Base::XMLReader::readFiles(zipios::ZipInputStream &zipstream) const
// no file name for the current entry in the zip was registered.
if (jt != FileList.end()) {
try {
Base::Reader reader(zipstream, jt->FileName, DocumentSchema);
Base::Reader reader(zipstream, jt->FileName, FileVersion);
jt->Object->RestoreDocFile(reader);
}
catch(...) {

View File

@@ -781,6 +781,7 @@ void Document::RestoreDocFile(Base::Reader &reader)
xmlReader.readElement("Document");
long scheme = xmlReader.getAttributeAsInteger("SchemaVersion");
xmlReader.DocumentSchema = scheme;
// At this stage all the document objects and their associated view providers exist.
// Now we must restore the properties of the view providers only.