Remove the unused default parameter of Buffer::doExport().

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 168e63b0144616ee8f858fb5376561f73c8afa3c..81d777c40026971fa7ebe79cafdce962020ddb21 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1224,7 +1224,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
        // http://www.tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf
        // !! To use the Fix-cm package, load it before \documentclass, and use the command
        // \RequirePackage to do so, rather than the normal \usepackage
-       // Do not to load any other package before the document class, unless you
+       // Do not try to load any other package before the document class, unless you
        // have a thorough understanding of the LATEX internals and know exactly what you
        // are doing!
        if (features.mustProvide("fix-cm"))
@@ -1560,59 +1560,8 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
                case PAPER_JISB6:
                        ods << ",b6j";
                        break;
-               default:
-                       // default papersize ie PAPER_DEFAULT
-                       switch (lyxrc.default_papersize) {
-                       case PAPER_DEFAULT: // keep compiler happy
-                               break;
-                       case PAPER_USLETTER:
-                               ods << ",letterpaper";
-                               break;
-                       case PAPER_USLEGAL:
-                               ods << ",legalpaper";
-                               break;
-                       case PAPER_USEXECUTIVE:
-                               ods << ",executivepaper";
-                               break;
-                       case PAPER_A3:
-                               ods << ",a3paper";
-                               break;
-                       case PAPER_A4:
-                               ods << ",a4paper";
-                               break;
-                       case PAPER_A5:
-                               ods << ",a5paper";
-                               break;
-                       case PAPER_B5:
-                               ods << ",b5paper";
-                               break;
-                       case PAPER_A0:
-                       case PAPER_A1:
-                       case PAPER_A2:
-                       case PAPER_A6:
-                       case PAPER_B0:
-                       case PAPER_B1:
-                       case PAPER_B2:
-                       case PAPER_B3:
-                       case PAPER_B4:
-                       case PAPER_B6:
-                       case PAPER_C0:
-                       case PAPER_C1:
-                       case PAPER_C2:
-                       case PAPER_C3:
-                       case PAPER_C4:
-                       case PAPER_C5:
-                       case PAPER_C6:
-                       case PAPER_JISB0:
-                       case PAPER_JISB1:
-                       case PAPER_JISB2:
-                       case PAPER_JISB3:
-                       case PAPER_JISB4:
-                       case PAPER_JISB5:
-                       case PAPER_JISB6:
-                       case PAPER_CUSTOM:
-                               break;
-                       }
+               case PAPER_DEFAULT:
+                       break;
                }
                docstring const g_options = trim(ods.str(), ",");
                os << "\\usepackage";
@@ -1717,6 +1666,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 
        // Now insert the LyX specific LaTeX commands...
        docstring lyxpreamble;
+       features.resolveAlternatives();
 
        if (output_sync) {
                if (!output_sync_macro.empty())
@@ -2404,11 +2354,7 @@ void BufferParams::readIncludeonly(Lexer & lex)
 
 string BufferParams::paperSizeName(PapersizePurpose purpose) const
 {
-       char real_papersize = papersize;
-       if (real_papersize == PAPER_DEFAULT)
-               real_papersize = lyxrc.default_papersize;
-
-       switch (real_papersize) {
+       switch (papersize) {
        case PAPER_DEFAULT:
                // could be anything, so don't guess
                return string();