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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 2f7653ea487fbf21891ef733ee72d85e0673009b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Dec 4 15:00:15 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Dec 9 17:34:40 2019 +0100

    Add comment about confusion in SwCommentRuler::CreateJsonNotification()
    
    No code changes.
    
    Change-Id: Ibc46b3e55038e84f2ad80ff12b277b2e2c77a4ce
    (cherry picked from commit 5b6d23dcd0f2f779b4bbffe7f427a7c397f41c95)
    Reviewed-on: https://gerrit.libreoffice.org/84755
    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 86667e6b02d7..7dd10518dc34 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.
  *
@@ -254,10 +254,28 @@ const 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 rules 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();