diff options
| author | Christian Lippka <cl@openoffice.org> | 2010-12-08 12:35:53 +0100 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2010-12-08 12:35:53 +0100 |
| commit | 43aa5e0362693dfddbd9e8a44ca028f49428fd96 (patch) | |
| tree | cdde34d90a543878d778dede93c2bdbdaa7de037 /sd | |
| parent | 7530937426b6ec089899ee8a91b83808e42885a1 (diff) | |
impressdefaults1: #i112002# enter rotation mode after text edit when rotation mode is on
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/source/ui/func/fusel.cxx | 4 | ||||
| -rwxr-xr-x | sd/source/ui/func/futext.cxx | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 9b3fb0e10de6..5c380da547bc 100755 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -160,8 +160,6 @@ FuSelection::~FuSelection() BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { - OSL_TRACE("FuSelection::MouseButtonDown(), clicks=%d", rMEvt.GetClicks() ); - // Hack fuer #?????# bHideAndAnimate = FALSE; @@ -650,8 +648,6 @@ 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 diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2f3111665692..2835821796a1 100755 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -702,6 +702,17 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) mpView->EndDragObj( mpView->IsDragWithCopy() ); mpView->ForceMarkedToAnotherPage(); mpView->SetCurrentObj(OBJ_TEXT); + + USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + + if ( mpView->IsRotateAllowed() && mpViewShell->GetFrameView()->IsClickChangeRotation() && (rMEvt.GetClicks() != 2) && + !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsRight() && + Abs(aPnt.X() - aMDPos.X()) < nDrgLog && + Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog) + { + // toggle to rotation mode + mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_ROTATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + } } else if( mpView && mpView->IsCreateObj() && rMEvt.IsLeft()) { |