sd/source/ui/func/fudraw.cxx | 22 +---------------------
sd/source/ui/func/fupoor.cxx | 16 ++++++++++++++++
sd/source/ui/inc/fudraw.hxx | 1 -
3 files changed, 17 insertions(+), 22 deletions(-)
New commits:
commit ddff603053051ed674ff267d5b75ddda9076903c
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Tue Mar 15 16:41:16 2016 +0100
sd image resizing: Small code cleanup
The decision whether to resize proportionally should be made in
FuPoor::doConstructOrthogonal
Change-Id: I9f27bc377db2933f781f962b0048527ded533b34
Reviewed-on: https://gerrit.libreoffice.org/23281
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 5404dc3..76898a6 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 34b35ab..9b05d71 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 ||
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index 6a22089..6300064 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -77,7 +77,6 @@ protected:
bool bDragHelpLine;
sal_uInt16 nHelpLine;
bool bPermanent;
- bool bIsMediaSelected;
private:
void DoModifiers(const MouseEvent& rMEvt, bool bSnapModPressed);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
