Kaydet (Commit) 37c3cf70 authored tarafından Matúš Kukan's avatar Matúš Kukan

Related cp#1000084: Make this work for other apps too and set proper default

Extend d98c817c and fix default.

Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604
üst cc9e4953
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx> #include <editeng/flditem.hxx>
#include <svx/svddrgmt.hxx>
#include <svx/svdoole2.hxx> #include <svx/svdoole2.hxx>
#include <svx/svdotext.hxx> #include <svx/svdotext.hxx>
#include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx>
...@@ -142,7 +143,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) ...@@ -142,7 +143,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( bDrag ) if ( bDrag )
{ {
aDragTimer.Start(); aDragTimer.Start();
pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl); if (pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl))
pView->GetDragMethod()->SetShiftPressed( rMEvt.IsShift() );
bReturn = true; bReturn = true;
} }
} }
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "fusel.hxx" #include "fusel.hxx"
#include <basic/sbstar.hxx> #include <basic/sbstar.hxx>
#include <svx/svddrgmt.hxx>
#include <svx/svdpagv.hxx> #include <svx/svdpagv.hxx>
#include <svx/svdogrp.hxx> #include <svx/svdogrp.hxx>
#include <svx/polysc3d.hxx> #include <svx/polysc3d.hxx>
...@@ -223,7 +224,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) ...@@ -223,7 +224,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
} }
if ( ! rMEvt.IsRight()) 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; bReturn = true;
} }
else else
...@@ -485,6 +487,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) ...@@ -485,6 +487,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpView->MarkPoint(*pHdl); mpView->MarkPoint(*pHdl);
if ( ! rMEvt.IsRight()) if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
} }
} }
else else
......
...@@ -640,7 +640,8 @@ SdrDragMethod::SdrDragMethod(SdrDragView& rNewView) ...@@ -640,7 +640,8 @@ SdrDragMethod::SdrDragMethod(SdrDragView& rNewView)
maOverlayObjectList(), maOverlayObjectList(),
mrSdrDragView(rNewView), mrSdrDragView(rNewView),
mbMoveOnly(false), mbMoveOnly(false),
mbSolidDraggingActive(getSdrDragView().IsSolidDragging()) mbSolidDraggingActive(getSdrDragView().IsSolidDragging()),
mbShiftPressed(false)
{ {
if(mbSolidDraggingActive && Application::GetSettings().GetStyleSettings().GetHighContrastMode()) if(mbSolidDraggingActive && Application::GetSettings().GetStyleSettings().GetHighContrastMode())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment