Mercurial > hg > svcore

changeset 627:080d8bdd8762

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix failure to encode entities in label texts
author Chris Cannam
date Mon, 05 Jul 2010 11:54:19 +0000
parents 686fc1703a33
children 001db550bd48
files data/model/NoteModel.h data/model/RegionModel.h
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/NoteModel.h	Mon May 24 16:04:10 2010 +0000
+++ b/data/model/NoteModel.h	Mon Jul 05 11:54:19 2010 +0000
@@ -56,7 +56,8 @@
     {
 	stream <<
             QString("%1<point frame=\"%2\" value=\"%3\" duration=\"%4\" level=\"%5\" label=\"%6\" %7/>\n")
-	    .arg(indent).arg(frame).arg(value).arg(duration).arg(level).arg(label).arg(extraAttributes);
+	    .arg(indent).arg(frame).arg(value).arg(duration).arg(level)
+            .arg(XmlExportable::encodeEntities(label)).arg(extraAttributes);
     }
 
     QString toDelimitedDataString(QString delimiter, size_t sampleRate) const
--- a/data/model/RegionModel.h	Mon May 24 16:04:10 2010 +0000
+++ b/data/model/RegionModel.h	Mon Jul 05 11:54:19 2010 +0000
@@ -55,7 +55,8 @@
     {
 	stream <<
             QString("%1<point frame=\"%2\" value=\"%3\" duration=\"%4\" label=\"%5\" %6/>\n")
-	    .arg(indent).arg(frame).arg(value).arg(duration).arg(label).arg(extraAttributes);
+	    .arg(indent).arg(frame).arg(value).arg(duration)
+            .arg(XmlExportable::encodeEntities(label)).arg(extraAttributes);
     }
 
     QString toDelimitedDataString(QString delimiter, size_t sampleRate) const