loplugin:flatten in chart2

Change-Id: Iadc4da6515a7d82e7a92b33d74d589b61fa2c64f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92480
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 28 insertions, 28 deletions

diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index d35bc04a0d24..27a4950a886b 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -349,38 +349,38 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
 {
     uno::Reference< beans::XPropertySet > xProp =
         uno::Reference<beans::XPropertySet>::query( xAxisModel );
-    if(xProp.is())
+    if(!xProp.is())
+        return;
+
+    try
     {
-        try
+        xProp->getPropertyValue( "TextBreak" ) >>= bLineBreakAllowed;
+        xProp->getPropertyValue( "TextOverlap" ) >>= bOverlapAllowed;
+        xProp->getPropertyValue( "StackCharacters" ) >>= bStackCharacters;
+        xProp->getPropertyValue( "TextRotation" ) >>= fRotationAngleDegree;
+
+        css::chart::ChartAxisArrangeOrderType eArrangeOrder;
+        xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder;
+        switch(eArrangeOrder)
         {
-            xProp->getPropertyValue( "TextBreak" ) >>= bLineBreakAllowed;
-            xProp->getPropertyValue( "TextOverlap" ) >>= bOverlapAllowed;
-            xProp->getPropertyValue( "StackCharacters" ) >>= bStackCharacters;
-            xProp->getPropertyValue( "TextRotation" ) >>= fRotationAngleDegree;
-
-            css::chart::ChartAxisArrangeOrderType eArrangeOrder;
-            xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder;
-            switch(eArrangeOrder)
-            {
-                case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE:
-                    eStaggering = AxisLabelStaggering::SideBySide;
-                    break;
-                case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN:
-                    eStaggering = AxisLabelStaggering::StaggerEven;
-                    break;
-                case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD:
-                    eStaggering = AxisLabelStaggering::StaggerOdd;
-                    break;
-                default:
-                    eStaggering = AxisLabelStaggering::StaggerAuto;
-                    break;
-            }
-        }
-        catch( const uno::Exception& )
-        {
-            TOOLS_WARN_EXCEPTION("chart2", "" );
+            case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE:
+                eStaggering = AxisLabelStaggering::SideBySide;
+                break;
+            case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN:
+                eStaggering = AxisLabelStaggering::StaggerEven;
+                break;
+            case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD:
+                eStaggering = AxisLabelStaggering::StaggerOdd;
+                break;
+            default:
+                eStaggering = AxisLabelStaggering::StaggerAuto;
+                break;
         }
     }
+    catch( const uno::Exception& )
+    {
+        TOOLS_WARN_EXCEPTION("chart2", "" );
+    }
 }
 
 bool AxisLabelProperties::isStaggered() const