diff options
author | Nils Jeisecke <jeisecke@saltation.de> | 2009-05-12 12:47:49 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-07-13 15:19:49 (GMT) |
commit | e15d415acbd426e58fb1e967eb331fe41488dfff (patch) | |
tree | 848a5a3fcdaee0a0fa1f1a1ccf1a3dc4a9a1afe0 /src/gui/text/qtextdocumentlayout.cpp | |
parent | f629c9caddb7ca921ad5af1c8607e059c30e39b0 (diff) | |
download | Qt-e15d415acbd426e58fb1e967eb331fe41488dfff.zip Qt-e15d415acbd426e58fb1e967eb331fe41488dfff.tar.gz Qt-e15d415acbd426e58fb1e967eb331fe41488dfff.tar.bz2 |
Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman for roman numbering of lists as supported by HTML/ODF
Reviewed-by: Olivier Goffart
Merge-request: 681
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
-rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 125d74c..f1d9091 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -1383,6 +1383,8 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p case QTextListFormat::ListDecimal: case QTextListFormat::ListLowerAlpha: case QTextListFormat::ListUpperAlpha: + case QTextListFormat::ListLowerRoman: + case QTextListFormat::ListUpperRoman: itemText = static_cast<QTextList *>(object)->itemText(bl); size.setWidth(fontMetrics.width(itemText)); size.setHeight(fontMetrics.height()); @@ -1426,7 +1428,9 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p switch (style) { case QTextListFormat::ListDecimal: case QTextListFormat::ListLowerAlpha: - case QTextListFormat::ListUpperAlpha: { + case QTextListFormat::ListUpperAlpha: + case QTextListFormat::ListLowerRoman: + case QTextListFormat::ListUpperRoman: { QTextLayout layout(itemText, font, q->paintDevice()); layout.setCacheEnabled(true); QTextOption option(Qt::AlignLeft | Qt::AlignAbsolute); |