Mercurial > hg > svcore
changeset 603:e43368ec5ff0
* Fix session save bug reported by Jeff Smith (entities not encoded in
label attributes for points in layers)
| author | Chris Cannam |
|---|---|
| date | Tue, 08 Sep 2009 11:27:26 +0000 |
| parents | 02d9664906e8 |
| children | 4541581067f3 |
| files | data/model/SparseOneDimensionalModel.h data/model/SparseTimeValueModel.h data/model/WritableWaveFileModel.cpp |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/data/model/SparseOneDimensionalModel.h Mon Aug 24 16:07:23 2009 +0000 +++ b/data/model/SparseOneDimensionalModel.h Tue Sep 08 11:27:26 2009 +0000 @@ -40,7 +40,8 @@ QString extraAttributes = "") const { stream << QString("%1<point frame=\"%2\" label=\"%3\" %4/>\n") - .arg(indent).arg(frame).arg(label).arg(extraAttributes); + .arg(indent).arg(frame).arg(XmlExportable::encodeEntities(label)) + .arg(extraAttributes); } QString toDelimitedDataString(QString delimiter, size_t sampleRate) const
--- a/data/model/SparseTimeValueModel.h Mon Aug 24 16:07:23 2009 +0000 +++ b/data/model/SparseTimeValueModel.h Tue Sep 08 11:27:26 2009 +0000 @@ -45,7 +45,8 @@ QString extraAttributes = "") const { stream << QString("%1<point frame=\"%2\" value=\"%3\" label=\"%4\" %5/>\n") - .arg(indent).arg(frame).arg(value).arg(label).arg(extraAttributes); + .arg(indent).arg(frame).arg(value).arg(XmlExportable::encodeEntities(label)) + .arg(extraAttributes); } QString toDelimitedDataString(QString delimiter, size_t sampleRate) const
--- a/data/model/WritableWaveFileModel.cpp Mon Aug 24 16:07:23 2009 +0000 +++ b/data/model/WritableWaveFileModel.cpp Tue Sep 08 11:27:26 2009 +0000 @@ -234,6 +234,7 @@ Model::toXml (out, indent, QString("type=\"writablewavefile\" file=\"%1\" channels=\"%2\" %3") - .arg(m_writer->getPath()).arg(m_model->getChannelCount()).arg(extraAttributes)); + .arg(encodeEntities(m_writer->getPath())) + .arg(m_model->getChannelCount()).arg(extraAttributes)); }