From 930ba91ec1e63067c2ad79eb8d18ff56b78aa500 Mon Sep 17 00:00:00 2001 From: mae Date: Thu, 24 Sep 2009 15:17:08 +0200 Subject: QTextDocument initial revision after setPlainText/setHtml After separating document revisions from the undo stack, the initial revision after setText/setHtml could get to high. Now it's +1 from the previous revision --- src/gui/text/qtextdocument.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 5540958..a8956b8 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1096,8 +1096,10 @@ void QTextDocument::setPlainText(const QString &text) Q_D(QTextDocument); bool previousState = d->isUndoRedoEnabled(); d->enableUndoRedo(false); + d->beginEditBlock(); d->clear(); QTextCursor(this).insertText(text); + d->endEditBlock(); d->enableUndoRedo(previousState); } @@ -1123,8 +1125,10 @@ void QTextDocument::setHtml(const QString &html) Q_D(QTextDocument); bool previousState = d->isUndoRedoEnabled(); d->enableUndoRedo(false); + d->beginEditBlock(); d->clear(); QTextHtmlImporter(this, html, QTextHtmlImporter::ImportToDocument).import(); + d->endEditBlock(); d->enableUndoRedo(previousState); } -- cgit v0.12