[Libreoffice-commits] core.git: sw/source

[Gabor Kelemen (via logerrit)]

 sw/source/uibase/app/docsh.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b6fa378951a1b4e44b83622db73e0d1fdc6dbb5c
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Mon Oct 21 19:21:00 2019 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Tue Oct 22 14:44:10 2019 +0200

    tdf#128229 Disable Accept All & Reject All if redlines are password protected
    
    Change-Id: If0a2781565b41aff1b502c293f89e2005b47cce8
    Reviewed-on: https://gerrit.libreoffice.org/81265
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>

diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index a373ec9e3a71..d9b49fc7789b 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1140,7 +1140,8 @@ void SwDocShell::GetState(SfxItemSet& rSet)
         case FN_REDLINE_ACCEPT_ALL:
         case FN_REDLINE_REJECT_ALL:
         {
-            if (GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().empty())
+            if (GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().empty() ||
+                HasChangeRecordProtection()) // tdf#128229 Disable Accept / Reject all if redlines are password protected
                 rSet.DisableItem(nWhich);
         }
         break;