[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/LibreOfficeKit sc/source

Marco Cecchetti marco.cecchetti at collabora.com
Fri Dec 1 06:50:16 UTC 2017


 include/LibreOfficeKit/LibreOfficeKit.hxx |    2 +-
 sc/source/ui/view/tabview.cxx             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6735a653befce96423cef8a14d2016015eea2d5f
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Fri Dec 1 00:59:33 2017 +0100

    lok: calc: small fixes
    
    For aligning with master
    
    Change-Id: I74cada5f50e88fc7c6ea0dfe78fdfab0d60a9af5
    Reviewed-on: https://gerrit.libreoffice.org/45631
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 93c7e574ec57..8c83a4bde0ed 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -447,7 +447,7 @@ public:
     }
 
     /**
-     * Show/Hide a single row/column header outline for Calc dosuments.
+     * Show/Hide a single row/column header outline for Calc documents.
      *
      * @param bColumn - if we are dealing with a column or row group
      * @param nLevel - the level to which the group belongs
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 59a9899d3bd6..7161edb75525 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2665,14 +2665,14 @@ void lcl_createGroupsData(
                     rGroupsBuffer += ", ";
                 }
 
-                int nGroupHidden = static_cast<int>(pEntry->IsHidden());
+                bool bGroupHidden = pEntry->IsHidden();
 
                 OUString aGroupData;
                 aGroupData += "{ \"level\": \"" + OUString::number(nLevel + 1) + "\", ";
                 aGroupData += "\"index\": \"" + OUString::number(nIndex) + "\", ";
                 aGroupData += "\"startPos\": \"" + OUString::number(rGroupStartPositions[nLevel]) + "\", ";
                 aGroupData += "\"endPos\": \"" + OUString::number(nTotalTwips) + "\", ";
-                aGroupData += "\"hidden\": \"" + OUString::number(nGroupHidden) + "\" }";
+                aGroupData += "\"hidden\": \"" + OUString::number(bGroupHidden ? 1 : 0) + "\" }";
 
                 rGroupsBuffer += aGroupData;
 


More information about the Libreoffice-commits mailing list