svn commit: r1530680 - /openoffice/trunk/main/sd/source/ui/table/tablefunction.cxx

[al...@apache.org]

Author: alg
Date: Wed Oct  9 15:31:38 2013
New Revision: 1530680

URL: http://svn.apache.org/r1530680
Log:
i123359 need to call SdrEndTextEdit before manipulating objects at model/view

Modified:
    openoffice/trunk/main/sd/source/ui/table/tablefunction.cxx

Modified: openoffice/trunk/main/sd/source/ui/table/tablefunction.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/table/tablefunction.cxx?rev=1530680&r1=1530679&r2=1530680&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/table/tablefunction.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/table/tablefunction.cxx Wed Oct  9 15:31:38 2013
@@ -171,6 +171,15 @@ void DrawViewShell::FuTable(SfxRequest& 
 		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 )
 		{