diff options
| author | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2010-12-08 10:42:58 +0100 |
|---|---|---|
| committer | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2010-12-08 10:42:58 +0100 |
| commit | 7530937426b6ec089899ee8a91b83808e42885a1 (patch) | |
| tree | 289816380935fb9bc5705a45c8a85a52ae86152c /sd | |
| parent | 21015b5d04af5f27a41dd77215a29ba250599fe2 (diff) | |
impressdefaults1: #i112002# re enable text edit on double click with rotation mode on
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/source/ui/func/fusel.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 332f9971c611..9b3fb0e10de6 100755 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -160,6 +160,8 @@ FuSelection::~FuSelection() BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { + OSL_TRACE("FuSelection::MouseButtonDown(), clicks=%d", rMEvt.GetClicks() ); + // Hack fuer #?????# bHideAndAnimate = FALSE; @@ -437,8 +439,11 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } } - if( bMarked && (nSlotId == SID_OBJECT_ROTATE) && !rMEvt.IsShift() ) - mpViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SYNCHRON); + if( bMarked && bTempRotation && (nSlotId == SID_OBJECT_ROTATE) && !rMEvt.IsShift() && (rMEvt.GetClicks() != 2) ) + { + nSlotId = SID_OBJECT_SELECT; + Activate(); + } } } } @@ -645,6 +650,8 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { + OSL_TRACE("FuSelection::MouseButtonUp(), clicks=%d", rMEvt.GetClicks() ); + BOOL bReturn = FALSE; // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context @@ -714,6 +721,8 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if (nSlotId == SID_OBJECT_SELECT && mpView->IsRotateAllowed() + + && (rMEvt.GetClicks() != 2) && (mpViewShell->GetFrameView()->IsClickChangeRotation() || (pSingleObj && pSingleObj->GetObjInventor()==E3dInventor)) |