summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-06 13:27:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-07 07:56:39 +0100
commit2e2d736ccbb21daae91603732c87d5375ede1b47 (patch)
tree6621e351d38dff77dc16c6413767f4baa3c76326 /oox
parent1647bc1309dcd313dff2614f4844b71b1c558dee (diff)
loplugin:collapseif in framework..sal
Change-Id: I3068b18f5cff024a48a8f8c68d69cadad30fe4d5 Reviewed-on: https://gerrit.libreoffice.org/62953 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/drawingml.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 573d2982cc88..ba60093fa121 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -666,11 +666,9 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
if (aLineDash.Dots == 0 && aLineDash.DotLen == 0 && aLineDash.Dashes == 0 && aLineDash.DashLen == 0 && aLineDash.Distance == 0) {
OUString aLineDashName;
GET(aLineDashName, LineDashName);
- if (!aLineDashName.isEmpty()) {
- if (xModel) {
- css::uno::Any aAny = getLineDash(xModel, aLineDashName);
- aAny >>= aLineDash;
- }
+ if (!aLineDashName.isEmpty() && xModel) {
+ css::uno::Any aAny = getLineDash(xModel, aLineDashName);
+ aAny >>= aLineDash;
}
}
bDashSet = true;