diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 13:05:07 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 13:05:07 +0000 |
| commit | 335884826179a2a30a2cdda036b4486657ec6840 (patch) | |
| tree | dc0b5bd35abdab44e38c98c38e4b9e0b448dd7e0 /sd/source/ui/view/drviewsd.cxx | |
| parent | INTEGRATION: CWS impress37 (1.11.118); FILE MERGED (diff) | |
| download | core-335884826179a2a30a2cdda036b4486657ec6840.tar.gz core-335884826179a2a30a2cdda036b4486657ec6840.zip | |
INTEGRATION: CWS impress37 (1.6.118); FILE MERGED
2005/03/11 12:33:42 af 1.6.118.1: #i44470# Added guard against pActualPage being NULL.
Diffstat (limited to 'sd/source/ui/view/drviewsd.cxx')
| -rw-r--r-- | sd/source/ui/view/drviewsd.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index e25921a35216..73adf0daab73 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewsd.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2004-11-26 20:32:36 $ + * last change: $Author: vg $ $Date: 2005-03-23 14:05:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -240,7 +240,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) { UINT32 nState = NAVSTATE_NONE; - USHORT nCurrentPage; + USHORT nCurrentPage = 0; USHORT nFirstPage = 0; USHORT nLastPage; BOOL bEndless = FALSE; @@ -268,9 +268,12 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) { nState |= NAVBTN_PEN_DISABLED | NAVTLB_UPDATE; - nCurrentPage = ( pActualPage->GetPageNum() - 1 ) / 2; + if (pActualPage != NULL) + { + nCurrentPage = ( pActualPage->GetPageNum() - 1 ) / 2; + aPageName = pActualPage->GetName(); + } nLastPage = GetDoc()->GetSdPageCount( ePageKind ) - 1; - aPageName = pActualPage->GetName(); } // erste Seite / vorherige Seite |