[Libreoffice-commits] online.git: bundled/include kit/Kit.cpp

[Marco Cecchetti]

 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |    7 ++++++-
 kit/Kit.cpp                                          |    6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 96a2d3c36ce937454894b6a64e28a53a2c74b856
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Tue Dec 12 12:23:36 2017 +0100

    calc: LOK_FEATURE_RANGE_ADDRESS (solving compatibility issue)
    
    In order to make cp-5.3 compatible with online 2.1.x we introduced a
    new enum which by default disables collecting the new range based
    header data implementation.
    
    This patch (re-)enable this feature on online 3.x
    
    Change-Id: Ieab4145df9d132810bd871b1a315fd2171ba0ab5
    Reviewed-on: https://gerrit.libreoffice.org/46288
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 2a2c04651c3a935a793f7710118b5945f6966ab0)
    Reviewed-on: https://gerrit.libreoffice.org/46598
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index cf85d7c6..f14ce4d3 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -79,7 +79,12 @@ typedef enum
     /**
      * Turn off tile rendering for annotations
      */
-    LOK_FEATURE_NO_TILED_ANNOTATIONS = (1ULL << 3)
+    LOK_FEATURE_NO_TILED_ANNOTATIONS = (1ULL << 3),
+
+    /**
+     * Enable range based header data
+     */
+    LOK_FEATURE_RANGE_HEADERS = (1ULL << 4)
 }
 LibreOfficeKitOptionalFeatures;
 
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 4e83df9b..13e791ac 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1419,7 +1419,8 @@ private:
             const auto flags = LOK_FEATURE_DOCUMENT_PASSWORD
                              | LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY
                              | LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK
-                             | LOK_FEATURE_NO_TILED_ANNOTATIONS;
+                             | LOK_FEATURE_NO_TILED_ANNOTATIONS
+                             | LOK_FEATURE_RANGE_HEADERS;
             _loKit->setOptionalFeatures(flags);
 
             // Save the provided password with us and the jailed url
@@ -2184,7 +2185,8 @@ void lokit_main(const std::string& childRoot,
         const auto flags = LOK_FEATURE_DOCUMENT_PASSWORD
                            | LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY
                            | LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK
-                           | LOK_FEATURE_NO_TILED_ANNOTATIONS;
+                           | LOK_FEATURE_NO_TILED_ANNOTATIONS
+                           | LOK_FEATURE_RANGE_HEADERS;
         loKit->setOptionalFeatures(flags);
         loKitDoc.reset(loKit->documentLoad(uri.c_str()));
         if (!loKitDoc || !loKitDoc->get())