sw/source/uibase/misc/swruler.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a3dcf498040111cf6f3fb96822c175d80f26d822
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Dec 5 00:28:41 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Dec 10 05:15:41 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit a69f5b1386fc7e3f7f9838c078e4078eeeec555d)
Reviewed-on: https://gerrit.libreoffice.org/84761
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index ae3f35a8f2c8..76682e5468e9 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -276,14 +276,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));
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
