sw/source/core/doc/docredln.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
New commits: commit dc401a7b0ae419a8f8bb433850046281c61bca74 Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Nov 24 15:34:55 2020 +0100 Commit: Andras Timar <[email protected]> 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 <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit 8f44a939ad09d0365607ae8960e2abfe77e3fe72) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106517 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <[email protected]> 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) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
