make it compile again

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16211 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/pspell.C b/src/pspell.C
index cd03873b4440ae13ca9fd192ba683580608b2013..9d876c1ff825452f0b18bcfd7929fb81d2c987a0 100644 (file)
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -27,8 +27,6 @@ extern "C" {
 
 namespace lyx {
 
-using docstring;
-
 using std::endl;
 using std::string;
 
@@ -155,8 +153,9 @@ docstring const PSpell::error()
        }
 
        if (err)
-               return err;
-       return "";
+               // FIXME UNICODE: err is not in UTF8, but probably the locale encoding
+               return from_utf8(err);
+       return docstring();
 }
 
 

diff --git a/src/pspell.h b/src/pspell.h
index 0080348797d1762726762a8628615464f37136b5..7d2cfc14efbb858f6df7c5d11d2702a4f47aaaef 100644 (file)
--- a/src/pspell.h
+++ b/src/pspell.h
@@ -18,13 +18,13 @@
 #include <map>
 
 
-namespace lyx {
-
 class PspellManager;
 class PspellStringEmulation;
 class PspellCanHaveError;
 class PspellConfig;
 
+namespace lyx {
+
 class BufferParams;