#96279#: don't switch page in presentation mode

2 files changed, 16 insertions, 11 deletions

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 084318bdfef6..fa9f8ed68038 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews1.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: thb $ $Date: 2001-12-19 14:09:49 $
+ *  last change: $Author: ka $ $Date: 2002-01-09 12:55:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1068,9 +1068,13 @@ BOOL SdDrawViewShell::SwitchPage(USHORT nSelectedPage)
         // nie auf eine Masterpage)
         pDoc->SetSelected(pActualPage, TRUE);
 
-        // VisArea zuziehen, um ggf. Objekte zu deaktivieren
-        DisconnectAllClients();
-        VisAreaChanged(Rectangle(Point(), Size(1, 1)));
+        if( !pFuSlideShow || ( pFuSlideShow->GetAnimationMode() != ANIMATIONMODE_SHOW ) )
+        {
+            // VisArea zuziehen, um ggf. Objekte zu deaktivieren
+            // !!! only if we are not in presentation mode (#96279) !!!
+            DisconnectAllClients();
+            VisAreaChanged(Rectangle(Point(), Size(1, 1)));
+        }
 
         if (eEditMode == EM_PAGE)
         {
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3d22f9e2e4b9..7637b01eb7cd 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews5.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: thb $ $Date: 2001-06-11 07:46:20 $
+ *  last change: $Author: ka $ $Date: 2002-01-09 12:55:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -483,13 +483,14 @@ void SdDrawViewShell::WriteFrameViewData()
     Rectangle aVisArea = pWindow->PixelToLogic( Rectangle( Point(0,0), aVisSizePixel) );
     pFrameView->SetVisArea(aVisArea);
 
-    if (ePageKind == PK_HANDOUT)
-    {
+    if( ePageKind == PK_HANDOUT )
         pFrameView->SetSelectedPage(0);
-    }
     else
     {
-        pFrameView->SetSelectedPage(aTabControl.GetCurPageId() - 1);
+        if( pFuSlideShow && ( pFuSlideShow->GetAnimationMode() == ANIMATIONMODE_SHOW ) )
+            pFrameView->SetSelectedPage( pFuSlideShow->GetCurrentPage() );
+        else
+            pFrameView->SetSelectedPage( aTabControl.GetCurPageId() - 1 );
     }
 
     pFrameView->SetViewShEditMode(eEditMode, ePageKind);