INTEGRATION: CWS aw024 (1.13.80); FILE MERGED

2006/09/22 02:25:38 aw 1.13.80.6: RESYNC: (1.16-1.17); FILE MERGED
2006/09/08 20:55:23 aw 1.13.80.5: RESYNC: (1.15-1.16); FILE MERGED
2006/08/03 17:09:54 aw 1.13.80.4: RESYNC: (1.14-1.15); FILE MERGED
2005/09/17 22:52:30 aw 1.13.80.3: RESYNC: (1.13-1.14); FILE MERGED
2005/05/26 11:30:40 aw 1.13.80.2: #i39531#
2005/05/19 12:15:25 aw 1.13.80.1: #i39529#

sw/source/ui/shells/drawsh.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: drawsh.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:13:34 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:19:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -385,7 +385,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
 
         if ( pDrView->IsTextEdit() )
         {
-            pDrView->EndTextEdit( TRUE );
+            pDrView->SdrEndTextEdit( TRUE );
             GetView().AttrChangedNotify(&rSh);
         }
 
@@ -399,7 +399,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
             SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)(GetView().GetViewFrame()->
                                         GetChildWindow(nId)->GetWindow());
 
-            pDlg->CreateStdFormObj(*pDrView, *pDrView->GetPageViewPvNum(0),
+            pDlg->CreateStdFormObj(*pDrView, *pDrView->GetSdrPageView(),
                                     rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(),
                                    ((const XFormTextStdFormItem*) pItem)->
                                    GetValue());