strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#100133# crash with ESCAPE in table text selection repaired

Browse source
This commit is contained in:
Oliver Specht 2002-06-12 13:18:20 +00:00
parent 2773a440a8
commit 9a27887358
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sw/source/ui/uiview/view2.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: view2.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -475,18 +475,21 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
} }
else if ( pWrtShell->HasSelection() || IsDrawMode() ) else if ( pWrtShell->HasSelection() || IsDrawMode() )
{ {
SdrView *pSdrView = pWrtShell->GetDrawView(); SdrView *pSdrView = pWrtShell->HasDrawView() ? pWrtShell->GetDrawView() : 0;
if(pSdrView->HasMarkedObj() && if(pSdrView && pSdrView->HasMarkedObj() &&
pSdrView->GetHdlList().GetFocusHdl()) pSdrView->GetHdlList().GetFocusHdl())
{ {
((SdrHdlList&)pSdrView->GetHdlList()).ResetFocusHdl(); ((SdrHdlList&)pSdrView->GetHdlList()).ResetFocusHdl();
} }
else else
{ {
LeaveDrawCreate(); if(pSdrView)
Point aPt(LONG_MIN, LONG_MIN); {
//go out of the frame LeaveDrawCreate();
pWrtShell->SelectObj(aPt, SW_LEAVE_FRAME); Point aPt(LONG_MIN, LONG_MIN);
//go out of the frame
pWrtShell->SelectObj(aPt, SW_LEAVE_FRAME);
}
pWrtShell->EnterStdMode(); pWrtShell->EnterStdMode();
AttrChangedNotify(pWrtShell); // ggf Shellwechsel... AttrChangedNotify(pWrtShell); // ggf Shellwechsel...
} }