Use unsigned values for enum

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 3952c86845bd9b2251abb6244b739dae6358dd42..22793ecb997c75b96942363b33794efb3a1d309d 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1635,7 +1635,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
                || find(classpsizes.begin(), classpsizes.end(), string_papersize[papersize]) != classpsizes.end();
 
        if ((!use_geometry || features.isProvided("geometry-light"))
-           && class_supported_papersize)
+           && class_supported_papersize && papersize != PAPER_DEFAULT)
                clsoptions << subst(tclass.pagesizeformat(), "$$s", string_papersize[papersize]) << ",";
 
        // if needed
@@ -2935,12 +2935,12 @@ void BufferParams::readIncludeonly(Lexer & lex)
 }
 
 
-string BufferParams::paperSizeName(PapersizePurpose purpose, string const psize) const
+string BufferParams::paperSizeName(PapersizePurpose purpose, string const & psize) const
 {
        PAPER_SIZE ppsize = psize.empty() ? papersize : papersizetranslator().find(psize);
        switch (ppsize) {
        case PAPER_DEFAULT:
-               if (documentClass().pagesize() == "custom")
+               if (documentClass().pagesize() == "default")
                        // could be anything, so don't guess
                        return string();
                return paperSizeName(purpose, documentClass().pagesize());