From 5c80e7737b8960feb53bd32534b916e8428ade41 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Fri, 5 Dec 2003 16:17:46 +0000 Subject: [PATCH] fix the output of custom paper sizes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8207 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/QDocument.C | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index da54fef7cb..4e9571416f 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Juergen Spitzmueller + + * QDocument.C: use geometry on custom, A3, B3 and B4 + papersizes. + 2003-12-05 Angus Leeming * QVCLog.[Ch]: diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index cefd5ce5dd..af27a2c706 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -337,6 +337,10 @@ void QDocument::apply() params.papersize2 = VMARGIN_PAPER_TYPE( dialog_->pageLayoutModule->papersizeCO->currentItem()); + // custom, A3, B3 and B4 paper sizes need geometry + int psize = dialog_->pageLayoutModule->papersizeCO->currentItem(); + bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9); + params.paperwidth = widgetsToLength(dialog_->pageLayoutModule->paperwidthLE, dialog_->pageLayoutModule->paperwidthUnitCO); @@ -355,7 +359,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) { -- 2.39.5