backport fix for bug #7013

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40606 a592a061-630c-0410-9148-cb99ea01b6c8

src/BufferParams.cpp

@@ -2552,6 +2552,14 @@ string const BufferParams::dvips_options() const
 {
 	string result;
 
+	// If the class loads the geometry package, we do not know which
+	// paper size is used, since we do not set it (bug 7013).
+	// Therefore we must not specify any argument here.
+	// dvips gets the correct paper size via DVI specials in this case
+	// (if the class uses the geometry package correctly).
+	if (documentClass().provides("geometry"))
+		return result;
+
 	if (use_geometry
 	    && papersize == PAPER_CUSTOM
 	    && !lyxrc.print_paper_dimension_flag.empty()

status.20x

@@ -123,6 +123,8 @@ What's new
 - Fix python problem with common path prefixes when exporting a LyX archive
   (bug 7933).
 
+- Fix dvips paper size arguments for presentations (beamer etc) (bug 7013).
+
 
 * TEX2LYX