core.git: desktop/source sfx2/source

[Gökay Şatır (via logerrit)]

 desktop/source/lib/init.cxx      |    3 +++
 sfx2/source/control/unoctitm.cxx |   15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit c15b872784c8fc0f5e5e813d38c7722f034034d2
Author:     Gökay Şatır <gokaysa...@gmail.com>
AuthorDate: Fri Mar 8 13:51:01 2024 +0300
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Mar 26 16:48:51 2024 +0100

    Allow enabling saving when comment edit is allowed in readonly.
    
    Change-Id: I88d535a5b23fb6d5de8e72eec61bdf3550bc757d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165334
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6eba39cc32f3..99c533c20598 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5079,6 +5079,9 @@ static bool isCommandAllowed(OUString& command) {
         return true;
     else
     {
+        if (command == u".uno:Save"_ustr && SfxViewShell::Current() && 
SfxViewShell::Current()->IsAllowChangeComments())
+            return true;
+
         for (size_t i = 0; i < std::size(nonAllowedList); i++)
         {
             if (nonAllowedList[i] == command)
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 24beba448818..1068b28e0ac8 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -547,7 +547,20 @@ static bool isCommandAllowedForViewType(const OUString& 
command)
             u"CopyHyperlinkLocation"_ustr
         };
 
-        return std::find(std::begin(allowedCommandList), 
std::end(allowedCommandList), command) != std::end(allowedCommandList);
+        bool allowed = std::find(std::begin(allowedCommandList), 
std::end(allowedCommandList), command) != std::end(allowedCommandList);
+
+        if (!allowed && SfxViewShell::Current() && 
SfxViewShell::Current()->IsAllowChangeComments())
+        {
+            constexpr OUString allowedCommentCommandList[] = {
+                u"InsertAnnotation"_ustr,
+                u"DeleteComment"_ustr,
+                u"DeleteAnnotation"_ustr,
+                u"EditAnnotation"_ustr
+            };
+            allowed = std::find(std::begin(allowedCommentCommandList), 
std::end(allowedCommentCommandList), command) != 
std::end(allowedCommentCommandList);
+        }
+
+        return allowed;
     }
 
     return true;