diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:13:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:13:48 +0000 |
| commit | 46d1e0c4e1a37a91da4c47be063f57cbce38128b (patch) | |
| tree | e6df30fab46745d40c4f563de5ec43e3739134f8 /sd/source/ui/view/drviews4.cxx | |
| parent | 59d889dbd77e5c84945aca77e66f41085545d051 (diff) | |
INTEGRATION: CWS presenterview (1.38.6); FILE MERGED
2008/03/26 10:47:10 cl 1.38.6.3: RESYNC: (1.38-1.39); FILE MERGED
2008/02/20 09:21:50 af 1.38.6.2: #i86240# Re-enabled context menus.
2008/01/09 18:28:26 cl 1.38.6.1: #i15900# slideshow api consolidation
Diffstat (limited to 'sd/source/ui/view/drviews4.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews4.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 2fda7490246f..5e3fe4ea3b72 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews4.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2008-03-12 11:56:32 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:13:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -553,7 +553,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if ( !IsInputLocked() ) { - const BOOL bNativeShow = mpSlideShow &&( mpSlideShow->getAnimationMode() == ANIMATIONMODE_SHOW ); + const bool bNativeShow (SlideShow::IsRunning(GetViewShellBase())); if( rCEvt.GetCommand() == COMMAND_PASTESELECTION && !bNativeShow ) { |