sw/source/uibase/docvw/edtwin.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 86689c5ceeb238bab480f476e5aa768d082d2f58
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Mar 17 16:32:44 2016 +0000
return of cid#982483 Dereference after null check
with
commit e41d23abb03a0c5a5c50be290c2265513e178889
Date: Tue Mar 15 19:43:36 2016 +0100
tdf#84953 Only resize proportionally when dragging on a corner
Change-Id: I7575b17e63e3f6f767169eb38d54f8792ff970c3
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 1013087..a354e1b 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4084,14 +4084,14 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
rSh.GetSelectionType() &
nsSelectionType::SEL_OLE;
bool bisResize = g_eSdrMoveHdl != HDL_MOVE;
- // Resize proportionally when media is selected and the
user drags on a corner
- const Point aSttPt(PixelToLogic(m_aStartPos));
- SdrHdl* pHdl = pSdrView->PickHandle(aSttPt);
- if (pHdl)
- bResizeKeepRatio = bResizeKeepRatio &&
pHdl->IsCornerHdl();
-
if (pSdrView)
{
+ // Resize proportionally when media is selected and
the user drags on a corner
+ const Point aSttPt(PixelToLogic(m_aStartPos));
+ SdrHdl* pHdl = pSdrView->PickHandle(aSttPt);
+ if (pHdl)
+ bResizeKeepRatio = bResizeKeepRatio &&
pHdl->IsCornerHdl();
+
if (pSdrView->GetDragMode() == SDRDRAG_CROP)
bisResize = false;
if (rMEvt.IsShift())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
