summaryrefslogtreecommitdiff
path: root/sfx2/source/control/charwin.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-06-19 15:27:12 +0200
committerMichael Meeks <michael.meeks@collabora.com>2019-06-19 15:32:31 +0200
commit347e273a685097a0d3d00b782bf8989d9582d224 (patch)
tree6b2e22b5181bf26df34161a5060668cd115d3429 /sfx2/source/control/charwin.cxx
parent7b9ec19bc2447389d7648401aa40ff8797e0c6af (diff)
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@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sfx2/source/control/charwin.cxx')
-rw-r--r--sfx2/source/control/charwin.cxx1
1 files changed, 0 insertions, 1 deletions
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;
}