diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:51:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:51:20 +0000 |
| commit | 01eb5716ed67413cd915f81647ce52916ee09b90 (patch) | |
| tree | 4b8795158aaf606c267701592f7806a002c9bfc0 /sc/source/ui/drawfunc/fudraw.cxx | |
| parent | 99eef1a88583d69a682cf54d1c7d75cbff0470e7 (diff) | |
INTEGRATION: CWS aw024 (1.14.38); FILE MERGED
2006/08/03 19:04:20 aw 1.14.38.5: RESYNC: (1.16-1.19); FILE MERGED
2006/07/07 16:06:03 aw 1.14.38.4: adaptions after resync SRC680m171->SRC680m174
2005/11/18 19:28:39 aw 1.14.38.3: RESYNC: (1.15-1.16); FILE MERGED
2005/09/20 01:43:47 aw 1.14.38.2: RESYNC: (1.14-1.15); FILE MERGED
2005/05/12 16:44:05 aw 1.14.38.1: #i39529#
Diffstat (limited to 'sc/source/ui/drawfunc/fudraw.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index a9645470f0f7..27e8cca81335 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fudraw.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2006-07-25 12:25:41 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:51:20 $ * * 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 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle ) { - pView->HideMarkHdl(NULL); + pView->HideMarkHdl(); pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 ); // consumed @@ -703,8 +703,8 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) if(pHdl->GetKind() == HDL_POLY) { // rescue ID of point with focus - sal_uInt16 nPol(pHdl->GetPolyNum()); - sal_uInt16 nPnt(pHdl->GetPointNum()); + sal_uInt32 nPol(pHdl->GetPolyNum()); + sal_uInt32 nPnt(pHdl->GetPointNum()); if(pView->IsPointMarked(*pHdl)) { @@ -861,7 +861,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) Point aPosPixel = pWindow->GetPointerPosPixel(); BOOL bAlt = pMEvt && pMEvt->IsMod2(); Point aPnt = pWindow->PixelToLogic( aPosPixel ); - SdrHdl* pHdl = pView->HitHandle(aPnt, *pWindow); + SdrHdl* pHdl = pView->PickHandle(aPnt); SdrObject* pObj; SdrPageView* pPV; @@ -910,7 +910,7 @@ BOOL FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const { Point aMPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); bIsSizingOrMoving = - pView->HitHandle( aMPos, *pWindow ) || // handles to resize the note + pView->PickHandle( aMPos ) || // handles to resize the note pView->IsTextEditFrameHit( aMPos ); // frame for moving the note } } |