diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:15:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:15:13 +0000 |
| commit | 838800ae8a6117f777ad3e000b2c7ededd0f676a (patch) | |
| tree | c51133c9b2d2d49beb86bbf74881eae5d3eeeb20 /sd | |
| parent | 94cc419547d896b5e5b8d63d168ecf410c9d369e (diff) | |
INTEGRATION: CWS impress109 (1.14.22); FILE MERGED
2006/10/10 15:04:00 cl 1.14.22.1: #134177# check if draw view is 0 before using it
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuconstr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index b0fd6d7576ec..dc1df9e071e6 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fuconstr.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-09-16 18:48:32 $ + * last change: $Author: vg $ $Date: 2006-11-01 14:15:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -214,7 +214,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); - if ( pView->IsDragObj() ) + if ( pView && pView->IsDragObj() ) { FrameView* pFrameView = pViewShell->GetFrameView(); BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); @@ -227,7 +227,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) pView->SetDragWithCopy(bDragWithCopy); pView->EndDragObj( pView->IsDragWithCopy() ); } - else if ( pView->IsMarkObj() ) + else if ( pView && pView->IsMarkObj() ) { pView->EndMarkObj(); } @@ -236,7 +236,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) bReturn = FALSE; } - if ( !pView->IsAction() ) + if ( pView && !pView->IsAction() ) { pWindow->ReleaseMouse(); USHORT nDrgLog = USHORT ( pWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); |