commit 3e06873d124c9f8f4cd2e5f5d619de3c99ca09bf
author Xisco Fauli <xiscofauli@libreoffice.org> Thu Dec 13 14:19:01 2018 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Thu Dec 13 17:23:55 2018 +0100
tree 38366748c7b05a8822f37a9b40bd04d4ad757701
parent c94ae40267ae3352e95911bcd1fb9f12f4a714a0

tdf#116529: Add calls to SetFieldUnit to switch inch/cm

Change-Id: I96208c01deb75cc9e1a5af7a15d7bc94afd28021
Reviewed-on: https://gerrit.libreoffice.org/65105
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

sw/source/uibase/sidebar/PageMarginControl.cxx

diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 984c7d8..8ce3af4 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -188,16 +188,20 @@
    Link<Edit&,void> aLinkLR = LINK( this, PageMarginControl, ModifyLRMarginHdl );
    m_pLeftMarginEdit->SetModifyHdl( aLinkLR );
    SetMetricValue( *m_pLeftMarginEdit.get(), m_nPageLeftMargin, m_eUnit );
    SetFieldUnit( *m_pLeftMarginEdit.get(), lcl_GetFieldUnit() );

    m_pRightMarginEdit->SetModifyHdl( aLinkLR );
    SetMetricValue( *m_pRightMarginEdit.get(), m_nPageRightMargin, m_eUnit );
    SetFieldUnit( *m_pRightMarginEdit.get(), lcl_GetFieldUnit() );

    Link<Edit&,void> aLinkUL = LINK( this, PageMarginControl, ModifyULMarginHdl );
    m_pTopMarginEdit->SetModifyHdl( aLinkUL );
    SetMetricValue( *m_pTopMarginEdit.get(), m_nPageTopMargin, m_eUnit );
    SetFieldUnit( *m_pTopMarginEdit.get(), lcl_GetFieldUnit() );

    m_pBottomMarginEdit->SetModifyHdl( aLinkUL );
    SetMetricValue( *m_pBottomMarginEdit.get(), m_nPageBottomMargin, m_eUnit );
    SetFieldUnit( *m_pBottomMarginEdit.get(), lcl_GetFieldUnit() );

    m_aPageSize = pSize->GetSize();
    SetMetricFieldMaxValues( m_aPageSize );