INTEGRATION: CWS aw024 (1.88.44); FILE MERGED

2006/09/22 02:32:45 aw 1.88.44.8: RESYNC: (1.96-1.97); FILE MERGED
2006/09/08 20:57:34 aw 1.88.44.7: RESYNC: (1.95-1.96); FILE MERGED
2006/08/03 17:11:43 aw 1.88.44.6: RESYNC: (1.94-1.95); FILE MERGED
2006/05/12 22:11:06 aw 1.88.44.5: RESYNC: (1.92-1.94); FILE MERGED
2005/11/18 16:03:02 aw 1.88.44.4: RESYNC: (1.90-1.92); FILE MERGED
2005/09/17 23:09:31 aw 1.88.44.3: RESYNC: (1.89-1.90); FILE MERGED
2005/07/22 10:36:15 aw 1.88.44.2: RESYNC: (1.88-1.89); FILE MERGED
2005/05/19 12:15:27 aw 1.88.44.1: #i39529#

sw/source/ui/uiview/view.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: view.cxx,v $
  *
- *  $Revision: 1.97 $
+ *  $Revision: 1.98 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:23:50 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:20:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -380,7 +380,7 @@ IMPL_LINK( SwView, FormControlActivated, FmFormShell*, EMPTYARG )
         // if we're editing text currently, cancel this
         SdrView *pSdrView = pWrtShell ? pWrtShell->GetDrawView() : NULL;
         if ( pSdrView && pSdrView->IsTextEdit() )
-            pSdrView->EndTextEdit( sal_True );
+            pSdrView->SdrEndTextEdit( sal_True );
 
         const_cast< SwView* >( this )->AttrChangedNotify( pWrtShell );
     }
@@ -1204,7 +1204,7 @@ SwView::~SwView()
     //JP 27.11.00: Bug 80631 - the last view must end the text edit
     SdrView *pSdrView = pWrtShell ? pWrtShell->GetDrawView() : 0;
     if( pSdrView && pSdrView->IsTextEdit() )
-        pSdrView->EndTextEdit( sal_True );
+        pSdrView->SdrEndTextEdit( sal_True );
 
     SetWindow( 0 );