This doesn't return a reference any more.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 32afe035e67c28da44836546645933fce4f80ecc..154263e42be7f0b35af00eb1dfde072656ad83c8 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -65,8 +65,8 @@ string const dvipdfm_options(BufferParams const & bp)
        string result;
 
        if (bp.papersize != PAPER_CUSTOM) {
-               string const paper_size = bp.paperSizeName();
-               if (paper_size != "b5" && paper_size != "foolscap")
+               string const paper_size = bp.paperSizeName(BufferParams::DVIPDFM);
+               if (!paper_size.empty())
                        result = "-p "+ paper_size;
 
                if (bp.orientation == ORIENTATION_LANDSCAPE)
@@ -496,8 +496,8 @@ bool Converters::move(string const & fmt,
        string const to_base = removeExtension(to.absFilename());
        string const to_extension = getExtension(to.absFilename());
 
-       FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
-       for (FileNameList::const_iterator it = files.begin();
+       support::FileNameList const files = FileName(path).dirList(getExtension(from.absFilename()));
+       for (support::FileNameList::const_iterator it = files.begin();
             it != files.end(); ++it) {
                string const from2 = it->absFilename();
                string const file2 = onlyFilename(from2);