cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / ispell.C

diff --git a/src/ispell.C b/src/ispell.C
index cdef2fb907acef9cf7565b763bb704ec4a0a663d..8a134c8624935de7cd093094f1dd7c3b4cdccddc 100644 (file)
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -32,6 +32,8 @@
 # include <sys/time.h>
 #endif
 
+using lyx::docstring;
+
 using boost::shared_ptr;
 
 #ifndef CXX_GLOBAL_CSTD
@@ -244,7 +246,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
        child_.reset(li);
        if (li->start() == -1) {
                error_ = _("Could not create an ispell process.\nYou may not have "
-                       "the right languages installed.");
+                                       "the right languages installed.");
                child_.reset(0);
                return;
        }
@@ -262,11 +264,11 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
                }
 
                /* must have read something from stderr */
-               error_ = buf;
+               error_ =lyx::from_utf8(buf);
        } else {
                // select returned error
                error_ = _("The ispell process returned an error.\nPerhaps "
-                               "it has been configured wrongly ?");
+                          "it has been configured wrongly ?");
        }
 
        close(pipein[0]);
@@ -379,7 +381,7 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
        }
 
        if (err_read) {
-               error_ = buf;
+               error_ = lyx::from_utf8(buf);
                return UNKNOWN_WORD;
        }
 
@@ -444,7 +446,7 @@ void ISpell::accept(WordLangTuple const & word)
 }
 
 
-string const ISpell::error()
+docstring const ISpell::error()
 {
        return error_;
 }