From 8df9fdee642e3588c5c33a29a07766865d1f0e38 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Fri, 4 Feb 2011 08:28:36 +0000
Subject: [PATCH] Don't pass the letterpaper option to the geometry package
 when using default paper format and margins are explicitly set.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37485 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BufferParams.cpp | 1 +
 status.16x           | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index c7d1f1d2a9..9d7c0b8b72 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1181,6 +1181,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 			// default papersize ie PAPER_DEFAULT
 			switch (lyxrc.default_papersize) {
 			case PAPER_DEFAULT: // keep compiler happy
+				break;
 			case PAPER_USLETTER:
 				ods << ",letterpaper";
 				break;
diff --git a/status.16x b/status.16x
index 0adba89e9d..81b764a0d5 100644
--- a/status.16x
+++ b/status.16x
@@ -84,6 +84,9 @@ What's new
 
 - Letter class: Support Quote, Quotation and Separator.
 
+- Don't pass the letterpaper option to the geometry package when using
+  default paper format and margins are explicitly set.
+
 
 * USER INTERFACE