diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-11-24 15:34:55 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2020-11-25 11:02:35 +0100 |
| commit | 56e7c74b2994ead8b1f376b65549ad8a623018cd (patch) | |
| tree | 9c47b853324e4684f8e9be0924c437a43ba10411 /sw | |
| parent | 5e4c771c0b89452ab55d1ab30dbb1634f15d3775 (diff) | |
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@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 8f44a939ad09d0365607ae8960e2abfe77e3fe72)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106517
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/docredln.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index ab57f1bb6b50..8a0f8d4b3597 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; @@ -1044,7 +1052,7 @@ SwRangeRedline::~SwRangeRedline() void MaybeNotifyRedlineModification(SwRangeRedline& rRedline, SwDoc& rDoc) { - if (!comphelper::LibreOfficeKit::isActive()) + if (!lcl_LOKRedlineNotificationEnabled()) return; const SwRedlineTable& rRedTable = rDoc.getIDocumentRedlineAccess().GetRedlineTable(); @@ -1060,7 +1068,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) |