[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 3 commits - sc/source

[Henry Castro]

 sc/source/ui/unoobj/docuno.cxx |    2 +-
 sc/source/ui/view/gridwin.cxx  |    2 +-
 sc/source/ui/view/viewdata.cxx |    7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1b3d17ba7cd45dc0431b9b1809d908a7a066d9a1
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Jun 4 21:37:55 2015 -0400

    sc tiled editing: Editview register LOKit callback
    
    Change-Id: I5ad07f0f3defacaac0f5dac724e9867bbc011dd6

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 22d46dc..8795afe 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -928,6 +928,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
     else
     {
         pEditView[eWhich] = new EditView( pNewEngine, pWin );
+
+        if (pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
+        {
+            pEditView[eWhich]->registerLibreOfficeKitCallback(pDoc->GetDrawLayer()->getLibreOfficeKitCallback(),
+                                                              pDoc->GetDrawLayer()->getLibreOfficeKitData());
+            pEditView[eWhich]->setTiledRendering(true);
+        }
     }
 
     //  bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576)
commit d1ed5b06b2cc7f52b896d6cd4ce0b59e8ceea6b9
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Jun 4 21:10:28 2015 -0400

    sc tiled editing: double-click empty cell
    
    Change-Id: I35c43e2a22ac6591a2bcf9857808503c0e111344

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c31d246..cfc0b5e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2415,7 +2415,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         {
             // don't forward the event to an empty cell, causes deselection in
             // case we used the double-click to select the empty cell
-            if (bIsTiledRendering)
+            if (bIsTiledRendering && bDouble)
             {
                 ScRefCellValue aCell;
                 aCell.assign(*pViewData->GetDocument(), ScAddress(nPosX, nPosY, nTab));
commit 671787e144345b03a801ede499cc4784e71d6941
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Jun 4 20:44:45 2015 -0400

    sc tiled editing: EndTracking trigger MouseUp
    
    It does not need to trigger fake MouseUp event
    
    Change-Id: Id90c7787ef3312abe81bce359648aee0dfccd905

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 73f674ef..36de586 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -591,7 +591,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount)
         // sometimes MouseButtonDown captures mouse and starts tracking, and VCL
         // will not take care of releasing that with tiled rendering
         if (pGridWindow->IsTracking())
-            pGridWindow->EndTracking();
+            pGridWindow->EndTracking(TrackingEventFlags::DontCallHdl);
 
         break;
     default: