summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-10-09 15:31:38 +0000
committerArmin Le Grand <alg@apache.org>2013-10-09 15:31:38 +0000
commitb5e8564995cd92e19cadcf8a6e9151be3efeeff4 (patch)
tree744310171b42ea4965608821da1fd1ee151de9d1 /sd
parent5d5b1156b3db3997b75779b0d007e46b5884c617 (diff)
i123359 need to call SdrEndTextEdit before manipulating objects at model/view
Notes
Notes: merged as: 668730fbdd1ccf9a23d0a55361d019ca9e58ff39
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/table/tablefunction.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index ddced59c395b..cd7799f99205 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -171,6 +171,15 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
apply_table_style( pObj, GetDoc(), sTableStyle );
SdrPageView* pPV = mpView->GetSdrPageView();
+ // #123359# 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 )
{