Fix bug #4269

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

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index e33dffc3c0da0bf6621021948089475b03926415..04b57045b24d2fed98bea7c4bb1aa52359512deb 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -32,15 +32,15 @@ std::locale::id numpunct<lyx::char_type>::id;
 namespace std {
 // Implementation of numpunct<lyx::char_type> defined in numpunct_lyx_char_type.h
 typedef basic_string<lyx::char_type> string_type;
-       
+
 string_type numpunct<lyx::char_type>::truename() const
-{ 
-       return lyx::from_ascii(numpunct<char>::truename()); 
+{
+       return lyx::from_ascii(numpunct<char>::truename());
 }
-       
+
 string_type numpunct<lyx::char_type>::falsename() const
-{ 
-       return lyx::from_ascii(numpunct<char>::falsename()); 
+{
+       return lyx::from_ascii(numpunct<char>::falsename());
 }
 
 } // namespace std
@@ -281,7 +281,7 @@ private:
                                inbytesleft, to, outbytesleft);
                if (converted == (size_t)(-1)) {
                        switch(errno) {
-                       case 0: 
+                       case 0:
                                // As strange as it may seem, this
                                // does happen on windows when parsing
                                // comments with accented chars in
@@ -307,7 +307,7 @@ private:
        string encoding_;
 };
 
-} // namespace anon
+} // namespace
 
 
 namespace lyx {
@@ -334,6 +334,12 @@ ifdocstream::ifdocstream() : base()
 }
 
 
+ifdocstream::ifdocstream(SetEnc const & enc) : base()
+{
+       setEncoding(*this, enc.encoding, in);
+}
+
+
 ifdocstream::ifdocstream(const char* s, ios_base::openmode mode,
                         string const & encoding)
        : base()
@@ -349,6 +355,12 @@ ofdocstream::ofdocstream(): base()
 }
 
 
+ofdocstream::ofdocstream(SetEnc const & enc) : base()
+{
+       setEncoding(*this, enc.encoding, out);
+}
+
+
 ofdocstream::ofdocstream(const char* s, ios_base::openmode mode,
                         string const & encoding)
        : base()
@@ -435,7 +447,7 @@ odocstream & operator<<(odocstream & os, char c)
 }
 #endif
 
-}
+} // namespace lyx
 
 
 #if ! defined(USE_WCHAR_T) && defined(__GNUC__)