From 785b9fcdbe9f3df2041004e6d23c3dab47f5b98c Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Wed, 6 Feb 2013 12:06:35 +0100
Subject: [PATCH] [spellcheck] Fixed replacing words in multiple lines text.

---
 src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.ui | 2 +-
 src/lib/plugins/qtwebkit/spellcheck/speller.cpp         | 4 +---
 tests/form.html                                         | 4 ++++
 translations/empty.ts                                   | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.ui b/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.ui
index 18fa22c44..cf8af56d7 100644
--- a/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.ui
+++ b/src/lib/plugins/qtwebkit/spellcheck/spellcheckdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dictionary path&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;b&gt;Dictionary path&lt;/b&gt;</string>
      </property>
     </widget>
    </item>
diff --git a/src/lib/plugins/qtwebkit/spellcheck/speller.cpp b/src/lib/plugins/qtwebkit/spellcheck/speller.cpp
index cffae60be..af910ddc8 100644
--- a/src/lib/plugins/qtwebkit/spellcheck/speller.cpp
+++ b/src/lib/plugins/qtwebkit/spellcheck/speller.cpp
@@ -221,11 +221,9 @@ void Speller::replaceWord()
 
         text.replace(m_startPos, m_endPos - m_startPos, word);
         text.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
+        text.replace(QLatin1Char('\n'), QLatin1String("\\n"));
         text.replace(QLatin1Char('\''), QLatin1String("\\'"));
 
-        word.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
-        word.replace(QLatin1Char('\''), QLatin1String("\\'"));
-
         m_element.evaluateJavaScript(QString("this.value='%1'").arg(text));
         m_element.evaluateJavaScript(QString("this.selectionStart=this.selectionEnd=%1").arg(cursorPos));
     }
diff --git a/tests/form.html b/tests/form.html
index c6013b162..2d2b5b9b6 100644
--- a/tests/form.html
+++ b/tests/form.html
@@ -8,6 +8,10 @@
 <form action="http://www.qupzilla.com/" method="post">
     Username: <input type="text" name="user" /><br/>
     Password: <input type="password" name="pass" />
+    <br/>
+    Text:
+    <textarea cols="50" rows="6" spellcheck="yes"></textarea>
+    <br/>
     <input type="submit" value="Send" />
   </form>
 <p>
diff --git a/translations/empty.ts b/translations/empty.ts
index a030cc200..69aad66aa 100644
--- a/translations/empty.ts
+++ b/translations/empty.ts
@@ -4247,10 +4247,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>SpellCheck</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dictionary path&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Change...</source>
         <translation type="unfinished"></translation>
@@ -4283,6 +4279,10 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>Add new word:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Dictionary path&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Speller</name>