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

[Jan Holesovsky]

 editeng/source/editeng/editview.cxx |    1 -
 sc/source/ui/app/inputhdl.cxx       |   13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 11bd217d414c03db5befd8b4bb2b21489072e30a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Mar 24 14:29:33 2015 +0100

    sc tiled editing: Setup the Calc's editeng for tiled editing.
    
    Change-Id: Ice6d9b66e72f6f88762a8c930b8b77dee7f64b40

diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index e9ec245..f763a0c 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -388,7 +388,6 @@ void EditView::Command( const CommandEvent& rCEvt )
 
 void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
 {
-
     if ( pImpEditView->pEditEngine->HasView( this ) )
     {
         // The control word is more important:
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 74c6222..3ba9095 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1731,6 +1731,19 @@ void ScInputHandler::UpdateActiveView()
     else
         pTableView = NULL;
 
+    // setup the pTableView editeng for tiled rendering to get cursor and selections
+    if (pActiveViewSh && pTableView)
+    {
+        ScDocShell* pDocShell = pActiveViewSh->GetViewData().GetDocShell();
+        ScDocument& rDoc = pDocShell->GetDocument();
+        if (rDoc.GetDrawLayer()->isTiledRendering())
+        {
+            ScDrawLayer *pDrawLayer = pDocShell->GetDocument().GetDrawLayer();
+            pTableView->registerLibreOfficeKitCallback(pDrawLayer->getLibreOfficeKitCallback(), pDrawLayer->getLibreOfficeKitData());
+            pTableView->setTiledRendering(true);
+        }
+    }
+
     if (pInputWin && eMode == SC_INPUT_TOP )
         pTopView = pInputWin->GetEditView();
     else