#100133# crash with ESCAPE in table text selection repaired
This commit is contained in:
parent
2773a440a8
commit
9a27887358
1 changed files with 11 additions and 8 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: view2.cxx,v $
|
||||
*
|
||||
* $Revision: 1.24 $
|
||||
* $Revision: 1.25 $
|
||||
*
|
||||
* last change: $Author: os $ $Date: 2002-05-24 08:02:12 $
|
||||
* last change: $Author: os $ $Date: 2002-06-12 14:18:20 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -475,18 +475,21 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
|
|||
}
|
||||
else if ( pWrtShell->HasSelection() || IsDrawMode() )
|
||||
{
|
||||
SdrView *pSdrView = pWrtShell->GetDrawView();
|
||||
if(pSdrView->HasMarkedObj() &&
|
||||
SdrView *pSdrView = pWrtShell->HasDrawView() ? pWrtShell->GetDrawView() : 0;
|
||||
if(pSdrView && pSdrView->HasMarkedObj() &&
|
||||
pSdrView->GetHdlList().GetFocusHdl())
|
||||
{
|
||||
((SdrHdlList&)pSdrView->GetHdlList()).ResetFocusHdl();
|
||||
}
|
||||
else
|
||||
{
|
||||
LeaveDrawCreate();
|
||||
Point aPt(LONG_MIN, LONG_MIN);
|
||||
//go out of the frame
|
||||
pWrtShell->SelectObj(aPt, SW_LEAVE_FRAME);
|
||||
if(pSdrView)
|
||||
{
|
||||
LeaveDrawCreate();
|
||||
Point aPt(LONG_MIN, LONG_MIN);
|
||||
//go out of the frame
|
||||
pWrtShell->SelectObj(aPt, SW_LEAVE_FRAME);
|
||||
}
|
||||
pWrtShell->EnterStdMode();
|
||||
AttrChangedNotify(pWrtShell); // ggf Shellwechsel...
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue