[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sfx2/source

[Miklos Vajna (via logerrit)]

 sfx2/source/control/charwin.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 347e273a685097a0d3d00b782bf8989d9582d224
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jun 19 15:27:12 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Jun 19 15:32:31 2019 +0200

    sfx2 character map dialog: avoid double insert of glyph
    
    The problem was that both the special character widget in
    SvxCharView::InsertCharToDoc() and the special character dialog in
    SvxCharacterMap::insertCharToDoc() reacted to KEY_RETURN, resulting in a
    double insertion.
    
    master has this resolved in commit
    374599f8c26713905a310673d2b429083321186a (weld SvxCharacterMap dialog,
    2018-03-22) already, do the minimal fix on this branch by reacting to
    KEY_RETURN only in the dialog.
    
    This is consistent with how the non-recent/favorite characters are
    handled, where also the dialog does the insertion, not the widget.
    
    Leaving the KEY_SPACE part unchanged, since that doesn't close the
    dialog, so no double insertion happens in that case.
    
    Change-Id: I9f75eb1d1b46cbbfe8dd4e160d245b5744acc8e0
    Reviewed-on: https://gerrit.libreoffice.org/74360
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 8bd37fc67452..13019c5b18fa 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -71,7 +71,6 @@ void SvxCharView::KeyInput( const KeyEvent& rKEvt )
     switch (aCode.GetCode())
     {
         case KEY_SPACE:
-        case KEY_RETURN:
             InsertCharToDoc();
             break;
     }