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

[Jan Holesovsky (via logerrit)]

 sw/source/core/doc/docredln.cxx |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit dc401a7b0ae419a8f8bb433850046281c61bca74
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Nov 24 15:34:55 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 8 00:04:02 2021 +0200

    lok: Don't even iterate through the redlines when they are disabled.
    
    It is not necessary, when we are not issuing any output anyway.
    
    Change-Id: Id952549befb1bef04a2dd9237d286922939eaae2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106509
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    (cherry picked from commit 8f44a939ad09d0365607ae8960e2abfe77e3fe72)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106517
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index a41348027471..354aa058d9ed 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -341,14 +341,22 @@ void lcl_LOKInvalidateStartEndFrames(SwShellCursor& rCursor)
                             FRM_CNTNT, &rCursor.GetEndPos());
 }
 
+bool lcl_LOKRedlineNotificationEnabled()
+{
+    static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+    if (comphelper::LibreOfficeKit::isActive() && !bDisableRedlineComments)
+        return true;
+
+    return false;
+}
+
 } // anonymous namespace
 
 /// Emits LOK notification about one addition / removal of a redline item.
 void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, SwRangeRedline* pRedline)
 {
     // Disable since usability is very low beyond some small number of changes.
-    static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
-    if (!comphelper::LibreOfficeKit::isActive() || bDisableRedlineComments)
+    if (!lcl_LOKRedlineNotificationEnabled())
         return;
 
     boost::property_tree::ptree aRedline;
@@ -1038,7 +1046,7 @@ SwRangeRedline::~SwRangeRedline()
 
 void MaybeNotifyRedlineModification(SwRangeRedline& rRedline, SwDoc& rDoc)
 {
-    if (!comphelper::LibreOfficeKit::isActive())
+    if (!lcl_LOKRedlineNotificationEnabled())
         return;
 
     const SwRedlineTable& rRedTable = rDoc.getIDocumentRedlineAccess().GetRedlineTable();
@@ -1054,7 +1062,7 @@ void MaybeNotifyRedlineModification(SwRangeRedline& rRedline, SwDoc& rDoc)
 
 void SwRangeRedline::MaybeNotifyRedlinePositionModification(tools::Long nTop)
 {
-    if (!comphelper::LibreOfficeKit::isActive())
+    if (!lcl_LOKRedlineNotificationEnabled())
         return;
 
     if(!m_oLOKLastNodeTop || *m_oLOKLastNodeTop != nTop)