summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-28 12:26:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-28 13:01:09 +0100
commit7b75dc8ccca61988392779d4c61eef15f1211c16 (patch)
tree8a24e59042e949f704feb6fad44b71bf834a5c36
parent452a06b70578eb83067c6c744cd97eebafc4003c (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
-rw-r--r--sc/source/ui/drawfunc/futext.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 4bec72d4e398..7b72133b5d29 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() );