diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-06-20 08:40:01 (GMT) |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-06-20 08:46:30 (GMT) |
commit | cb760eaef631abd49836ae5c8dc12a61ef5eff0d (patch) | |
tree | f0c48c2f9a6b543592c7998a5663ea11c8232376 /src/gui/text/qtextdocumentfragment_p.h | |
parent | ee77ee5c25f58271e6f2863225d08573da86c3ee (diff) | |
download | Qt-cb760eaef631abd49836ae5c8dc12a61ef5eff0d.zip Qt-cb760eaef631abd49836ae5c8dc12a61ef5eff0d.tar.gz Qt-cb760eaef631abd49836ae5c8dc12a61ef5eff0d.tar.bz2 |
Fix empty lines in Qt HTML when displayed in external browsers (again)
This redoes f541c78e1bc5b293466b40e6f10496199a4a5d73 in a way which
should be more compliant with different browsers. In particular,
Outlook didn't support the CSS trick in the last fix, so we need the
somewhat larger patch which adds an extra line break node to the tree
and then ignores it when re-importing the document.
Task-number: QTBUG-3669
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/gui/text/qtextdocumentfragment_p.h')
-rw-r--r-- | src/gui/text/qtextdocumentfragment_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h index bfbec30..227123e 100644 --- a/src/gui/text/qtextdocumentfragment_p.h +++ b/src/gui/text/qtextdocumentfragment_p.h @@ -135,7 +135,7 @@ private: Table scanTable(int tableNodeIdx); - enum ProcessNodeResult { ContinueWithNextNode, ContinueWithCurrentNode }; + enum ProcessNodeResult { ContinueWithNextNode, ContinueWithCurrentNode, ContinueWithNextSibling }; void appendBlock(const QTextBlockFormat &format, QTextCharFormat charFmt = QTextCharFormat()); bool appendNodeText(); |