diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:16:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-03 14:16:02 +0000 |
| commit | 8a0e8ac7f9fb68c27837945078bddba30f388d89 (patch) | |
| tree | af0cd4f4ca006ab72d143d07767688ce8cd5e0ae /sd/source/ui/view/drviews7.cxx | |
| parent | INTEGRATION: CWS presenterview (1.50.22); FILE MERGED (diff) | |
| download | core-8a0e8ac7f9fb68c27837945078bddba30f388d89.tar.gz core-8a0e8ac7f9fb68c27837945078bddba30f388d89.zip | |
INTEGRATION: CWS presenterview (1.72.48); FILE MERGED
2008/03/26 10:47:13 cl 1.72.48.5: RESYNC: (1.74-1.76); FILE MERGED
2008/01/09 18:28:26 cl 1.72.48.4: #i15900# slideshow api consolidation
2007/12/13 10:30:04 af 1.72.48.3: RESYNC: (1.73-1.74); FILE MERGED
2007/07/11 09:11:52 af 1.72.48.2: RESYNC: (1.72-1.73); FILE MERGED
2007/07/10 13:46:49 af 1.72.48.1: #i18486# Converted several members of ViewShellBase to shared_ptrs.
Diffstat (limited to 'sd/source/ui/view/drviews7.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 0c97fbd72ea3..cf9d3ee55f00 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews7.cxx,v $ * - * $Revision: 1.76 $ + * $Revision: 1.77 $ * - * last change: $Author: rt $ $Date: 2008-03-12 11:56:53 $ + * last change: $Author: kz $ $Date: 2008-04-03 15:16:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1049,7 +1049,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } // EditText aktiv - if (GetViewShellBase().GetViewShellManager().GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL) + if (GetViewShellBase().GetViewShellManager()->GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL) { USHORT nCurrentSId = SID_ATTR_CHAR; @@ -1333,8 +1333,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_MATH ); } - if( (mpSlideShow && (mpSlideShow->getAnimationMode() != ANIMATIONMODE_PREVIEW) ) || - GetDocSh()->IsPreview() ) + rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); + if( (xSlideshow.is() && xSlideshow->isRunning() && (xSlideshow->getAnimationMode() != ANIMATIONMODE_PREVIEW) ) || GetDocSh()->IsPreview() ) { // Eigene Slots rSet.DisableItem( SID_PRESENTATION ); @@ -1356,7 +1356,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_DELETE_PAGE ); rSet.DisableItem( SID_PAGESETUP ); - if( mpSlideShow ) + if( xSlideshow.is() && xSlideshow->isRunning() ) { rSet.ClearItem(SID_OBJECT_ALIGN); rSet.ClearItem(SID_ZOOM_TOOLBOX); @@ -1676,7 +1676,9 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) // clause because the current function of the docshell can only be // search and replace or spell checking and in that case switching the // view mode is allowed. - if (GetViewFrame()->GetFrame()->IsInPlace() || mpSlideShow) + const bool bIsRunning = SlideShow::IsRunning(GetViewShellBase()); + + if (GetViewFrame()->GetFrame()->IsInPlace() || bIsRunning) { if ( !GetViewFrame()->GetFrame()->IsInPlace() ) { @@ -1747,7 +1749,7 @@ void DrawViewShell::GetState (SfxItemSet& rSet) void DrawViewShell::Execute (SfxRequest& rReq) { - if(GetSlideShow()) + if(SlideShow::IsRunning(GetViewShellBase())) { // Do not execute anything during a native slide show. return; |