loplugin:comparisonwithconstant in chart2

Change-Id: I95787007b26cdcf0d5d1617ecd0e55d377b551d7
Reviewed-on: https://gerrit.libreoffice.org/37941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

12 files changed, 75 insertions, 75 deletions

diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 0a83e792b818..742adc3cb044 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -80,7 +80,7 @@ double SAL_CALL DateScaling::doScaling( double value )
                 fResult += fDayOfMonth/fDaysInMonth;
                 if(m_bShifted)
                 {
-                    if( YEAR==m_nTimeUnit )
+                    if( m_nTimeUnit==YEAR )
                         fResult += 0.5*lcl_fNumberOfMonths;
                     else
                         fResult += 0.5;
@@ -147,7 +147,7 @@ double SAL_CALL InverseDateScaling::doScaling( double value )
                 //Date aDate(m_aNullDate);
                 if(m_bShifted)
                 {
-                    if( YEAR==m_nTimeUnit )
+                    if( m_nTimeUnit==YEAR )
                         value -= 0.5*lcl_fNumberOfMonths;
                     else
                         value -= 0.5;
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index ce1fa1570f27..0ccb61445a32 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -639,12 +639,12 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
         long nNumer = 1;
         long nIntervalDays =  nDayCount / nMaxMainIncrementCount;
         double nDaysPerInterval = 1.0;
-        if( nIntervalDays>365 || YEAR==rExplicitScale.TimeResolution )
+        if( nIntervalDays>365 || rExplicitScale.TimeResolution==YEAR )
         {
             rExplicitIncrement.MajorTimeInterval.TimeUnit = YEAR;
             nDaysPerInterval = 365.0;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
         }
-        else if( nIntervalDays>31 || MONTH==rExplicitScale.TimeResolution )
+        else if( nIntervalDays>31 || rExplicitScale.TimeResolution==MONTH )
         {
             rExplicitIncrement.MajorTimeInterval.TimeUnit = MONTH;
             nDaysPerInterval = 31.0;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index c3d98df7456c..901242455252 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -150,7 +150,7 @@ TickFactory2D::TickFactory2D(
           , m_fOffset_LogicToScreen(0.0)
 {
     double fWidthY = m_fScaledVisibleMax - m_fScaledVisibleMin;
-    if (chart2::AxisOrientation_MATHEMATICAL == m_rScale.Orientation)
+    if (m_rScale.Orientation == chart2::AxisOrientation_MATHEMATICAL)
     {
         m_fStretch_LogicToScreen = 1.0/fWidthY;
         m_fOffset_LogicToScreen = -m_fScaledVisibleMin;
@@ -233,8 +233,8 @@ void TickFactory2D::addPointSequenceForTickLine( drawing::PointSequenceSequence&
 B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties& rAxisProperties, bool bIncludeFarAwayDistanceIfSo, bool bIncludeSpaceBetweenTickAndText ) const
 {
     bool bFarAwayLabels = false;
-    if( css::chart::ChartAxisLabelPosition_OUTSIDE_START == rAxisProperties.m_eLabelPos
-        || css::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos )
+    if( rAxisProperties.m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_START
+        || rAxisProperties.m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_END )
         bFarAwayLabels = true;
 
     double fInnerDirectionSign = rAxisProperties.maLabelAlignment.mfInnerTickDirection;
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 886b67e9edc2..59ed66cdc917 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -58,7 +58,7 @@ void VAxisBase::initAxisLabelProperties( const css::awt::Size& rFontReferenceSiz
     if( !m_aAxisProperties.m_bDisplayLabels )
         return;
 
-    if( AxisType::SERIES==m_aAxisProperties.m_nAxisType )
+    if( m_aAxisProperties.m_nAxisType==AxisType::SERIES )
     {
         if( m_aAxisProperties.m_xAxisTextProvider.is() )
             m_aTextLabels = m_aAxisProperties.m_xAxisTextProvider->getTextualData();
@@ -71,7 +71,7 @@ void VAxisBase::initAxisLabelProperties( const css::awt::Size& rFontReferenceSiz
             return;
         }
     }
-    else if( AxisType::CATEGORY==m_aAxisProperties.m_nAxisType )
+    else if( m_aAxisProperties.m_nAxisType==AxisType::CATEGORY )
     {
         if( m_aAxisProperties.m_pExplicitCategoriesProvider )
             m_aTextLabels = m_aAxisProperties.m_pExplicitCategoriesProvider->getSimpleCategories();
@@ -81,13 +81,13 @@ void VAxisBase::initAxisLabelProperties( const css::awt::Size& rFontReferenceSiz
 
     m_aAxisLabelProperties.nNumberFormatKey = m_aAxisProperties.m_nNumberFormatKey;
     m_aAxisLabelProperties.init(m_aAxisProperties.m_xAxisModel);
-    if( m_aAxisProperties.m_bComplexCategories && AxisType::CATEGORY == m_aAxisProperties.m_nAxisType )
+    if( m_aAxisProperties.m_bComplexCategories && m_aAxisProperties.m_nAxisType == AxisType::CATEGORY )
         m_aAxisLabelProperties.eStaggering = SIDE_BY_SIDE;
 }
 
 bool VAxisBase::isDateAxis() const
 {
-    return AxisType::DATE == m_aScale.AxisType;
+    return m_aScale.AxisType == AxisType::DATE;
 }
 bool VAxisBase::isComplexCategoryAxis() const
 {
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 786e8a3d73aa..35a9855a472f 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -241,7 +241,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
         if( AxisHelper::isAxisPositioningEnabled() )
         {
             xAxisProp->getPropertyValue("CrossoverPosition") >>= m_eCrossoverType;
-            if( css::chart::ChartAxisPosition_VALUE == m_eCrossoverType )
+            if( m_eCrossoverType == css::chart::ChartAxisPosition_VALUE )
             {
                 double fValue = 0.0;
                 xAxisProp->getPropertyValue("CrossoverValue") >>= fValue;
@@ -250,7 +250,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
                     fValue = ::rtl::math::round(fValue);
                 m_pfMainLinePositionAtOtherAxis.reset(fValue);
             }
-            else if( css::chart::ChartAxisPosition_ZERO == m_eCrossoverType )
+            else if( m_eCrossoverType == css::chart::ChartAxisPosition_ZERO )
                 m_pfMainLinePositionAtOtherAxis.reset(0.0);
 
             xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos;
@@ -292,18 +292,18 @@ void AxisProperties::init( bool bCartesian )
                 && m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() )
             m_bComplexCategories = true;
 
-        if( css::chart::ChartAxisPosition_END == m_eCrossoverType )
+        if( m_eCrossoverType == css::chart::ChartAxisPosition_END )
             maLabelAlignment.mfInnerTickDirection = m_bCrossingAxisHasReverseDirection ? 1.0 : -1.0;
         else
             maLabelAlignment.mfInnerTickDirection = m_bCrossingAxisHasReverseDirection ? -1.0 : 1.0;
 
-        if( css::chart::ChartAxisLabelPosition_NEAR_AXIS == m_eLabelPos )
+        if( m_eLabelPos == css::chart::ChartAxisLabelPosition_NEAR_AXIS )
             maLabelAlignment.mfLabelDirection = maLabelAlignment.mfInnerTickDirection;
-        else if( css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE == m_eLabelPos )
+        else if( m_eLabelPos == css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE )
             maLabelAlignment.mfLabelDirection = -maLabelAlignment.mfInnerTickDirection;
-        else if( css::chart::ChartAxisLabelPosition_OUTSIDE_START == m_eLabelPos )
+        else if( m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_START )
             maLabelAlignment.mfLabelDirection = m_bCrossingAxisHasReverseDirection ? -1 : 1;
-        else if( css::chart::ChartAxisLabelPosition_OUTSIDE_END == m_eLabelPos )
+        else if( m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_END )
             maLabelAlignment.mfLabelDirection = m_bCrossingAxisHasReverseDirection ? 1 : -1;
 
         if( m_nDimensionIndex==2 )
@@ -415,7 +415,7 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
 
 bool AxisLabelProperties::isStaggered() const
 {
-    return ( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering );
+    return ( eStaggering == STAGGER_ODD || eStaggering == STAGGER_EVEN );
 }
 
 void AxisLabelProperties::autoRotate45()
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 3ff5cd913cfb..057f957a46ad 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -236,9 +236,9 @@ TickInfo* LabelIterator::firstInfo()
         pTickInfo = m_aPureTickIter.nextInfo();
     if(!pTickInfo)
         return nullptr;
-    if( (STAGGER_EVEN==m_eAxisLabelStaggering && m_bInnerLine)
+    if( (m_eAxisLabelStaggering==STAGGER_EVEN && m_bInnerLine)
         ||
-        (STAGGER_ODD==m_eAxisLabelStaggering && !m_bInnerLine)
+        (m_eAxisLabelStaggering==STAGGER_ODD && !m_bInnerLine)
         )
     {
         //skip first label
@@ -259,8 +259,8 @@ TickInfo* LabelIterator::nextInfo()
         pTickInfo = m_aPureTickIter.nextInfo();
     while( pTickInfo && !pTickInfo->xTextShape.is() );
 
-    if(  STAGGER_EVEN==m_eAxisLabelStaggering
-      || STAGGER_ODD==m_eAxisLabelStaggering )
+    if(  m_eAxisLabelStaggering==STAGGER_EVEN
+      || m_eAxisLabelStaggering==STAGGER_ODD )
     {
         //skip one label
         do
@@ -1016,15 +1016,15 @@ double VCartesianAxis::getAxisIntersectionValue() const
     double fMin = (m_nDimensionIndex==1) ? m_pPosHelper->getLogicMinX() : m_pPosHelper->getLogicMinY();
     double fMax = (m_nDimensionIndex==1) ? m_pPosHelper->getLogicMaxX() : m_pPosHelper->getLogicMaxY();
 
-    return (css::chart::ChartAxisPosition_END == m_aAxisProperties.m_eCrossoverType) ? fMax : fMin;
+    return (m_aAxisProperties.m_eCrossoverType == css::chart::ChartAxisPosition_END) ? fMax : fMin;
 }
 
 double VCartesianAxis::getLabelLineIntersectionValue() const
 {
-    if (css::chart::ChartAxisLabelPosition_OUTSIDE_START == m_aAxisProperties.m_eLabelPos)
+    if (m_aAxisProperties.m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_START)
         return (m_nDimensionIndex==1) ? m_pPosHelper->getLogicMinX() : m_pPosHelper->getLogicMinY();
 
-    if (css::chart::ChartAxisLabelPosition_OUTSIDE_END == m_aAxisProperties.m_eLabelPos)
+    if (m_aAxisProperties.m_eLabelPos == css::chart::ChartAxisLabelPosition_OUTSIDE_END)
         return (m_nDimensionIndex==1) ? m_pPosHelper->getLogicMaxX() : m_pPosHelper->getLogicMaxY();
 
     return getAxisIntersectionValue();
@@ -1055,7 +1055,7 @@ B2DVector VCartesianAxis::getScreenPosition( double fLogicX, double fLogicY, dou
     if( m_pPosHelper )
     {
         drawing::Position3D aScenePos = m_pPosHelper->transformLogicToScene( fLogicX, fLogicY, fLogicZ, true );
-        if(3==m_nDimension)
+        if(m_nDimension==3)
         {
             if( m_xLogicTarget.is() && m_pPosHelper && m_pShapeFactory )
             {
@@ -1126,9 +1126,9 @@ void VCartesianAxis::get2DAxisMainLine(
     double fXOther = fMaxX;
     int nDifferentValue = !m_pPosHelper->isMathematicalOrientationX() ? -1 : 1;
     if( !m_pPosHelper->isSwapXAndY() )
-        nDifferentValue *= (CuboidPlanePosition_Left != m_eLeftWallPos) ? -1 : 1;
+        nDifferentValue *= (m_eLeftWallPos != CuboidPlanePosition_Left) ? -1 : 1;
     else
-        nDifferentValue *= (CuboidPlanePosition_Bottom != m_eBottomPos) ? -1 : 1;
+        nDifferentValue *= (m_eBottomPos != CuboidPlanePosition_Bottom) ? -1 : 1;
     if( nDifferentValue<0 )
     {
         fXOnXPlane = fMaxX;
@@ -1139,9 +1139,9 @@ void VCartesianAxis::get2DAxisMainLine(
     double fYOther = fMaxY;
     nDifferentValue = !m_pPosHelper->isMathematicalOrientationY() ? -1 : 1;
     if( !m_pPosHelper->isSwapXAndY() )
-        nDifferentValue *= (CuboidPlanePosition_Bottom != m_eBottomPos) ? -1 : 1;
+        nDifferentValue *= (m_eBottomPos != CuboidPlanePosition_Bottom) ? -1 : 1;
     else
-        nDifferentValue *= (CuboidPlanePosition_Left != m_eLeftWallPos) ? -1 : 1;
+        nDifferentValue *= (m_eLeftWallPos != CuboidPlanePosition_Left) ? -1 : 1;
     if( nDifferentValue<0 )
     {
         fYOnYPlane = fMaxY;
@@ -1151,7 +1151,7 @@ void VCartesianAxis::get2DAxisMainLine(
     double fZOnZPlane = fMaxZ;
     double fZOther = fMinZ;
     nDifferentValue = !m_pPosHelper->isMathematicalOrientationZ() ? -1 : 1;
-    nDifferentValue *= (CuboidPlanePosition_Back != m_eBackWallPos) ? -1 : 1;
+    nDifferentValue *= (m_eBackWallPos != CuboidPlanePosition_Back) ? -1 : 1;
     if( nDifferentValue<0 )
     {
         fZOnZPlane = fMinZ;
@@ -1165,7 +1165,7 @@ void VCartesianAxis::get2DAxisMainLine(
     double fYEnd;
     double fZEnd = fZStart;
 
-    if( 0==m_nDimensionIndex ) //x-axis
+    if( m_nDimensionIndex==0 ) //x-axis
     {
         if( fCrossesOtherAxis < fMinY )
             fCrossesOtherAxis = fMinY;
@@ -1175,7 +1175,7 @@ void VCartesianAxis::get2DAxisMainLine(
         fYStart = fYEnd = fCrossesOtherAxis;
         fXEnd=m_pPosHelper->getLogicMaxX();
 
-        if(3==m_nDimension)
+        if(m_nDimension==3)
         {
             if( AxisHelper::isAxisPositioningEnabled() )
             {
@@ -1219,7 +1219,7 @@ void VCartesianAxis::get2DAxisMainLine(
             }
         }//end 3D x axis
     }
-    else if( 1==m_nDimensionIndex ) //y-axis
+    else if( m_nDimensionIndex==1 ) //y-axis
     {
         if( fCrossesOtherAxis < fMinX )
             fCrossesOtherAxis = fMinX;
@@ -1229,7 +1229,7 @@ void VCartesianAxis::get2DAxisMainLine(
         fXStart = fXEnd = fCrossesOtherAxis;
         fYEnd=m_pPosHelper->getLogicMaxY();
 
-        if(3==m_nDimension)
+        if(m_nDimension==3)
         {
             if( AxisHelper::isAxisPositioningEnabled() )
             {
@@ -1318,7 +1318,7 @@ void VCartesianAxis::get2DAxisMainLine(
                 fYStart = fYEnd = m_pPosHelper->isMathematicalOrientationY() ? m_pPosHelper->getLogicMaxY() : m_pPosHelper->getLogicMinY();
             }
 
-            if(3==m_nDimension)
+            if(m_nDimension==3)
             {
                 rStart = getScreenPosition( fXStart, fYStart, fZStart );
                 rEnd = getScreenPosition( fXEnd, fYEnd, fZEnd );
@@ -1363,15 +1363,15 @@ void VCartesianAxis::get2DAxisMainLine(
     rStart = getScreenPosition( fXStart, fYStart, fZStart );
     rEnd = getScreenPosition( fXEnd, fYEnd, fZEnd );
 
-    if(3==m_nDimension && !AxisHelper::isAxisPositioningEnabled() )
+    if(m_nDimension==3 && !AxisHelper::isAxisPositioningEnabled() )
         rAlignment.mfInnerTickDirection = rAlignment.mfLabelDirection;//to behave like before
 
-    if(3==m_nDimension && AxisHelper::isAxisPositioningEnabled() )
+    if(m_nDimension==3 && AxisHelper::isAxisPositioningEnabled() )
     {
         double fDeltaX = rEnd.getX() - rStart.getX();
         double fDeltaY = rEnd.getY() - rStart.getY();
 
-        if( 2==m_nDimensionIndex )
+        if( m_nDimensionIndex==2 )
         {
             if( m_eLeftWallPos != CuboidPlanePosition_Left )
             {
@@ -1758,7 +1758,7 @@ void VCartesianAxis::createShapes()
         return;
 
     //create line shapes
-    if(2==m_nDimension)
+    if(m_nDimension==2)
     {
         //create extra long ticks to separate complex categories (create them only there where the labels are)
         if( isComplexCategoryAxis() )
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 934d17046ea3..d232d78afbac 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -83,7 +83,7 @@ void VCartesianCoordinateSystem::createGridShapes()
 
         aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
             , this->createCIDForGrid( xAxis,nDimensionIndex,nAxisIndex ) );
-        if(2==nDimensionCount)
+        if(nDimensionCount==2)
             aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen );
         aGrid.setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
         aGrid.createShapes();
@@ -130,7 +130,7 @@ void VCartesianCoordinateSystem::createVAxisList(
             if( xCrossingMainAxis.is() )
             {
                 ScaleData aCrossingScale( xCrossingMainAxis->getScaleData() );
-                aAxisProperties.m_bCrossingAxisHasReverseDirection = (AxisOrientation_REVERSE==aCrossingScale.Orientation);
+                aAxisProperties.m_bCrossingAxisHasReverseDirection = (aCrossingScale.Orientation==AxisOrientation_REVERSE);
 
                 if( aCrossingScale.AxisType == AxisType::CATEGORY )
                     aAxisProperties.m_bCrossingAxisIsCategoryAxes = true;
@@ -178,7 +178,7 @@ void VCartesianCoordinateSystem::initVAxisInList()
             pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
             pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
                 , this->createCIDForAxis( getAxisByDimension( nDimensionIndex, nAxisIndex ), nDimensionIndex, nAxisIndex ) );
-            if(2==nDimensionCount)
+            if(nDimensionCount==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
         }
@@ -203,7 +203,7 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes()
             sal_Int32 nDimensionIndex = aIt->first.first;
             sal_Int32 nAxisIndex = aIt->first.second;
             pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
-            if(2==nDimensionCount)
+            if(nDimensionCount==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
         }
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 8da909ffef3f..57073235c0ff 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -96,29 +96,29 @@ GridLinePoints::GridLinePoints( const PlottingPositionHelper* pPosHelper, sal_In
     //P1: point on both walls
     //P2: point on 'left' wall not on 'back' wall
 
-    P0[0]=P1[0]=P2[0]= (CuboidPlanePosition_Left == eLeftWallPos || bSwapXY) ? MinX : MaxX;
-    P0[1]=P1[1]=P2[1]= (CuboidPlanePosition_Left == eLeftWallPos || !bSwapXY) ? MinY : MaxY;
-    P0[2]=P1[2]=P2[2]= (CuboidPlanePosition_Back == eBackWallPos) ? MinZ : MaxZ;
+    P0[0]=P1[0]=P2[0]= (eLeftWallPos == CuboidPlanePosition_Left || bSwapXY) ? MinX : MaxX;
+    P0[1]=P1[1]=P2[1]= (eLeftWallPos == CuboidPlanePosition_Left || !bSwapXY) ? MinY : MaxY;
+    P0[2]=P1[2]=P2[2]= (eBackWallPos == CuboidPlanePosition_Back) ? MinZ : MaxZ;
 
     if(m_nDimensionIndex==0)
     {
-        P0[1]= (CuboidPlanePosition_Left == eLeftWallPos || !bSwapXY) ? MaxY : MinY;
-        P2[2]= (CuboidPlanePosition_Back == eBackWallPos) ? MaxZ : MinZ;
-        if( CuboidPlanePosition_Bottom != eBottomPos && !bSwapXY )
+        P0[1]= (eLeftWallPos == CuboidPlanePosition_Left || !bSwapXY) ? MaxY : MinY;
+        P2[2]= (eBackWallPos == CuboidPlanePosition_Back) ? MaxZ : MinZ;
+        if( eBottomPos != CuboidPlanePosition_Bottom && !bSwapXY )
             P2=P1;
     }
     else if(m_nDimensionIndex==1)
     {
-        P0[0]= (CuboidPlanePosition_Left == eLeftWallPos || bSwapXY) ? MaxX : MinX;
-        P2[2]= (CuboidPlanePosition_Back == eBackWallPos) ? MaxZ : MinZ;
-        if( CuboidPlanePosition_Bottom != eBottomPos && bSwapXY )
+        P0[0]= (eLeftWallPos == CuboidPlanePosition_Left || bSwapXY) ? MaxX : MinX;
+        P2[2]= (eBackWallPos == CuboidPlanePosition_Back) ? MaxZ : MinZ;
+        if( eBottomPos != CuboidPlanePosition_Bottom && bSwapXY )
             P2=P1;
     }
     else if(m_nDimensionIndex==2)
     {
-        P0[0]= (CuboidPlanePosition_Left == eLeftWallPos || bSwapXY) ? MaxX : MinX;
-        P2[1]= (CuboidPlanePosition_Left == eLeftWallPos || !bSwapXY) ? MaxY : MinY;
-        if( CuboidPlanePosition_Bottom != eBottomPos )
+        P0[0]= (eLeftWallPos == CuboidPlanePosition_Left || bSwapXY) ? MaxX : MinX;
+        P2[1]= (eLeftWallPos == CuboidPlanePosition_Left || !bSwapXY) ? MaxY : MinY;
+        if( eBottomPos != CuboidPlanePosition_Bottom )
         {
             if( !bSwapXY )
                 P0=P1;
@@ -239,7 +239,7 @@ void VCartesianGrid::createShapes()
                 xTarget.set( xGroupShape_Shapes );
         }
 
-        if(2==m_nDimension)
+        if(m_nDimension==2)
         {
 
             GridLinePoints aGridLinePoints( m_pPosHelper, m_nDimensionIndex );
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 0cafa1560f5e..318561e5267b 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -142,7 +142,7 @@ void VCoordinateSystem::setTransformationSceneToScreen(
         VAxisBase* pVAxis = aIt->second.get();
         if( pVAxis )
         {
-            if(2==pVAxis->getDimensionCount())
+            if(pVAxis->getDimensionCount()==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
         }
     }
@@ -182,7 +182,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
         std::swap(nXResolution,nYResolution);
 
     //2D
-    if( 2 == aResolution.getLength() )
+    if( aResolution.getLength() == 2 )
     {
         aResolution[0]=nXResolution;
         aResolution[1]=nYResolution;
@@ -373,20 +373,20 @@ void VCoordinateSystem::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAuto
     double fMax = 0.0;
     ::rtl::math::setInf(&fMin, false);
     ::rtl::math::setInf(&fMax, true);
-    if( 0 == nDimIndex )
+    if( nDimIndex == 0 )
     {
         // x dimension
         fMin = m_aMergedMinMaxSupplier.getMinimumX();
         fMax = m_aMergedMinMaxSupplier.getMaximumX();
     }
-    else if( 1 == nDimIndex )
+    else if( nDimIndex == 1 )
     {
         // y dimension
         ExplicitScaleData aScale = getExplicitScale( 0, 0 );
         fMin = m_aMergedMinMaxSupplier.getMinimumYInRange(aScale.Minimum,aScale.Maximum, nAxisIndex);
         fMax = m_aMergedMinMaxSupplier.getMaximumYInRange(aScale.Minimum,aScale.Maximum, nAxisIndex);
     }
-    else if( 2 == nDimIndex )
+    else if( nDimIndex == 2 )
     {
         // z dimension
         fMin = m_aMergedMinMaxSupplier.getMinimumZ();
@@ -457,7 +457,7 @@ void VCoordinateSystem::createMaximumAxesLabels()
         VAxisBase* pVAxis = aIt->second.get();
         if( pVAxis )
         {
-            if(2==pVAxis->getDimensionCount())
+            if(pVAxis->getDimensionCount()==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->createMaximumLabels();
         }
@@ -472,7 +472,7 @@ void VCoordinateSystem::createAxesLabels()
         VAxisBase* pVAxis = aIt->second.get();
         if( pVAxis )
         {
-            if(2==pVAxis->getDimensionCount())
+            if(pVAxis->getDimensionCount()==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->createLabels();
         }
@@ -488,7 +488,7 @@ void VCoordinateSystem::updatePositions()
         VAxisBase* pVAxis = aIt->second.get();
         if( pVAxis )
         {
-            if(2==pVAxis->getDimensionCount())
+            if(pVAxis->getDimensionCount()==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->updatePositions();
         }
@@ -504,7 +504,7 @@ void VCoordinateSystem::createAxesShapes()
         VAxisBase* pVAxis = aIt->second.get();
         if( pVAxis )
         {
-            if(2==pVAxis->getDimensionCount())
+            if(pVAxis->getDimensionCount()==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
 
             tFullAxisIndex aFullAxisIndex = aIt->first;
@@ -512,13 +512,13 @@ void VCoordinateSystem::createAxesShapes()
             {
                 if( aFullAxisIndex.first == 0 )
                 {
-                    if( AxisType::CATEGORY!=m_aExplicitScales[1].AxisType )
+                    if( m_aExplicitScales[1].AxisType!=AxisType::CATEGORY )
                         pVAxis->setExtraLinePositionAtOtherAxis(
                             m_aExplicitScales[1].Origin );
                 }
                 else if( aFullAxisIndex.first == 1 )
                 {
-                    if( AxisType::CATEGORY!=m_aExplicitScales[0].AxisType )
+                    if( m_aExplicitScales[0].AxisType!=AxisType::CATEGORY )
                         pVAxis->setExtraLinePositionAtOtherAxis(
                             m_aExplicitScales[0].Origin );
                 }
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index da53f99b527c..b3315f86f1dc 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -33,7 +33,7 @@ VPolarAxis* VPolarAxis::createAxis( const AxisProperties& rAxisProperties
            , const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
            , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount )
 {
-    if( 0==nDimensionIndex )
+    if( nDimensionIndex==0 )
         return new VPolarAngleAxis( rAxisProperties, xNumberFormatsSupplier, nDimensionCount );
     return new VPolarRadiusAxis( rAxisProperties, xNumberFormatsSupplier, nDimensionCount );
 }
@@ -59,7 +59,7 @@ void VPolarAxis::setIncrements( const std::vector< ExplicitIncrementData >& rInc
 
 bool VPolarAxis::isAnythingToDraw()
 {
-    return ( 2==m_nDimension && VAxisBase::isAnythingToDraw() );
+    return ( m_nDimension==2 && VAxisBase::isAnythingToDraw() );
 }
 
 } //namespace chart
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index f0e20c47d898..9c8ada2ae0ee 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -122,7 +122,7 @@ void VPolarCoordinateSystem::initVAxisInList()
             VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis );
             if( pVPolarAxis )
                 pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
-            if(2==nDimensionCount)
+            if(nDimensionCount==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
         }
@@ -150,7 +150,7 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes()
             VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis );
             if( pVPolarAxis )
                 pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
-            if(2==nDimensionCount)
+            if(nDimensionCount==2)
                 pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
             pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
         }
@@ -177,7 +177,7 @@ void VPolarCoordinateSystem::createGridShapes()
         aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
         aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
             , this->createCIDForGrid( xAxis, nDimensionIndex, nAxisIndex ) );
-        if(2==nDimensionCount)
+        if(nDimensionCount==2)
             aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen );
         aGrid.setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY );
         aGrid.createShapes();
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 7ff9a9be2ffd..856bd3197bd2 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -235,7 +235,7 @@ void VPolarGrid::createShapes()
     VCartesianGrid::fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
 
     //create tick mark line shapes
-    if(2==m_nDimension)
+    if(m_nDimension==2)
     {
         if(m_nDimensionIndex==1)
             this->create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );