diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 14:20:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-14 14:45:09 +0100 |
| commit | 7b5d20983dfbfb458898eeab54828ba5fef5841f (patch) | |
| tree | b067a0fbdb143073e17a44e20cc0384193be550c /sc/source | |
| parent | b9565ef0a73c235cd1e14fce9031db6e9237c524 (diff) | |
editeng: handle SdrModel::isTiledSearching()
Given that the edit/outliner views can come and go, avoid the lifecycle
problems with just passing a pointer to the sdr model to editeng, and
then it'll always have the up to date "are we searching" information.
editeng can't depend on svx, so provide an interface class SdrModel can
implement.
Change-Id: I3b98011593b00ac0fab05b6b9c591dd20d94c579
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 65fd839da6e9..a4cf3efbfe5c 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1722,7 +1722,7 @@ void ScInputHandler::UpdateActiveView() if (comphelper::LibreOfficeKit::isActive()) { ScDrawLayer *pDrawLayer = pDocShell->GetDocument().GetDrawLayer(); - pTableView->registerLibreOfficeKitCallback(pDrawLayer->getLibreOfficeKitCallback(), pDrawLayer->getLibreOfficeKitData()); + pTableView->registerLibreOfficeKitCallback(pDrawLayer->getLibreOfficeKitCallback(), pDrawLayer->getLibreOfficeKitData(), pDrawLayer); pTableView->setTiledRendering(true); } } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index fdf86d44faaa..95b9573b0d29 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -941,7 +941,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, if (pDoc->GetDrawLayer() && comphelper::LibreOfficeKit::isActive()) { pEditView[eWhich]->registerLibreOfficeKitCallback(pDoc->GetDrawLayer()->getLibreOfficeKitCallback(), - pDoc->GetDrawLayer()->getLibreOfficeKitData()); + pDoc->GetDrawLayer()->getLibreOfficeKitData(), + pDoc->GetDrawLayer()); pEditView[eWhich]->setTiledRendering(true); } } |