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 /sw/source/uibase/docvw | |
| 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 'sw/source/uibase/docvw')
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index c4d0f6a4e87e..86be22085bfb 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -881,7 +881,7 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe } } -void SwPostItMgr::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData) +void SwPostItMgr::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData, OutlinerSearchable* pSearchable) { for (SwSidebarItem* pItem : mvPostItFields) { @@ -890,7 +890,7 @@ void SwPostItMgr::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac continue; pPostIt->GetOutlinerView()->setTiledRendering(comphelper::LibreOfficeKit::isActive()); - pPostIt->GetOutlinerView()->registerLibreOfficeKitCallback(pCallback, pData); + pPostIt->GetOutlinerView()->registerLibreOfficeKitCallback(pCallback, pData, pSearchable); } } diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 6f73a63b0272..57374acb05aa 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -619,7 +619,7 @@ void SwSidebarWin::InitControls() void* pData = nullptr; pDrawModel->getLibreOfficeKitCallback(pCallback, pData); mpOutlinerView->setTiledRendering(comphelper::LibreOfficeKit::isActive()); - mpOutlinerView->registerLibreOfficeKitCallback(pCallback, pData); + mpOutlinerView->registerLibreOfficeKitCallback(pCallback, pData, pDrawModel); } //create Scrollbars |