diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-03-24 14:29:33 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-30 09:23:43 +0200 |
commit | c14a2662d6004eb282f3122d9a0b4cf581863ad5 (patch) | |
tree | 0054c707476861fe178f535b664b4dc65b6249b9 | |
parent | e23af8be459a6099704c87129a75074c69d13364 (diff) |
sc tiled editing: Setup the Calc's editeng for tiled editing.
Change-Id: Ice6d9b66e72f6f88762a8c930b8b77dee7f64b40
-rw-r--r-- | editeng/source/editeng/editview.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index cc2685d16c8c..11d041d96086 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 d394c604b6e2..b1a19832233d 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 |