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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index e6b5b1803ef6..bb218ab9dca3 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -619,8 +619,18 @@ bool Outliner::SearchAndReplaceAll() else if( nullptr != dynamic_cast< const DrawViewShell *>( pViewShell.get() )) { // Disable selection change notifications during search all. - pViewShell->GetDoc()->setTiledSearching(true); - comphelper::ScopeGuard aGuard([pViewShell]() { pViewShell->GetDoc()->setTiledSearching(false); }); + SfxViewShell& rSfxViewShell = pViewShell->GetViewShellBase(); + if (comphelper::LibreOfficeKit::isViewCallback()) + rSfxViewShell.setTiledSearching(true); + else + pViewShell->GetDoc()->setTiledSearching(true); + comphelper::ScopeGuard aGuard([pViewShell, &rSfxViewShell]() + { + if (comphelper::LibreOfficeKit::isViewCallback()) + rSfxViewShell.setTiledSearching(false); + else + pViewShell->GetDoc()->setTiledSearching(false); + }); // Go to beginning/end of document. maObjectIterator = ::sd::outliner::OutlinerContainer(this).begin(); @@ -671,10 +681,7 @@ bool Outliner::SearchAndReplaceAll() boost::property_tree::write_json(aStream, aTree); OString aPayload = aStream.str().c_str(); if (comphelper::LibreOfficeKit::isViewCallback()) - { - SfxViewShell& rSfxViewShell = pViewShell->GetViewShellBase(); rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_SEARCH_RESULT_SELECTION, aPayload.getStr()); - } else pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_RESULT_SELECTION, aPayload.getStr()); } |