From 0b76f7ee3f7ac7c37c62b4d91307a20d9faca01a Mon Sep 17 00:00:00 2001 From: Rishabh Kumar Date: Tue, 10 Mar 2015 08:33:53 +0530 Subject: tdf#86787: Page style margin limited to 99.99mm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Normailizes MarginEdit before assigning values to SetMax and SetLast Change-Id: I2aa1eca75c36e8dd4ac5905b49d6802b5c763f85 Reviewed-on: https://gerrit.libreoffice.org/14821 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/tabpages/page.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 80880c6b2689..d321103297d0 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -354,14 +354,14 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr m_pPaperHeightEdit->SetLast(m_pPaperHeightEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); // #i4219# also for margins (1/100th cm). Was: 9999, keeping. - m_pLeftMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperLeftMargin()); - m_pLeftMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperLeftMargin()); - m_pRightMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperRightMargin()); - m_pRightMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperRightMargin()); - m_pTopMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperTopMargin()); - m_pTopMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperTopMargin()); - m_pBottomMarginEdit->SetMax(aDrawinglayerOpt.GetMaximumPaperBottomMargin()); - m_pBottomMarginEdit->SetLast(aDrawinglayerOpt.GetMaximumPaperBottomMargin()); + m_pLeftMarginEdit->SetMax(m_pLeftMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()), FUNIT_MM); + m_pLeftMarginEdit->SetLast(m_pLeftMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()), FUNIT_MM); + m_pRightMarginEdit->SetMax(m_pRightMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()), FUNIT_MM); + m_pRightMarginEdit->SetLast(m_pRightMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()), FUNIT_MM); + m_pTopMarginEdit->SetMax(m_pTopMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()), FUNIT_MM); + m_pTopMarginEdit->SetLast(m_pTopMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()), FUNIT_MM); + m_pBottomMarginEdit->SetMax(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); + m_pBottomMarginEdit->SetLast(m_pBottomMarginEdit->Normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); m_pPortraitBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); m_pLandscapeBtn->SetAccessibleRelationMemberOf(m_pOrientationFT); -- cgit v1.2.1