INTEGRATION: CWS aw024 (1.28.152); FILE MERGED

2006/09/22 02:35:14 aw 1.28.152.9: RESYNC: (1.33-1.34); FILE MERGED
2006/09/08 20:58:34 aw 1.28.152.8: RESYNC: (1.32-1.33); FILE MERGED
2006/08/03 17:12:32 aw 1.28.152.7: RESYNC: (1.31-1.32); FILE MERGED
2006/07/27 15:52:24 aw 1.28.152.6: #114408# adaptions for SC
2006/05/17 12:49:28 aw 1.28.152.5: changes after resync
2006/01/26 21:23:17 aw 1.28.152.4: RESYNC: (1.30-1.31); FILE MERGED
2005/11/18 16:03:41 aw 1.28.152.3: RESYNC: (1.29-1.30); FILE MERGED
2005/09/17 23:11:34 aw 1.28.152.2: RESYNC: (1.28-1.29); FILE MERGED
2005/05/19 12:15:27 aw 1.28.152.1: #i39529#

sw/source/ui/uiview/viewdraw.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: viewdraw.cxx,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.35 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:25:28 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:21:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -150,6 +150,10 @@
 #include <svx/extrusionbar.hxx>
 #endif
 
+#ifndef _SV_SVAPP_HXX //autogen
+#include <vcl/svapp.hxx>
+#endif
+
 using namespace ::com::sun::star;
 /*--------------------------------------------------------------------
     Beschreibung:   Drawing-Ids ausfuehren
@@ -472,7 +476,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
     }
 
     if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit())
-        pSdrView->EndTextEdit( sal_True );
+        pSdrView->SdrEndTextEdit( sal_True );
 
     AttrChangedNotify(pWrtShell);
 }
@@ -567,7 +571,7 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
     pSdrView->SetHitTolerancePixel( 2 );
 
     if( pSdrView->IsMarkedHit( aDocPos ) &&
-        !pSdrView->HitHandle( aDocPos, *pSh->GetOut() ) && IsTextTool() &&
+        !pSdrView->PickHandle( aDocPos ) && IsTextTool() &&
         pSdrView->PickObj( aDocPos, pObj, pPV, SDRSEARCH_PICKTEXTEDIT ) &&
 
         // #108784#
@@ -579,7 +583,7 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
 
         !pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT))
     {
-        bReturn = BeginTextEdit(pObj, pPV, pEditWin, FALSE );
+        bReturn = BeginTextEdit( pObj, pPV, pEditWin, sal_False );
     }
 
     pSdrView->SetHitTolerancePixel( nOld );
@@ -590,8 +594,7 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
 /******************************************************************************
  *  Beschreibung: DrawTextEditMode einschalten
  ******************************************************************************/
-sal_Bool SwView::BeginTextEdit( SdrObject* pObj, SdrPageView* pPV,
-                                Window* pWin, sal_Bool bIsNewObj )
+sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, sal_Bool bIsNewObj)
 {
     SwWrtShell *pSh = &GetWrtShell();
     SdrView *pSdrView = pSh->GetDrawView();
@@ -667,10 +670,10 @@ sal_Bool SwView::BeginTextEdit( SdrObject* pObj, SdrPageView* pPV,
     // set in each case, thus it will be correct for all objects
     ((SdrTextObj*)pToBeActivated)->SetTextEditOffset(aNewTextEditOffset);
 
-    sal_Bool bRet = pSdrView->BegTextEdit( pToBeActivated, pPV, pWin, TRUE, pOutliner, 0, FALSE, FALSE, FALSE );
+    sal_Bool bRet(pSdrView->SdrBeginTextEdit( pToBeActivated, pPV, pWin, sal_True, pOutliner, 0, sal_False, sal_False, sal_False ));
 
     // #i7672#
-    // Since BegTextEdit actually creates the OutlinerView and thus also
+    // Since SdrBeginTextEdit actually creates the OutlinerView and thus also
     // sets the background color, an own background color needs to be set
     // after TextEditing was started. This is now done here.
     if(bRet)