CWS-TOOLING: integrate CWS ooo321gsl05ooo/OOO320_m17

1 files changed, 10 insertions, 0 deletions

diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 30328540f..00670da32 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -201,6 +201,16 @@ void SlideSorterViewShell::Initialize (void)
 
 void SlideSorterViewShell::Init (bool bIsMainViewShell)
 {
+    // The search dialog is turned off automatically when the slide
+    // sorter is shown in the center pane.  What remains to be done is
+    // to abort the search function.
+    if (bIsMainViewShell)
+    {
+        DrawDocShell* pDocShell = GetDocSh();
+        if (pDocShell != NULL)
+            pDocShell->SetDocShellFunction(::sd::FunctionReference());
+    }
+
     ViewShell::Init(bIsMainViewShell);
 
     mpSlideSorter->GetModel().UpdatePageList();