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-11 09:32:08 +0200 |
commit | d98c817cc71e62a2beecc7142062f9ef33a7149b (patch) | |
tree | b204588f46e938c5549c2a4ff4b87d8e71bc9591 /include | |
parent | d5dd1216804afae35d7fe7dbb1d37b0ca1fcce88 (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.
Change-Id: I70565e4e3f80daf0e1007031ef7d49036fb0e26b
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/svddrgmt.hxx | 3 | ||||
-rw-r--r-- | include/svx/svdoashp.hxx | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index db16b0ec5b07..6e2fa4a87359 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -127,6 +127,7 @@ private: // bitfield bool mbMoveOnly : 1; bool mbSolidDraggingActive : 1; + bool mbShiftPressed : 1; protected: // access for derivated classes to maSdrDragEntries @@ -193,6 +194,8 @@ public: void Show(); void Hide(); + bool IsShiftPressed() { return mbShiftPressed; } + void SetShiftPressed(bool bShiftPressed) { mbShiftPressed = bShiftPressed; } virtual void TakeSdrDragComment(OUString& rStr) const=0; virtual bool BeginSdrDrag()=0; virtual void MoveSdrDrag(const Point& rPnt)=0; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index e5b3e8f8b29d..fbf2c1256523 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -110,7 +110,8 @@ public: SVX_DLLPRIVATE void DragCreateObject( SdrDragStat& rDrag ); SVX_DLLPRIVATE void DragResizeCustomShape( const Rectangle& rNewRect, SdrObjCustomShape* pObj ) const; - SVX_DLLPRIVATE void DragMoveCustomShapeHdl( const Point aDestination, const sal_uInt16 nCustomShapeHdlNum, SdrObjCustomShape* pObj ) const; + SVX_DLLPRIVATE void DragMoveCustomShapeHdl( const Point aDestination, + const sal_uInt16 nCustomShapeHdlNum, SdrObjCustomShape* pObj, bool bMoveCalloutRectangle ) const; // #i37011# centralize throw-away of render geometry void InvalidateRenderGeometry(); |