strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS draw18 (1.29.2); FILE MERGED

Browse source 
2003/06/17 13:10:06 af 1.29.2.2: #110243# Avoid invalid cast.
2003/06/17 12:49:15 af 1.29.2.1: #110243# Joined two if statements to their original form to allow proper update of preview.
This commit is contained in:
Vladimir Glazounov 2003-06-24 06:41:21 +00:00
parent 81326cbce7
commit 9d10666355
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sd/source/ui/app/sdmod2.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: sdmod2.cxx,v $ * $RCSfile: sdmod2.cxx,v $
* *
* $Revision: 1.29 $ * $Revision: 1.30 $
* *
* last change: $Author: vg $ $Date: 2003-06-06 10:45:53 $ * last change: $Author: vg $ $Date: 2003-06-24 07:41:21 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -261,14 +261,15 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
pViewSh = PTR_CAST( SdViewShell, SfxViewShell::Current() ); pViewSh = PTR_CAST( SdViewShell, SfxViewShell::Current() );
if( pViewSh ) if( pViewSh )
{
if( pViewSh->ISA( SdOutlineViewShell ) )
{ {
// #110023# // #110023#
// since the view from the SdOutlineViewShell can be zero during SdOutlineViewShell c'tor // since the view from the SdOutlineViewShell can be zero during SdOutlineViewShell c'tor
// we have to check this here // we have to check this here
SdOutlineView * pSdView = (SdOutlineView*) ( (SdOutlineViewShell*) pViewSh)->GetView(); SdOutlineView* pSdView = NULL;
if( pSdView && (pInfo->GetOutliner() == pSdView->GetOutliner()) ) if (pViewSh->ISA (SdOutlineViewShell))
pSdView = static_cast<SdOutlineView*> (static_cast<SdOutlineViewShell*>(pViewSh)->GetView());
if (pSdView != NULL
&& (pInfo->GetOutliner() == pSdView->GetOutliner()))
{ {
// outline mode // outline mode
nPgNum = 0; nPgNum = 0;
@ -282,7 +283,6 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
nPgNum++; nPgNum++;
} }
} }
}
else else
{ {
// draw mode, slide mode and preview // draw mode, slide mode and preview