diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-17 15:48:54 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-10 22:11:13 +0200 |
| commit | f7bb919ab014eb29fe77e287abf6eaf6c85750ce (patch) | |
| tree | b97e9b761bc8b24be922396804dc5eed1ce3cfe2 /sd | |
| parent | 6765956f6e67b1c835719ac043b88641b55ea725 (diff) | |
Resolves: fdo#78404 #i123468# Added SdrEndTextEdit before replacing...
EmptyPresObj, also secured ReplaceObjectAtView to check for active TextEdit,
assert this and make an emergency correction
(cherry picked from commit 623cd778689bd0851652b2db00b24c308dfb657a)
Conflicts:
svx/source/svdraw/svdedtv.cxx
(cherry picked from commit 3b729ab35b5064dcd21f125dfd0aa7d7e709fd9f)
Change-Id: I0e9ae1b1cd84e04c37c4de38aca7752804782384
Reviewed-on: https://gerrit.libreoffice.org/9482
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 15eb9f1cc08b..1606c33757a2 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -348,6 +348,14 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) pPage->InsertPresObj( pOleObj, ePresObjKind ); pOleObj->SetUserCall(pPickObj->GetUserCall()); } + + // #i123468# we need to end text edit before replacing the object. There cannot yet + // being text typed (else it would not be an EmptyPresObj anymore), but it may be + // in text edit mode + if (mpView->IsTextEdit()) + { + mpView->SdrEndTextEdit(); + } } bool bRet = true; |