[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdelibs-4.1-branch/kdeui/widgets
From:       Laurent Montel <montel () kde ! org>
Date:       2009-03-27 10:54:39
Message-ID: 1238151279.694952.19392.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 945363 by mlaurent:

Backport:
Don't lose html formatting when we cancel spellchecking


 M  +7 -1      ktextedit.cpp  


--- branches/kdepim/enterprise4/kdelibs-4.1-branch/kdeui/widgets/ktextedit.cpp #945362:945363
@@ -106,6 +106,7 @@
     bool checkSpellingEnabled : 1;
     bool findReplaceEnabled: 1;
     QString originalBuffer;
+    QString originalHtml;
     QString spellChechingConfigFileName;
     QString spellCheckingLanguage;
     Sonnet::Highlighter *highlighter;
@@ -119,7 +120,10 @@
 void KTextEdit::Private::spellCheckerCanceled()
 {
     parent->selectAll();
-    parent->setPlainText(originalBuffer);
+    if(parent->acceptRichText ())
+      parent->setHtml(originalHtml);
+    else
+      parent->setPlainText(originalBuffer);
     spellCheckerFinished();
 }
 
@@ -551,6 +555,8 @@
   connect(spellDialog, SIGNAL(languageChanged(const QString &)),
           this, SIGNAL(languageChanged(const QString &)));
   d->originalBuffer = toPlainText();
+  if(acceptRichText ())
+    d->originalHtml = toHtml();
   spellDialog->setBuffer(d->originalBuffer);
   spellDialog->show();
 }
[prev in list] [next in list] [prev in thread] [next in thread]