diff options
| -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 c2e87ef4dc7e..ff6ca891c6d0 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 354dc619b001..cc0031723afd 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 9e5b5f44c638..04d2c59a87f3 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()) { |