sd/source/ui/table/tablefunction.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 888007f5850b997b2bbf4d1b7615a536140e72e8
Author: Armin Le Grand <a...@apache.org>
Date: Wed Oct 9 15:31:38 2013 +0000
Resolves: #i123359# need to call SdrEndTextEdit before...
manipulating objects at model/view
(cherry picked from commit b5e8564995cd92e19cadcf8a6e9151be3efeeff4)
Change-Id: Ie282370c7fc2dea4f9d59d85aac742b41d7c4541
(cherry picked from commit 668730fbdd1ccf9a23d0a55361d019ca9e58ff39)
diff --git a/sd/source/ui/table/tablefunction.cxx
b/sd/source/ui/table/tablefunction.cxx
index 77de56c..1ab6f9b 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -161,6 +161,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 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
