INTEGRATION: CWS aw024 (1.53.70); FILE MERGED

2006/09/22 02:40:04 aw 1.53.70.10: RESYNC: (1.60-1.61); FILE MERGED
2006/09/08 21:02:25 aw 1.53.70.9: RESYNC: (1.59-1.60); FILE MERGED
2006/08/03 17:13:04 aw 1.53.70.8: RESYNC: (1.58-1.59); FILE MERGED
2006/07/04 15:11:54 aw 1.53.70.7: RESYNC: (1.57-1.58); FILE MERGED
2006/05/17 12:49:28 aw 1.53.70.6: changes after resync
2006/05/12 22:13:16 aw 1.53.70.5: RESYNC: (1.55-1.57); FILE MERGED
2005/11/18 16:04:40 aw 1.53.70.4: RESYNC: (1.54-1.55); FILE MERGED
2005/09/17 23:18:42 aw 1.53.70.3: RESYNC: (1.53-1.54); FILE MERGED
2005/05/26 11:30:41 aw 1.53.70.2: #i39531#
2005/05/19 12:15:28 aw 1.53.70.1: #i39529#

sw/source/ui/uno/unotxvw.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unotxvw.cxx,v $
  *
- *  $Revision: 1.61 $
+ *  $Revision: 1.62 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:31:30 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:21:33 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -167,6 +167,10 @@
 
 #include "swdtflvr.hxx"
 
+#ifndef _SV_SVAPP_HXX //autogen
+#include <vcl/svapp.hxx>
+#endif
+
 using ::com::sun::star::util::URL;
 
 using namespace ::com::sun::star;
@@ -560,10 +564,10 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
             if(pObj)
             {
                 SdrView* pDrawView = rSh.GetDrawView();
-                SdrPageView* pPV = pDrawView->GetPageViewPvNum(0);
+                SdrPageView* pPV = pDrawView->GetSdrPageView();
                 if ( pPV && pObj->GetPage() == pPV->GetPage() )
                 {
-                    pDrawView->EndTextEdit();
+                    pDrawView->SdrEndTextEdit();
                     pDrawView->UnmarkAll();
                     pDrawView->MarkObj( pObj, pPV );
                 }
@@ -591,7 +595,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
             SdrView* pDrawView = rSh.GetDrawView();
             if (pDrawView)
             {
-                pDrawView->EndTextEdit();
+                pDrawView->SdrEndTextEdit();
                 pDrawView->UnmarkAll();
 
                 if (pSvxShape)      // einzelnes Shape
@@ -600,7 +604,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
                     if (pObj)
                     {
 //                      lcl_ShowObject( *pViewSh, *pDrawView, pObj );
-                        SdrPageView* pPV = pDrawView->GetPageViewPvNum(0);
+                        SdrPageView* pPV = pDrawView->GetSdrPageView();
                         if ( pPV && pObj->GetPage() == pPV->GetPage() )
                         {
                             pDrawView->MarkObj( pObj, pPV );
@@ -633,7 +637,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
                                     if (!pPV)               // erstes Objekt
                                     {
 //                                      lcl_ShowObject( *pViewSh, *pDrawView, pObj );
-                                        pPV = pDrawView->GetPageViewPvNum(0);
+                                        pPV = pDrawView->GetSdrPageView();
                                     }
                                     if ( pPV && pObj->GetPage() == pPV->GetPage() )
                                     {