[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Maxim Monastirsky (via logerrit)]

 sw/source/uibase/docvw/AnnotationMenuButton.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 630bda1b424ff262d084c000be4a8d266d0f35d8
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Fri Jun 7 12:06:13 2019 +0300
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jun 14 07:38:26 2019 +0200

    tdf#125146 Use correct id for reply command item
    
    This was overlooked in commit
    a10b4fd2bc08651d47bdb19bb8ab9c1f8f3d4851
    ("convert annotation menu to .ui").
    
    Change-Id: Ia9e44460394e60f9c2ae767fbb2a07414fa07cf7
    Reviewed-on: https://gerrit.libreoffice.org/73971
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 1b39bae5debe3bf952449bd7d2910defcea92b9e)
    Reviewed-on: https://gerrit.libreoffice.org/73992
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 51a7d809d7cc..c8996bdc3554 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -102,7 +102,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
 
     if (mrSidebarWin.IsProtected())
     {
-        pButtonPopup->EnableItem(FN_REPLY, false);
+        pButtonPopup->EnableItem(pButtonPopup->GetItemId("reply"), false);
     }
     else
     {
@@ -118,11 +118,11 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
         // do not allow to reply to ourself and no answer possible if this note is in a protected section
         if (sAuthor == mrSidebarWin.GetAuthor())
         {
-            pButtonPopup->EnableItem(FN_REPLY, false);
+            pButtonPopup->EnableItem(pButtonPopup->GetItemId("reply"), false);
         }
         else
         {
-            pButtonPopup->EnableItem(FN_REPLY);
+            pButtonPopup->EnableItem(pButtonPopup->GetItemId("reply"));
         }
     }