From 39cf9a513072a1676d55073de1971561f7401550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Mon, 1 Dec 2003 09:09:07 +0000
Subject: [PATCH] INTEGRATION: CWS geordi2q10 (1.53.162); FILE MERGED
 2003/11/26 16:09:32 rt 1.53.162.1: #111934#: join CWS draw20pp1

---
 sd/source/ui/docshell/docshel4.cxx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index c1377b8bd300..61c27fd79f2c 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -2,9 +2,9 @@
  *
  *  $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
  *  either of the following licenses
@@ -550,8 +550,9 @@ BOOL SdDrawDocShell::LoadFrom(SvStorage* pStor)
 
             if(pLocalItemSet && pDestItemSet)
             {
-                const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>(
-                    pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
+                const SfxUnoAnyItem* pItem = static_cast<
+                    const SfxUnoAnyItem*>(
+                        pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
 
                 if(pItem)
                 {
@@ -929,7 +930,11 @@ BOOL SdDrawDocShell::GotoBookmark(const String& rBookmark)
             * Zur Seite springen
             **********************************************************/
             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();