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

[Ashod Nakashian (via logerrit)]

 sw/source/core/edit/edfcol.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit e6a6449aab2b63252ccb4ca9e3e009534c5f0c48
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Oct 3 05:49:51 2018 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Dec 26 04:35:55 2019 +0100

    sw: paragraph-sign: avoid re-validating paragraphs when classifying
    
    When setting the classification watermark, every edit to the document
    is triggering a re-validation of signatures, which is excessive and
    excessively expensive.
    
    Change-Id: I7808877263f553a871f2c31856da1a2f9e50c4bb
    Reviewed-on: https://gerrit.libreoffice.org/63007
    Tested-by: Jenkins
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 10a0693a60d11cfd2401f9f96041bc3d5d7c4c5b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85808
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 8068e618ffcf..b97ce353a840 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -2160,6 +2160,12 @@ void SwEditShell::ClassifyDocPerHighestParagraphClass()
 
     const SfxClassificationPolicyType eHighestClassType = SfxClassificationHelper::stringToPolicyType(sHighestClass);
 
+    // Prevent paragraph signature validation since the below changes (f.e. watermarking) are benign.
+    const bool bOldValidationFlag = SetParagraphSignatureValidation(false);
+    comphelper::ScopeGuard const g([this, bOldValidationFlag]() {
+        SetParagraphSignatureValidation(bOldValidationFlag);
+    });
+
     // Check the origin, if "manual" (created via advanced classification dialog),
     // then we just need to set the category name.
     if (sfx::getCreationOriginProperty(xPropertyContainer, aKeyCreator) == sfx::ClassificationCreationOrigin::MANUAL)