[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source

[Tamás Zolnai (via logerrit)]

 sfx2/source/control/unoctitm.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 0aee4f53bd9634d4a320578ab714f179bcc675e0
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Feb 5 11:33:26 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Feb 5 14:17:37 2020 +0100

    lok: writer: Convert row height / cloumn width to the correct unit.
    
    In online, the mobile wizad displayed these attributes in the wrong
    unit.
    
    Change-Id: I165a8ee17bebbbfd8962ac9addc89df39c77851a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88004
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 017ae620604de06414dc3f780804c241b87e45c6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88014
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7b8d6d101df8..b95ed01dc784 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1205,6 +1205,18 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
             }
         }
     }
+    else if (aEvent.FeatureURL.Path == "TableColumWidth" ||
+             aEvent.FeatureURL.Path == "TableRowHeight")
+    {
+        sal_Int32 nValue;
+        if (aEvent.State >>= nValue)
+        {
+            float nScaleValue = 1000.0;
+            nValue *= nScaleValue;
+            sal_Int32 nConvertedValue = OutputDevice::LogicToLogic(nValue, MapUnit::MapTwip, MapUnit::MapInch);
+            aBuffer.append(OUString::number(nConvertedValue / nScaleValue));
+        }
+    }
     else
     {
         // Try to send JSON state version