diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:21:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:21:44 +0000 |
| commit | d95a881c2e45c2c027bef1bdd49a416510fe9577 (patch) | |
| tree | d0a8df8b364cb92cd5de45d852522303b1af8bb8 | |
| parent | cc54c739d247a09d28151f8b5e2aefdfae86fab1 (diff) | |
INTEGRATION: CWS presenterview (1.55.54); FILE MERGED
2008/03/26 10:47:29 cl 1.55.54.5: RESYNC: (1.57-1.58); FILE MERGED
2008/01/09 18:28:27 cl 1.55.54.4: #i15900# slideshow api consolidation
2007/09/11 15:32:43 af 1.55.54.3: RESYNC: (1.56-1.57); FILE MERGED
2007/07/11 09:13:21 af 1.55.54.2: RESYNC: (1.55-1.56); FILE MERGED
2007/03/12 14:22:42 af 1.55.54.1: #i74730# Removed unused SlideView inclusion.
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index c3a7a34b30ba..519c77b7328e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdview2.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: rt $ $Date: 2008-03-12 11:59:45 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:21:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -138,15 +138,14 @@ #ifndef SD_DRAW_VIEW_HXX #include "drawview.hxx" #endif -#ifndef SD_SLIDE_VIEW_HXX -#include "SlideView.hxx" -#endif #include "helpids.h" #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> #endif +#include "slideshow.hxx" + namespace sd { #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED @@ -703,7 +702,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge mpDropMarkerObj = NULL; } - if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE ) && ( !mpViewSh || mpViewSh->GetSlideShow() ) ) + if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE ) && mpViewSh && SlideShow::IsRunning(mpViewSh->GetViewShellBase()) ) bBookmark = FALSE; if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bXFillExchange || bSBAFormat || bEditEngine || bString || bRTF ) |