diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-14 09:33:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-14 09:33:55 (GMT) |
| commit | eb6d5d51a932ab61d094e8de5c119d75380c788a (patch) | |
| tree | d0b09ae72d5a490268e813640ad3a46dafbff86b /src/gui/text | |
| parent | ea0963bde7fb9f1486dd157f43955a11024d3e7d (diff) | |
| parent | 82f32ef0e4e744276a011e30ce99aafa341ea816 (diff) | |
| download | Qt-eb6d5d51a932ab61d094e8de5c119d75380c788a.zip Qt-eb6d5d51a932ab61d094e8de5c119d75380c788a.tar.gz Qt-eb6d5d51a932ab61d094e8de5c119d75380c788a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix alignment value not handled in ODF
Silence a compiler warning about unhandled enum in switch
Silence the "array out of bounds" warning in GCC 4.6.
Silence the callgrind warnings in our source code when using gcc 4.6
Create a function that merges the SSE common code
Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextodfwriter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index 1619c9c..2addc0f 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -591,6 +591,7 @@ void QTextOdfWriter::writeCharacterFormat(QXmlStreamWriter &writer, QTextCharFor QString value; switch (format.verticalAlignment()) { case QTextCharFormat::AlignMiddle: + case QTextCharFormat::AlignBaseline: case QTextCharFormat::AlignNormal: value = QString::fromLatin1("0%"); break; case QTextCharFormat::AlignSuperScript: value = QString::fromLatin1("super"); break; case QTextCharFormat::AlignSubScript: value = QString::fromLatin1("sub"); break; |