From 954937fd331c4128a45764754f9379919b944598 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 10 Jun 2003 15:03:52 +0000 Subject: [PATCH] Compilation fix after Lars' changes ;-) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7141 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QDocument.C | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 54b24069f2..cc261b33c3 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2003-06-10 Angus Leeming + + * QDocument.C (apply): compilation fix after Lars' changes ;-) + 2003-06-10 Angus Leeming * QExternal.C (update_contents): show the help text when the dialog is diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 7951a4ba1d..f1f66258bf 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -337,8 +337,8 @@ void QDocument::apply() params.float_placement = dialog_->floatModule->get(); // paper - params.papersize2 = - dialog_->pageLayoutModule->papersizeCO->currentItem(); + params.papersize2 = static_cast + (dialog_->pageLayoutModule->papersizeCO->currentItem()); params.paperwidth = widgetsToLength(dialog_->pageLayoutModule->paperwidthLE, dialog_->pageLayoutModule->paperwidthUnitCO); @@ -364,7 +364,7 @@ void QDocument::apply() if (margin > 0) { margin = margin - 1; } - params.paperpackage = char(margin); + params.paperpackage = static_cast(margin); // set params.papersize from params.papersize2 // and params.paperpackage