Scope reduction.

Change-Id: Ie92743a05c857f0cbb5e812d8341127d29d18202

chart2/source/view/axes/VCartesianAxis.cxx

@@ -1381,8 +1381,9 @@ void VCartesianAxis::createLabels()
         return;
 
     //create labels
-    if( m_aAxisProperties.m_bDisplayLabels )
-    {
+    if (!m_aAxisProperties.m_bDisplayLabels)
+        return;
+
     boost::scoped_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
     TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
     if( !pTickFactory2D )
@@ -1424,7 +1425,6 @@ void VCartesianAxis::createLabels()
         }
     }
     doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D );
-    }
 }
 
 void VCartesianAxis::createMaximumLabels()
@@ -1435,8 +1435,9 @@ void VCartesianAxis::createMaximumLabels()
         return;
 
     //create labels
-    if( m_aAxisProperties.m_bDisplayLabels )
-    {
+    if (!m_aAxisProperties.m_bDisplayLabels)
+        return;
+
     boost::scoped_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
     TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
     if( !pTickFactory2D )
@@ -1451,6 +1452,7 @@ void VCartesianAxis::createMaximumLabels()
     AxisLabelProperties aAxisLabelProperties( m_aAxisLabelProperties );
     if( isAutoStaggeringOfLabelsAllowed( aAxisLabelProperties, pTickFactory2D->isHorizontalAxis(), pTickFactory2D->isVerticalAxis() ) )
         aAxisLabelProperties.eStaggering = STAGGER_EVEN;
+
     aAxisLabelProperties.bOverlapAllowed = true;
     aAxisLabelProperties.bLineBreakAllowed = false;
     sal_Int32 nTextLevelCount = getTextLevelCount();
@@ -1465,14 +1467,14 @@ void VCartesianAxis::createMaximumLabels()
         }
     }
     doStaggeringOfLabels( aAxisLabelProperties, pTickFactory2D );
-    }
 }
 
 void VCartesianAxis::updatePositions()
 {
     //update positions of labels
-    if( m_aAxisProperties.m_bDisplayLabels )
-    {
+    if (!m_aAxisProperties.m_bDisplayLabels)
+        return;
+
     boost::scoped_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
     TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
     if( !pTickFactory2D )
@@ -1536,7 +1538,6 @@ void VCartesianAxis::updatePositions()
     }
 
     doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D );
-    }
 }
 
 void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory_2D& rTickFactory2D, bool bOnlyAtLabels )