diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-12-05 00:28:41 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-12-05 13:51:06 +0100 |
| commit | 55eddbecb34f811d5292fe4dc5c568cf5fff2ad4 (patch) | |
| tree | e6822e2594fe6c441a48078a732ea8e1fd099522 /sw | |
| parent | f77fd91dc24b197086df1845735da77fec64ec30 (diff) | |
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@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit a69f5b1386fc7e3f7f9838c078e4078eeeec555d)
Reviewed-on: https://gerrit.libreoffice.org/84522
Tested-by: Jenkins
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/misc/swruler.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 989ef20f9057..d500ce3006d2 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -279,14 +279,17 @@ 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)); } |