diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-15 17:56:38 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-15 17:26:47 +0000 |
commit | c97422fa103618ba19bde0d815674a0173058bb4 (patch) | |
tree | 88eaaf927f5991428e9e9d3f1d7a36f66c2acffa /sw/source | |
parent | 38971bd6543143df41192b0552c51a8119d452a0 (diff) |
sfx2: bring the view shell's LOK callback up to date with SdrModel
This fixes CppunitTest_sw_tiledrendering in the LOK_VIEW_CALLBACK=1
case.
Change-Id: Ib79e57908c3edda0154341baba8279ede4281a42
Reviewed-on: https://gerrit.libreoffice.org/26313
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/uibase/uiview/viewsrch.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 2e069c65fcc1..41097862f08f 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -267,10 +267,14 @@ void SwView::ExecSearch(SfxRequest& rReq) { // Disable LOK selection notifications during search. SwDrawModel* pModel = m_pWrtShell->getIDocumentDrawModelAccess().GetDrawModel(); - if (pModel) + if (comphelper::LibreOfficeKit::isViewCallback()) + m_pWrtShell->GetSfxViewShell()->setTiledSearching(true); + else if (pModel) pModel->setTiledSearching(true); bool bRet = SearchAll(); - if (pModel) + if (comphelper::LibreOfficeKit::isViewCallback()) + m_pWrtShell->GetSfxViewShell()->setTiledSearching(false); + else if (pModel) pModel->setTiledSearching(false); if( !bRet ) |