core.git: Branch 'distro/collabora/co-25.04' - sw/source

[Pranam Lashkari (via logerrit)]

 sw/source/uibase/sidebar/TableEditPanel.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1cdff82bfcbf9192ad6e477763e49d7fe3b7de3a
Author:     Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Fri May 23 03:47:33 2025 +0530
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun May 25 00:46:21 2025 +0200

    lok: use locale units in dialogs and table sidebar
    
    this patch updates fix for the dialog which were not fixed by 
e2708fecb34fb4084f8db5f2c5ffb4d8923002ca
    part 3
    
    Change-Id: Icae1254a6a6825ee7b4c78a28c9b8d328b7de4a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185694
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx 
b/sw/source/uibase/sidebar/TableEditPanel.cxx
index cee7dfeba5f7..30c6904d8443 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -188,7 +188,7 @@ void TableEditPanel::InitRowHeightToolitem()
     Link<weld::MetricSpinButton&, void> aLink = LINK(this, TableEditPanel, 
RowHeightMofiyHdl);
     m_aRowHeightEdit.connect_value_changed(aLink);
 
-    FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(false)->GetMetric();
+    FieldUnit eFieldUnit = SwModule::get()->GetFieldUnit();
     m_aRowHeightEdit.SetFieldUnit(eFieldUnit);
 
     m_aRowHeightEdit.set_min(MINLAY, FieldUnit::TWIP);
@@ -202,7 +202,7 @@ void TableEditPanel::InitColumnWidthToolitem()
     Link<weld::MetricSpinButton&, void> aLink = LINK(this, TableEditPanel, 
ColumnWidthMofiyHdl);
     m_aColumnWidthEdit.connect_value_changed(aLink);
 
-    FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(false)->GetMetric();
+    FieldUnit eFieldUnit = SwModule::get()->GetFieldUnit();
     m_aColumnWidthEdit.SetFieldUnit(eFieldUnit);
 
     m_aColumnWidthEdit.set_min(MINLAY, FieldUnit::TWIP);
@@ -229,7 +229,7 @@ void TableEditPanel::InitAlignmentControls()
     m_xAlignment->append(OUString::number(text::HoriOrientation::NONE),
                          SwResId(STR_TABLE_PANEL_ALIGN_MANUAL));
 
-    FieldUnit eFieldUnit = SwModule::get()->GetUsrPref(false)->GetMetric();
+    FieldUnit eFieldUnit = SwModule::get()->GetFieldUnit();
     m_aLeftSpacingEdit.SetFieldUnit(eFieldUnit);
     m_aRightSpacingEdit.SetFieldUnit(eFieldUnit);
 }