summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-12-04 15:00:15 +0200
committerTor Lillqvist <tml@collabora.com>2019-12-05 11:26:00 +0200
commit0fb2b9b23ac3d082251217b3478917b387fe162c (patch)
treeaaf678c195d6a805f56ee6b8ca900f707625044f
parent0027c01b3ef976d34f2f75cace43a26b59b07460 (diff)
Add comment about confusion in SwCommentRuler::CreateJsonNotification()
No code changes. (cherry picked from commit 5b6d23dcd0f2f779b4bbffe7f427a7c397f41c95) Change-Id: Ibc46b3e55038e84f2ad80ff12b277b2e2c77a4ce
-rw-r--r--sw/source/uibase/misc/swruler.cxx20
1 files changed, 19 insertions, 1 deletions
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 0597ee1761af..021013890631 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -257,10 +257,28 @@ std::string SwCommentRuler::CreateJsonNotification()
{
boost::property_tree::ptree jsonNotif;
+ // Note that GetMargin1(), GetMargin2(), GetNullOffset(), and GetPageOffset() return values in
+ // pixels. Not twips. So "converting" the returned values with convertTwipToMm100() is quite
+ // wrong. (Also, even if the return values actually were in twips, it is questionable why we
+ // would want to pass them in mm100, as all other length values in the LOKit protocol apparently
+ // are in twips.)
+
+ // Anyway, as the consuming code in Online mostly seems to work anyway, it is likely that it
+ // would work as well even if the values in pixels were passed without a bogus "conversion" to
+ // mm100. But let's keep this as is for now.
+
+ // Also note that in desktop LibreOffice, these pixel values for the ruler of course change as
+ // one changes the zoom level. (Can be seen if one temporarily modifies the NotifyKit() function
+ // below to call this CreateJsonNotification() function and print its result in all cases even
+ // without LibreOfficeKit::isActive().) But in both web-based Online and in the iOS app, the
+ // zoom level from the point of view of this code here apparently does not change even if one
+ // zooms from the Online code's point of view.
jsonNotif.put("margin1", convertTwipToMm100(GetMargin1()));
jsonNotif.put("margin2", convertTwipToMm100(GetMargin2()));
jsonNotif.put("leftOffset", convertTwipToMm100(GetNullOffset()));
jsonNotif.put("pageOffset", convertTwipToMm100(GetPageOffset()));
+
+ // GetPageWidth() on the other hand does return a value in twips.
jsonNotif.put("pageWidth", convertTwipToMm100(GetPageWidth()));
RulerUnitData aUnitData = GetCurrentRulerUnit();