INTEGRATION: CWS aw013 (1.5.66); FILE MERGED

2004/06/29 11:30:54 aw 1.5.66.2: RESYNC: (1.5-1.6); FILE MERGED
2004/06/28 14:55:01 aw 1.5.66.1: #117254#

1 files changed, 6 insertions, 19 deletions

diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index c76ead8d1836..acbd351ce2df 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewcontactofsdrpage.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-10 11:33:34 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 14:42:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,19 +135,7 @@ namespace sdr
         // that number if the model does not have any MasterPages.
         sal_uInt32 ViewContactOfSdrPage::ImpGetCorrectedMasterPageCount() const
         {
-            sal_uInt32 nRetval(GetSdrPage().GetMasterPageCount());
-
-            // If there is no model or the model has no MasterPages, forget MasterPageCount
-            if(nRetval)
-            {
-                SdrModel* pModel = GetSdrPage().GetModel();
-
-                if(!pModel || !pModel->GetMasterPageCount())
-                {
-                    nRetval = 0L;
-                }
-            }
-
+            sal_uInt32 nRetval(GetSdrPage().TRG_HasMasterPage() ? 1L : 0L);
             return nRetval;
         }
 
@@ -456,12 +444,11 @@ namespace sdr
             if(nIndex < nMasterPageCount)
             {
                 // return the added MasterPage as sub-hierarchy of the draw page
-                SdrPage* pMasterPage = GetSdrPage().GetMasterPage((sal_uInt16)nIndex);
-                DBG_ASSERT(pMasterPage, "ViewContactOfMasterPage::GetViewContact: Corrupt MasterPage List (!)");
-                ViewContact& rViewContactOfMasterPage = pMasterPage->GetViewContact();
+                SdrPage& rMasterPage = GetSdrPage().TRG_GetMasterPage();
+                ViewContact& rViewContactOfMasterPage = rMasterPage.GetViewContact();
 
                 // set visible layers from MasterPage Layer info
-                SetOfByte aMasterPageVisibleLayers = GetSdrPage().GetMasterPageVisibleLayers((sal_uInt16)nIndex);
+                SetOfByte aMasterPageVisibleLayers = GetSdrPage().TRG_GetMasterPageVisibleLayers();
                 rViewContactOfMasterPage.SetVisibleLayers(aMasterPageVisibleLayers);
 
                 return rViewContactOfMasterPage;