diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-10 20:56:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-14 16:20:11 +0200 |
| commit | f48d1e36c01ad9a433a916bfabb9eeb963a04d0e (patch) | |
| tree | c3ea0f77d8132ddab48390c112f23a0c0c81d5b1 /sw/source | |
| parent | abaa319d3bfe3d50c978835c92aea600fddd5241 (diff) | |
Allow to move only callout handle with shift key (cp#1000084)
When line callout was used, you couldn't move the point next to
the rectangle.
Now it's possible with shift key pressed.
(cherry picked from commit d98c817cc71e62a2beecc7142062f9ef33a7149b)
Conflicts:
include/svx/svddrgmt.hxx
sw/source/core/frmedt/feshview.cxx
sw/source/uibase/wrtsh/select.cxx
Change-Id: I70565e4e3f80daf0e1007031ef7d49036fb0e26b
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/wrtsh/select.cxx | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 782c645e72c7..61b6513f0284 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -20,6 +20,7 @@ #include "hintids.hxx" #include <svx/sdrobjectfilter.hxx> +#include <svx/svddrgmt.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> @@ -613,14 +614,15 @@ void SwFEShell::SetDragMode( sal_uInt16 eDragMode ) |* *************************************************************************/ -long SwFEShell::BeginDrag( const Point* pPt, sal_Bool ) +long SwFEShell::BeginDrag( const Point* pPt, sal_Bool bIsShift) { SdrView *pView = Imp()->GetDrawView(); if ( pView && pView->AreObjectsMarked() ) { delete pChainFrom; delete pChainTo; pChainFrom = pChainTo = 0; SdrHdl* pHdl = pView->PickHandle( *pPt ); - pView->BegDragObj( *pPt, 0, pHdl ); + if (pView->BegDragObj( *pPt, 0, pHdl )) + pView->GetDragMethod()->SetShiftPressed( bIsShift ); ::FrameNotify( this, FLY_DRAG ); return 1; } diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index f60d86f20e07..449bed316bfe 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -662,16 +662,16 @@ void SwWrtShell::SetRedlineModeAndCheckInsMode( sal_uInt16 eMode ) // Edit frame -long SwWrtShell::BeginFrmDrag(const Point *pPt, sal_Bool) +long SwWrtShell::BeginFrmDrag(const Point *pPt, sal_Bool bIsShift) { fnDrag = &SwFEShell::Drag; if(bStartDrag) { Point aTmp( nStartDragX, nStartDragY ); - SwFEShell::BeginDrag( &aTmp, sal_False ); + SwFEShell::BeginDrag( &aTmp, bIsShift ); } else - SwFEShell::BeginDrag( pPt, sal_False ); + SwFEShell::BeginDrag( pPt, bIsShift ); return 1; } |