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>

1 files changed, 12 insertions, 5 deletions

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 12bbfe3b7bec..2ea4d8102b5e 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());
         }