INTEGRATION: CWS impressfunctions (1.39.40); FILE MERGED

2005/11/28 18:02:26 cl 1.39.40.2: RESYNC: (1.39-1.40); FILE MERGED
2005/10/28 10:58:31 cl 1.39.40.1: #125341# reworked FuPoor classes to use refcounting

1 files changed, 6 insertions, 19 deletions

diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 199f9b40c2f6..384008d39932 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: viewshe2.cxx,v $
  *
- *  $Revision: 1.40 $
+ *  $Revision: 1.41 $
  *
- *  last change: $Author: rt $ $Date: 2005-10-19 12:28:46 $
+ *  last change: $Author: rt $ $Date: 2005-12-14 17:31:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -809,9 +809,9 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin)
     {
         mpSlideShow->setWindow(pWin);
     }
-    if (pFuActual)
+    if(HasCurrentFunction())
     {
-        pFuActual->SetWindow(pWin);
+        GetCurrentFunction()->SetWindow(pWin);
     }
 }
 
@@ -833,9 +833,9 @@ BOOL ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window* pWin)
         {
             bReturn = mpSlideShow->requestHelp(rHEvt);
         }
-        else if (pFuActual)
+        else if(HasCurrentFunction())
         {
-            bReturn = pFuActual->RequestHelp(rHEvt);
+            bReturn = GetCurrentFunction()->RequestHelp(rHEvt);
         }
     }
 
@@ -1093,19 +1093,6 @@ const Rectangle& ViewShell::GetAllWindowRect()
     return maAllWindowRectangle;
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-void ViewShell::CancelSearching()
-{
-    delete pFuSearch;
-    pFuSearch = NULL;
-}
-
 /*************************************************************************
 |*
 |* Read user data