fix nullstream also in pch files

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 89b7b5191519b92996b12814001ec5ee416c6f3a..a70fd8ae0150300de5302965599ca538f818fa98 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -211,7 +211,7 @@ void LyXRC::setDefaults() {
        document_path.erase();
        tempdir_path = "/tmp";
        view_dvi_paper_option.erase();
-       default_papersize = PAPER_USLETTER;
+       default_papersize = PAPER_DEFAULT;
        custom_export_format = "ps";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
        bibtex_command = "bibtex";
@@ -586,6 +586,9 @@ int LyXRC::read(LyXLex & lexrc)
                                else if (size == "b5")
                                        default_papersize =
                                                PAPER_B5;
+                               else if (size == "default")
+                                       default_papersize =
+                                               PAPER_DEFAULT;
                        }
                        break;
 
@@ -1297,6 +1300,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                        os << "# The default papersize to use.\n"
                           << "\\default_papersize \"";
                        switch (default_papersize) {
+                       case PAPER_DEFAULT:
+                               os << "default"; break;
                        case PAPER_USLETTER:
                                os << "usletter"; break;
                        case PAPER_USLEGAL:
@@ -1311,7 +1316,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                                os << "a5"; break;
                        case PAPER_B5:
                                os << "b5"; break;
-                       case PAPER_DEFAULT: break;
+                       case PAPER_CUSTOM:
+                       case PAPER_B3:
+                       case PAPER_B4: break;
                        }
                        os << "\"\n";
                }