diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-14 18:08:51 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-14 18:17:30 +0200 |
| commit | a32f8c730ae39d7c791f6c884df8773dac23b420 (patch) | |
| tree | e3c30635c0a2f5e597583cdaa9023f08efabd213 | |
| parent | f48d1e36c01ad9a433a916bfabb9eeb963a04d0e (diff) | |
Related cp#1000084: Make this work for other apps too and set proper default
Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default.
(cherry picked from commit 37c3cf70c724b7402588d1d32d3aa76a965ee41b)
Conflicts:
sc/source/ui/drawfunc/fusel.cxx
sd/source/ui/func/fusel.cxx
Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604
| -rw-r--r-- | sc/source/ui/drawfunc/fusel.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 5 | ||||
| -rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 13e1d30534c4..7c928bd7b2cc 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> @@ -146,7 +147,8 @@ sal_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 = sal_True; } } diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index b1cfce36733a..a3764e937607 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> @@ -225,7 +226,8 @@ sal_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 = sal_True; } else @@ -488,6 +490,7 @@ sal_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 5a6cba41b9de..a54c3d245303 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -639,7 +639,8 @@ SdrDragMethod::SdrDragMethod(SdrDragView& rNewView) maOverlayObjectList(), mrSdrDragView(rNewView), mbMoveOnly(false), - mbSolidDraggingActive(getSdrDragView().IsSolidDragging()) + mbSolidDraggingActive(getSdrDragView().IsSolidDragging()), + mbShiftPressed(false) { if(mbSolidDraggingActive && Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { |