[Libreoffice-commits] core.git: sc/source sd/source svx/source

[Matúš Kukan]

 sc/source/ui/drawfunc/fusel.cxx |    4 +++-
 sd/source/ui/func/fusel.cxx     |    5 ++++-
 svx/source/svdraw/svddrgmt.cxx  |    3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 37c3cf70c724b7402588d1d32d3aa76a965ee41b
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Mon Jul 14 18:08:51 2014 +0200

    Related cp#1000084: Make this work for other apps too and set proper default
    
    Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default.
    
    Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604

diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index c2e87ef..ff6ca89 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -21,6 +21,7 @@
 
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
+#include <svx/svddrgmt.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdotext.hxx>
 #include <sfx2/dispatch.hxx>
@@ -142,7 +143,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
             if ( bDrag )
             {
                 aDragTimer.Start();
-                pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
+                if (pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl))
+                    pView->GetDragMethod()->SetShiftPressed( rMEvt.IsShift() );
                 bReturn = true;
             }
         }
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 354dc61..cc00317 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -19,6 +19,7 @@
 
 #include "fusel.hxx"
 #include <basic/sbstar.hxx>
+#include <svx/svddrgmt.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/polysc3d.hxx>
@@ -223,7 +224,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
             }
 
             if ( ! rMEvt.IsRight())
-                mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
+                if (mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog))
+                    mpView->GetDragMethod()->SetShiftPressed( rMEvt.IsShift() );
             bReturn = true;
         }
         else
@@ -485,6 +487,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                     mpView->MarkPoint(*pHdl);
                     if ( ! rMEvt.IsRight())
                         mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
+
                 }
             }
             else
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 9e5b5f4..04d2c59 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -640,7 +640,8 @@ SdrDragMethod::SdrDragMethod(SdrDragView& rNewView)
     maOverlayObjectList(),
     mrSdrDragView(rNewView),
     mbMoveOnly(false),
-    mbSolidDraggingActive(getSdrDragView().IsSolidDragging())
+    mbSolidDraggingActive(getSdrDragView().IsSolidDragging()),
+    mbShiftPressed(false)
 {
     if(mbSolidDraggingActive && Application::GetSettings().GetStyleSettings().GetHighContrastMode())
     {