diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 10:14:01 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 10:14:01 +0200 |
| commit | f40440c06b16f9660768ca4f263f415b9794bcf0 (patch) | |
| tree | 9bb55419ac9bb688bbab7d86e87abcd3af8b9c78 | |
| parent | d2d73573bbdec9093abda1aa34bd911dca578535 (diff) | |
| parent | 19497428a14474717e2dee418ac45144daf8bd63 (diff) | |
Merge commit 'libreoffice-3.4.2.3'
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/inc/futext.hxx | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 281645d36..f68337072 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -140,6 +140,7 @@ static sal_Bool bTestText = 0; FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) , bFirstObjCreated(sal_False) +, bJustEndedEdit(false) , rRequest (rReq) { } @@ -400,6 +401,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if( mpView->IsTextEdit() ) { mpView->SdrEndTextEdit(); + bJustEndedEdit = true; if(aVEvt.pHdl) { @@ -682,7 +684,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - if ( mpView->IsRotateAllowed() && mpViewShell->GetFrameView()->IsClickChangeRotation() && (rMEvt.GetClicks() != 2) && + if ( mpView->IsRotateAllowed() && mpViewShell->GetFrameView()->IsClickChangeRotation() && (rMEvt.GetClicks() != 2) && !bJustEndedEdit && !rMEvt.IsShift() && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsRight() && Abs(aPnt.X() - aMDPos.X()) < nDrgLog && Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog) @@ -690,6 +692,9 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // toggle to rotation mode mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_OBJECT_ROTATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } + + if( bJustEndedEdit ) + bJustEndedEdit = false; } else if( mpView && mpView->IsCreateObj() && rMEvt.IsLeft()) { diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index ea5b3091f..a792a03a7 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -98,6 +98,7 @@ protected: SdrObjectWeakRef mxTextObj; Link aOldLink; sal_Bool bFirstObjCreated; + bool bJustEndedEdit; SfxRequest& rRequest; |