sw/source/uibase/docvw/AnnotationMenuButton.cxx | 29 +++---------------------
1 file changed, 4 insertions(+), 25 deletions(-)
New commits:
commit dea852d00bed5cfe2c223b8bf30dff19a60a50a6
Author: Gökay Şatır <gokaysa...@gmail.com>
AuthorDate: Thu Sep 7 11:22:25 2023 +0300
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 18 15:06:55 2023 +0200
We can allow one to answer their own comment.
Other office implementations allow this.
I think we can enable reply button for the owner of the comment, unless
there is a good reason to not to.
Signed-off-by: Gökay Şatır <gokaysa...@gmail.com>
Change-Id: I6969122efe24d2804b4092e0afe0709a2fd1ef98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156688
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157018
Tested-by: Jenkins
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 975e9a02895b..5e42d15c879e 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -69,6 +69,8 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl,
weld::Toggleable&, void)
bool bReadOnly = IsReadOnly();
if (bReadOnly)
{
+ mxMenuButton->set_item_visible("reply", false);
+ mxMenuButton->set_item_visible("sep1", false); // Separator after
reply button.
mxMenuButton->set_item_visible("resolve", false);
mxMenuButton->set_item_visible("unresolve", false);
mxMenuButton->set_item_visible("resolvethread", false);
@@ -77,6 +79,8 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl,
weld::Toggleable&, void)
}
else
{
+ mxMenuButton->set_item_visible("reply", !IsReadOnlyOrProtected());
+ mxMenuButton->set_item_visible("sep1", !IsReadOnlyOrProtected());
mxMenuButton->set_item_visible("resolve", !IsResolved());
mxMenuButton->set_item_visible("unresolve", IsResolved());
mxMenuButton->set_item_visible("resolvethread", !IsThreadResolved());
@@ -88,31 +92,6 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl,
weld::Toggleable&, void)
mxMenuButton->set_item_visible("deleteby", !bReadOnly);
mxMenuButton->set_item_visible("deleteall", !bReadOnly);
mxMenuButton->set_item_visible("formatall", !bReadOnly);
-
- bool bReplyVis = true;
-
- // No answer possible if this note is in a protected section.
- if (IsReadOnlyOrProtected())
- {
- mxMenuButton->set_item_visible("reply", false);
- bReplyVis = false;
- }
- else
- {
- SvtUserOptions aUserOpt;
- OUString sAuthor;
- if ((sAuthor = aUserOpt.GetFullName()).isEmpty())
- {
- if ((sAuthor = aUserOpt.GetID()).isEmpty())
- {
- sAuthor = SwResId(STR_REDLINE_UNKNOWN_AUTHOR);
- }
- }
- // do not allow to reply to ourself
- bReplyVis = sAuthor != GetAuthor();
- }
- mxMenuButton->set_item_visible("reply", bReplyVis);
- mxMenuButton->set_item_visible("sep1", bReplyVis);
}
IMPL_LINK(SwAnnotationWin, KeyInputHdl, const KeyEvent&, rKeyEvt, bool)
