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

[Pranam Lashkari (via logerrit)]

 sw/source/uibase/utlui/uitool.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b9e06e94090e49c55140e0304a093a2bc110c72d
Author:     Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Mon Sep 8 23:52:24 2025 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 17 12:27:27 2025 +0200

    lok: use locale units for all dialogs
    
    problem:
    in lok table dialog used inches when language was de
    but sidebar was set correctly to cm
    
    continues work from e2708fecb34fb4084f8db5f2c5ffb4d8923002ca
    
    Change-Id: I59b2aa28ec219c7298de6d0abd712617e9ddf7a6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190580
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit ca185af0838243290ee204f049923ef3bd39d236)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191019
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/utlui/uitool.cxx 
b/sw/source/uibase/utlui/uitool.cxx
index 88c66adb8310..ad053b8e81fb 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
+#include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
@@ -787,6 +788,8 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
 
 FieldUnit   GetDfltMetric(bool bWeb)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return SwModule::get()->GetFieldUnit();
     return SwModule::get()->GetUsrPref(bWeb)->GetMetric();
 }