diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-17 13:17:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-17 13:17:19 +0000 |
| commit | 4154ca1293e47b680985497de758e963995c1201 (patch) | |
| tree | 216eb0daf9d4cdaa1b594e9d915cbff521f35000 /svx/source/svdraw/svdedxv.cxx | |
| parent | f3930a43319e788ced5da55dde065544510ff11f (diff) | |
INTEGRATION: CWS os19 (1.32.54); FILE MERGED
2004/09/12 19:45:17 os 1.32.54.4: RESYNC: (1.38-1.39); FILE MERGED
2004/04/29 17:06:26 os 1.32.54.3: RESYNC: (1.33-1.38); FILE MERGED
2003/11/18 10:26:09 hr 1.32.54.2: RESYNC: (1.32-1.33); FILE MERGED
2003/10/31 10:19:58 os 1.32.54.1: #i18881# prevent focus change in BegTextEdit
Diffstat (limited to 'svx/source/svdraw/svdedxv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f762b80ca9b1..fb1d2f7c87e8 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdedxv.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2004-07-12 14:45:36 $ + * last change: $Author: rt $ $Date: 2004-09-17 14:17:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -583,7 +583,7 @@ BOOL SdrObjEditView::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin BOOL SdrObjEditView::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, BOOL bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, - BOOL bDontDeleteOutliner, BOOL bOnlyOneView) + BOOL bDontDeleteOutliner, BOOL bOnlyOneView, BOOL bGrabFocus) { EndTextEdit(); if (!HAS_BASE(SdrTextObj,pObj)) return FALSE; // z.Zt. nur mit meinen Textobjekten @@ -722,7 +722,8 @@ BOOL SdrObjEditView::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin } } } - pWin->GrabFocus(); // Damit der Cursor hier auch blinkt + if(bGrabFocus) + pWin->GrabFocus(); // Damit der Cursor hier auch blinkt pTextEditOutlinerView->ShowCursor(); pTextEditOutliner->SetStatusEventHdl(LINK(this,SdrObjEditView,ImpOutlinerStatusEventHdl)); #ifndef SVX_LIGHT |