diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-15 17:56:38 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:39 -0400 |
| commit | 894284e562cb27d483bde21f51d8e12ac3cbebec (patch) | |
| tree | a7eea6e39080909e688b055f06183bab7f1011dc /sw | |
| parent | 297d11c3882e425d9a4cb1077262e34db79dc5c1 (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.
Reviewed-on: https://gerrit.libreoffice.org/26313
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c97422fa103618ba19bde0d815674a0173058bb4)
Change-Id: Ib79e57908c3edda0154341baba8279ede4281a42
Diffstat (limited to 'sw')
| -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 c2eee692ff36..296eefe9559e 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -275,10 +275,14 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) { // 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 ) |