strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sd: Drop unnecessary non-zero check

Browse source 
The second part of the condition already
makes sure that the mark count is non-zero.

Change-Id: I174bfc2ff3112616a63dda64f4435cd3d235343c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177424
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn 2024-11-27 15:29:00 +01:00
parent 4f7cdf40de
commit aea7c6a013
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sd/source/ui/view/drviews4.cxx
View file

@ -646,8 +646,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
{
// is something selected?
const SdrMarkList& rMarkList(mpDrawView->GetMarkedObjectList());
if (rMarkList.GetMarkCount() != 0 &&
rMarkList.GetMarkCount() == 1 )
if (rMarkList.GetMarkCount() == 1)
{
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
if( HasCurrentFunction(SID_BEZIER_EDIT) && (dynamic_cast< SdrPathObj * >( pObj ) != nullptr ) )
@ -788,8 +787,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
// multiple selection
else if (rMarkList.GetMarkCount() != 0 &&
rMarkList.GetMarkCount() > 1 )
else if (rMarkList.GetMarkCount() > 1)
{
aPopupId = "multiselect";
}
@ -822,7 +820,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
const SdrMarkList& rMarkList(mpDrawView->GetMarkedObjectList());
//middle of the bounding rect if something is marked
if( rMarkList.GetMarkCount() != 0 && rMarkList.GetMarkCount() >= 1 )
if (rMarkList.GetMarkCount() >= 1)
{
::tools::Rectangle aMarkRect;
rMarkList.TakeBoundRect(nullptr,aMarkRect);