fix the output of custom paper sizes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@8200 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2003-12-05 10:00:19 +00:00
parent 0c326c6694
commit 9bf25694b9
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2003-12-05 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QDocument.C: use geometry on custom, A3, B3 and B4
papersizes.
2003-11-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* ui/QMathDialogBase.ui: remove mention of \frac in tooltip, since

View File

@ -306,6 +306,10 @@ void QDocument::apply()
params.papersize2 =
dialog_->paperModule->papersizeCO->currentItem();
// custom, A3, B3 and B4 paper sizes need geometry
int psize = dialog_->paperModule->papersizeCO->currentItem();
bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
params.paperwidth = widgetsToLength(dialog_->paperModule->paperwidthLE,
dialog_->paperModule->paperwidthUnitCO);
@ -329,7 +333,8 @@ void QDocument::apply()
// margins
params.use_geometry =
(dialog_->marginsModule->marginCO->currentItem() == 1);
(dialog_->marginsModule->marginCO->currentItem() == 1
|| geom_papersize);
int margin = dialog_->marginsModule->marginCO->currentItem();
if (margin > 0) {