INTEGRATION: CWS aw024 (1.53.48); FILE MERGED

2006/11/10 05:11:33 aw 1.53.48.13: RESYNC: (1.70-1.71); FILE MERGED
2006/09/21 23:45:44 aw 1.53.48.12: RESYNC: (1.69-1.70); FILE MERGED
2006/08/03 16:39:33 aw 1.53.48.11: RESYNC: (1.66-1.69); FILE MERGED
2006/07/07 16:04:56 aw 1.53.48.10: adaptions after resync SRC680m171->SRC680m174
2006/05/12 20:55:43 aw 1.53.48.9: RESYNC: (1.64-1.66); FILE MERGED
2006/01/26 20:19:22 aw 1.53.48.8: RESYNC: (1.61-1.64); FILE MERGED
2005/11/22 14:23:16 aw 1.53.48.7: #b898147##
2005/11/18 14:47:20 aw 1.53.48.6: RESYNC: (1.58-1.61); FILE MERGED
2005/09/17 14:10:23 aw 1.53.48.5: RESYNC: (1.57-1.58); FILE MERGED
2005/05/26 11:24:45 aw 1.53.48.4: #i39531#
2005/05/19 12:11:39 aw 1.53.48.3: #i39529#
2005/05/13 14:41:11 aw 1.53.48.2: RESYNC: (1.53-1.57); FILE MERGED
2005/05/12 16:46:29 aw 1.53.48.1: #i39529#

1 files changed, 21 insertions, 21 deletions

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index cd3758f1a0f8..044b0f1f2945 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: drviews1.cxx,v $
  *
- *  $Revision: 1.71 $
+ *  $Revision: 1.72 $
  *
- *  last change: $Author: vg $ $Date: 2006-11-01 18:05:23 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 14:41:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -276,7 +276,7 @@ void DrawViewShell::SelectionHasChanged (void)
             if (!pOleObj)
             {
                 pIPClient->DeactivateObject();
-                pDrView->ShowMarkHdl(NULL);
+                pDrView->ShowMarkHdl();
             }
             else
             {
@@ -395,7 +395,7 @@ USHORT DrawViewShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
         USHORT nID = GetCurrentFunction()->GetSlotID();
         if (nID == SID_TEXTEDIT || nID == SID_ATTR_CHAR)
         {
-            pDrView->EndTextEdit();
+            pDrView->SdrEndTextEdit();
         }
     }
     else if( !bRet )
@@ -428,7 +428,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
 
         if ( pDrView->IsTextEdit() )
         {
-            pDrView->EndTextEdit();
+            pDrView->SdrEndTextEdit();
         }
 
         LayerTabBar* pLayerBar = GetLayerTabControl();
@@ -871,7 +871,7 @@ ErrCode DrawViewShell::DoVerb(long nVerb)
                     * OLE-Objekt erzeugen, StarImage starten
                     * Grafik-Objekt loeschen (durch OLE-Objekt ersetzt)
                     **************************************************************/
-                    pDrView->HideMarkHdl(NULL);
+                    pDrView->HideMarkHdl();
 
                     SvStorageRef aStor = new SvStorage(String());
                     SvInPlaceObjectRef aNewIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())
@@ -894,10 +894,10 @@ ErrCode DrawViewShell::DoVerb(long nVerb)
                         SdrOle2Obj* pSdrOle2Obj = new SdrOle2Obj( aNewIPObj,
                                                                   aName, aRect );
 
-                        SdrPageView* pPV = pDrView->GetPageViewPvNum(0);
+                        SdrPageView* pPV = pDrView->GetSdrPageView();
 
                         pPV->GetObjList()->InsertObject( pSdrOle2Obj );
-                        pDrView->ReplaceObject( pObj, *pPV, pTempSdrGrafObj );
+                        pDrView->ReplaceObjectAtView( pObj, *pPV, pTempSdrGrafObj );
 
                         pSdrOle2Obj->SetLogicRect(aRect);
                         aNewIPObj->SetVisAreaSize(aRect.GetSize());
@@ -1003,7 +1003,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
 
                 if( pNewPage )
                 {
-                    SdrPageView* pPV = pDrView->GetPageViewPvNum(0);
+                    SdrPageView* pPV = pDrView->GetSdrPageView();
 
                     String sPageText (pNewPage->GetLayoutName());
                     sPageText.Erase(sPageText.SearchAscii(SD_LT_SEPARATOR));
@@ -1023,7 +1023,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
 
                 if (pActualPage == pNewPage)
                 {
-                    SdrPageView* pPV = pDrView->GetPageViewPvNum(0);
+                    SdrPageView* pPV = pDrView->GetSdrPageView();
 
                     if (pPV && pNewPage == dynamic_cast< SdPage* >( pPV->GetPage() ) &&
                         pNewPage->GetName() == aTabControl.GetPageText(nSelectedPage+1))
@@ -1036,7 +1036,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
         }
 
         if( pDrView )
-            pDrView->EndTextEdit();
+            pDrView->SdrEndTextEdit();
 
         pActualPage = NULL;
 
@@ -1107,7 +1107,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
             **********************************************************************/
             GetDoc()->SetSelected(pActualPage, TRUE);
 
-            SdrPageView* pPageView = pDrView->GetPageViewPvNum(0);
+            SdrPageView* pPageView = pDrView->GetSdrPageView();
 
             if (pPageView)
             {
@@ -1129,11 +1129,11 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
                 }
             }
 
-            pDrView->HideAllPages();
-            pDrView->ShowPage(pActualPage, Point(0, 0));
+            pDrView->HideSdrPage();
+            pDrView->ShowSdrPage(pActualPage);
             GetViewShellBase().GetDrawController().FireSwitchCurrentPage(pActualPage);
 
-            SdrPageView* pNewPageView = pDrView->GetPageViewPvNum(0);
+            SdrPageView* pNewPageView = pDrView->GetSdrPageView();
 
             if (pNewPageView)
             {
@@ -1168,7 +1168,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
             /**********************************************************************
             * MASTERPAGE
             **********************************************************************/
-            SdrPageView* pPageView = pDrView->GetPageViewPvNum(0);
+            SdrPageView* pPageView = pDrView->GetSdrPageView();
 
             if (pPageView)
             {
@@ -1190,7 +1190,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
                 }
             }
 
-            pDrView->HideAllPages();
+            pDrView->HideSdrPage();
 
             SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, ePageKind);
 
@@ -1198,11 +1198,11 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
                 pMaster = GetDoc()->GetMasterSdPage(0, ePageKind);
 
             USHORT nNum = pMaster->GetPageNum();
-            pDrView->ShowMasterPagePgNum(nNum, Point(0, 0));
+            pDrView->ShowSdrPage(pDrView->GetModel()->GetMasterPage(nNum));
 
             GetViewShellBase().GetDrawController().FireSwitchCurrentPage(pMaster);
 
-            SdrPageView* pNewPageView = pDrView->GetPageViewPvNum(0);
+            SdrPageView* pNewPageView = pDrView->GetSdrPageView();
 
             if (pNewPageView)
             {
@@ -1351,7 +1351,7 @@ void DrawViewShell::ResetActualLayer()
                         pLayerBar->InsertPage(nLayer+1, aName);
 
                         TabBarPageBits nBits = 0;
-                        SdrPageView* pPV = pDrView->GetPageViewPvNum(0);
+                        SdrPageView* pPV = pDrView->GetSdrPageView();
 
                         if (pPV && !pPV->IsLayerVisible(aName))
                         {
@@ -1371,7 +1371,7 @@ void DrawViewShell::ResetActualLayer()
 
                         TabBarPageBits nBits = 0;
 
-                        if (!pDrView->GetPageViewPvNum(0)->IsLayerVisible(aName))
+                        if (!pDrView->GetSdrPageView()->IsLayerVisible(aName))
                         {
                             // Unsichtbare Layer werden anders dargestellt
                             nBits = TPB_SPECIAL;