[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

[Armin Le Grand]

 sd/source/ui/table/tablefunction.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit b5e8564995cd92e19cadcf8a6e9151be3efeeff4
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Oct 9 15:31:38 2013 +0000

    i123359 need to call SdrEndTextEdit before manipulating objects at model/view

diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index ddced59..cd7799f 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 )
         {