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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index fd5682b2b0a0..69c1e21b7900 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1825,9 +1825,15 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } // Avoid LOK selection notifications before we have all the results. - rDoc.GetDrawLayer()->setTiledSearching(true); + if (comphelper::LibreOfficeKit::isViewCallback()) + GetViewData().GetViewShell()->setTiledSearching(true); + else + rDoc.GetDrawLayer()->setTiledSearching(true); MarkDataChanged(); - rDoc.GetDrawLayer()->setTiledSearching(false); + if (comphelper::LibreOfficeKit::isViewCallback()) + GetViewData().GetViewShell()->setTiledSearching(false); + else + rDoc.GetDrawLayer()->setTiledSearching(false); if ( bFound ) { |