diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-05-06 12:05:14 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-05-12 11:53:19 +0000 |
| commit | 8bcacdc832058a7728ab5e8260a2266033033a07 (patch) | |
| tree | f290a5a2aed8af5654e844269ed7f7470722c0c1 | |
| parent | 34499f08b560a33de35f34ec8ea2d9f2ffaf616b (diff) | |
tdf#63994 Calc Multiline Input: Create new line with Shift-Return
Change-Id: I5ddf6d51aaf7168cf116169f30a1c308b3445a6d
Reviewed-on: https://gerrit.libreoffice.org/24694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index b40f93d5dbd5..afaccd2c1ca9 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3210,8 +3210,12 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false switch ( nCode ) { case KEY_RETURN: - if (bControl && !bShift && (!bInputLine || pInputWin)) + // New line when in the input line and Shift/Ctrl-Enter is pressed, + // or when in a cell and Ctrl-Enter is pressed. + if ((pInputWin && bInputLine && bControl != bShift) || (!bInputLine && bControl && !bShift)) + { bDoEnter = true; + } else if (nModi == 0 && nTipVisible && pFormulaData && miAutoPosFormula != pFormulaData->end()) { PasteFunctionData(); |