summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-08-16 10:52:29 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-18 17:59:18 +0200
commit83d8cd6067da522ce107a5b68a4cf2f81f84f881 (patch)
tree0d75c10d302272277afaca5f33c475307f5f9252 /src/gui/text/qtextengine.cpp
parent4b6fe1bdc8018ee6d76a70929e39e52518c3dc1c (diff)
Fix bidi reordering of RTL text with embedded images
According to the UBA, the object replacement character should be considered ON. There's no reason to special case its directionality, as the bidi algorithm will already have given it an implicit directionality. Task-number: QTBUG-20910 Reviewed-by: Lars (cherry picked from commit 2657bfa7c4de9f114331d1714a306b3999ae30d8) Change-Id: I1c8e45d67ef44b1b6f96edb2f5074331b5422eb7 Reviewed-on: http://codereview.qt.nokia.com/2999 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
-rw-r--r--src/gui/text/qtextengine.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index e327ac14f0..f7b7aa28a1 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1534,8 +1534,6 @@ void QTextEngine::itemize() const
while (uc < e) {
switch (*uc) {
case QChar::ObjectReplacementCharacter:
- if (analysis->bidiLevel % 2)
- --analysis->bidiLevel;
analysis->script = QUnicodeTables::Common;
analysis->flags = QScriptAnalysis::Object;
break;