Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / support / docstream.cpp

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 82ec8dc54d270e25a9b85381db0599a647426abb..7777d1331585bea368e84ea109adc9293096028f 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -15,6 +15,7 @@
 
 #include <cerrno>
 #include <cstdio>
+#include <cstring>
 #include <iconv.h>
 #include <locale>
 
@@ -219,14 +220,14 @@ protected:
                    encoding_ == "GB" ||
                    encoding_ == "EUC-TW")
                        return 4;
-               else if (encoding_ == "EUC-JP")
+               else if (encoding_ == "EUC-JP" ||
+                        encoding_ == "ISO-2022-JP")
                        return 3;
                else if (encoding_ == "BIG5" ||
                         encoding_ == "EUC-KR" ||
                         encoding_ == "EUC-CN" ||
                         encoding_ == "SJIS" ||
-                        encoding_ == "GBK" ||
-                        encoding_ == "JIS" )
+                        encoding_ == "GBK")
                        return 2;
                else
                        return 1;