[Libreoffice-commits] .: 7 commits - sd/source

[Jan Holesovsky]

 sd/source/ui/func/futext.cxx |    7 ++++++-
 sd/source/ui/inc/futext.hxx  |    1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit db29edb76544bdfae4f59576774eaf486a1a7ed6
Merge: f40440c... f410fcc...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 18:38:34 2011 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/impress

commit f40440c06b16f9660768ca4f263f415b9794bcf0
Merge: d2d7357... 1949742...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 10:14:01 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'

commit 19497428a14474717e2dee418ac45144daf8bd63
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:43 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit bd7a8f5179fee130fa86bcb06594d9eb25def4fb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:07:58 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit 0a164c876dc1d18fa5bd34453a885f0af7bbcfe7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:10 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit ec54ce767efd015c4b1ea646b1a8c05b796fc3a2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:40 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit b684f1144acf3da2d9e4951a47d433234d84e482
Author: Luke Symes <allsymes at gmail.com>
Date:   Thu Jul 7 09:22:50 2011 +0200

    fdo#37482 selecting text box after editing gives rotation handles
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 281645d..f683370 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 ea5b309..a792a03 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;