diff options
Diffstat (limited to 'svx/source/svdraw/svdview.cxx')
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 4b3ed1855d..bdfed9e872 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -371,7 +372,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co USHORT nHitPassNum=0; USHORT nHlplIdx=0; USHORT nGlueId=0; - BOOL bUnmarkedObjHit=FALSE; if (bTextEditHit || bTextEditSel) { eHit=SDRHIT_TEXTEDIT; @@ -429,7 +429,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co break; } } - bUnmarkedObjHit=TRUE; } else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV)) { @@ -502,8 +501,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft()); // FitToSize berueksichtigen - SdrFitToSizeType eFit=pTextObj->GetFitToSize(); - BOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + BOOL bFitToSize(pTextObj->IsFitToSize()); if (bFitToSize) { Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1); Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1); @@ -662,7 +660,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark BOOL bGlue=pHdl->GetKind()==HDL_GLUE; BOOL bPoly=!bGlue && IsPointMarkable(*pHdl); - BOOL bMarked=bGlue || bPoly && pHdl->IsSelected(); + BOOL bMarked=bGlue || (bPoly && pHdl->IsSelected()); if (bGlue || bPoly) { eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; @@ -1602,3 +1600,5 @@ void SdrView::SetMasterPagePaintCaching(sal_Bool bOn) } } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |