[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - svx/source

[Miklos Vajna]

 svx/source/svdraw/svdmrkv.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 97abf479e785d1a6098f972f5215271960d0f79f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 19 14:26:36 2015 +0100

    SdrMarkView tiled rendering: suppress handles during text edit
    
    Without this, graphic selection was still around during text editing, so
    long push on an editeng word (in a Writer shape) triggered the shape
    movement action, not a word selection in editeng.
    
    Change-Id: I2ec2f1f9a417bacd08d8b357b4203d48ebaf15c7

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index cc8badb..ac5d4ff 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -686,6 +686,9 @@ void SdrMarkView::SetMarkHandles()
 
                 if(pSdrTextObj && pSdrTextObj->IsInEditMode())
                 {
+                    if (GetModel()->isTiledRendering())
+                        // Suppress handles -> empty graphic selection.
+                        GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "EMPTY");
                     return;
                 }
             }