diff options
| author | Kai Ahrens <ka@openoffice.org> | 2001-09-06 14:55:02 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2001-09-06 14:55:02 +0000 |
| commit | c3b9f691b443939f7c13a931bd0b1dd0f41ce983 (patch) | |
| tree | 4a55c3de62f6311a52f099429e9643276f49e865 /sd/source/ui/view/drviewsi.cxx | |
| parent | #90102# Removed SID_PRESENTATION_END from toolbar (diff) | |
| download | core-c3b9f691b443939f7c13a931bd0b1dd0f41ce983.tar.gz core-c3b9f691b443939f7c13a931bd0b1dd0f41ce983.zip | |
#91957#: check mark list before accessing object
Diffstat (limited to 'sd/source/ui/view/drviewsi.cxx')
| -rw-r--r-- | sd/source/ui/view/drviewsi.cxx | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 4cd96e5eed62..3da9e70b6220 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewsi.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ka $ $Date: 2001-06-11 08:28:31 $ + * last change: $Author: ka $ $Date: 2001-09-06 15:55:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1152,27 +1152,26 @@ void SdDrawViewShell::AssignFromEffectWindow() /******************************************************* |* ggfs. in Preview anzeigen \******************************************************/ - SfxChildWindow* pPreviewChildWindow = - GetViewFrame()->GetChildWindow(SdPreviewChildWindow::GetChildWindowId()); - if ( pPreviewChildWindow && ePageKind != PK_HANDOUT ) + SfxChildWindow* pPreviewChildWindow = GetViewFrame()->GetChildWindow(SdPreviewChildWindow::GetChildWindowId()); + + if( pPreviewChildWindow && ePageKind != PK_HANDOUT ) { - SdPreviewWin* pPreviewWin = - (SdPreviewWin*)pPreviewChildWindow->GetWindow(); - if (pPreviewWin && pPreviewWin->GetDoc() == pDoc) + SdPreviewWin* pPreviewWin = (SdPreviewWin*) pPreviewChildWindow->GetWindow(); + + if( pPreviewWin && pPreviewWin->GetDoc() == pDoc ) { - for (nObject = 0; nObject < nCount; nObject++) + for( nObject = 0; nObject < nCount; nObject++ ) { - SdrObject* pObject = rMarkList.GetMark(nObject)-> - GetObj(); - - pInfo = pDoc->GetAnimationInfo(pObject); - if (pInfo) + if( rMarkList.GetMark( nObject ) ) { - // das Pfadobjekt fuer 'an Kurve entlang'? - if (!(eEffect == presentation::AnimationEffect_PATH && - pObject == pPath)) + SdrObject* pObject = rMarkList.GetMark( nObject )->GetObj(); + + if( pObject ) { - pPreviewWin->HideAndAnimateObject(pObject); + pInfo = pDoc->GetAnimationInfo( pObject ); + + if( pInfo && !( eEffect == presentation::AnimationEffect_PATH && pObject == pPath ) ) + pPreviewWin->HideAndAnimateObject( pObject ); } } } |