* src/encoding.C (latexChar,read):

        * src/support/unicode.C (convert): do not forget to reset lyxerr to
        std::dec type of output.

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

diff --git a/src/encoding.C b/src/encoding.C
index 8fb89e1d80064ac7872e031344eef55fecd60ead..e2a7436f957928aee9948c2393d42d761c508645 100644 (file)
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -169,7 +169,8 @@ docstring const Encoding::latexChar(char_type c) const
                CharInfoMap::const_iterator const it = unicodesymbols.find(c);
                if (it == unicodesymbols.end())
                        lyxerr << "Could not find LaTeX command for character 0x"
-                              << std::hex << c << ".\nLaTeX export will fail."
+                              << std::hex << c << std::dec
+                              << ".\nLaTeX export will fail."
                               << endl;
                else
                        return it->second.command;
@@ -322,8 +323,9 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                                info.force = true;
                        else
                                lyxerr << "Ignoring unknown flag `" << flag
-                                      << "' for symbol `0x" << std::hex
-                                      << symbol << "'." << endl;
+                                      << "' for symbol `0x" 
+                                      << std::hex << symbol << std::dec 
+                                      << "'." << endl;
                }
 
                if (!info.preamble.empty())

diff --git a/src/support/unicode.C b/src/support/unicode.C
index a9d5a6a634a21a811201dce53b1c8d0fdb7abf80..6284e58cae881415b84b7ff64cb7f296f84da743 100644 (file)
--- a/src/support/unicode.C
+++ b/src/support/unicode.C
@@ -158,7 +158,7 @@ int IconvProcessor::convert(char const * buf, size_t buflen,
                                        *reinterpret_cast<unsigned char const *>(buf + i);
                                lyxerr << " 0x" << b;
                        }
-                       lyxerr << endl;
+                       lyxerr << std::dec << endl;
                        break;
                case EINVAL:
                        lyxerr << "EINVAL An incomplete multibyte sequence"
@@ -173,7 +173,7 @@ int IconvProcessor::convert(char const * buf, size_t buflen,
                                        *reinterpret_cast<unsigned char const *>(buf + i);
                                lyxerr << " 0x" << b;
                        }
-                       lyxerr << endl;
+                       lyxerr << std::dec << endl;
                        break;
                default:
                        lyxerr << "\tSome other error: " << errno << endl;