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

INTEGRATION: CWS geordi2q10 (1.53.162); FILE MERGED

Browse source 
2003/11/26 16:09:32 rt 1.53.162.1: #111934#: join CWS draw20pp1
This commit is contained in:
Rüdiger Timm 2003-12-01 09:09:07 +00:00
parent 22589a8336
commit 39cf9a5130
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sd/source/ui/docshell/docshel4.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: docshel4.cxx,v $ * $RCSfile: docshel4.cxx,v $
* *
* $Revision: 1.53 $ * $Revision: 1.54 $
* *
* last change: $Author: vg $ $Date: 2003-05-16 14:17:31 $ * last change: $Author: rt $ $Date: 2003-12-01 10:09:07 $
* *
* 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
@ -550,8 +550,9 @@ BOOL SdDrawDocShell::LoadFrom(SvStorage* pStor)
if(pLocalItemSet && pDestItemSet) if(pLocalItemSet && pDestItemSet)
{ {
const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>( const SfxUnoAnyItem* pItem = static_cast<
pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL)); const SfxUnoAnyItem*>(
pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
if(pItem) if(pItem)
{ {
@ -929,7 +930,11 @@ BOOL SdDrawDocShell::GotoBookmark(const String& rBookmark)
* Zur Seite springen * Zur Seite springen
**********************************************************/ **********************************************************/
bFound = TRUE; bFound = TRUE;
SdPage* pPage = (SdPage*) pDoc->GetPage(nPgNum); SdPage* pPage;
if (bIsMasterPage)
pPage = (SdPage*) pDoc->GetMasterPage(nPgNum);
else
pPage = (SdPage*) pDoc->GetPage(nPgNum);
PageKind eNewPageKind = pPage->GetPageKind(); PageKind eNewPageKind = pPage->GetPageKind();