diff options
| author | Armin Le Grand <alg@apache.org> | 2013-10-09 15:31:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 20:15:09 +0100 |
| commit | 668730fbdd1ccf9a23d0a55361d019ca9e58ff39 (patch) | |
| tree | b2e42e769d278189d859e2cfdd94c8c101838d4b /sd | |
| parent | 57a28dc9556b4e6fff337e0eb9d0d8abc5223161 (diff) | |
Resolves: #i123359# need to call SdrEndTextEdit before...
manipulating objects at model/view
(cherry picked from commit b5e8564995cd92e19cadcf8a6e9151be3efeeff4)
Change-Id: Ie282370c7fc2dea4f9d59d85aac742b41d7c4541
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 7944ed96b8ef..d1716f016d10 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -162,6 +162,15 @@ void DrawViewShell::FuTable(SfxRequest& rReq) apply_table_style( pObj, GetDoc(), sTableStyle ); SdrPageView* pPV = mpView->GetSdrPageView(); + // #i123359# if an object is to be replaced/manipulated it may be that it is in text edit mode, + // so to be on the safe side call SdrEndTextEdit here + SdrTextObj* pCheckForTextEdit = dynamic_cast< SdrTextObj* >(pPickObj); + + if(pCheckForTextEdit && pCheckForTextEdit->IsInEditMode()) + { + mpView->SdrEndTextEdit(); + } + // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj if( pPickObj ) { |