From 84bc1aa4b46958072b897d684bdf3d8e25b824a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Tue, 18 May 2010 21:08:06 +0000
Subject: [PATCH] GuiDocument.cpp: code simplifications; thanks Vincent

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34436 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiDocument.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 1bdec6849e..ddfed79a96 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1305,13 +1305,10 @@ void GuiDocument::setMargins()
 	if (extern_geometry) {
 		marginsModule->marginCB->setChecked(false);
 		setCustomMargins(true);
-		return;
+	} else {
+		marginsModule->marginCB->setChecked(!bp_.use_geometry);
+		setCustomMargins(!bp_.use_geometry);
 	}
-	bool custom = false;
-	if (bp_.use_geometry)
-		custom = true;
-	marginsModule->marginCB->setChecked(!custom);
-	setCustomMargins(!custom);
 }