diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:18:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:18:57 +0000 |
| commit | 338d3dbea16adb76d72fc9ec7ac97e05fc6d5029 (patch) | |
| tree | a725b7f2af4dc21cfbc3c7ac3d5c132ef9488a17 | |
| parent | fca93d7e1e6173e3ae676be354d149101852d835 (diff) | |
INTEGRATION: CWS presenterview (1.10.122); FILE MERGED
2008/01/09 18:28:27 cl 1.10.122.1: #i15900# slideshow api consolidation
| -rw-r--r-- | sd/source/ui/view/drviewsh.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 12daf13c1605..6816a485789c 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviewsh.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:39:49 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:18:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,6 +78,8 @@ #include "drawview.hxx" #endif +#include "slideshow.hxx" + namespace sd { #define TABCONTROL_INITIAL_SIZE 500 @@ -128,7 +130,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) Rectangle aVisArea(rWin.PixelToLogic(Rectangle(Point(0,0), aVisSizePixel))); Size aVisAreaSize(aVisArea.GetSize()); - if(!aVisArea.IsInside(rRect) && !mpSlideShow) + if(!aVisArea.IsInside(rRect) && !SlideShow::IsRunning( GetViewShellBase() ) ) { // Objekt liegt nicht komplett im sichtbaren Bereich sal_Int32 nFreeSpaceX(aVisAreaSize.Width() - aLogicSize.Width()); |