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

[Tor Lillqvist (via logerrit)]

 sw/source/uibase/misc/swruler.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a69f5b1386fc7e3f7f9838c078e4078eeeec555d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Dec 5 00:28:41 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Dec 5 07:52:13 2019 +0100

    tdf#128468: The RulerTab::nPos is in twips
    
    Do pass that as actual mm100 then.
    
    Change-Id: Ifc9608aeee838172a18cc07aa1dbe0d7f3f5fb6a
    Reviewed-on: https://gerrit.libreoffice.org/84473
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index c58123a1367b..28909ccab95e 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -277,14 +277,17 @@ const std::string SwCommentRuler::CreateJsonNotification()
     jsonNotif.put("pageOffset", convertTwipToMm100(GetPageOffset()));
 
     // GetPageWidth() on the other hand does return a value in twips.
+    // So here convertTwipToMm100() really does produce actual mm100. Fun.
     jsonNotif.put("pageWidth", convertTwipToMm100(GetPageWidth()));
 
     boost::property_tree::ptree tabs;
 
+    // The RulerTab array elements that GetTabs() returns have their nPos field in twips. So these
+    // too are actual mm100.
     for (auto const& tab : GetTabs())
     {
         boost::property_tree::ptree element;
-        element.put("position", tab.nPos);
+        element.put("position", convertTwipToMm100(tab.nPos));
         element.put("style", tab.nStyle);
         tabs.push_back(std::make_pair("", element));
     }