diff options
| -rw-r--r-- | src/gui/text/qtextdocumentfragment.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp index 3bd1e2a801..896ba5c211 100644 --- a/src/gui/text/qtextdocumentfragment.cpp +++ b/src/gui/text/qtextdocumentfragment.cpp @@ -1142,7 +1142,7 @@ QTextHtmlImporter::ProcessNodeResult QTextHtmlImporter::processBlockNode() } if (hasBlock) { QTextBlockFormat fmt; - fmt.setIndent(0); + fmt.setIndent(currentNode->blockFormat.indent()); cursor.mergeBlockFormat(fmt); } } diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index 4274753c37..0664cd4e61 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -87,6 +87,7 @@ private slots: void html_listIndents4(); void html_listIndents5(); void html_listIndents6(); + void html_listIndents7(); void blockCharFormat(); void blockCharFormatCopied(); void initialBlock(); @@ -756,6 +757,18 @@ void tst_QTextDocumentFragment::html_listIndents6() QCOMPARE(cursor.blockFormat().indent(), 0); } +void tst_QTextDocumentFragment::html_listIndents7() +{ + const char html[] = "<ul><li style=\"-qt-block-indent:1;\">Hey</ul>"; + setHtml(QString::fromLatin1(html)); + cursor.movePosition(QTextCursor::Start); + cursor.movePosition(QTextCursor::NextBlock); + QTextList *list = cursor.currentList(); + QVERIFY(list); + QCOMPARE(list->format().indent(), 1); + QCOMPARE(cursor.block().blockFormat().indent(), 1); +} + void tst_QTextDocumentFragment::blockCharFormat() { const char html[] = "<p style=\"font-style:italic\"><span style=\"font-style:normal\">Test</span></p>"; |