summaryrefslogtreecommitdiff
path: root/svx/source/sidebar
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 09:26:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 12:39:11 +0100
commit5404f75a2fa863b97bdf8432f647053f0bff726e (patch)
tree119d2cede534f5ce1173422df99a0e532d6a7a28 /svx/source/sidebar
parent39efec060719bb2654ba20844ba02429371a4ffb (diff)
loplugin:collapseif in sdext..svx
Change-Id: I188d9e9b53e00acfbae3c7acd54de28f084c4b3f Reviewed-on: https://gerrit.libreoffice.org/62985 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/sidebar')
-rw-r--r--svx/source/sidebar/line/LinePropertyPanelBase.cxx22
1 files changed, 8 insertions, 14 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 9b1b8152321f..33c478fc457f 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -385,14 +385,11 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault,
mpLBStart->Enable();
}
- if(bSetOrDefault)
+ if(bSetOrDefault && pItem)
{
- if(pItem)
- {
- mpStartItem.reset(static_cast<XLineStartItem*>(pItem->Clone()));
- SelectEndStyle(true);
- return;
- }
+ mpStartItem.reset(static_cast<XLineStartItem*>(pItem->Clone()));
+ SelectEndStyle(true);
+ return;
}
mpStartItem.reset(nullptr);
@@ -412,14 +409,11 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault,
mpLBEnd->Enable();
}
- if(bSetOrDefault)
+ if(bSetOrDefault && pItem)
{
- if(pItem)
- {
- mpEndItem.reset(static_cast<XLineEndItem*>(pItem->Clone()));
- SelectEndStyle(false);
- return;
- }
+ mpEndItem.reset(static_cast<XLineEndItem*>(pItem->Clone()));
+ SelectEndStyle(false);
+ return;
}
mpEndItem.reset(nullptr);