diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-28 12:26:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-28 13:03:08 +0100 |
| commit | ad90d924ad5b29cd2209ef8b9217ae9377f85870 (patch) | |
| tree | 0c63eb6b4e10b8188c302889de631da5f36f843f /sc | |
| parent | 6b35c59f3727e1e79cb7206dc2cd576161f38e8c (diff) | |
Resolves: tdf#90960 toggle out of paste-mode on editing an object
otherwise pressing return in the object goes to the
sheet and attempts to paste over the current cell
reproduce with insert->comment in A1, insert some text and
click in e.g. A5, ctrl c, right click on A1 and show comment,
double click on comment to edit, go to end of text and
press enter, either "bad things happen" if a11y is enabled
, or "nothing happens" instead of a new line appearing in
the object
Change-Id: Ie44851cf3394652e1a60eecb59a999889094b3c5
(cherry picked from commit 7b75dc8ccca61988392779d4c61eef15f1211c16)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/drawfunc/futext.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 17d50953da40..4f6a1c851214 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -725,6 +725,12 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!? if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) ) { + // Toggle out of paste mode if we are in it, otherwise + // pressing return in this object will instead go to the + // sheet and be considered an overwrite-cell instruction + pViewShell->GetViewData().SetPasteMode(SC_PASTE_NONE); + pViewShell->UpdateCopySourceOverlay(); + // EditEngine-UndoManager anmelden pViewShell->SetDrawTextUndo( &pO->GetUndoManager() ); |