INTEGRATION: CWS aw024 (1.34.198); FILE MERGED

2006/09/22 02:41:03 aw 1.34.198.8: RESYNC: (1.40-1.41); FILE MERGED
2006/09/08 21:03:00 aw 1.34.198.7: RESYNC: (1.39-1.40); FILE MERGED
2006/07/04 15:12:05 aw 1.34.198.6: RESYNC: (1.38-1.39); FILE MERGED
2006/05/12 22:13:25 aw 1.34.198.5: RESYNC: (1.36-1.38); FILE MERGED
2005/11/18 16:05:16 aw 1.34.198.4: RESYNC: (1.35-1.36); FILE MERGED
2005/09/17 23:20:05 aw 1.34.198.3: RESYNC: (1.34-1.35); FILE MERGED
2005/05/26 11:30:41 aw 1.34.198.2: #i39531#
2005/05/19 12:15:28 aw 1.34.198.1: #i39529#

sw/source/ui/utlui/content.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: content.cxx,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:32:38 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:21:46 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -3074,7 +3074,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
             SdrView* pDrawView = pActiveShell->GetDrawView();
             if (pDrawView)
             {
-                pDrawView->EndTextEdit();
+                pDrawView->SdrEndTextEdit();
                 pDrawView->UnmarkAll();
                 SdrModel* pModel = pActiveShell->getIDocumentDrawModelAccess()->GetDrawModel();
                 SdrPage* pPage = pModel->GetPage(0);
@@ -3087,7 +3087,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
                     if ( pTemp->GetName() == pCnt->GetName() )
                     // <--
                     {
-                        SdrPageView* pPV = pDrawView->GetPageViewPvNum(0);
+                        SdrPageView* pPV = pDrawView->GetSdrPageView();
                         if( pPV )
                         {
                             pDrawView->MarkObj( pTemp, pPV );