[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/sidebar/PageMarginControl.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit b41e256f3ed994338546bbac2a85b223ce802fce
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Dec 13 14:19:01 2018 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Dec 13 20:39:53 2018 +0100

    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 at redhat.com>
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 3e06873d124c9f8f4cd2e5f5d619de3c99ca09bf)
    Reviewed-on: https://gerrit.libreoffice.org/65116

diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 984c7d8cde2b..8ce3af41a5eb 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -188,16 +188,20 @@ PageMarginControl::PageMarginControl( sal_uInt16 nId, vcl::Window* pParent )
     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 );