diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 14:16:09 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-04-24 14:16:09 +0000 |
| commit | 9ba1d66d83e9e5a0205ca2379c63d2e55d1d07c8 (patch) | |
| tree | bb553e390ccca80e254b033c3bd6972193d2a6b1 /svx | |
| parent | 6c5b1a3d21134904b321002d466ab730d1fb8e29 (diff) | |
INTEGRATION: CWS aw055 (1.39.270); FILE MERGED
2008/02/12 14:13:56 aw 1.39.270.1: #i81809# maximum paper width/height fix
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/page.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/dialog/page.cxx b/svx/source/dialog/page.cxx index db1d2fb45f95..73576881a0d5 100644 --- a/svx/source/dialog/page.cxx +++ b/svx/source/dialog/page.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: page.cxx,v $ - * $Revision: 1.40 $ + * $Revision: 1.41 $ * * This file is part of OpenOffice.org. * @@ -423,10 +423,10 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : // #i4219# take Maximum now from configuration (1/100th cm) // was: 11900 -> 119 cm ;new value 3 meters -> 300 cm -> 30000 - aPaperWidthEdit.SetMax(aDrawinglayerOpt.GetMaximumPaperWidth()); - aPaperWidthEdit.SetLast(aDrawinglayerOpt.GetMaximumPaperWidth()); - aPaperHeightEdit.SetMax(aDrawinglayerOpt.GetMaximumPaperHeight()); - aPaperHeightEdit.SetLast(aDrawinglayerOpt.GetMaximumPaperHeight()); + aPaperWidthEdit.SetMax(aPaperWidthEdit.Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FUNIT_CM); + aPaperWidthEdit.SetLast(aPaperWidthEdit.Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FUNIT_CM); + aPaperHeightEdit.SetMax(aPaperHeightEdit.Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); + aPaperHeightEdit.SetLast(aPaperHeightEdit.Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); // #i4219# also for margins (1/100th cm). Was: 9999, keeping. aLeftMarginEdit.SetMax(aDrawinglayerOpt.GetMaximumPaperLeftMargin()); |