Attachment 108854 Details for Bug 84380 – git diff of the fudraw.cxx file at sd/source/ui/func

git diff of the fudraw.cxx file at sd/source/ui/func

fudrawDiff.cxx (text/plain), 7.14 KB, created by Victor Sanches Portella on 2014-11-03 17:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Sanches Portella

Created: 2014-11-03 17:25:06 UTC

Size: 7.14 KB

patch

obsolete

>diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
>index 219cd6e..da4e833 100644
>--- a/sd/source/ui/func/fudraw.cxx
>+++ b/sd/source/ui/func/fudraw.cxx
>@@ -88,6 +88,72 @@ FuDraw::~FuDraw()
>     mpView->BrkAction();
> }
> 
>+
>+/*************************************************************************
>+|*
>+|* Do Modifiers - code shared by MouseButtonDown and MouseMove
>+|*
>+\************************************************************************/
>+
>+void FuDraw::DoModifiers(const MouseEvent& rMEvt, bool bSnapModPressed)
>+{
>+     FrameView* pFrameView = mpViewShell->GetFrameView();
>+    
>+    bool bGridSnap = pFrameView->IsGridSnap();
>+    bGridSnap = (bSnapModPressed != bGridSnap);
>+
>+    if (mpView->IsGridSnap() != bGridSnap)
>+        mpView->SetGridSnap(bGridSnap);
>+
>+    bool bBordSnap = pFrameView->IsBordSnap();
>+    bBordSnap = (bSnapModPressed != bBordSnap);
>+
>+    if (mpView->IsBordSnap() != bBordSnap)
>+        mpView->SetBordSnap(bBordSnap);
>+
>+    bool bHlplSnap = pFrameView->IsHlplSnap();
>+    bHlplSnap = (bSnapModPressed != bHlplSnap);
>+
>+    if (mpView->IsHlplSnap() != bHlplSnap)
>+        mpView->SetHlplSnap(bHlplSnap);
>+
>+    bool bOFrmSnap = pFrameView->IsOFrmSnap();
>+    bOFrmSnap = (bSnapModPressed != bOFrmSnap);
>+
>+    if (mpView->IsOFrmSnap() != bOFrmSnap)
>+        mpView->SetOFrmSnap(bOFrmSnap);
>+
>+    bool bOPntSnap = pFrameView->IsOPntSnap();
>+    bOPntSnap = (bSnapModPressed != bOPntSnap);
>+
>+    if (mpView->IsOPntSnap() != bOPntSnap)
>+        mpView->SetOPntSnap(bOPntSnap);
>+
>+    bool bOConSnap = pFrameView->IsOConSnap();
>+    bOConSnap = (bSnapModPressed != bOConSnap);
>+
>+    if (mpView->IsOConSnap() != bOConSnap)
>+        mpView->SetOConSnap(bOConSnap);
>+
>+    bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
>+
>+    if (mpView->IsAngleSnapEnabled() != bAngleSnap)
>+        mpView->SetAngleSnapEnabled(bAngleSnap);
>+
>+    bool bCenter = rMEvt.IsMod2();
>+
>+    if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
>+         mpView->IsResizeAtCenter() != bCenter )
>+    {
>+        mpView->SetCreate1stPointAsCenter(bCenter);
>+        mpView->SetResizeAtCenter(bCenter);
>+    }
>+
>+
>+
>+}
>+
>+
> bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
> {
>     // remember button state for creation of own MouseEvents
>@@ -111,6 +177,7 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
> 
>     if ( rMEvt.IsLeft() )
>     {
>+        
>         FrameView* pFrameView = mpViewShell->GetFrameView();
> 
>         bool bOrtho = false;
>@@ -140,63 +207,17 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
>         {
>             bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho();
>         }
>-
>+        
>         if (!mpView->IsSnapEnabled())
>             mpView->SetSnapEnabled(true);
>-        bool bSnapModPressed = rMEvt.IsMod1();
>-
>-        bool bGridSnap = pFrameView->IsGridSnap();
>-        bGridSnap = (bSnapModPressed != bGridSnap);
>-
>-        if (mpView->IsGridSnap() != bGridSnap)
>-            mpView->SetGridSnap(bGridSnap);
>-
>-        bool bBordSnap = pFrameView->IsBordSnap();
>-        bBordSnap = (bSnapModPressed != bBordSnap);
>-
>-        if (mpView->IsBordSnap() != bBordSnap)
>-            mpView->SetBordSnap(bBordSnap);
> 
>-        bool bHlplSnap = pFrameView->IsHlplSnap();
>-        bHlplSnap = (bSnapModPressed != bHlplSnap);
>-
>-        if (mpView->IsHlplSnap() != bHlplSnap)
>-            mpView->SetHlplSnap(bHlplSnap);
>-
>-        bool bOFrmSnap = pFrameView->IsOFrmSnap();
>-        bOFrmSnap = (bSnapModPressed != bOFrmSnap);
>-
>-        if (mpView->IsOFrmSnap() != bOFrmSnap)
>-            mpView->SetOFrmSnap(bOFrmSnap);
>-
>-        bool bOPntSnap = pFrameView->IsOPntSnap();
>-        bOPntSnap = (bSnapModPressed != bOPntSnap);
>-
>-        if (mpView->IsOPntSnap() != bOPntSnap)
>-            mpView->SetOPntSnap(bOPntSnap);
>-
>-        bool bOConSnap = pFrameView->IsOConSnap();
>-        bOConSnap = (bSnapModPressed != bOConSnap);
>-
>-        if (mpView->IsOConSnap() != bOConSnap)
>-            mpView->SetOConSnap(bOConSnap);
>-
>-        bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
>-
>-        if (mpView->IsAngleSnapEnabled() != bAngleSnap)
>-            mpView->SetAngleSnapEnabled(bAngleSnap);
>+        bool bSnapModPressed = rMEvt.IsMod1();
>+        
> 
>         if (mpView->IsOrtho() != bOrtho)
>             mpView->SetOrtho(bOrtho);
> 
>-        bool bCenter = rMEvt.IsMod2();
>-
>-        if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
>-             mpView->IsResizeAtCenter() != bCenter )
>-        {
>-            mpView->SetCreate1stPointAsCenter(bCenter);
>-            mpView->SetResizeAtCenter(bCenter);
>-        }
>+        DoModifiers(rMEvt, bSnapModPressed);
> 
>         SdrPageView* pPV = 0;
>         sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
>@@ -223,7 +244,7 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
> }
> 
> bool FuDraw::MouseMove(const MouseEvent& rMEvt)
>-{
>+{ 
>     FrameView* pFrameView = mpViewShell->GetFrameView();
>     Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
> 
>@@ -255,62 +276,15 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt)
>         {
>             bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho();
>         }
>-
>+        
>         bool bSnapModPressed = rMEvt.IsMod2();
>         mpView->SetDragWithCopy(rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
> 
>-        bool bGridSnap = pFrameView->IsGridSnap();
>-        bGridSnap = (bSnapModPressed != bGridSnap);
>-
>-        if (mpView->IsGridSnap() != bGridSnap)
>-            mpView->SetGridSnap(bGridSnap);
>-
>-        bool bBordSnap = pFrameView->IsBordSnap();
>-        bBordSnap = (bSnapModPressed != bBordSnap);
>-
>-        if (mpView->IsBordSnap() != bBordSnap)
>-            mpView->SetBordSnap(bBordSnap);
>-
>-        bool bHlplSnap = pFrameView->IsHlplSnap();
>-        bHlplSnap = (bSnapModPressed != bHlplSnap);
>-
>-        if (mpView->IsHlplSnap() != bHlplSnap)
>-            mpView->SetHlplSnap(bHlplSnap);
>-
>-        bool bOFrmSnap = pFrameView->IsOFrmSnap();
>-        bOFrmSnap = (bSnapModPressed != bOFrmSnap);
>-
>-        if (mpView->IsOFrmSnap() != bOFrmSnap)
>-            mpView->SetOFrmSnap(bOFrmSnap);
>-
>-        bool bOPntSnap = pFrameView->IsOPntSnap();
>-        bOPntSnap = (bSnapModPressed != bOPntSnap);
>-
>-        if (mpView->IsOPntSnap() != bOPntSnap)
>-            mpView->SetOPntSnap(bOPntSnap);
>-
>-        bool bOConSnap = pFrameView->IsOConSnap();
>-        bOConSnap = (bSnapModPressed != bOConSnap);
>-
>-        if (mpView->IsOConSnap() != bOConSnap)
>-            mpView->SetOConSnap(bOConSnap);
>-
>-        bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
>-
>-        if (mpView->IsAngleSnapEnabled() != bAngleSnap)
>-            mpView->SetAngleSnapEnabled(bAngleSnap);
>-
>         if (mpView->IsOrtho() != bOrtho)
>             mpView->SetOrtho(bOrtho);
>+        
>+        DoModifiers(rMEvt, bSnapModPressed);
> 
>-        bool bCenter = rMEvt.IsMod2();
>-
>-        if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
>-             mpView->IsResizeAtCenter() != bCenter )
>-        {
>-            mpView->SetCreate1stPointAsCenter(bCenter);
>-            mpView->SetResizeAtCenter(bCenter);
>-        }
> 
>         if ( mpView->IsDragHelpLine() )
>             mpView->MovDragHelpLine(aPos);

Actions: View

Attachments on bug 84380: 108854