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 | ccddd0f7f7ce32db59a6865f5c9c79d0532d9f64 (patch) | |
| tree | 6aaad4b7ca08fe1842e3e319ba57afbec38f318c /sd | |
| parent | 58707d613f0fdd7e80cde7502195d7d0112fa3a4 (diff) | |
| parent | 1cb65f56602d9ba5079ecb7d1d297ea90fefafc1 (diff) | |
Merge commit 'libreoffice-3.4.2.3'
Diffstat (limited to 'sd')
| -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 05ae15a565a3..a6a3664f5785 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 f68c9bece7c1..bcffd4fa12d8 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; |