diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:11:45 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:11:45 +0000 |
commit | 4bd4196dbed0173afb20b08da180f50d6e9788b1 (patch) | |
tree | ba8122e834dcc7635af2a6b29481a20d0d139952 /sd/source/ui/view | |
parent | c3d37a1e87b0e1f969723e8782c43d31f9dbd6d6 (diff) |
INTEGRATION: CWS presenterview (1.53.12); FILE MERGED
2008/01/09 18:28:26 cl 1.53.12.1: #i15900# slideshow api consolidation
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index a3204b24d39b..956ebc533db0 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews2.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: hr $ $Date: 2007-06-26 13:41:57 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:11:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -234,8 +234,7 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) void DrawViewShell::FuTemporary(SfxRequest& rReq) { // Waehrend einer Native-Diashow wird nichts ausgefuehrt! - if(mpSlideShow && - rReq.GetSlot() != SID_NAVIGATOR) + if(SlideShow::IsRunning( GetViewShellBase() ) && (rReq.GetSlot() != SID_NAVIGATOR)) return; DBG_ASSERT( mpDrawView, "sd::DrawViewShell::FuTemporary(), no draw view!" ); |