[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/annotsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4677f06baff2ac3d667f74d84d85de45f8c35849
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 25 16:48:44 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Sep 29 12:00:34 2020 +0200

    Related: tdf#136985 apparent phantom redo entries with cursor in comment
    
    with a redo element in redo stack but the cursor in a comment the
    redo dropdown list appears empty even though the toolbar button
    is active. The problem doesn't appear in the undo case.
    
    This typo appears tobe there since original checkin of
    
    commit 9b67ca9c73b72a889811123269854ab2ca89d6a9
    Date:   Tue Feb 19 12:57:51 2008 +0000
    
        INTEGRATION: CWS notes2 (1.1.2); FILE ADDED
    
    Change-Id: I8715989c3e9958e3d2a0041129fbed81501057ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103440
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index ccc7b10e3428..5bcda2e9a072 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1645,7 +1645,7 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
                     else if ((nWhich == SID_GETREDOSTRINGS) &&
                              (rSh.GetFirstRedoInfo(nullptr, nullptr)))
                     {
-                        rSh.GetDoStrings( SwWrtShell::UNDO, aItem );
+                        rSh.GetDoStrings( SwWrtShell::REDO, aItem );
                     }
 
                     sList.append(aItem.GetString());