diff options
Diffstat (limited to 'sd/source/ui/func')
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 22 | ||||
| -rw-r--r-- | sd/source/ui/func/fupoor.cxx | 16 |
2 files changed, 17 insertions, 21 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5404dc30ffd8..76898a62cac7 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -78,7 +78,6 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, , bDragHelpLine(false) , nHelpLine(0) , bPermanent(false) - , bIsMediaSelected(false) { } @@ -155,25 +154,6 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) bDragHelpLine = false; aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); - // Check whether a media object is selected - bIsMediaSelected = false; - if (mpView->AreObjectsMarked()) - { - const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - if (rMarkList.GetMarkCount() == 1) - { - SdrMark* pMark = rMarkList.GetMark(0); - // tdf#89758 Extra check to avoid interactive crop preview from being - // proportionally scaled by default. - if (mpView->GetDragMode() != SDRDRAG_CROP) - { - sal_uInt16 aObjIdentifier = pMark->GetMarkedSdrObj()->GetObjIdentifier(); - bIsMediaSelected = aObjIdentifier == OBJ_GRAF || - aObjIdentifier == OBJ_MEDIA; - } - } - } - if ( rMEvt.IsLeft() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); @@ -261,7 +241,7 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt) if (mpView->IsAction()) { // #i33136# and fdo#88339 - if(bRestricted && (bIsMediaSelected || doConstructOrthogonal())) + if(bRestricted && doConstructOrthogonal()) { // Scale proportionally by default: // rectangle->quadrat, ellipse->circle, Images etc. diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 34b35ab4a1ca..9b05d71a41c3 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -1123,7 +1123,23 @@ bool FuPoor::cancel() // #i33136# bool FuPoor::doConstructOrthogonal() const { + // Check whether a media object is selected + bool bIsMediaSelected = false; + // tdf#89758 Avoid interactive crop preview from being proportionally scaled by default. + if (mpView->AreObjectsMarked() && mpView->GetDragMode() != SDRDRAG_CROP) + { + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + if (rMarkList.GetMarkCount() == 1) + { + SdrMark* pMark = rMarkList.GetMark(0); + sal_uInt16 aObjIdentifier = pMark->GetMarkedSdrObj()->GetObjIdentifier(); + bIsMediaSelected = aObjIdentifier == OBJ_GRAF || + aObjIdentifier == OBJ_MEDIA; + } + } + return ( + bIsMediaSelected || SID_DRAW_XLINE == nSlotId || SID_DRAW_CIRCLEARC == nSlotId || SID_DRAW_SQUARE == nSlotId || |